Render Rotom drone camera to start orbiting around + try to avoid collisions using raycast point cloud

CHANGELOG-COOKING.md

@@ -1,11 +0,0 @@
-### Additions
-- Added the Campfire Pot, made from apricorns and placed onto campfires.
-  - This pot can be used to make bait for fishing, Poké Cakes, Lure Cakes, local specialties, and potions (less efficiently than a brewing stand).
-  - There is a different pot for each apricorn colour because at this point I think we may have an addiction.
-- Added Aprijuice, made from the Campfire Pot using apricorns with seasoning to give flavours.
-  - Aprijuice can be fed to ride-able Pokémon to improve their riding characteristics, depending on the flavour and the Pokémon's nature.
-
-### Datapack and Addon Changes
-- Renamed the fishing_baits datapack folder to spawn_bait_effects.
-- Added `seasonings` datapack folder for controlling usable items in the campfire pot and what colour and flavour they apply.
-- Added campfire pot recipe type, which you could use to make anything work as fishing bait.

CHANGELOG-MARKS.md

@@ -1,12 +0,0 @@
-### Additions
-- Added functionality for marks.
-- Added data for all marks and all title ribbons from Pokémon.
-- Added marks screen within the summary UI.
-- Added `/givemark <player> <partySlot> <mark>` command to give a mark to a Pokémon.
-- Added `/takemark <player> <partySlot> <mark>` command to remove a mark from a Pokémon.
-- Added `/giveallmarks <player> <partySlot>` command to give all available marks to a Pokémon.
-
-### MoLang & Datapacks
-- Added Flows for `bobber_spawn_pokemon_post`, `pokemon_entity_spawn`, and `fossil_revived`.
-- Added `marks` datapack folder.
-- Added MoLang functions `entity.is_in_rain`, `pokemon.add_marks(Mark...)`, `pokemon.add_potential_marks(Mark...)`, `pokemon.add_marks_with_chance(Mark...)`, `pokemon.apply_potential_marks`, and `world.is_snowing_at(x, y, z)`.

CHANGELOG-PC.md

@@ -1,22 +1,16 @@
 ### Additions
-- Added ability to rename PC Boxes by clicking on the name of a box.
-- Added box options buttons for boxes, toggleable by clicking the right icon button in the bottom bar.
-  - The button on the right allows for changing the box wallpaper.
-  - The option buttons on the left side allow for sorting the box by name, level, Pokédex number, gender, and type. Shift clicking allows for sorting in reverse order.
-- Added filter functionality in PC UI, which supports `PokemonProperties` (e.g. `shiny=yes` shows all shiny Pokémon).
-- Added `/changewallpaper <player> <boxNumber> <wallpaper>` command to change a box wallpaper through commands.
-- Added `/renamebox <player> <boxNumber> <name>` command to rename a PC box through commands.
-- Added IVs and EVs stat displays in PC.
+
+- 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` and `RenamePCBoxEvent.Post` events to prevent players from renaming a box or changing their input.
-- Added `ChangePCBoxWallpaperEvent.Pre` and `ChangePCBoxWallpaperEvent.Post` to prevent players from changing wallpapers or changing their selection.
-- Added `WallpaperCollectionEvent` which gets called when clients connect to a server, allowing the server to handle which of the client-found wallpapers it's allowed to move (collected wallpapers can be removed for example to make it "vanish" client-side).
-- Added `WallpaperUnlockedEvent`.
-- Renamed `SetPCBoxPokemonPacket` and the respective handler to `SetPCBoxPacket`.
 
-### Addons
-- Added Flows for `player_tick_pre`, `player_tick_post`, `advancement_earned`, `right_clicked_entity`, `right_clicked_block`, `player_died`, `wallpaper_unlocked`.
-- Flows now have `q.` for any context properties in addition to the `c.` properties, making it a bit more convenient when calling other scripts from Flows.
-- Added `unlockable_pc_box_wallpapers` datapack folder for wallpapers that need to be unlocked before they're usable.
-- 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.
+- 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`

CHANGELOG-RIDING.md

@@ -1,4 +0,0 @@
-### Additions
-
-- Added the ability to ride Pokémon by shift-right clicking and selecting the ride option.
-- Added /calculateseatpositions command for approximating hitbox locations for riding configurations.

CHANGELOG.md

@@ -2,138 +2,13 @@
 ## [1.7.0 (Month xth, 2025)](#1-7-0)
 
 ### Additions
-- Added `/spectateBattle <player>` command to spectate battles without having to manually walk up to the target.
 - Added an in-game configuration screen, allowing all settings from `main.json` to be edited directly in-game.
 - Added `/cobblemonconfig reload` command to reload `main.json` configuration. **Note:** Some settings require a server restart to take effect; use this command cautiously.
 - 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.
-- Added Pokémon markings, toggleable within the summary.
-- Added `/boxcount` command to change PC boxes amount
-- Added cosmetics for Gurdurr, Conkeldurr, Squirtle Line, Sneasler, Sandile line, Treecko line, Braixen, Delphox, and Dragonite.
-- Added cosmetics for Gurdurr, Conkeldurr, Squirtle Line, Sneasler, Sandle line, Treecko line, Braixen, Delphox, and Dragonite.
-- Added `/transformmodelpart (position|rotation|scale) <modelPart> <transform: x y z>` command that can add transformations to a pokemon's model part.
-  - The player executing the command must be facing the target pokemon entity. Transformations are not persistent and will revert when resources are reloaded.
-- Added lang keys for all moves and abilities up to Generation 9.
-- Fixed Moon Ball moon phase logic to actually work correctly
-- Added `translucent_cull` boolean option into resolver's layer to allow for translucent textures with culling
-- Added [LambDynamicLights](https://modrinth.com/mod/lambdynamiclights) support for items held by Pokémon.
-
-### Pokémon Added
-
-#### Gen 2
-- Dunsparce
-
-#### Gen 3
-- Spoink
-- Grumpig
-- Snorunt
-- Glalie
-
-#### Gen 4
-- Bronzor
-- Bronzong
-- Croagunk
-- Froslass
-
-#### Gen 5
-- Pansage
-- Simisage
-- Pansear
-- Simisear
-- Panpour
-- Simipour
-- Munna
-- Musharna
-- Blitzle
-- Zebstrika
-- Trubbish
-- Garbodor
-
-#### Gen 6
-- Noibat
-- Noivern
-
-#### Gen 7
-- Drampa
-
-#### Gen 8
-- Silicobra
-- Sandaconda
-
-#### Gen 9
-- Smoliv
-- Dolliv
-- Arboliva
-- Orthworm
-- Dudunsparce
-
-### Animation updates for the following Pokémon
-- Garchomp
-- Tropius
-- Torpius
-- Nosepass
-- Probopass
-- Sneasler
-- Braixen
-- Delphox
-- Cinderace
-- Kangaskhan
-
-### Model updates for the following Pokémon
-- Gyarados
-- Dragonite
-- Eevee
-- Vaporeon
-- Jolteon
-- Flareon
-- Espeon
-- Umbreon
-- Leafeon
-- Glaceon
-- Sylveon
-- Treecko
-- Grovyle
-- Sceptile
-- Honchkrow
-- Garchomp
-- Pidgeot
-- Nosepass
-- Probopass
-- Kangaskhan
-- Cinderace
-- Magnezone
-- Metagross
-- Added Syrupy Apples.
 
 ### Changes
 - Renamed `chargeGainedPerTick` config to `secondsToChargeHealingMachine`.
-- Made Blocks of Gold count as Big Nuggets when held by a Pokémon (for Fling functionality)
-- Players can now eat Sweet and Tart Apples, Whipped Dreams, and the Alcremie Sweets.
-- Updated Sweet and Tart Apple sprites
-- Updated the following recipes: Air Balloon, Assault Vest, Binding Band, Black Belt, Blunder Policy, Choice Band, Choice Scarf, Cleanse Tag, Covert Cloak, Destiny Knot, Eject Button, Expert Belt, Focus Band, Focus Sash, Magnet, Metronome, Muscle Band, Power Anklet, Power Band, Power Belt, Power Bracer, Power Lens, Power Weight, Protective Pads, Protein, Punching Glove, Reaper Cloth, Rocky Helmet, Room Service, Sachet, Safety Goggles, Silk Scarf, Spell Tag, Utility Umbrella, Weakness Policy, Zinc
-- Added alternate ingredient options to the following recipes: Cell Battery, Charcoal Stick, Dragon Fang, Miracle Seed, Mystic Water, Never Melt Ice, Twisted Spoon, Damp Rock, Heat Rock, Icy Rock, Smooth Rock
-- Grouped together some recipes within the Recipe Book. Groups include: the seven basic Poké Balls, the seven basic Ancient Poké Balls, Gilded Chests, Pokedexes, and the Weather Rocks.
-- Updated some item tags to better integrate behaviours between Cobblemon, Vanilla Minecraft, and other mods
-  - Removed Cooked Meat, Raw Meat, Protein Ingredients, and Zinc Ingredients, the first two are now using `c` namespace tags, the latter have better integrated use of tags within their recipes which removes need for custom tags.
-  - Added our seeds tag into `#c:seeds`, which is now made use of for the Miracle Seed recipe. 
-- Tweaked the Natural Materials Vanilla file to fit with the changes to tags
-- Substantially optimised spawning checks mainly by front-loading biome filtering.
-- 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.
-- Improved the performance of saving Pokédex and player data.
-- Pokémon hitbox now scales with entity attribute `generic.scale`.
-- Removed Shulker aspect and replaced it with cosmetic_item-shulker_shell.
-- Shulker shell Forretress is now a cosmetic rather than a special evo and thus all shulker Forretress will revert back to normal until a shulker shell is put in their cosmetic slot.
-- Updated `doPokemonSpawning` gamerule to support per-dimension configurations.
-- The Pokedex now displays a form name of a "normal" Pokémon for when the base form is still a named form.
-- Improved the zoom functionality of the Pokédex Scanner by giving the levels logarithmic scaling.
-- Added a subtle rotation effect to the Pokédex Scanner's wheel when zooming.
-- Improved parity with vanilla mobs' drop behavior; loot and XP drop on death instead of after the entire death sequence finishes.
-- Quirk animations no longer play in the battle GUI since they were pretty distracting.
-- A number of Pokemon that float above the ground visually (Gastly, Klingklang, etc.)  are no longer considered to be touching the ground
 
 ### Fixes
 - Fixed Particles sometimes facing the wrong direction (looking at you, Swords Dance)
@@ -146,25 +21,6 @@
 - 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.
-- Fixed `hide_additional_tooltip` vanilla flag not properly hiding tooltips on pokerod and bait items
-- Removed a number of scenarios in which a Pokémon battle may send out a Pokémon into collision geometry.
-- Fixed NPCs using Pokémon outside of their pool when a Pokémon name had a typo.
-- Fixed an issue with datapacked species features not being applied properly when relogging.
-- Fixed Pokémon marked as silent still playing shiny sounds and effects.
-- Fixed an issue with newer versions of Fabric API where underground Pokémon were spawning in The End.
-- Fixed spawning not working well when you're at high points surrounded by lower altitude spawning areas, such as flying.
-- Fixed certain Pokémon with forms not having appropriate stock Pokédex entries.
-- Fixed issue with Pokédex Scanner that caused the open/close overlay to have the wrong opacity values
-- Fixed dragon's breath not being usable on the restoration tank when it should be
 
 ### Developer
 - A finished battle now has winners and losers set inside of `PokemonBattle` instead of them always being empty.
@@ -175,41 +31,14 @@
 - 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.
-- Reworked observable handling in `Pokemon.kt` to cut down on RAM usage and clarify the file.
-  - Note: This will break mods that used our observable functionality there or in MoveSet, IVs, EVs, or BenchedMoves. 
-  - Using `Pokemon#onChange()` is now the way to mark a Pokémon as needing a save.
-  - Using `[Pokemon].changeObservable` is now the way to get an `Observable` for any save-worthy changes.
-- Updated NPCEntity beam positioning to properly account for the baseScale property.
-- Updated NPCEntity pokeball throw positioning to properly account for the baseScale property.
-- Fixed `[Pokemon].copyFrom` error causing forms, IVs, and EVs to not be applied properly when using `[Pokemon].loadFromJSON` or `[Pokemon].loadFromNBT`
-- Added new item class, `WearableItem`. Instances of this class should have a corresponding 3D model. These models render when the items display context is `HEAD`.
-- Pokemon now have a fireImmune attribute in their behaviour that can be set to true to ignore all fire damage (lava, magma blocks, etc.)
-  `JSON
-  {
-    "behaviour": {
-      "fireImmune": true
-    }
-  }
-  `
-  
+
+### 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`
-- Added `interpolate` boolean property to animated textures to allow gradual colour changes between frames.
-- Fixed species additions not being capable of changing implemented status.
-- Added support for action effects that are triggered by `|-activate|` Showdown instructions. `activate_{effect_id}` is the syntax.
-- Added MoLang functions for rendering items `render_item(item_id, locator_name)` and `clear_items()`.
-- Fixed location spawn filter components causing crashes
-- Added `pokemon` as an available MoLang function for the `battleActor` functions.
-- Added `spawn_pokemon` as an available MoLang function for the `worldHolder` functions.
-- Added `attempt_wild_battle` as an available MoLang function.
-- Added `pokemon` as an available Molang function for the `battleActor` functions.
-- Fixed `heldItem` property inside spawn files not working and causing crashes
-- Fixed `spawn_bedrock_particles` MoLang causing crashes when used in a server environment
-- The Pokédex form lang key definition now follows `cobblemon.ui.pokedex.info.form.{species}-{formname}` instead of `cobblemon.ui.pokedex.info.form.{formname}`.
 
 ## [1.6.1 (January 26th, 2025)](#1-6-1)
 
@@ -315,7 +144,6 @@
 - Geodude
 - Graveler
 - Golem
-- Magnezone
 
 ### Cry updates for the following Pokémon
 - Sceptile
@@ -2331,4 +2159,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.

common/build.gradle.kts

@@ -1,9 +1,8 @@
-
-import utilities.isSnapshot
-import utilities.version
 import java.time.OffsetDateTime
 import java.time.ZoneOffset
 import java.time.format.DateTimeFormatter
+import utilities.isSnapshot
+import utilities.version
 
 /*
  *

common/src/main/java/com/cobblemon/mod/common/OrientationControllable.java

@@ -1,24 +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.orientation.OrientationController;
-import net.minecraft.util.Mth;
-import net.minecraft.util.SmoothDouble;
-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;
-
-import java.util.function.Function;
-
-public interface OrientationControllable {
-    OrientationController getOrientationController();
-}

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

@@ -13,12 +13,10 @@ import com.cobblemon.mod.common.client.render.layer.PokemonOnShoulderRenderer;
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
 import com.cobblemon.mod.common.pokemon.FormData;
 import com.cobblemon.mod.common.pokemon.lighthing.LightingData;
-import dev.lambdaurora.lambdynlights.LambDynLights;
 import dev.lambdaurora.lambdynlights.api.DynamicLightHandler;
 import dev.lambdaurora.lambdynlights.api.DynamicLightHandlers;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.entity.EntityType;
-import net.minecraft.world.item.ItemStack;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -55,19 +53,15 @@ public class LambDynamicLightsCompat {
 
     private static int resolvedPokemonLightLevel(PokemonEntity pokemon) {
         var underwater = !pokemon.level().getFluidState(BlockPos.containing(pokemon.getX(), pokemon.getEyeY(), pokemon.getZ())).isEmpty();
-
-        ItemStack item = pokemon.getShownItem();
-        int itemLightLevel = item.isEmpty()?0:LambDynLights.getLuminanceFromItemStack(item, underwater);
-        int formLightLevel = extractFormLightLevel(pokemon.getForm(), underwater).orElse(0);
-
-        return Math.max(itemLightLevel, formLightLevel);
+        return extractFormLightLevel(pokemon.getForm(), underwater).orElse(0);
     }
 
     private static int resolvedShoulderLightLevel(Player player) {
+        final var shoulderDataPair = PokemonOnShoulderRenderer.shoulderDataOf(player);
         var underwater = !player.level().getFluidState(BlockPos.containing(player.getX(), player.getEyeY(), player.getZ())).isEmpty();
-        final int leftLightLevel = extractShoulderLightLevel(PokemonOnShoulderRenderer.shoulderDataFrom(player.getShoulderEntityLeft()), underwater);
-        final int rightLightLevel = extractShoulderLightLevel(PokemonOnShoulderRenderer.shoulderDataFrom(player.getShoulderEntityRight()), underwater);
-        return Math.max(leftLightLevel, rightLightLevel);
+        final Optional<Integer> leftLightLevel = extractShoulderLightLevel(shoulderDataPair.getFirst(), underwater);
+        final Optional<Integer> rightLightLevel = extractShoulderLightLevel(shoulderDataPair.getSecond(), underwater);
+        return Math.max(leftLightLevel.orElse(0), rightLightLevel.orElse(0));
     }
 
     private static Optional<Integer> extractFormLightLevel(@NotNull FormData form, boolean underwater) {
@@ -77,16 +71,11 @@ public class LambDynamicLightsCompat {
         return Optional.of(form.getLightingData().getLightLevel());
     }
 
-    private static int extractShoulderLightLevel(@Nullable PokemonOnShoulderRenderer.ShoulderData shoulderData, boolean underwater) {
+    private static Optional<Integer> extractShoulderLightLevel(@Nullable PokemonOnShoulderRenderer.ShoulderData shoulderData, boolean underwater) {
         if (shoulderData == null) {
-            return 0;
+            return Optional.empty();
         }
-
-        ItemStack item = shoulderData.getShownItem();
-        int itemLightLevel = item.isEmpty()?0:LambDynLights.getLuminanceFromItemStack(item, underwater);
-        int formLightLevel = extractFormLightLevel(shoulderData.getForm(), underwater).orElse(0);
-
-        return Math.max(itemLightLevel, formLightLevel);
+        return extractFormLightLevel(shoulderData.getForm(), underwater);
     }
 
     private static boolean liquidGlowModeSupport(@NotNull LightingData.LiquidGlowMode liquidGlowMode, boolean underwater) {

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

@@ -1,62 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.mixin;
-
-import com.cobblemon.mod.common.block.SaccharineLeafBlock;
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.state.BlockState;
-import org.objectweb.asm.Opcodes;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Unique;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Desc;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.ModifyVariable;
-import org.spongepowered.asm.mixin.injection.Slice;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
-
-
-@Mixin(targets = "net.minecraft.world.entity.animal.Bee$BeeGrowCropGoal")
-public abstract class BeeEntityMixin {
-
-    @Unique
-    private BlockState cobblemon$result = null;
-
-    @Inject(method = "tick()V", at = @At(
-            value = "INVOKE",
-            target = "Lnet/minecraft/world/level/block/BonemealableBlock;performBonemeal(Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/util/RandomSource;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;)V",
-            shift = At.Shift.BY,
-            by = 2
-        ),
-        locals = LocalCapture.CAPTURE_FAILHARD
-    )
-    private void injectCustomGrowth(CallbackInfo ci, int i, BlockPos blockPos, BlockState blockState, Block block) {
-        if (block instanceof SaccharineLeafBlock) {
-
-            int age = blockState.getValue(SaccharineLeafBlock.Companion.getAGE());
-
-            if (age < 2) {
-                this.cobblemon$result = blockState.setValue(SaccharineLeafBlock.Companion.getAGE(), age + 1);
-            }
-        }
-    }
-
-    @ModifyVariable(method = "tick", at = @At(value = "LOAD", ordinal = 0), index = 5)
-    private BlockState applyCustomBlockState(BlockState before) {
-        if(this.cobblemon$result != null && before == null) {
-            BlockState result = this.cobblemon$result;
-            this.cobblemon$result = null;
-            return result;
-        }
-
-        return before;
-    }
-}

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

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

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

@@ -6,22 +6,18 @@
  * 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.OrientationControllable;
 import com.cobblemon.mod.common.item.PokedexItem;
 import com.mojang.blaze3d.vertex.PoseStack;
-import net.minecraft.client.Minecraft;
 import net.minecraft.client.player.AbstractClientPlayer;
 import net.minecraft.client.renderer.ItemInHandRenderer;
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.item.ItemStack;
-import org.joml.Quaternionf;
 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.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(ItemInHandRenderer.class)
@@ -31,15 +27,5 @@ public class ItemInHandRendererMixin {
         if (abstractClientPlayer.isUsingItem() && abstractClientPlayer.getUseItem().getItem() instanceof PokedexItem) {
             ci.cancel();
         }
-        else if (abstractClientPlayer instanceof OrientationControllable controllable && controllable.getOrientationController().isActive()) {
-
-        }
-    }
-
-    @Redirect(method = "renderHandsWithItems", at = @At(value = "INVOKE", target = "Lcom/mojang/blaze3d/vertex/PoseStack;mulPose(Lorg/joml/Quaternionf;)V", ordinal = 1))
-    private void cobblemon$renderHandswithItems(PoseStack instance, Quaternionf quaternion) {
-        if (!(Minecraft.getInstance().player instanceof OrientationControllable controllable && controllable.getOrientationController().isActive())) {
-            instance.mulPose(quaternion);
-        }
     }
 }

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

@@ -6,13 +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.Cobblemon;
 import com.cobblemon.mod.common.ModAPI;
 import com.cobblemon.mod.common.item.PokeBallItem;
 import com.cobblemon.mod.common.item.PokedexItem;
-import com.cobblemon.mod.common.item.WearableItem;
 import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.client.renderer.ItemModelShaper;
@@ -41,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;
 
@@ -55,18 +53,17 @@ public abstract class ItemRendererMixin {
     )
     private void cobblemon$overrideItemModel(ItemStack stack, ItemDisplayContext renderMode, boolean leftHanded, PoseStack matrices, MultiBufferSource multiBufferSource, int light, int overlay, BakedModel model, CallbackInfo ci) {
         boolean shouldBe2d = renderMode == ItemDisplayContext.GUI || renderMode == ItemDisplayContext.FIXED;
-        ResourceLocation resourceLocation = null;
         if (shouldBe2d) {
+            ResourceLocation resourceLocation = null;
             if (stack.getItem() instanceof PokeBallItem pokeBallItem) resourceLocation = pokeBallItem.getPokeBall().getModel2d();
             else if (stack.getItem() instanceof PokedexItem pokedexItem) resourceLocation = pokedexItem.getType().getItemSpritePath();
-        }
-        if (renderMode != ItemDisplayContext.HEAD && stack.getItem() instanceof WearableItem wearableItem) resourceLocation = wearableItem.getModel2d();
 
-        if (resourceLocation != null) {
-            BakedModel replacementModel = this.itemModelShaper.getModelManager().getModel(new ModelResourceLocation(resourceLocation, "inventory"));
-            if (!cobblemon$isSameModel(model, replacementModel)) {
-                ci.cancel();
-                render(stack, renderMode, leftHanded, matrices, multiBufferSource, light, overlay, replacementModel);
+            if (resourceLocation != null) {
+                BakedModel replacementModel = this.itemModelShaper.getModelManager().getModel(new ModelResourceLocation(resourceLocation, "inventory"));
+                if (!cobblemon$isSameModel(model, replacementModel)) {
+                    ci.cancel();
+                    render(stack, renderMode, leftHanded, matrices, multiBufferSource, light, overlay, replacementModel);
+                }
             }
         }
     }
@@ -80,7 +77,6 @@ public abstract class ItemRendererMixin {
             boolean canOpenScreen = entity != null && ((entity.getOffhandItem() == stack && !(entity.getMainHandItem().getItem() instanceof PokedexItem)) || entity.getMainHandItem() == stack);
             resourceLocation = pokedexItem.getType().getItemModelPath(isScanModel ? "scanning" : (canOpenScreen ? null : "off"));
         }
-        else if (stack.getItem() instanceof WearableItem wearableItem) resourceLocation = wearableItem.getModel3d();
 
         if (resourceLocation != null) {
             BakedModel model = this.itemModelShaper.getModelManager().getModel(new ModelResourceLocation(resourceLocation, MODEL_PATH));

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

@@ -1,119 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.mixin;
-
-import com.cobblemon.mod.common.OrientationControllable;
-import com.cobblemon.mod.common.api.orientation.OrientationController;
-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.client.render.models.blockbench.FloatingState;
-import com.cobblemon.mod.common.client.render.models.blockbench.PosableModel;
-import com.cobblemon.mod.common.client.render.models.blockbench.repository.VaryingModelRepository;
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
-import com.mojang.authlib.GameProfile;
-import net.minecraft.client.CameraType;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.multiplayer.ClientLevel;
-import net.minecraft.client.player.AbstractClientPlayer;
-import net.minecraft.client.player.LocalPlayer;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.level.ClipContext;
-import net.minecraft.world.phys.HitResult;
-import net.minecraft.world.phys.Vec3;
-import org.jetbrains.annotations.NotNull;
-import org.joml.Matrix3f;
-import org.joml.Vector3f;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.Unique;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-
-import java.util.Map;
-
-@Mixin(LocalPlayer.class)
-public abstract class LocalPlayerMixin extends AbstractClientPlayer implements OrientationControllable {
-    @Shadow
-    private float jumpRidingScale;
-
-    public LocalPlayerMixin(ClientLevel clientLevel, GameProfile gameProfile) {
-        super(clientLevel, gameProfile);
-    }
-
-    @Inject(method = "getJumpRidingScale", at = @At("HEAD"), cancellable = true)
-    public void modifyJumpRidingScale(CallbackInfoReturnable<Float> cir) {
-        LocalPlayer player = (LocalPlayer) (Object) this;
-        if (player.isPassenger() && player.getVehicle() instanceof PokemonEntity pokemonEntity) {
-            var rideValue = pokemonEntity.<Float>ifRidingAvailableSupply(null, (behaviour, settings, state) -> {
-                if (behaviour.canJump(settings, state, pokemonEntity, player)) return null;
-                return behaviour.setRideBar(settings, state, pokemonEntity, player);
-            });
-            if (rideValue != null) {
-                cir.setReturnValue(rideValue);
-            }
-        }
-    }
-
-    @Override
-    public HitResult pick(double hitDistance, float partialTicks, boolean hitFluids) {
-        Entity vehicle = this.getVehicle();
-        if (vehicle instanceof PokemonEntity pokemonEntity) {
-            int seatIndex = pokemonEntity.getPassengers().indexOf(this);
-            Seat seat = pokemonEntity.getSeats().get(seatIndex);
-
-            PokemonClientDelegate delegate = (PokemonClientDelegate) pokemonEntity.getDelegate();
-            MatrixWrapper locator = delegate.getLocatorStates().get(seat.getLocator());
-
-            if (locator == null) {
-                super.pick(hitDistance, partialTicks, hitFluids);
-            }
-
-            Vec3 locatorOffset = new Vec3(locator.getMatrix().getTranslation(new Vector3f()));
-
-            OrientationController controller = this.getOrientationController();
-
-            float currEyeHeight = this.getEyeHeight();
-            Vector3f offset = new Vector3f(new Vector3f(0f, currEyeHeight - (this.getBbHeight() / 2), 0f));
-
-            if (Minecraft.getInstance().options.getCameraType() == CameraType.FIRST_PERSON) {
-                PosableModel model = VaryingModelRepository.INSTANCE.getPoser(pokemonEntity.getPokemon().getSpecies().getResourceIdentifier(), new FloatingState());
-                offset.add(cobblemon$getFirstPersonOffset(model, seat));
-            }
-
-            Matrix3f orientation = controller.isActive() && controller.getOrientation() != null ? controller.getOrientation() : new Matrix3f();
-            Vec3 rotatedEyeHeight = new Vec3(orientation.transform(offset));
-
-            Vec3 eyePosition = locatorOffset.add(pokemonEntity.position()).add(rotatedEyeHeight);
-
-            Vec3 viewVector = this.getViewVector(partialTicks);
-            Vec3 viewDistanceVector = eyePosition.add(viewVector.x * hitDistance, viewVector.y * hitDistance, viewVector.z * hitDistance);
-            return this.level()
-                    .clip(
-                            new ClipContext(
-                                    eyePosition, viewDistanceVector, ClipContext.Block.OUTLINE, hitFluids ? net.minecraft.world.level.ClipContext.Fluid.ANY : net.minecraft.world.level.ClipContext.Fluid.NONE, this
-                            )
-                    );
-        }
-
-        return super.pick(hitDistance, partialTicks, hitFluids);
-    }
-
-    @Unique
-    private static @NotNull Vector3f cobblemon$getFirstPersonOffset(PosableModel model, Seat seat) {
-        Map<String, Vec3> cameraOffsets = model.getFirstPersonCameraOffset();
-
-        if (cameraOffsets.containsKey(seat.getLocator())) {
-            return cameraOffsets.get(seat.getLocator()).toVector3f();
-        } else {
-            return new Vector3f(0f, 0f, 0f);
-        }
-    }
-}

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

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

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

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

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

@@ -0,0 +1,111 @@
+/*
+ * 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.client.CobblemonClient;
+import com.cobblemon.mod.common.client.keybind.keybinds.PartySendBinding;
+import com.cobblemon.mod.common.pokedex.scanner.PokedexUsageContext;
+import com.llamalad7.mixinextras.injector.v2.WrapWithCondition;
+import com.llamalad7.mixinextras.sugar.Local;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.MouseHandler;
+import net.minecraft.client.player.LocalPlayer;
+import net.minecraft.util.Mth;
+import net.minecraft.util.SmoothDouble;
+import org.objectweb.asm.Opcodes;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(MouseHandler.class)
+public class MouseHandlerMixin {
+    @Shadow
+    private double accumulatedScrollY;
+
+    @Shadow @Final private Minecraft minecraft;
+
+    @Shadow @Final private SmoothDouble smoothTurnY;
+
+    @Shadow @Final private SmoothDouble smoothTurnX;
+
+    @Shadow private double accumulatedDX;
+
+    @Shadow private double accumulatedDY;
+
+    @Inject(
+            method = "onScroll",
+            at = @At(
+                    value = "FIELD",
+                    target="Lnet/minecraft/client/MouseHandler;accumulatedScrollY:D",
+                    opcode = Opcodes.PUTFIELD,
+                    ordinal = 2,
+                    shift = At.Shift.BEFORE
+            ),
+            cancellable = true
+    )
+    public void cobblemon$scrollParty(long window, double horizontal, double vertical, CallbackInfo ci) {
+        if (PartySendBinding.INSTANCE.getWasDown()) {
+            int i = (int) accumulatedScrollY;
+            if (i > 0) {
+                accumulatedScrollY -= i;
+                CobblemonClient.INSTANCE.getStorage().shiftSelected(false);
+                ci.cancel();
+                PartySendBinding.INSTANCE.actioned();
+            } else if (i < 0) {
+                accumulatedScrollY -= i;
+                CobblemonClient.INSTANCE.getStorage().shiftSelected(true);
+                ci.cancel();
+                PartySendBinding.INSTANCE.actioned();
+            }
+        }
+    }
+
+    @Inject(
+        method = "onScroll",
+        at = @At(
+            value = "INVOKE",
+            target = "Lnet/minecraft/world/entity/player/Inventory;swapPaint(D)V"
+        ),
+        cancellable = true
+    )
+    public void cobblemon$doPokedexZoom(long window, double horizontal, double vertical, CallbackInfo ci) {
+        PokedexUsageContext usageContext = CobblemonClient.INSTANCE.getPokedexUsageContext();
+        if (usageContext.getScanningGuiOpen()) {
+            usageContext.adjustZoom(vertical);
+            ci.cancel();
+        }
+    }
+
+    @WrapWithCondition(
+            method = "turnPlayer",
+            at = @At(
+                    value = "INVOKE",
+                    target = "Lnet/minecraft/client/player/LocalPlayer;turn(DD)V"
+            )
+    )
+    public boolean cobblemon$modifyRotation(LocalPlayer player, double cursorDeltaX, double cursorDeltaY, @Local(argsOnly = true) double d) {
+        // I know this technically doesn't need to be a WrapWithCondition, but it'll make things easier later for riding.
+        PokedexUsageContext usageContext = CobblemonClient.INSTANCE.getPokedexUsageContext();
+        if (usageContext.getScanningGuiOpen()) {
+            this.smoothTurnY.reset();
+            this.smoothTurnX.reset();
+            var defaultSensitivity = this.minecraft.options.sensitivity().get() * 0.6000000238418579 + 0.20000000298023224;
+            var spyglassSensitivity = Math.pow(defaultSensitivity, 3);
+            var lookSensitivity = spyglassSensitivity * 8.0;
+            var sensitivity = Mth.lerp(usageContext.getFovMultiplier(), spyglassSensitivity, lookSensitivity);
+            player.turn(this.accumulatedDX * sensitivity, (this.accumulatedDY * sensitivity));
+            return false;
+        }
+        return true;
+    }
+
+}

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

@@ -1,30 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.mixin;
-
-import com.cobblemon.mod.common.platform.events.PlatformEvents;
-import com.cobblemon.mod.common.platform.events.ServerPlayerEvent;
-import net.minecraft.advancements.AdvancementHolder;
-import net.minecraft.server.PlayerAdvancements;
-import net.minecraft.server.level.ServerPlayer;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-
-@Mixin(PlayerAdvancements.class)
-public class PlayerAdvancementsMixin {
-    @Shadow private ServerPlayer player;
-
-    @Inject(method = "award", at = @At(value = "INVOKE", target = "Lnet/minecraft/advancements/AdvancementRewards;grant(Lnet/minecraft/server/level/ServerPlayer;)V"))
-    private void cobblemon$award(AdvancementHolder advancement, String criterionKey, CallbackInfoReturnable<Boolean> cir) {
-        PlatformEvents.SERVER_PLAYER_ADVANCEMENT_EARNED.emit(new ServerPlayerEvent.AdvancementEarned(player, advancement));
-    }
-}

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

@@ -10,15 +10,12 @@ package com.cobblemon.mod.common.mixin;
 
 import com.cobblemon.mod.common.Cobblemon;
 import com.cobblemon.mod.common.CobblemonItems;
-import com.cobblemon.mod.common.OrientationControllable;
 import com.cobblemon.mod.common.api.events.CobblemonEvents;
 import com.cobblemon.mod.common.api.events.item.LeftoversCreatedEvent;
-import com.cobblemon.mod.common.api.orientation.OrientationController;
 import com.cobblemon.mod.common.api.pokemon.PokemonSpecies;
 import com.cobblemon.mod.common.api.storage.party.PartyStore;
 import com.cobblemon.mod.common.api.storage.party.PlayerPartyStore;
 import com.cobblemon.mod.common.api.tags.CobblemonItemTags;
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
 import com.cobblemon.mod.common.pokedex.scanner.PokedexEntityData;
 import com.cobblemon.mod.common.pokedex.scanner.ScannableEntity;
 import com.cobblemon.mod.common.pokemon.FormData;
@@ -29,18 +26,14 @@ import com.cobblemon.mod.common.util.CompoundTagExtensionsKt;
 import com.cobblemon.mod.common.util.CompoundTagUtilities;
 import com.cobblemon.mod.common.util.DataKeys;
 import com.cobblemon.mod.common.world.gamerules.CobblemonGameRules;
-import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
-import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.Tag;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.damagesource.DamageSource;
-import net.minecraft.world.entity.EntityDimensions;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.entity.Pose;
 import net.minecraft.world.entity.item.ItemEntity;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.food.FoodProperties;
@@ -48,7 +41,6 @@ import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.Level;
 import org.jetbrains.annotations.Nullable;
 import org.objectweb.asm.Opcodes;
-import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.Unique;
@@ -57,11 +49,14 @@ import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
-import java.util.*;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+import java.util.UUID;
 import java.util.stream.Collectors;
 
 @Mixin(Player.class)
-public abstract class PlayerMixin extends LivingEntity implements ScannableEntity, OrientationControllable {
+public abstract class PlayerMixin extends LivingEntity implements ScannableEntity {
 
     @Shadow public abstract CompoundTag getShoulderEntityLeft();
 
@@ -79,10 +74,6 @@ public abstract class PlayerMixin extends LivingEntity implements ScannableEntit
 
     @Shadow public abstract void displayClientMessage(Component message, boolean overlay);
 
-    @Shadow @Final private static Map<Pose, EntityDimensions> POSES;
-    @Shadow @Final public static EntityDimensions STANDING_DIMENSIONS;
-    @Unique
-    private final OrientationController cobblemon$orientationController = new OrientationController(this);
 
     protected PlayerMixin(EntityType<? extends LivingEntity> p_20966_, Level p_20967_) {
         super(p_20966_, p_20967_);
@@ -110,19 +101,6 @@ public abstract class PlayerMixin extends LivingEntity implements ScannableEntit
         }
     }
 
-    @Inject(method = "tick", at = @At("HEAD"))
-    private void cobblemon$updateRenderOrientation(CallbackInfo ci) {
-        this.cobblemon$orientationController.tick();
-    }
-
-    @Override
-    public EntityDimensions getDefaultDimensions(Pose pose) {
-        if (this.getVehicle() instanceof PokemonEntity) {
-            return STANDING_DIMENSIONS;
-        }
-        return POSES.getOrDefault(pose, STANDING_DIMENSIONS);
-    }
-
     @Inject(
         method = "removeEntitiesOnShoulder",
         at = @At(
@@ -189,7 +167,8 @@ public abstract class PlayerMixin extends LivingEntity implements ScannableEntit
 
     @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) {
@@ -246,37 +225,4 @@ public abstract class PlayerMixin extends LivingEntity implements ScannableEntit
     public LivingEntity resolveEntityScan() {
         return this;
     }
-
-    @Override
-    public void absMoveTo(double x, double y, double z, float yaw, float pitch) {
-        if (cobblemon$orientationController.getActive()) {
-            this.absMoveTo(x, y, z);
-            this.setYRot(yaw % 360.0f);
-            this.setXRot(pitch % 360.0f);
-            this.yRotO = this.getYRot();
-            this.xRotO = this.getXRot();
-        }
-        else {
-            this.absMoveTo(x, y, z);
-            this.absRotateTo(yaw, pitch);
-        }
-    }
-
-    @WrapOperation(
-            method = "rideTick()V",
-            at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/player/Player;wantsToStopRiding()Z")
-    )
-    public boolean delegateDismountToController(Player instance, Operation<Boolean> original) {
-        if (this.getVehicle() instanceof PokemonEntity pokemonEntity) {
-            return pokemonEntity.ifRidingAvailableSupply(false, (behaviour, settings, state) -> {
-                return behaviour.dismountOnShift(settings, state, pokemonEntity) && original.call(instance);
-            });
-        }
-        return original.call(instance);
-    }
-
-    @Override
-    public OrientationController getOrientationController() {
-        return cobblemon$orientationController;
-    }
-}
+}

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

@@ -0,0 +1,28 @@
+/*
+ * 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.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.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 {
+
+    @Inject(method = "render", at = @At(value = "TAIL"))
+    public void renderPlayer(AbstractClientPlayer player, float f, float g, PoseStack poseStack, MultiBufferSource multiBufferSource, int i, CallbackInfo ci) {
+        ClientPlayerIcon.Companion.onRenderPlayer(player);
+    }
+}

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

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

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

@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.mixin;
-
-import net.minecraft.world.inventory.RecipeBookType;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Mutable;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.gen.Invoker;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Mixin(value = RecipeBookType.class)
-public class RecipeBookTypeMixin {
-
-    @Final
-    @Mutable
-    @Shadow
-    private static RecipeBookType[] $VALUES; // moj
-
-    @Invoker("<init>")
-    private static RecipeBookType cobblemon$createBookType(String name, int ordinal) {
-        throw new AssertionError();
-    }
-
-    @Inject(
-            method = "<clinit>",
-            at = @At("TAIL")
-    )
-    private static void cobblemon$addRecipeBookType(CallbackInfo ci) {
-        ArrayList<RecipeBookType> types = new ArrayList<>(List.of($VALUES));
-        types.add(cobblemon$createBookType("COOKING_POT", $VALUES.length));
-        $VALUES = types.toArray(RecipeBookType[]::new);
-    }
-}

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

@@ -1,101 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.mixin;
-
-import com.cobblemon.mod.common.CobblemonNetwork;
-import com.cobblemon.mod.common.OrientationControllable;
-import com.cobblemon.mod.common.api.net.NetworkPacket;
-import com.cobblemon.mod.common.api.orientation.OrientationController;
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
-import com.cobblemon.mod.common.mixin.accessor.ChunkMapAccessor;
-import com.cobblemon.mod.common.mixin.accessor.TrackedEntityAccessor;
-import com.cobblemon.mod.common.net.messages.client.orientation.ClientboundUpdateOrientationPacket;
-import com.cobblemon.mod.common.net.messages.client.pokemon.update.ClientboundUpdateRidingStatePacket;
-import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
-import net.minecraft.network.protocol.Packet;
-import net.minecraft.server.level.ChunkMap;
-import net.minecraft.server.level.ServerEntity;
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.server.network.ServerPlayerConnection;
-import net.minecraft.world.entity.Entity;
-import org.joml.Matrix3f;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.Unique;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-import java.util.Set;
-import java.util.function.Consumer;
-
-@Mixin(ServerEntity.class)
-public abstract class ServerEntityMixin {
-
-    @Shadow
-    @Final
-    private Consumer<Packet<?>> broadcast;
-    @Shadow
-    @Final
-    private Entity entity;
-    @Unique
-    private Matrix3f cobblemon$lastSentOrientation;
-    @Unique
-    private boolean cobblemon$lastSentActive;
-
-    @Inject(method = "sendChanges", at = @At("TAIL"))
-    private void cobblemon$sendChanges(CallbackInfo ci) {
-        cobblemon$sendOrientationChanges();
-        cobblemon$sendRidingStateChanges();
-    }
-
-    private void cobblemon$sendRidingStateChanges() {
-        if (!(this.entity instanceof PokemonEntity pokemonEntity)) return;
-        if (pokemonEntity.getRidingState() == null) return;
-        if (pokemonEntity.getRiding() == null) return;
-        var ridingBehaviour = pokemonEntity.getRiding();
-        var ridingState = pokemonEntity.getRidingState();
-        var previousRidingState = pokemonEntity.getPreviousRidingState();
-        if (previousRidingState != null && !ridingState.shouldSync(previousRidingState)) return;
-        cobblemon$broadcast(new ClientboundUpdateRidingStatePacket(pokemonEntity.getId(), ridingBehaviour.getKey(), pokemonEntity.getRidingState(), null));
-    }
-
-    private void cobblemon$sendOrientationChanges() {
-        if (!(this.entity instanceof OrientationControllable controllable)) return;
-        OrientationController controller = controllable.getOrientationController();
-        Matrix3f currOrientation = controller.getOrientation();
-        boolean currActive = controller.getActive();
-
-        if (currOrientation == null || currOrientation.equals(cobblemon$lastSentOrientation) && (currActive == cobblemon$lastSentActive))
-            return;
-        cobblemon$lastSentOrientation = new Matrix3f(currOrientation);
-        cobblemon$lastSentActive = currActive;
-
-        cobblemon$broadcast(new ClientboundUpdateOrientationPacket(currOrientation, currActive, entity.getId()));
-    }
-
-    private void cobblemon$broadcast(NetworkPacket<?> packet) {
-        if (!(entity.level() instanceof ServerLevel level)) return;
-        ChunkMap chunkMap = level.getChunkSource().chunkMap;
-        Int2ObjectMap<?> entityMap = ((ChunkMapAccessor) chunkMap).getEntityMap();
-        Object tracked = entityMap.get(entity.getId());
-        if (!(tracked instanceof TrackedEntityAccessor tracker)) return;
-
-        Set<ServerPlayerConnection> seenBy = tracker.getSeenBy();
-        for (ServerPlayerConnection conn : seenBy) {
-            ServerPlayer player = conn.getPlayer();
-            if (player == entity) continue;
-            CobblemonNetwork.INSTANCE.sendPacketToPlayer(player, packet);
-        }
-    }
-
-
-}

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

@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.mixin;
-
-import com.cobblemon.mod.common.OrientationControllable;
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
-import net.minecraft.server.level.ServerPlayer;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Unique;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-@Mixin(ServerPlayer.class)
-public abstract class ServerPlayerMixin {
-
-    @Inject(method = "rideTick", at = @At("HEAD"))
-    private void cobblemon$updateOrientationControllerRideTick(CallbackInfo ci) {
-        if (!(this instanceof OrientationControllable controllable)) return;
-        var shouldUseCustomOrientation = cobblemon$shouldUseCustomOrientation((ServerPlayer)(Object)this);
-        controllable.getOrientationController().setActive(shouldUseCustomOrientation);
-    }
-
-    @Unique
-    private boolean cobblemon$shouldUseCustomOrientation(ServerPlayer player) {
-        var playerVehicle = player.getVehicle();
-        if (playerVehicle == null) return false;
-        if (!(playerVehicle instanceof PokemonEntity pokemonEntity)) return false;
-        return pokemonEntity.ifRidingAvailableSupply(false, (behaviour, settings, state) -> {
-            return behaviour.shouldRoll(settings, state, pokemonEntity);
-        });
-    }
-
-    @Inject(method = "stopRiding", at = @At("HEAD"))
-    public void cobblemon$resetOrientationOnDismount(CallbackInfo ci) {
-        if (!(this instanceof OrientationControllable controllable)) return;
-        controllable.getOrientationController().setActive(false);
-    }
-
-}

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

@@ -1,20 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.mixin.accessor;
-
-import net.minecraft.client.Camera;
-import net.minecraft.world.level.BlockGetter;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Accessor;
-
-@Mixin(Camera.class)
-public interface CameraAccessor {
-    @Accessor("level")
-    BlockGetter getLevel();
-}

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

@@ -1,20 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.mixin.accessor;
-
-import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
-import net.minecraft.server.level.ChunkMap;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Accessor;
-
-@Mixin(ChunkMap.class)
-public interface ChunkMapAccessor {
-    @Accessor("entityMap")
-    Int2ObjectMap<?> getEntityMap();
-}

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

@@ -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.mixin.accessor;
-
-import net.minecraft.client.gui.components.StateSwitchingButton;
-import net.minecraft.client.gui.screens.recipebook.RecipeBookComponent;
-import net.minecraft.network.chat.Component;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Mutable;
-import org.spongepowered.asm.mixin.gen.Accessor;
-
-@Mixin(RecipeBookComponent.class)
-public interface RecipeBookComponentAccessor {
-    @Accessor("filterButton")
-    StateSwitchingButton getFilterButton();
-}

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

@@ -1,21 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.mixin.accessor;
-
-import net.minecraft.server.network.ServerPlayerConnection;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Accessor;
-
-import java.util.Set;
-
-@Mixin(targets = "net.minecraft.server.level.ChunkMap$TrackedEntity")
-public interface TrackedEntityAccessor {
-    @Accessor("seenBy")
-    Set<ServerPlayerConnection> getSeenBy();
-}

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

@@ -9,10 +9,8 @@
 package com.cobblemon.mod.common.mixin.client;
 
 import com.cobblemon.mod.common.client.CobblemonClient;
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
 import com.cobblemon.mod.common.pokedex.scanner.PokedexUsageContext;
 import net.minecraft.client.player.AbstractClientPlayer;
-import net.minecraft.client.player.LocalPlayer;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -32,13 +30,5 @@ public class AbstractClientPlayerMixin {
         if (usageContext.getScanningGuiOpen()) {
             cir.setReturnValue(usageContext.getFovMultiplier());
         }
-
-        LocalPlayer player = (LocalPlayer) (Object) this;
-        if (player != null && player.isPassenger() && player.getVehicle() instanceof PokemonEntity) {
-            PokemonEntity ride = (PokemonEntity) player.getVehicle();
-
-            //Return custom fov mult
-            cir.setReturnValue(ride.rideFovMult());
-        }
     }
 }

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

@@ -1,161 +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.Cobblemon;
-import com.cobblemon.mod.common.OrientationControllable;
-import com.cobblemon.mod.common.api.riding.Rideable;
-import com.cobblemon.mod.common.client.MountedPokemonAnimationRenderController;
-import com.cobblemon.mod.common.client.render.camera.MountedCameraRenderer;
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
-import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
-import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
-import com.llamalad7.mixinextras.sugar.Local;
-import net.minecraft.client.Camera;
-import net.minecraft.client.Minecraft;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.level.BlockGetter;
-import net.minecraft.world.phys.Vec3;
-import org.joml.Matrix3f;
-import org.joml.Quaternionf;
-import org.joml.Vector3f;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.Unique;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-@Mixin(Camera.class)
-public abstract class CameraMixin {
-    @Shadow
-    private Entity entity;
-    @Shadow
-    @Final
-    private Quaternionf rotation;
-    @Shadow
-    @Final
-    private Vector3f forwards;
-    @Shadow
-    @Final
-    private Vector3f up;
-    @Shadow
-    @Final
-    private Vector3f left;
-    @Shadow
-    private float xRot;
-    @Shadow
-    private float yRot;
-
-    @Shadow
-    private float eyeHeight;
-    @Shadow
-    private float eyeHeightOld;
-
-    @Shadow
-    protected abstract void setPosition(Vec3 pos);
-
-    @Unique
-    private float returnTimer = 0;
-    @Unique
-    private float rollAngleStart = 0;
-    @Unique
-    Minecraft minecraft = Minecraft.getInstance();
-
-    @Unique
-    boolean disableRollableCameraDebug = false;
-
-    @Inject(method = "setRotation", at = @At("HEAD"), cancellable = true)
-    public void cobblemon$setRotation(float f, float g, CallbackInfo ci) {
-        if (!(this.entity instanceof OrientationControllable controllable) || disableRollableCameraDebug) return;
-        var controller = controllable.getOrientationController();
-        if (!controller.isActive() && controller.getOrientation() != null) {
-            if (this.returnTimer < 1) {
-                //Rotation is taken from entity since we no longer handle mouse ourselves
-                //Stops a period of time when you can't input anything.
-                controller.getOrientation().set(
-                        new Matrix3f()
-                                .rotateY((float) Math.toRadians(180 - this.entity.getYRot()))
-                                .rotateX((float) Math.toRadians(-this.entity.getXRot()))
-                );
-                if (rollAngleStart == 0) {
-                    this.returnTimer = 1;
-                    controller.reset();
-                    return;
-                }
-                controller.getOrientation().rotateZ((float) Math.toRadians(-rollAngleStart * (1 - returnTimer)));
-                cobblemon$applyRotation();
-                this.returnTimer += .05F;
-                ci.cancel();
-            }
-            else {
-                this.returnTimer = 1;
-                controller.reset();
-            }
-            return;
-        }
-        if (controller.getOrientation() == null) return;
-        cobblemon$applyRotation();
-
-        this.returnTimer = 0;
-        this.rollAngleStart = controller.getRoll();
-        ci.cancel();
-    }
-
-    @Inject(method = "setup", at = @At("HEAD"))
-    private void cobblemon$tickAnimationPreRenders(BlockGetter level, Entity entity, boolean detached, boolean thirdPersonReverse, float partialTick, CallbackInfo ci) {
-        MountedPokemonAnimationRenderController.INSTANCE.reset();
-    }
-
-    @WrapOperation(method = "setup", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/Camera;setPosition(DDD)V"))
-    public void cobblemon$positionCamera(Camera instance, double x, double y, double z, Operation<Void> original, @Local(ordinal = 1, argsOnly = true) boolean thirdPersonReverse) {
-        if (cobblemon$isRidingPokemon(entity)) {
-            Vec3 position = MountedCameraRenderer.INSTANCE.getCameraPosition(instance, entity, entity.getVehicle(), thirdPersonReverse, eyeHeightOld, eyeHeight);
-            if (position != null) {
-                setPosition(position);
-                return;
-            }
-        }
-
-        original.call(instance, x, y, z);
-    }
-
-    @Unique
-    private boolean cobblemon$isRidingPokemon(Entity entity) {
-        return entity.getVehicle() instanceof PokemonEntity;
-    }
-
-    @Unique
-    private void cobblemon$applyRotation() {
-        if (!(this.entity instanceof OrientationControllable controllable) || controllable.getOrientationController().getOrientation() == null)
-            return;
-        var controller = controllable.getOrientationController();
-        var newRotation = controller.getOrientation().normal(new Matrix3f()).getNormalizedRotation(new Quaternionf());
-        if (this.minecraft.options.getCameraType().isMirrored()) {
-            newRotation.rotateY((float) Math.toRadians(180));
-        }
-        this.rotation.set(newRotation);
-        this.xRot = controller.getPitch();
-        this.yRot = controller.getYaw();
-        this.forwards.set(controller.getForwardVector());
-        this.up.set(controller.getUpVector());
-        this.left.set(controller.getLeftVector());
-    }
-
-    @WrapOperation(method = "setup", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/Camera;move(FFF)V", ordinal = 0))
-    public void stopMoveIfRolling(Camera instance, float zoom, float dy, float dx, Operation<Void> original) {
-        Entity entity = instance.getEntity();
-        Entity vehicle = entity.getVehicle();
-
-        if (!(vehicle instanceof PokemonEntity) || Cobblemon.config.getViewBobTranslation()) {
-            original.call(instance, zoom, dy, dx);
-        }
-    }
-}

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

@@ -1,85 +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.CobblemonRecipeCategories;
-import com.cobblemon.mod.common.item.crafting.CookingPotBookCategory;
-import com.cobblemon.mod.common.item.crafting.CookingPotRecipe;
-import com.cobblemon.mod.common.item.crafting.CookingPotShapelessRecipe;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Maps;
-import net.minecraft.client.ClientRecipeBook;
-import net.minecraft.client.RecipeBookCategories;
-import net.minecraft.client.gui.screens.recipebook.RecipeCollection;
-import net.minecraft.core.RegistryAccess;
-
-import net.minecraft.world.item.crafting.Recipe;
-import net.minecraft.world.item.crafting.RecipeHolder;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-
-import java.util.List;
-import java.util.Map;
-
-@Mixin(ClientRecipeBook.class)
-public abstract class ClientRecipeBookMixin {
-
-    @Shadow
-    protected static Map<RecipeBookCategories, List<List<RecipeHolder<?>>>> categorizeAndGroupRecipes(Iterable<RecipeHolder<?>> recipes) {
-        return null;
-    }
-
-    @Shadow private Map<RecipeBookCategories, List<RecipeCollection>> collectionsByTab;
-
-    @Shadow private List<RecipeCollection> allCollections;
-
-    @Inject(method = "getCategory", at = @At(value = "HEAD"), cancellable = true)
-    private static void addCustomCategory(RecipeHolder<?> recipe, CallbackInfoReturnable<RecipeBookCategories> cir) {
-        Recipe<?> recipe2 = recipe.value();
-        if (recipe2 instanceof CookingPotRecipe || recipe2 instanceof CookingPotShapelessRecipe) {
-            CookingPotBookCategory category = recipe2 instanceof CookingPotRecipe
-                    ? ((CookingPotRecipe) recipe2).getCategory()
-                    : ((CookingPotShapelessRecipe) recipe2).category();
-            RecipeBookCategories var7;
-            switch (category) {
-                case MISC -> var7 = CobblemonRecipeCategories.COOKING_POT_MISC.toVanillaCategory();
-                case FOODS -> var7 = CobblemonRecipeCategories.COOKING_POT_FOODS.toVanillaCategory();
-                case MEDICINES -> var7 = CobblemonRecipeCategories.COOKING_POT_MEDICINES.toVanillaCategory();
-                case BAITS -> var7 = CobblemonRecipeCategories.COOKING_POT_BAITS.toVanillaCategory();
-                default -> throw new MatchException(null, null);
-            }
-            cir.setReturnValue(var7);
-        }
-    }
-
-    @Inject(method = "setupCollections", at = @At("RETURN"))
-    private void addCustomAggregateCategories(Iterable<RecipeHolder<?>> recipes, RegistryAccess registryAccess, CallbackInfo ci) {
-        Map<RecipeBookCategories, List<List<RecipeHolder<?>>>> map = categorizeAndGroupRecipes(recipes);
-        Map<RecipeBookCategories, List<RecipeCollection>> map2 = Maps.newHashMap();
-        ImmutableList.Builder<RecipeCollection> builder = ImmutableList.builder();
-
-        map.forEach((recipeBookCategories, list) -> {
-            List<RecipeCollection> collections = list.stream()
-                    .map(listx -> new RecipeCollection(registryAccess, listx))
-                    .peek(builder::add)
-                    .collect(ImmutableList.toImmutableList());
-            map2.put(recipeBookCategories, collections);
-        });
-        RecipeBookCategories.AGGREGATE_CATEGORIES.forEach((recipeBookCategories, list) -> map2.put(recipeBookCategories, (List)list.stream().flatMap((recipeBookCategoriesx) -> ((List)map2.getOrDefault(recipeBookCategoriesx, ImmutableList.of())).stream()).collect(ImmutableList.toImmutableList())));
-        CobblemonRecipeCategories.Companion.getCustomAggregateCategories().forEach((recipeBookCategories, list) -> map2.put(recipeBookCategories, (List)list.stream().flatMap((recipeBookCategoriesx) -> ((List)map2.getOrDefault(recipeBookCategoriesx, ImmutableList.of())).stream()).collect(ImmutableList.toImmutableList())));
-
-        this.collectionsByTab = ImmutableMap.copyOf(map2);
-        this.allCollections = builder.build();
-    }
-}

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

@@ -1,79 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.mixin.client;
-
-import com.cobblemon.mod.common.client.render.player.MountedPlayerRenderer;
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
-import net.minecraft.client.model.HumanoidModel;
-import net.minecraft.client.model.geom.ModelPart;
-import net.minecraft.client.player.AbstractClientPlayer;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.entity.LivingEntity;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.Unique;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-import java.util.HashMap;
-
-@Mixin(HumanoidModel.class)
-public class HumanoidModelMixin {
-    @Unique HashMap<String, ModelPart> relevantPartsByName = new HashMap<>();
-
-    @Shadow @Final
-    public ModelPart head;
-    @Shadow @Final
-    public ModelPart rightArm;
-    @Shadow @Final
-    public ModelPart leftArm;
-    @Shadow @Final
-    public ModelPart rightLeg;
-    @Shadow @Final
-    public ModelPart leftLeg;
-
-    @Inject(method = "setupAnim*", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/model/geom/ModelPart;copyFrom(Lnet/minecraft/client/model/geom/ModelPart;)V", shift = At.Shift.BEFORE))
-    public void cobblemon$animateRiders(
-        LivingEntity entity,
-        float limbSwing,
-        float limbSwingAmount,
-        float ageInTicks,
-        float netHeadYaw,
-        float headPitch,
-        CallbackInfo ci
-    ) {
-        if (relevantPartsByName.isEmpty()) {
-            relevantPartsByName.put("arm_left", leftArm);
-            relevantPartsByName.put("arm_right", rightArm);
-            relevantPartsByName.put("leg_left", leftLeg);
-            relevantPartsByName.put("leg_right", rightLeg);
-            relevantPartsByName.put("head", head);
-        }
-
-        Entity vehicle = entity.getVehicle();
-        if (vehicle instanceof PokemonEntity pokemonEntity && entity instanceof AbstractClientPlayer) {
-            var shouldRotatePlayerHead = pokemonEntity.ifRidingAvailableSupply(false, (behaviour, settings, state) -> {
-                return behaviour.shouldRotatePlayerHead(settings, state, pokemonEntity);
-            });
-
-            if (!shouldRotatePlayerHead) {
-                netHeadYaw = 0f;
-                headPitch = 0f;
-                if (this.head != null) {
-                    this.head.yRot = 0f;
-                    this.head.xRot = 0f;
-                }
-            }
-
-            MountedPlayerRenderer.INSTANCE.animate(pokemonEntity, (AbstractClientPlayer) entity, relevantPartsByName, netHeadYaw, headPitch, ageInTicks, limbSwing, limbSwingAmount);
-        }
-    }
-}

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

@@ -1,79 +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.CobblemonNetwork;
-import com.cobblemon.mod.common.OrientationControllable;
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
-import com.cobblemon.mod.common.net.messages.server.orientation.ServerboundUpdateOrientationPacket;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.player.LocalPlayer;
-import net.minecraft.world.entity.EntityType;
-import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.level.Level;
-import org.joml.Matrix3f;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Unique;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-@Mixin(LocalPlayer.class)
-public abstract class LocalPlayerMixin extends LivingEntity {
-
-    @Unique Matrix3f cobblemon$lastOrientation;
-
-    protected LocalPlayerMixin(EntityType<? extends LivingEntity> entityType, Level level) {
-        super(entityType, level);
-    }
-
-//    @Inject(method = "sendPosition", at = @At("TAIL"))
-//    private void cobblemon$updateRotationMatrix(CallbackInfo ci) {
-//        if (!(this instanceof OrientationControllable controllable)) return;
-//        var controller = controllable.getOrientationController();
-//        if (!controller.isActive() || controller.getOrientation() == cobblemon$lastOrientation) return;
-//        cobblemon$lastOrientation = controller.getOrientation() != null ? new Matrix3f(controller.getOrientation()) : null;
-//        CobblemonNetwork.INSTANCE.sendToServer(new ServerboundUpdateOrientationPacket(controller.getOrientation()));
-//    }
-
-    @Inject(method = "tick", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/multiplayer/ClientPacketListener;send(Lnet/minecraft/network/protocol/Packet;)V"))
-    private void cobblemon$updateRotationMatrixPassenger(CallbackInfo ci) {
-        if (!(this instanceof OrientationControllable controllable)) return;
-        var controller = controllable.getOrientationController();
-        if (!controller.isActive() || controller.getOrientation() == cobblemon$lastOrientation) return;
-        cobblemon$lastOrientation = controller.getOrientation() != null ? new Matrix3f(controller.getOrientation()) : null;
-        CobblemonNetwork.INSTANCE.sendToServer(new ServerboundUpdateOrientationPacket(controller.getOrientation()));
-    }
-
-    @Inject(method = "rideTick", at = @At("HEAD"))
-    private void cobblemon$updateOrientationControllerRideTick(CallbackInfo ci) {
-        if (Minecraft.getInstance().player != (Object)this) return;
-        if (!(this instanceof OrientationControllable controllable)) return;
-        var shouldUseCustomOrientation = cobblemon$shouldUseCustomOrientation((LocalPlayer)(Object)this);
-        controllable.getOrientationController().setActive(shouldUseCustomOrientation);
-    }
-
-    @Unique
-    private boolean cobblemon$shouldUseCustomOrientation(LocalPlayer player) {
-        var playerVehicle = player.getVehicle();
-        if (playerVehicle == null) return false;
-        if (!(playerVehicle instanceof PokemonEntity pokemonEntity)) return false;
-        return pokemonEntity.ifRidingAvailableSupply(false, (behaviour, settings, state) -> {
-            return behaviour.shouldRoll(settings, state, pokemonEntity);
-        });
-    }
-
-    @Override
-    public void stopRiding() {
-        super.stopRiding();
-        if (Minecraft.getInstance().player != (Object)this) return;
-        if (!(this instanceof OrientationControllable controllable)) return;
-        controllable.getOrientationController().setActive(false);
-    }
-}

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

@@ -1,249 +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.OrientationControllable;
-import com.cobblemon.mod.common.client.CobblemonClient;
-import com.cobblemon.mod.common.client.keybind.keybinds.PartySendBinding;
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
-import com.cobblemon.mod.common.pokedex.scanner.PokedexUsageContext;
-import com.llamalad7.mixinextras.injector.v2.WrapWithCondition;
-import com.llamalad7.mixinextras.sugar.Local;
-import com.mojang.blaze3d.Blaze3D;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.MouseHandler;
-import net.minecraft.client.player.LocalPlayer;
-import net.minecraft.util.Mth;
-import net.minecraft.util.SmoothDouble;
-import net.minecraft.world.phys.Vec3;
-import org.objectweb.asm.Opcodes;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.Unique;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
-
-@Mixin(MouseHandler.class)
-public abstract 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;
-
-    @Shadow @Final private SmoothDouble smoothTurnX;
-
-    @Shadow private double accumulatedDX;
-
-    @Shadow private double accumulatedDY;
-
-    @Shadow private double lastHandleMovementTime;
-
-    @Shadow public abstract boolean isMouseGrabbed();
-
-    @Shadow protected abstract void turnPlayer(double movementTime);
-
-    @Unique private double cobblemon$timeDelta;
-
-    @Inject(
-            method = "onScroll",
-            at = @At(
-                    value = "FIELD",
-                    target="Lnet/minecraft/client/MouseHandler;accumulatedScrollY:D",
-                    opcode = Opcodes.PUTFIELD,
-                    ordinal = 2,
-                    shift = At.Shift.BEFORE
-            ),
-            cancellable = true
-    )
-    public void cobblemon$scrollParty(long window, double horizontal, double vertical, CallbackInfo ci) {
-        if (PartySendBinding.INSTANCE.getWasDown()) {
-            int i = (int) accumulatedScrollY;
-            if (i > 0) {
-                accumulatedScrollY -= i;
-                CobblemonClient.INSTANCE.getStorage().shiftSelected(false);
-                ci.cancel();
-                PartySendBinding.INSTANCE.actioned();
-            } else if (i < 0) {
-                accumulatedScrollY -= i;
-                CobblemonClient.INSTANCE.getStorage().shiftSelected(true);
-                ci.cancel();
-                PartySendBinding.INSTANCE.actioned();
-            }
-        }
-    }
-
-    @Inject(
-        method = "onScroll",
-        at = @At(
-            value = "INVOKE",
-            target = "Lnet/minecraft/world/entity/player/Inventory;swapPaint(D)V"
-        ),
-        cancellable = true
-    )
-    public void cobblemon$doPokedexZoom(long window, double horizontal, double vertical, CallbackInfo ci) {
-        PokedexUsageContext usageContext = CobblemonClient.INSTANCE.getPokedexUsageContext();
-        if (usageContext.getScanningGuiOpen()) {
-            usageContext.adjustZoom(vertical);
-            ci.cancel();
-        }
-    }
-
-    @WrapWithCondition(
-            method = "turnPlayer",
-            at = @At(
-                    value = "INVOKE",
-                    target = "Lnet/minecraft/client/player/LocalPlayer;turn(DD)V"
-            )
-    )
-    public boolean cobblemon$modifyRotation(
-        LocalPlayer player,
-        double cursorDeltaX,
-        double cursorDeltaY,
-        @Local(argsOnly = true) double d,
-        @Local(argsOnly = true) double movementTime
-        ) {
-        PokedexUsageContext usageContext = CobblemonClient.INSTANCE.getPokedexUsageContext();
-        if (usageContext.getScanningGuiOpen()) {
-            this.smoothTurnY.reset();
-            this.smoothTurnX.reset();
-            var defaultSensitivity = this.minecraft.options.sensitivity().get() * 0.6000000238418579 + 0.20000000298023224;
-            var spyglassSensitivity = Math.pow(defaultSensitivity, 3);
-            var lookSensitivity = spyglassSensitivity * 8.0;
-            var sensitivity = Mth.lerp(usageContext.getFovMultiplier(), spyglassSensitivity, lookSensitivity);
-            player.turn(this.accumulatedDX * sensitivity, (this.accumulatedDY * sensitivity));
-            return false;
-        }
-
-        if (!(player instanceof OrientationControllable controllable)) return true;
-
-        if (!controllable.getOrientationController().isActive()) {
-            xMouseSmoother.reset();
-            yMouseSmoother.reset();
-            pitchSmoother.reset();
-            rollSmoother.reset();
-            yawSmoother.reset();
-            return true;
-        }
-
-        //Send mouse input to be interpreted into rotation
-        //deltas by the ride controller
-        Vec3 angVecMouse = cobblemon$getRideMouseRotation(cursorDeltaX, cursorDeltaY, movementTime);
-
-        //Perform Rotation using mouse influenced rotation deltas.
-        controllable.getOrientationController().rotate(
-            (float) angVecMouse.x,
-            (float) angVecMouse.y,
-            (float) angVecMouse.z
-        );
-
-        //Gather and apply the current rotation deltas
-        var angRot = cobblemon$getAngularVelocity(movementTime);
-
-        //Apply smoothing if requested by the controller.
-        //This Might be best if done by the controller itself?
-        if(cobblemon$shouldUseAngVelSmoothing())
-        {
-            var yaw = yawSmoother.getNewDeltaValue(angRot.x * 0.5f, d);
-            var pitch = pitchSmoother.getNewDeltaValue(angRot.y * 0.5f, d);
-            var roll = rollSmoother.getNewDeltaValue(angRot.z * 0.5f, d);
-            controllable.getOrientationController().rotate((float) yaw, (float) pitch, (float) roll);
-        }
-        //Otherwise simply apply the smoothing
-        else
-        {
-            controllable.getOrientationController().rotate((float) (angRot.x * 10 * d), (float) (angRot.y * 10 * d), (float) (angRot.z * 10 * d));
-        }
-        return false;
-    }
-
-    @Inject(method = "handleAccumulatedMovement", at = @At("HEAD"))
-    private void cobblemon$maintainMovementWhenInScreens2(CallbackInfo ci) {
-        double time = Blaze3D.getTime();
-        cobblemon$timeDelta = time - this.lastHandleMovementTime;
-    }
-
-    @Inject(method = "handleAccumulatedMovement", at = @At("TAIL"))
-    private void cobblemon$maintainMovementWhenInScreens(CallbackInfo ci) {
-        if (minecraft.player == null) return;
-        if (!(minecraft.player instanceof OrientationControllable controllable)) return;
-        if (!controllable.getOrientationController().isActive()) return;
-        if (minecraft.isPaused()) return;
-        if (isMouseGrabbed()) return;
-
-        this.turnPlayer(cobblemon$timeDelta);
-    }
-
-    @Unique
-    private Vec3 cobblemon$getAngularVelocity(double deltaTime) {
-        var player = minecraft.player;
-        if (player == null) return Vec3.ZERO;
-        if (!(player instanceof OrientationControllable)) return Vec3.ZERO;
-
-        var playerVehicle = player.getVehicle();
-        if (playerVehicle == null) return Vec3.ZERO;
-        if (!(playerVehicle instanceof PokemonEntity pokemonEntity)) return Vec3.ZERO;
-        return pokemonEntity.ifRidingAvailableSupply(Vec3.ZERO, (behaviour, settings, state) -> {
-            return behaviour.angRollVel(settings, state, pokemonEntity, player, deltaTime);
-        });
-    }
-
-    @Unique
-    private Vec3 cobblemon$getRideMouseRotation(double mouseX, double mouseY, double deltaTime) {
-        var player = minecraft.player;
-        if (player == null) return Vec3.ZERO;
-        var vehicle = player.getVehicle();
-        if (vehicle == null) return Vec3.ZERO;
-        if (!(vehicle instanceof PokemonEntity pokemonEntity)) return Vec3.ZERO;
-
-        var sensitivity = cobblemon$getRidingSensitivity();
-        return pokemonEntity.ifRidingAvailableSupply(Vec3.ZERO, (behaviour, settings, state) -> {
-            return behaviour.rotationOnMouseXY(
-                    settings,
-                    state,
-                    pokemonEntity,
-                    player,
-                    mouseY,
-                    mouseX,
-                    yMouseSmoother,
-                    xMouseSmoother,
-                    sensitivity,
-                    deltaTime
-            );
-        });
-    }
-
-    @Unique
-    private double cobblemon$getRidingSensitivity() {
-        var sensitivity = this.minecraft.options.sensitivity().get() * 0.6000000238418579 + 0.20000000298023224;
-        return Math.pow(sensitivity, 3);
-    }
-
-    @Unique
-    private boolean cobblemon$shouldUseAngVelSmoothing() {
-        var player = minecraft.player;
-        if (player == null) return true;
-
-        var playerVehicle = player.getVehicle();
-        if (playerVehicle == null) return true;
-        if (!(playerVehicle instanceof PokemonEntity pokemonEntity)) return true;
-        return pokemonEntity.ifRidingAvailableSupply(true, (behaviour, settings, state) -> {
-            return behaviour.useAngVelSmoothing(settings, state, pokemonEntity);
-        });
-    }
-
-}

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

@@ -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.mixin.client;
-
-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.llamalad7.mixinextras.injector.wrapoperation.Operation;
-import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
-import com.mojang.blaze3d.vertex.PoseStack;
-import net.minecraft.client.model.EntityModel;
-import net.minecraft.client.model.PlayerModel;
-import net.minecraft.client.player.AbstractClientPlayer;
-import net.minecraft.client.renderer.MultiBufferSource;
-import net.minecraft.client.renderer.entity.EntityRendererProvider;
-import net.minecraft.client.renderer.entity.LivingEntityRenderer;
-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;
-
-@Mixin(PlayerRenderer.class)
-public abstract class PlayerRendererMixin extends LivingEntityRenderer<AbstractClientPlayer, PlayerModel<AbstractClientPlayer>> {
-
-    public PlayerRendererMixin(EntityRendererProvider.Context context, PlayerModel<AbstractClientPlayer> model, float shadowRadius) {
-        super(context, model, shadowRadius);
-    }
-
-    @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);
-    }
-
-    @WrapOperation(method = "getRenderOffset(Lnet/minecraft/client/player/AbstractClientPlayer;F)Lnet/minecraft/world/phys/Vec3;", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/player/AbstractClientPlayer;isCrouching()Z"))
-    private boolean cobblemon$disableCrouchOffset(AbstractClientPlayer instance, Operation<Boolean> original) {
-        if (instance.isPassenger() && instance.getVehicle() instanceof PokemonEntity) {
-            return false;
-        }
-        return original.call(instance);
-    }
-
-    @Inject(method = "setModelProperties", at = @At("TAIL"))
-    private void cobblemon$setModelProperties(AbstractClientPlayer player, CallbackInfo ci) {
-        if (player.isPassenger() && player.getVehicle() instanceof PokemonEntity) {
-            PlayerModel<AbstractClientPlayer> playerModel = this.getModel();
-            playerModel.crouching = false;
-        }
-    }
-
-    @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) {
-        if (player.isPassenger()) {
-            var vehicle = player.getVehicle();
-            if (vehicle instanceof PokemonEntity entity) {
-                MountedPlayerRenderer.INSTANCE.render(player, entity, poseStack, a, b, partialTicks, i);
-            }
-        }
-    }
-}

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

@@ -1,73 +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.CobblemonItems;
-import com.cobblemon.mod.common.CobblemonRecipeCategories;
-import com.google.common.collect.ImmutableList;
-import net.minecraft.client.RecipeBookCategories;
-import net.minecraft.world.inventory.RecipeBookType;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.Items;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Mutable;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.gen.Invoker;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-
-import java.util.ArrayList;
-import java.util.List;
-
-
-@Mixin(RecipeBookCategories.class)
-public class RecipeBookCategoriesMixin {
-
-    @Final
-    @Mutable
-    @Shadow
-    private static RecipeBookCategories[] $VALUES;
-
-    @Invoker("<init>")
-    private static RecipeBookCategories cobblemon$createCategory(String name, int ordinal, ItemStack... icons) {
-        throw new AssertionError();
-    }
-
-    @Inject(
-            method = "<clinit>",
-            at = @At("TAIL")
-    )
-    private static void cobblemon$addRecipeBookType(CallbackInfo ci) {
-        ArrayList<RecipeBookCategories> types = new ArrayList<>(List.of($VALUES));
-        types.add(cobblemon$createCategory("COOKING_POT_SEARCH", $VALUES.length, new ItemStack(Items.COMPASS)));
-        types.add(cobblemon$createCategory("COOKING_POT_FOODS", $VALUES.length + 1, new ItemStack(CobblemonItems.ROASTED_LEEK)));
-        types.add(cobblemon$createCategory("COOKING_POT_MEDICINES", $VALUES.length + 2, new ItemStack(CobblemonItems.HP_UP)));
-        types.add(cobblemon$createCategory("COOKING_POT_BAITS", $VALUES.length + 3, new ItemStack(CobblemonItems.PERSIM_BERRY)));
-        types.add(cobblemon$createCategory("COOKING_POT_MISC", $VALUES.length + 4, new ItemStack(CobblemonItems.MIRROR_HERB)));
-        $VALUES = types.toArray(RecipeBookCategories[]::new);
-    }
-
-    @Inject(method = "getCategories", at = @At("HEAD"), cancellable = true)
-    private static void modifyCategories(RecipeBookType recipeBookType, CallbackInfoReturnable<List<RecipeBookCategories>> cir) {
-        if (recipeBookType == RecipeBookType.valueOf("COOKING_POT")) {
-            List var10000 = ImmutableList.of(
-                    CobblemonRecipeCategories.COOKING_POT_SEARCH.toVanillaCategory(),
-                    CobblemonRecipeCategories.COOKING_POT_FOODS.toVanillaCategory(),
-                    CobblemonRecipeCategories.COOKING_POT_MEDICINES.toVanillaCategory(),
-                    CobblemonRecipeCategories.COOKING_POT_BAITS.toVanillaCategory(),
-                    CobblemonRecipeCategories.COOKING_POT_MISC.toVanillaCategory());
-            cir.setReturnValue(var10000);
-            return;
-        }
-    }
-}

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

@@ -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.mixin.client;
-
-import com.cobblemon.mod.common.CobblemonRecipeCategories;
-import net.minecraft.client.ClientRecipeBook;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.RecipeBookCategories;
-import net.minecraft.client.gui.screens.recipebook.RecipeBookComponent;
-import net.minecraft.client.gui.screens.recipebook.RecipeBookPage;
-import net.minecraft.client.gui.screens.recipebook.RecipeBookTabButton;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-@Mixin(RecipeBookComponent.class)
-public class RecipeBookComponentMixin {
-
-    @Shadow private ClientRecipeBook book;
-
-    @Shadow protected Minecraft minecraft;
-
-    @Shadow private int width;
-
-    @Shadow private int xOffset;
-
-    @Shadow private int height;
-
-    @Shadow @Final private RecipeBookPage recipeBookPage;
-
-    @Inject(method = "updateTabs", at = @At("HEAD"), cancellable = true)
-    private void customUpdateTabs(CallbackInfo ci) {
-        RecipeBookComponent instance = (RecipeBookComponent) (Object) this;
-        int i = (width - 147) / 2 - xOffset - 30;
-        int j = (height - 166) / 2 + 3;
-        int k = 27;
-        int l = 0;
-
-        for (RecipeBookTabButton recipeBookTabButton : instance.tabButtons) {
-            RecipeBookCategories recipeBookCategories = recipeBookTabButton.getCategory();
-            if (recipeBookCategories != RecipeBookCategories.CRAFTING_SEARCH && recipeBookCategories != RecipeBookCategories.FURNACE_SEARCH && recipeBookCategories != CobblemonRecipeCategories.COOKING_POT_SEARCH.toVanillaCategory()) {
-                if (recipeBookTabButton.updateVisibility(book)) {
-                    recipeBookTabButton.setPosition(i, j + 27 * l++);
-                    recipeBookTabButton.startAnimation(minecraft);
-                }
-            } else {
-                recipeBookTabButton.visible = true;
-                recipeBookTabButton.setPosition(i, j + k * l++);
-            }
-        }
-
-        ci.cancel();
-    }
-}

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

@@ -1,40 +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 net.minecraft.client.ClientRecipeBook;
-import net.minecraft.client.gui.screens.recipebook.RecipeBookTabButton;
-import net.minecraft.client.gui.screens.recipebook.RecipeCollection;
-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.CallbackInfoReturnable;
-
-import java.util.List;
-
-@Mixin(RecipeBookTabButton.class)
-public class RecipeBookTabButtonMixin {
-
-    @Inject(method = "updateVisibility", at = @At("HEAD"), cancellable = true)
-    private void customUpdateVisibility(ClientRecipeBook recipeBook, CallbackInfoReturnable<Boolean> cir) {
-        RecipeBookTabButton instance = (RecipeBookTabButton) (Object) this;
-        List<RecipeCollection> list = recipeBook.getCollection(instance.getCategory());
-        boolean visible = false;
-        if (list != null) {
-            for (RecipeCollection recipeCollection : list) {
-                if (recipeCollection.hasKnownRecipes() && recipeCollection.hasFitting()) {
-                    visible = true;
-                    break;
-                }
-            }
-        }
-        instance.visible = visible;
-        cir.setReturnValue(visible);
-    }
-}

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

@@ -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.mixin.client;
-
-import net.minecraft.client.gui.screens.recipebook.RecipeCollection;
-import net.minecraft.stats.RecipeBook;
-import net.minecraft.world.entity.player.StackedContents;
-import net.minecraft.world.item.crafting.RecipeHolder;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-import java.util.List;
-import java.util.Set;
-
-@Mixin(RecipeCollection.class)
-public class RecipeCollectionMixin {
-
-    @Shadow @Final private Set<RecipeHolder<?>> fitsDimensions;
-
-    @Shadow @Final private Set<RecipeHolder<?>> craftable;
-
-    @Shadow @Final private List<RecipeHolder<?>> recipes;
-
-    @Inject(method = "canCraft", at = @At("HEAD"), cancellable = true)
-    private void customCanCraft(StackedContents handler, int width, int height, RecipeBook book, CallbackInfo ci) {
-        for (RecipeHolder<?> recipeHolder : recipes) {
-            boolean bl = recipeHolder.value().canCraftInDimensions(width, height) && book.contains(recipeHolder);
-            if (bl) {
-                fitsDimensions.add(recipeHolder);
-            } else {
-                fitsDimensions.remove(recipeHolder);
-            }
-
-            if (bl && handler.canCraft(recipeHolder.value(), null)) {
-                craftable.add(recipeHolder);
-            } else {
-                craftable.remove(recipeHolder);
-            }
-        }
-
-        ci.cancel();
-    }
-}

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

@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.mixin.entity;
-
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
-import net.minecraft.world.entity.Entity;
-import org.jetbrains.annotations.Nullable;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-@Mixin(Entity.class)
-public abstract class EntityMixin {
-
-    @Shadow @Nullable public abstract Entity getVehicle();
-
-    @Inject(method = "updateInWaterStateAndDoWaterCurrentPushing", at = @At(value = "FIELD", target = "Lnet/minecraft/world/entity/Entity;wasTouchingWater:Z", ordinal = 1), cancellable = true)
-    public void cobblemon$verifyActuallyTouchingWater(CallbackInfo ci) {
-        if(this.getVehicle() instanceof PokemonEntity) {
-            ci.cancel();
-        }
-    }
-
-}

common/src/main/java/com/cobblemon/mod/common/mixin/riding/JetMixin.java

@@ -1,62 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.mixin.riding;
-
-import net.minecraft.client.player.LocalPlayer;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
-
-@Mixin(LocalPlayer.class)
-public class JetMixin {
-
-    @Shadow private int jumpRidingTicks;
-    @Shadow private float jumpRidingScale;
-
-    private float jetStrength;
-
-//    @Redirect(method = "tickMovement", at = @At(target = "Lnet/minecraft/entity/JumpingMount;getJumpCooldown()I", value = "INVOKE"))
-//    public int cobblemon$tryHandlingJet(JumpingMount mount) {
-//        if(mount instanceof PokemonEntity pokemon) {
-////            if(pokemon.getDataTracker().get(PokemonEntity.MOVING)) {
-////                ++this.field_3938;
-////                if (this.field_3938 < 11) {
-////                    this.jetStrength = (float) this.field_3938 * 0.1F;
-////                } else {
-//                    this.mountJumpStrength = 0.8F + 2.0F / (float) (this.field_3938 - 9) * 0.1F;
-////                }
-////            } else {
-////                this.field_3938 = 0;
-////                this.jetStrength = 0;
-////            }
-//
-////            return -1;
-//        }
-//
-//        return 0;
-//    }
-
-    @Inject(
-            method = "aiStep",
-            at = @At(
-                    target = "Lnet/minecraft/client/player/LocalPlayer;jumpRidingScale:F",
-                    value = "FIELD",
-                    ordinal = 4,
-                    shift = At.Shift.AFTER
-            ),
-            locals = LocalCapture.CAPTURE_FAILSOFT
-    )
-    public void cobblemon$applyCachedJumpStrength(CallbackInfo ci) {
-        this.jumpRidingScale = this.jetStrength;
-    }
-
-}

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

@@ -19,7 +19,6 @@ import com.cobblemon.mod.common.api.drop.ItemDropEntry
 import com.cobblemon.mod.common.api.events.CobblemonEvents
 import com.cobblemon.mod.common.api.events.CobblemonEvents.DATA_SYNCHRONIZED
 import com.cobblemon.mod.common.api.interaction.RequestManager
-import com.cobblemon.mod.common.api.molang.ObjectValue
 import com.cobblemon.mod.common.api.permission.PermissionValidator
 import com.cobblemon.mod.common.api.pokeball.catching.calculators.CaptureCalculator
 import com.cobblemon.mod.common.api.pokeball.catching.calculators.CaptureCalculators
@@ -63,11 +62,7 @@ import com.cobblemon.mod.common.api.storage.player.adapter.PlayerDataMongoBacken
 import com.cobblemon.mod.common.api.storage.player.factory.CachedPlayerDataStoreFactory
 import com.cobblemon.mod.common.api.tags.CobblemonEntityTypeTags
 import com.cobblemon.mod.common.api.tags.CobblemonItemTags
-import com.cobblemon.mod.common.battles.BagItems
-import com.cobblemon.mod.common.battles.BattleFormat
-import com.cobblemon.mod.common.battles.BattleRegistry
-import com.cobblemon.mod.common.battles.BattleSide
-import com.cobblemon.mod.common.battles.ShowdownThread
+import com.cobblemon.mod.common.battles.*
 import com.cobblemon.mod.common.battles.actor.PokemonBattleActor
 import com.cobblemon.mod.common.battles.pokemon.BattlePokemon
 import com.cobblemon.mod.common.client.CobblemonPack
@@ -85,29 +80,16 @@ 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.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.*
 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.DataKeys
-import com.cobblemon.mod.common.util.cobblemonResource
-import com.cobblemon.mod.common.util.ifDedicatedServer
-import com.cobblemon.mod.common.util.isLaterVersion
-import com.cobblemon.mod.common.util.party
-import com.cobblemon.mod.common.util.requestWallpapers
-import com.cobblemon.mod.common.util.server
+import com.cobblemon.mod.common.util.*
 import com.cobblemon.mod.common.world.feature.CobblemonPlacedFeatures
 import com.cobblemon.mod.common.world.feature.ore.CobblemonOrePlacedFeatures
 import com.cobblemon.mod.common.world.gamerules.CobblemonGameRules
@@ -115,30 +97,27 @@ import com.mongodb.ConnectionString
 import com.mongodb.MongoClientSettings
 import com.mongodb.client.MongoClient
 import com.mongodb.client.MongoClients
-import java.io.File
-import java.io.FileReader
-import java.io.FileWriter
-import java.io.PrintWriter
-import java.util.UUID
-import java.util.concurrent.TimeUnit
-import kotlin.math.roundToInt
-import kotlin.properties.Delegates
-import kotlin.reflect.full.memberProperties
-import kotlin.reflect.jvm.isAccessible
-import kotlin.reflect.jvm.javaField
 import net.minecraft.client.Minecraft
 import net.minecraft.commands.synchronization.SingletonArgumentInfo
-import net.minecraft.core.registries.Registries
 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.entity.player.Player
 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
@@ -172,9 +151,7 @@ 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 = mutableMapOf<UUID, Set<ResourceLocation>>()
-
-    val serverPlayerStructs = mutableMapOf<UUID, ObjectValue<Player>>()
+    var wallpapers = mapOf<UUID, List<ResourceLocation>>()
 
     @JvmStatic
     val builtinPacks = listOf<CobblemonPack>(
@@ -195,8 +172,6 @@ object Cobblemon {
             this.LOGGER.info("  - Branch: ${CobblemonBuildDetails.BRANCH}")
         }
 
-        implementation.registerRecipeSerializers()
-        implementation.registerRecipeTypes()
         implementation.registerPermissionValidator()
         implementation.registerSoundEvents()
         implementation.registerDataComponents()
@@ -205,11 +180,9 @@ object Cobblemon {
         implementation.registerEntityTypes()
         implementation.registerEntityAttributes()
         implementation.registerBlockEntityTypes()
-        implementation.registerPoiTypes()
         implementation.registerVillagers()
         implementation.registerWorldGenFeatures()
         implementation.registerParticles()
-        implementation.registerMenu()
         implementation.registerEntityDataSerializers()
         implementation.registerCriteria()
         implementation.registerEntitySubPredicates()
@@ -244,7 +217,6 @@ object Cobblemon {
             storage.onPlayerDisconnect(it.player)
             playerDataManager.onPlayerDisconnect(it.player)
             RequestManager.onLogoff(it.player)
-            serverPlayerStructs.remove(it.player.uuid)
         }
         PlatformEvents.PLAYER_DEATH.subscribe {
             PCLinkManager.removeLink(it.player.uuid)
@@ -306,7 +278,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
@@ -414,11 +385,9 @@ object Cobblemon {
         PlatformEvents.SERVER_STOPPED.subscribe {
             storage.unregisterAll(it.server.registryAccess())
             playerDataManager.saveAllStores()
-            playerDataManager.saveExecutor.shutdown()
-            playerDataManager.saveExecutor.awaitTermination(30L, TimeUnit.SECONDS)
         }
-        PlatformEvents.SERVER_STARTED.subscribe { event ->
-            bestSpawner.onServerStarted(event.server)
+        PlatformEvents.SERVER_STARTED.subscribe {
+            bestSpawner.onServerStarted()
             battleRegistry.onServerStarted()
         }
         PlatformEvents.SERVER_TICK_POST.subscribe { ServerTickHandler.onTick(it.server) }
@@ -566,10 +535,6 @@ object Cobblemon {
         this.implementation.registerCommandArgument(cobblemonResource("form"), FormArgumentType::class, SingletonArgumentInfo.contextFree(FormArgumentType::form))
         this.implementation.registerCommandArgument(cobblemonResource("dex"), DexArgumentType::class, SingletonArgumentInfo.contextFree (DexArgumentType::dex))
         this.implementation.registerCommandArgument(cobblemonResource("npc_class"), NPCClassArgumentType::class, SingletonArgumentInfo.contextFree(NPCClassArgumentType::npcClass))
-        this.implementation.registerCommandArgument(cobblemonResource("wallpaper"), UnlockablePCBoxWallpaperArgumentType::class, SingletonArgumentInfo.contextFree(UnlockablePCBoxWallpaperArgumentType::wallpaper))
-        this.implementation.registerCommandArgument(cobblemonResource("mark"), MarkArgumentType::class, SingletonArgumentInfo.contextFree(MarkArgumentType::mark))
-        this.implementation.registerCommandArgument(cobblemonResource("transform_type"), TransformTypeArgumentType::class, SingletonArgumentInfo.contextFree(TransformTypeArgumentType::transformType))
-        this.implementation.registerCommandArgument(cobblemonResource("model_part"), ModelPartArgumentType::class, SingletonArgumentInfo.contextFree(ModelPartArgumentType::modelPart))
     }
 
 }

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

@@ -8,7 +8,6 @@
 
 package com.cobblemon.mod.common
 
-import com.cobblemon.mod.common.block.entity.PokeCakeBlockEntity
 import com.cobblemon.mod.common.block.entity.BerryBlockEntity
 import com.cobblemon.mod.common.block.entity.HealingMachineBlockEntity
 import com.cobblemon.mod.common.block.entity.PCBlockEntity
@@ -37,6 +36,9 @@ object CobblemonBlockEntities : PlatformRegistry<Registry<BlockEntityType<*>>, R
     @JvmField
     val PC: BlockEntityType<PCBlockEntity> = this.create("pc", BlockEntityType.Builder.of(::PCBlockEntity, CobblemonBlocks.PC).build(null))
 
+    @JvmField
+    val STADIUM: BlockEntityType<StadiumBlockEntity> = this.create("stadium_terminal", BlockEntityType.Builder.of(::StadiumBlockEntity, CobblemonBlocks.STADIUM).build(null))
+
     @JvmField
     val LECTERN: BlockEntityType<LecternBlockEntity> = this.create("lectern", BlockEntityType.Builder.of(::LecternBlockEntity, CobblemonBlocks.LECTERN).build(null))
 
@@ -46,9 +48,9 @@ object CobblemonBlockEntities : PlatformRegistry<Registry<BlockEntityType<*>>, R
     @JvmField
     val PASTURE: BlockEntityType<PokemonPastureBlockEntity> = this.create("pasture", BlockEntityType.Builder.of(::PokemonPastureBlockEntity, CobblemonBlocks.PASTURE).build(null))
     @JvmField
-    val SIGN: BlockEntityType<CobblemonSignBlockEntity> = this.create("sign", BlockEntityType.Builder.of(::CobblemonSignBlockEntity, CobblemonBlocks.APRICORN_SIGN, CobblemonBlocks.APRICORN_WALL_SIGN, CobblemonBlocks.SACCHARINE_SIGN, CobblemonBlocks.SACCHARINE_WALL_SIGN).build(null))
+    val SIGN: BlockEntityType<CobblemonSignBlockEntity> = this.create("sign", BlockEntityType.Builder.of(::CobblemonSignBlockEntity, CobblemonBlocks.APRICORN_SIGN, CobblemonBlocks.APRICORN_WALL_SIGN).build(null))
     @JvmField
-    val HANGING_SIGN: BlockEntityType<CobblemonHangingSignBlockEntity> = this.create("hanging_sign", BlockEntityType.Builder.of(::CobblemonHangingSignBlockEntity, CobblemonBlocks.APRICORN_HANGING_SIGN, CobblemonBlocks.APRICORN_WALL_HANGING_SIGN, CobblemonBlocks.SACCHARINE_HANGING_SIGN, CobblemonBlocks.SACCHARINE_WALL_HANGING_SIGN).build(null))
+    val HANGING_SIGN: BlockEntityType<CobblemonHangingSignBlockEntity> = this.create("hanging_sign", BlockEntityType.Builder.of(::CobblemonHangingSignBlockEntity, CobblemonBlocks.APRICORN_HANGING_SIGN, CobblemonBlocks.APRICORN_WALL_HANGING_SIGN).build(null))
 
     @JvmField
     val GILDED_CHEST: BlockEntityType<GildedChestBlockEntity> = this.create("chest", BlockEntityType.Builder.of(::GildedChestBlockEntity,
@@ -87,36 +89,4 @@ object CobblemonBlockEntities : PlatformRegistry<Registry<BlockEntityType<*>>, R
     val DISPLAY_CASE: BlockEntityType<DisplayCaseBlockEntity> = this.create("display_case",
         BlockEntityType.Builder.of(::DisplayCaseBlockEntity, CobblemonBlocks.DISPLAY_CASE).build(null)
     )
-
-    @JvmField
-    val INCENSE_SWEET: BlockEntityType<SweetIncenseBlockEntity> = this.create("incense_sweet",
-            BlockEntityType.Builder.of(::SweetIncenseBlockEntity, CobblemonBlocks.INCENSE_SWEET).build(null)
-    )
-
-    @JvmField
-    val CAMPFIRE: BlockEntityType<CampfireBlockEntity> = this.create("campfire_pot",
-            BlockEntityType.Builder.of(::CampfireBlockEntity, CobblemonBlocks.CAMPFIRE).build(null)
-    )
-
-    /*@JvmField
-    val LURE_CAKE: BlockEntityType<LureCakeBlockEntity> =
-        BlockEntityType.Builder.of({ pos, state -> LureCakeBlockEntity(pos, state) },
-            CobblemonBlocks.LURE_CAKE
-        ).build(null)*/
-
-    @JvmField
-    val LURE_CAKE: BlockEntityType<LureCakeBlockEntity> = this.create(
-        "lure_cake",
-        BlockEntityType.Builder.of(::LureCakeBlockEntity, CobblemonBlocks.LURE_CAKE).build(null)
-    )
-    @JvmField
-    val POKE_CAKE: BlockEntityType<PokeCakeBlockEntity> = this.create(
-        "poke_cake",
-        BlockEntityType.Builder.of(::PokeCakeBlockEntity, CobblemonBlocks.POKE_CAKE).build(null)
-    )
-    @JvmField
-    val CANDLE_POKE_CAKE: BlockEntityType<CandlePokeCakeBlockEntity> = this.create(
-        "candle_poke_cake",
-        BlockEntityType.Builder.of(::CandlePokeCakeBlockEntity, CobblemonBlocks.CANDLE_POKE_CAKE).build(null)
-    )
 }

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

@@ -10,10 +10,8 @@ package com.cobblemon.mod.common
 
 import com.cobblemon.mod.common.api.apricorn.Apricorn
 import com.cobblemon.mod.common.block.*
-import com.cobblemon.mod.common.block.campfirepot.CampfireBlock
 import com.cobblemon.mod.common.block.LecternBlock
 import com.cobblemon.mod.common.block.MintBlock.MintType
-import com.cobblemon.mod.common.block.campfirepot.CampfirePotBlock
 import com.cobblemon.mod.common.block.chest.GildedChestBlock
 import com.cobblemon.mod.common.block.sign.CobblemonHangingSignBlock
 import com.cobblemon.mod.common.block.sign.CobblemonSignBlock
@@ -22,7 +20,6 @@ import com.cobblemon.mod.common.block.sign.CobblemonWallSignBlock
 import com.cobblemon.mod.common.mixin.invoker.*
 import com.cobblemon.mod.common.platform.PlatformRegistry
 import com.cobblemon.mod.common.util.cobblemonResource
-import net.minecraft.core.BlockPos
 import net.minecraft.core.Registry
 import net.minecraft.core.registries.BuiltInRegistries
 import net.minecraft.core.registries.Registries
@@ -30,13 +27,9 @@ import net.minecraft.resources.ResourceKey
 import net.minecraft.resources.ResourceLocation
 import net.minecraft.util.valueproviders.UniformInt
 import net.minecraft.world.effect.MobEffects
-import net.minecraft.world.entity.EntityType
-import net.minecraft.world.level.BlockGetter
 import net.minecraft.world.level.block.*
 import net.minecraft.world.level.block.state.BlockBehaviour
-import net.minecraft.world.level.block.state.BlockState
 import net.minecraft.world.level.block.state.properties.BlockSetType
-import net.minecraft.world.level.block.state.properties.BlockStateProperties.LIT
 import net.minecraft.world.level.block.state.properties.NoteBlockInstrument
 import net.minecraft.world.level.block.state.properties.WoodType
 import net.minecraft.world.level.material.MapColor
@@ -50,8 +43,6 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<
 
     val APRICORN_BLOCK_SET_TYPE = BlockSetType("apricorn")
     val APRICORN_WOOD_TYPE = WoodType.register(WoodType("apricorn", APRICORN_BLOCK_SET_TYPE))
-    val SACCHARINE_BLOCK_SET_TYPE = BlockSetType("saccharine")
-    val SACCHARINE_WOOD_TYPE = WoodType.register(WoodType("saccharine", SACCHARINE_BLOCK_SET_TYPE))
 
     // Evolution Ores
     @JvmField
@@ -168,80 +159,15 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<
     @JvmField
     val YELLOW_APRICORN_SAPLING = this.create("yellow_apricorn_sapling", ApricornSaplingBlock(PLANT_PROPERTIES, Apricorn.YELLOW))
 
-    // Saccharines
-    @JvmField
-    val SACCHARINE_LOG = this.create("saccharine_log", SaccharineLogBlock(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_BLUE).instrument(NoteBlockInstrument.BASS).strength(2.0F).sound(SoundType.WOOD).ignitedByLava()))
-    @JvmField
-    val SACCHARINE_HONEY_LOG = this.create("saccharine_honey_log", SaccharineHoneyLogBlock(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_BLUE).instrument(NoteBlockInstrument.BASS).strength(2.0F).sound(SoundType.WOOD).ignitedByLava()))
-
-    @JvmField
-    val STRIPPED_SACCHARINE_LOG = this.create("stripped_saccharine_log", SaccharineStrippedLogBlock(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_LIGHT_BLUE).instrument(NoteBlockInstrument.BASS).strength(2.0F).sound(SoundType.WOOD).ignitedByLava())) //log("stripped_saccharine_log")
-    @JvmField
-    val SACCHARINE_WOOD = log("saccharine_wood")
-    @JvmField
-    val STRIPPED_SACCHARINE_WOOD = this.create("stripped_saccharine_wood", SaccharineStrippedLogBlock(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_LIGHT_BLUE).instrument(NoteBlockInstrument.BASS).strength(2.0F).sound(SoundType.WOOD).ignitedByLava())) //log("stripped_saccharine_log")
-    @JvmField
-    val SACCHARINE_PLANKS = this.create("saccharine_planks", Block(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_LIGHT_BLUE).instrument(NoteBlockInstrument.BASS).strength(2.0f, 3.0f).sound(SoundType.WOOD)))
-    @JvmField
-    val SACCHARINE_LEAVES = this.create("saccharine_leaves", SaccharineLeafBlock(
-        BlockBehaviour.Properties.of().mapColor(
-            MapColor.PLANT
-        ).strength(0.2f).randomTicks().sound(SoundType.GRASS).noOcclusion()
-            .isValidSpawn { _: BlockState?, _: BlockGetter?, _: BlockPos?, entity: EntityType<*>? ->
-                entity === EntityType.OCELOT || entity === EntityType.PARROT
-            }.isSuffocating { _: BlockState?, _: BlockGetter?, _: BlockPos? ->
-                false
-            }.isViewBlocking { _: BlockState?, _: BlockGetter?, _: BlockPos? ->
-                false
-            }.ignitedByLava().pushReaction(PushReaction.DESTROY)
-            .isRedstoneConductor { _: BlockState?, _: BlockGetter?, _: BlockPos? ->
-                false
-            }))
-    @JvmField
-    val SACCHARINE_FENCE = this.create("saccharine_fence", FenceBlock(BlockBehaviour.Properties.of().mapColor(SACCHARINE_PLANKS.defaultMapColor()).instrument(NoteBlockInstrument.BASS).strength(2.0f, 3.0f).sound(SoundType.WOOD)))
-    @JvmField
-    val SACCHARINE_FENCE_GATE = this.create("saccharine_fence_gate", FenceGateBlock(SACCHARINE_WOOD_TYPE, BlockBehaviour.Properties.of().mapColor(SACCHARINE_PLANKS.defaultMapColor()).instrument(NoteBlockInstrument.BASS).strength(2.0f, 3.0f).sound(SoundType.WOOD)))
-
-    val SACCHARINE_BUTTON = this.create("saccharine_button", BlocksInvoker.createWoodenButtonBlock(BlockSetType.OAK))
-    @JvmField
-    val SACCHARINE_PRESSURE_PLATE = this.create("saccharine_pressure_plate", PressurePlateBlockInvoker.`cobblemon$create`(SACCHARINE_BLOCK_SET_TYPE, BlockBehaviour.Properties.of().mapColor(SACCHARINE_PLANKS.defaultMapColor()).instrument(NoteBlockInstrument.BASS).noCollission().strength(0.5f).sound(SoundType.WOOD)))
-    @JvmField
-    val SACCHARINE_SIGN = this.create("saccharine_sign", CobblemonSignBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.OAK_SIGN), SACCHARINE_WOOD_TYPE))
-    @JvmField
-    val SACCHARINE_WALL_SIGN = this.create("saccharine_wall_sign", CobblemonWallSignBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.OAK_WALL_SIGN), SACCHARINE_WOOD_TYPE))
-    @JvmField
-    val SACCHARINE_HANGING_SIGN = this.create("saccharine_hanging_sign", CobblemonHangingSignBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.OAK_WALL_HANGING_SIGN), SACCHARINE_WOOD_TYPE))
-    @JvmField
-    val SACCHARINE_WALL_HANGING_SIGN = this.create("saccharine_wall_hanging_sign", CobblemonWallHangingSignBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.OAK_HANGING_SIGN), SACCHARINE_WOOD_TYPE))
-    @JvmField
-    val SACCHARINE_SLAB = this.create("saccharine_slab", SlabBlock(BlockBehaviour.Properties.of().mapColor(MapColor.WOOD).instrument(NoteBlockInstrument.BASS).strength(2.0f, 3.0f).sound(SoundType.WOOD)))
-    @JvmField
-    val SACCHARINE_STAIRS = this.create("saccharine_stairs", StairsBlockInvoker.`cobblemon$create`(SACCHARINE_PLANKS.defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(SACCHARINE_PLANKS)))
-    @JvmField
-    val SACCHARINE_DOOR = this.create("saccharine_door", DoorBlockInvoker.`cobblemon$create`(SACCHARINE_BLOCK_SET_TYPE, BlockBehaviour.Properties.of().mapColor(SACCHARINE_PLANKS.defaultMapColor()).instrument(NoteBlockInstrument.BASS).strength(3.0F).sound(SoundType.WOOD).noOcclusion()))
-    @JvmField
-    val SACCHARINE_TRAPDOOR = this.create("saccharine_trapdoor", TrapdoorBlockInvoker.`cobblemon$create`(SACCHARINE_BLOCK_SET_TYPE, BlockBehaviour.Properties.of().mapColor(MapColor.WOOD).instrument(NoteBlockInstrument.BASS).strength(3.0F).sound(SoundType.WOOD).noOcclusion()))
-    @JvmField
-    val SACCHARINE_SAPLING = this.create("saccharine_sapling", SaccharineSaplingBlock(PLANT_PROPERTIES))
-
     @JvmField
     val MEDICINAL_LEEK = this.create("medicinal_leek", MedicinalLeekBlock(BlockBehaviour.Properties.of().pushReaction(PushReaction.DESTROY).ignitedByLava().mapColor(MapColor.CRIMSON_NYLIUM).noCollission().randomTicks().instabreak().sound(CobblemonSounds.MEDICINAL_LEEK_SOUNDS)))
     @JvmField
-    val BUGWORT = this.create("bugwort", BugwortBlock(BlockBehaviour.Properties.of().pushReaction(PushReaction.DESTROY).ignitedByLava().mapColor(MapColor.COLOR_PURPLE).noCollission().randomTicks().instabreak().sound(CobblemonSounds.MEDICINAL_LEEK_SOUNDS)))
-    @JvmField
     val ENERGY_ROOT = this.create("energy_root", EnergyRootBlock(BlockBehaviour.Properties.of().pushReaction(PushReaction.DESTROY).ignitedByLava().mapColor(MapColor.DIRT).noCollission().randomTicks().instabreak().sound(CobblemonSounds.ENERGY_ROOT_SOUNDS)))
     @JvmField
     val BIG_ROOT = this.create("big_root", BigRootBlock(BlockBehaviour.Properties.of().pushReaction(PushReaction.DESTROY).ignitedByLava().mapColor(MapColor.PLANT).noCollission().randomTicks().instabreak().sound(CobblemonSounds.BIG_ROOT_SOUNDS)))
     @JvmField
     val REVIVAL_HERB = this.create("revival_herb", RevivalHerbBlock(BlockBehaviour.Properties.of().pushReaction(PushReaction.DESTROY).mapColor(MapColor.PLANT).ignitedByLava().noCollission().instabreak().sound(CobblemonSounds.REVIVAL_HERB_SOUNDS)))
 
-    @JvmField
-    val LURE_CAKE = this.create("lure_cake", LureCakeBlock(BlockBehaviour.Properties.of().forceSolidOn().strength(0.5F).sound(SoundType.WOOL).pushReaction(PushReaction.DESTROY)))
-    @JvmField
-    val POKE_CAKE = this.create("poke_cake", PokeCakeBlock(BlockBehaviour.Properties.ofFullCopy(LURE_CAKE)))
-    @JvmField
-    val CANDLE_POKE_CAKE = this.create("candle_poke_cake", CandlePokeCakeBlock(BlockBehaviour.Properties.ofFullCopy(LURE_CAKE).lightLevel { blockState -> if (blockState.getValue(LIT) == true) 3 else 0 }))
-
     @JvmField
     val TUMBLESTONE_CLUSTER = tumblestoneBlock("tumblestone_cluster", GrowableStoneBlock.STAGE_3, 7, 3, null)
     @JvmField
@@ -393,60 +319,6 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<
     @JvmField
     val YELLOW_APRICORN = apricornBlock("yellow_apricorn", Apricorn.YELLOW)
 
-    @JvmField
-    val BLACK_CAMPFIRE_POT = create("campfire_pot_black",
-        CampfirePotBlock(
-            BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_BLACK).sound(CobblemonSounds.CAMPFIRE_POT_SOUNDS)
-                .strength(0.5F).pushReaction(PushReaction.BLOCK).noOcclusion()
-        )
-    )
-    @JvmField
-    val BLUE_CAMPFIRE_POT = create("campfire_pot_blue",
-        CampfirePotBlock(
-            BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_BLUE).sound(CobblemonSounds.CAMPFIRE_POT_SOUNDS)
-                .strength(0.5F).pushReaction(PushReaction.BLOCK).noOcclusion()
-        )
-    )
-    @JvmField
-    val GREEN_CAMPFIRE_POT = create("campfire_pot_green",
-        CampfirePotBlock(
-            BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_GREEN).sound(CobblemonSounds.CAMPFIRE_POT_SOUNDS)
-                .strength(0.5F).pushReaction(PushReaction.BLOCK).noOcclusion()
-        )
-    )
-    @JvmField
-    val PINK_CAMPFIRE_POT = create("campfire_pot_pink",
-        CampfirePotBlock(
-            BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_PINK).sound(CobblemonSounds.CAMPFIRE_POT_SOUNDS)
-                .strength(0.5F).pushReaction(PushReaction.BLOCK).noOcclusion()
-        )
-    )
-    @JvmField
-    val RED_CAMPFIRE_POT = create("campfire_pot_red",
-        CampfirePotBlock(
-            BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_RED).sound(CobblemonSounds.CAMPFIRE_POT_SOUNDS)
-                .strength(0.5F).pushReaction(PushReaction.BLOCK).noOcclusion()
-        )
-    )
-    @JvmField
-    val WHITE_CAMPFIRE_POT = create("campfire_pot_white",
-        CampfirePotBlock(
-            BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_LIGHT_GRAY)
-                .sound(CobblemonSounds.CAMPFIRE_POT_SOUNDS).strength(0.5F).pushReaction(PushReaction.BLOCK)
-                .noOcclusion()
-        )
-    )
-    @JvmField
-    val YELLOW_CAMPFIRE_POT = create("campfire_pot_yellow",
-        CampfirePotBlock(
-            BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_YELLOW).sound(CobblemonSounds.CAMPFIRE_POT_SOUNDS)
-                .strength(0.5F).pushReaction(PushReaction.BLOCK).noOcclusion()
-        )
-    )
-
-    @JvmField
-    val CAMPFIRE = create("campfire", CampfireBlock(BlockBehaviour.Properties.of().sound(SoundType.WOOD).noOcclusion().pushReaction(PushReaction.BLOCK).mapColor(MapColor.PODZOL).strength(2.0F).lightLevel { if ((it.getValue(CampfireBlock.SOUL) as Boolean)) 9 else 14 }))
-
     @JvmField
     val RELIC_COIN_POUCH = create("relic_coin_pouch", CoinPouchBlock(BlockBehaviour.Properties.of().sound(CobblemonSounds.RELIC_COIN_POUCH_SOUNDS).pushReaction(PushReaction.DESTROY).noOcclusion(), true))
     @JvmField
@@ -482,15 +354,15 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<
     @JvmField
     val PC = create("pc", PCBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).sound(SoundType.METAL).pushReaction(PushReaction.BLOCK).strength(2F).noOcclusion().lightLevel { if ((it.getValue(PCBlock.ON) as Boolean) && (it.getValue(PCBlock.PART) == PCBlock.PCPart.TOP)) 10 else 0 }))
 
+    @JvmField
+    val STADIUM = create("stadium_terminal", StadiumBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).sound(SoundType.METAL).pushReaction(PushReaction.BLOCK).strength(2F)))
+
     @JvmField
     val LECTERN = create("lectern", LecternBlock(BlockBehaviour.Properties.of().mapColor(MapColor.WOOD).instrument(NoteBlockInstrument.BASS).sound(SoundType.WOOD).strength(2.5F).ignitedByLava()))
 
     @JvmField
     val DISPLAY_CASE = create("display_case", DisplayCaseBlock(BlockBehaviour.Properties.of().sound(CobblemonSounds.DISPLAY_CASE_SOUNDS).noOcclusion().pushReaction(PushReaction.BLOCK).mapColor(MapColor.STONE).strength(0.3F)))
 
-    @JvmField
-    val INCENSE_SWEET = create("incense_sweet", SweetIncenseBlock(BlockBehaviour.Properties.of().sound(CobblemonSounds.DISPLAY_CASE_SOUNDS).noOcclusion().pushReaction(PushReaction.BLOCK).mapColor(MapColor.STONE).strength(0.3f)))
-
     @JvmField
     val PASTURE = create("pasture", PastureBlock(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_BROWN).sound(SoundType.WOOD).strength(2F).noOcclusion().pushReaction(PushReaction.BLOCK).lightLevel { if ((it.getValue(PastureBlock.ON) as Boolean) && (it.getValue(PastureBlock.PART) == PastureBlock.PasturePart.TOP)) 10 else 0 }))
 
@@ -512,8 +384,6 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<
     val PEP_UP_FLOWER = this.create("pep_up_flower", FlowerBlock(MobEffects.LEVITATION, 10F, BlockBehaviour.Properties.of().mapColor(MapColor.PLANT).noCollission().instabreak().sound(SoundType.GRASS).offsetType(BlockBehaviour.OffsetType.XZ).pushReaction(PushReaction.DESTROY)))
     @JvmField
     val POTTED_PEP_UP_FLOWER = this.create("potted_pep_up_flower", BlocksInvoker.createFlowerPotBlock(PEP_UP_FLOWER))
-    @JvmField
-    val HEARTY_GRAINS = this.create("hearty_grains", HeartyGrainsBlock(BlockBehaviour.Properties.of().pushReaction(PushReaction.DESTROY).ignitedByLava().mapColor(MapColor.PLANT).noCollission().randomTicks().instabreak().sound(CobblemonSounds.VIVICHOKE_SOUNDS)))
 
     /**
      * Returns a map of all the blocks that can be stripped with an axe in the format of input - output.
@@ -522,10 +392,7 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<
      */
     fun strippedBlocks(): Map<Block, Block> = mapOf(
         APRICORN_WOOD to STRIPPED_APRICORN_WOOD,
-        APRICORN_LOG to STRIPPED_APRICORN_LOG,
-        SACCHARINE_WOOD to STRIPPED_SACCHARINE_WOOD,
-        SACCHARINE_LOG to STRIPPED_SACCHARINE_LOG,
-        SACCHARINE_HONEY_LOG to STRIPPED_SACCHARINE_LOG
+        APRICORN_LOG to STRIPPED_APRICORN_LOG
     )
 
 

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

@@ -23,7 +23,7 @@ object CobblemonCommands {
         ChangeEyeHeight.register(dispatcher)
         ChangeScaleAndSize.register(dispatcher)
         ChangeWalkSpeed.register(dispatcher)
-        TransformModelPartCommand.register(dispatcher)
+        ChangeJointScaleCommand.register(dispatcher)
         TestCommand.register(dispatcher)
         ReloadShowdownCommand.register(dispatcher)
         ClickTextCommand.register(dispatcher)
@@ -60,17 +60,10 @@ object CobblemonCommands {
         RenameBoxCommand.register(dispatcher)
         ChangeBoxWallpaperCommand.register(dispatcher)
         RunMolangScriptCommand.register(dispatcher)
-        SpectateBattleCommand.register(dispatcher)
         CobblemonConfigCommand.register(dispatcher)
-        UnlockPCBoxWallpaperCommand.register(dispatcher)
-        ChangePCBoxesCommand.register(dispatcher)
-        MarkGiveCommand.register(dispatcher)
-        MarkTakeCommand.register(dispatcher)
-        MarkGiveAllCommand.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
         CobblemonInfoCommand.register(dispatcher)
-        CalculateSeatPositionCommand.register(dispatcher)
     }
 }

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

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

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

@@ -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,23 +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 }
         }
 
-        // Most places in the mod use query structs so it's probably nicer to present the things as query values.
-        context.forEach { (key, value) -> runtime.environment.query.addFunction(key) { return@addFunction value } }
-
-        functions.forEach { (name, function) -> runtime.environment.query.addFunction(name, function) }
-
         flows[eventResourceLocation]?.forEach {
             if (cancelable != null && cancelable.isCanceled) {
                 return

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

@@ -94,17 +94,12 @@ interface CobblemonImplementation {
      */
     fun registerBlockEntityTypes()
 
-    fun registerPoiTypes()
     /**
      * TODO
      *
      */
     fun registerVillagers()
 
-    fun registerRecipeSerializers()
-    fun registerRecipeTypes()
-
-
     /**
      * TODO
      *
@@ -113,8 +108,6 @@ interface CobblemonImplementation {
 
     fun registerParticles()
 
-    fun registerMenu()
-
     fun registerEntitySubPredicates()
 
 

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

@@ -8,13 +8,9 @@
 
 package com.cobblemon.mod.common
 
-import com.cobblemon.mod.common.block.PotComponent
-import com.cobblemon.mod.common.item.components.BaitEffectsComponent
-import com.cobblemon.mod.common.item.components.FlavourComponent
-import com.cobblemon.mod.common.item.components.FoodColourComponent
 import com.cobblemon.mod.common.item.components.HeldItemCapableComponent
 import com.cobblemon.mod.common.item.components.PokemonItemComponent
-import com.cobblemon.mod.common.item.components.RodBaitComponent
+import com.cobblemon.mod.common.item.RodBaitComponent
 import com.cobblemon.mod.common.platform.PlatformRegistry
 import net.minecraft.core.Registry
 import net.minecraft.core.component.DataComponentType
@@ -40,34 +36,11 @@ object CobblemonItemComponents : PlatformRegistry<Registry<DataComponentType<*>>
         .networkSynchronized(RodBaitComponent.PACKET_CODEC)
         .build())
 
-    val POT_DATA: DataComponentType<PotComponent> = create("cooking_pot_item", DataComponentType.builder<PotComponent>()
-        .persistent(PotComponent.CODEC)
-        .networkSynchronized(PotComponent.PACKET_CODEC)
-        .build())
-
-    val BAIT_EFFECTS: DataComponentType<BaitEffectsComponent> = create("bait_effects", DataComponentType.builder<BaitEffectsComponent>()
-        .persistent(BaitEffectsComponent.CODEC)
-        .networkSynchronized(BaitEffectsComponent.PACKET_CODEC)
-        .build())
-
-    val FLAVOUR: DataComponentType<FlavourComponent> = create("flavour", DataComponentType.builder<FlavourComponent>()
-        .persistent(FlavourComponent.CODEC)
-        .networkSynchronized(FlavourComponent.PACKET_CODEC)
-        .build())
-
-    val FOOD_COLOUR: DataComponentType<FoodColourComponent> = create("food_colour", DataComponentType.builder<FoodColourComponent>()
-        .persistent(FoodColourComponent.CODEC)
-        .networkSynchronized(FoodColourComponent.PACKET_CODEC)
-        .build())
 
 
     fun register() {
         Registry.register(BuiltInRegistries.DATA_COMPONENT_TYPE, ResourceLocation.parse("cobblemon:pokemon_item"), POKEMON_ITEM)
         Registry.register(BuiltInRegistries.DATA_COMPONENT_TYPE, ResourceLocation.parse("cobblemon:bait"), BAIT)
-        Registry.register(BuiltInRegistries.DATA_COMPONENT_TYPE, ResourceLocation.parse("cobblemon:cooking_pot_item"), POT_DATA)
-        Registry.register(BuiltInRegistries.DATA_COMPONENT_TYPE, ResourceLocation.parse("cobblemon:bait_effects"), BAIT_EFFECTS)
-        Registry.register(BuiltInRegistries.DATA_COMPONENT_TYPE, ResourceLocation.parse("cobblemon:flavour"), FLAVOUR)
-        Registry.register(BuiltInRegistries.DATA_COMPONENT_TYPE, ResourceLocation.parse("cobblemon:food_colour"), FOOD_COLOUR)
     }
 
     override val registry = BuiltInRegistries.DATA_COMPONENT_TYPE

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

@@ -8,7 +8,6 @@
 
 package com.cobblemon.mod.common
 
-import com.cobblemon.mod.common.api.apricorn.Apricorn
 import com.cobblemon.mod.common.api.item.ability.AbilityChanger
 import com.cobblemon.mod.common.api.mulch.MulchVariant
 import com.cobblemon.mod.common.api.pokeball.PokeBalls
@@ -27,14 +26,9 @@ import com.cobblemon.mod.common.item.armor.CobblemonArmorTrims
 import com.cobblemon.mod.common.item.battle.DireHitItem
 import com.cobblemon.mod.common.item.battle.GuardSpecItem
 import com.cobblemon.mod.common.item.battle.XStatItem
-import com.cobblemon.mod.common.item.berry.BerryItem
-import com.cobblemon.mod.common.item.berry.FriendshipRaisingBerryItem
-import com.cobblemon.mod.common.item.berry.HealingBerryItem
-import com.cobblemon.mod.common.item.berry.PPRestoringBerryItem
-import com.cobblemon.mod.common.item.berry.PortionHealingBerryItem
-import com.cobblemon.mod.common.item.berry.StatusCuringBerryItem
-import com.cobblemon.mod.common.item.berry.VolatileCuringBerryItem
+import com.cobblemon.mod.common.item.berry.*
 import com.cobblemon.mod.common.item.interactive.*
+import com.cobblemon.mod.common.item.interactive.PotionItem
 import com.cobblemon.mod.common.item.interactive.ability.AbilityChangeItem
 import com.cobblemon.mod.common.platform.PlatformRegistry
 import com.cobblemon.mod.common.pokeball.PokeBall
@@ -50,14 +44,7 @@ import net.minecraft.world.effect.MobEffectInstance
 import net.minecraft.world.effect.MobEffects
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.food.FoodProperties
-import net.minecraft.world.item.BlockItem
-import net.minecraft.world.item.HangingSignItem
-import net.minecraft.world.item.Item
-import net.minecraft.world.item.ItemStack
-import net.minecraft.world.item.Items
-import net.minecraft.world.item.Rarity
-import net.minecraft.world.item.SignItem
-import net.minecraft.world.item.SmithingTemplateItem
+import net.minecraft.world.item.*
 import net.minecraft.world.level.Level
 import net.minecraft.world.level.block.Block
 
@@ -184,25 +171,6 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
     @JvmField
     val POKEDEX_WHITE = pokedexItem(PokedexType.WHITE)
 
-    val campfire_pots = mutableListOf<CampfirePotItem>()
-    @JvmField
-    val CAMPFIRE_POT_BLACK = campfirePotItem(CobblemonBlocks.BLACK_CAMPFIRE_POT, "black")
-    @JvmField
-    val CAMPFIRE_POT_BLUE = campfirePotItem(CobblemonBlocks.BLUE_CAMPFIRE_POT, "blue")
-    @JvmField
-    val CAMPFIRE_POT_GREEN = campfirePotItem(CobblemonBlocks.GREEN_CAMPFIRE_POT, "green")
-    @JvmField
-    val CAMPFIRE_POT_PINK = campfirePotItem(CobblemonBlocks.PINK_CAMPFIRE_POT, "pink")
-    @JvmField
-    val CAMPFIRE_POT_RED = campfirePotItem(CobblemonBlocks.RED_CAMPFIRE_POT, "red")
-    @JvmField
-    val CAMPFIRE_POT_WHITE = campfirePotItem(CobblemonBlocks.WHITE_CAMPFIRE_POT, "white")
-    @JvmField
-    val CAMPFIRE_POT_YELLOW = campfirePotItem(CobblemonBlocks.YELLOW_CAMPFIRE_POT, "yellow")
-
-    @JvmField
-    val Hearty_Grains = compostableItem("hearty_grains", HeartyGrainsItem(CobblemonBlocks.HEARTY_GRAINS))
-
     @JvmField
     val VIVICHOKE = compostableItem("vivichoke")
 
@@ -293,321 +261,6 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
     @JvmField
     val GIMMIGHOUL_CHEST = this.create("gimmighoul_chest", BlockItem(CobblemonBlocks.GIMMIGHOUL_CHEST, Item.Properties()))
 
-    // Saccharines
-    @JvmField
-    val SACCHARINE_LOG = blockItem("saccharine_log", CobblemonBlocks.SACCHARINE_LOG)
-    @JvmField
-    val SACCHARINE_HONEY_LOG = blockItem("saccharine_honey_log", CobblemonBlocks.SACCHARINE_HONEY_LOG)
-    @JvmField
-    val STRIPPED_SACCHARINE_LOG = blockItem("stripped_saccharine_log", CobblemonBlocks.STRIPPED_SACCHARINE_LOG)
-    @JvmField
-    val SACCHARINE_WOOD = blockItem("saccharine_wood", CobblemonBlocks.SACCHARINE_WOOD)
-    @JvmField
-    val STRIPPED_SACCHARINE_WOOD = blockItem("stripped_saccharine_wood", CobblemonBlocks.STRIPPED_SACCHARINE_WOOD)
-    @JvmField
-    val SACCHARINE_PLANKS = blockItem("saccharine_planks", CobblemonBlocks.SACCHARINE_PLANKS)
-    @JvmField
-    val SACCHARINE_LEAVES = compostableBlockItem("saccharine_leaves", CobblemonBlocks.SACCHARINE_LEAVES)
-    @JvmField
-    val SACCHARINE_BOAT = create("saccharine_boat", CobblemonBoatItem(CobblemonBoatType.SACCHARINE, false, Item.Properties().stacksTo(1)))
-    @JvmField
-    val SACCHARINE_CHEST_BOAT = create("saccharine_chest_boat", CobblemonBoatItem(CobblemonBoatType.SACCHARINE, true, Item.Properties().stacksTo(1)))
-
-    @JvmField
-    val SACCHARINE_DOOR = blockItem("saccharine_door", CobblemonBlocks.SACCHARINE_DOOR)
-    @JvmField
-    val SACCHARINE_TRAPDOOR = blockItem("saccharine_trapdoor", CobblemonBlocks.SACCHARINE_TRAPDOOR)
-    @JvmField
-    val SACCHARINE_FENCE = blockItem("saccharine_fence", CobblemonBlocks.SACCHARINE_FENCE)
-    @JvmField
-    val SACCHARINE_FENCE_GATE = blockItem("saccharine_fence_gate", CobblemonBlocks.SACCHARINE_FENCE_GATE)
-    @JvmField
-    val SACCHARINE_BUTTON = blockItem("saccharine_button", CobblemonBlocks.SACCHARINE_BUTTON)
-    @JvmField
-    val SACCHARINE_PRESSURE_PLATE = blockItem("saccharine_pressure_plate", CobblemonBlocks.SACCHARINE_PRESSURE_PLATE)
-    @JvmField
-    val SACCHARINE_SLAB = blockItem("saccharine_slab", CobblemonBlocks.SACCHARINE_SLAB)
-    @JvmField
-    val SACCHARINE_STAIRS = blockItem("saccharine_stairs", CobblemonBlocks.SACCHARINE_STAIRS)
-    @JvmField
-    val SACCHARINE_SIGN = this.create("saccharine_sign", SignItem(Item.Properties().stacksTo(16), CobblemonBlocks.SACCHARINE_SIGN, CobblemonBlocks.SACCHARINE_WALL_SIGN))
-    @JvmField
-    val SACCHARINE_HANGING_SIGN = this.create("saccharine_hanging_sign", HangingSignItem(CobblemonBlocks.SACCHARINE_HANGING_SIGN, CobblemonBlocks.SACCHARINE_WALL_HANGING_SIGN, Item.Properties().stacksTo(16)))
-    @JvmField
-    val SACCHARINE_SAPLING = saccharineSaplingItem("saccharine_sapling", SaccharineSaplingItem(CobblemonBlocks.SACCHARINE_SAPLING))
-
-    @JvmField
-    val BUGWORT = bugwortItem("bugwort", BugwortItem(CobblemonBlocks.BUGWORT))
-    @JvmField
-    val POKE_BAIT = noSettingsItem("poke_bait")
-
-    @JvmField
-    val LURE_CAKE = blockItem("lure_cake", CobblemonBlocks.LURE_CAKE)
-    @JvmField
-    val POKE_CAKE = blockItem("poke_cake", CobblemonBlocks.POKE_CAKE)
-
-    val aprijuices = mutableListOf<AprijuiceItem>()
-    @JvmField
-    val APRIJUICE_BLACK = aprijuiceItem(Apricorn.BLACK)
-    @JvmField
-    val APRIJUICE_RED = aprijuiceItem(Apricorn.RED)
-    @JvmField
-    val APRIJUICE_BLUE = aprijuiceItem(Apricorn.BLUE)
-    @JvmField
-    val APRIJUICE_GREEN = aprijuiceItem(Apricorn.GREEN)
-    @JvmField
-    val APRIJUICE_YELLOW = aprijuiceItem(Apricorn.YELLOW)
-    @JvmField
-    val APRIJUICE_WHITE = aprijuiceItem(Apricorn.WHITE)
-    @JvmField
-    val APRIJUICE_PINK = aprijuiceItem(Apricorn.PINK)
-
-    @JvmField
-    val POKE_PUFF = noSettingsItem("poke_puff") // todo make a PokePuffItem class for friendship boosting purposes
-
-    // FOODS
-    @JvmField
-    val SWEET_HEART = noSettingsItem("sweet_heart") // todo make a SweetHeartItem class for breeding purposes
-
-    @JvmField
-    val PEWTER_CRUNCHIES = create("pewter_crunchies", object : Item(Properties().stacksTo(16) // todo add all the effects and/or an item class for it for special interactions?
-            .food(FoodProperties.Builder()
-                    .nutrition(10)
-                    .saturationModifier(1.2F)
-                    .effect(MobEffectInstance(MobEffects.ABSORPTION, 900, 0), 1F)
-                    .alwaysEdible()
-                    .build())) {
-        override fun finishUsingItem(stack: ItemStack, world: Level, user: LivingEntity): ItemStack {
-            user.removeAllEffects()
-            return super.finishUsingItem(stack, world, user)
-        }
-    })
-
-    @JvmField
-    val RAGE_CANDY_BAR = create("rage_candy_bar", object : Item(Properties().stacksTo(16) // todo add all the effects and/or an item class for it for special interactions?
-            .food(FoodProperties.Builder()
-                    .nutrition(10)
-                    .saturationModifier(1.2F)
-                    .effect(MobEffectInstance(MobEffects.ABSORPTION, 900, 0), 1F)
-                    .alwaysEdible()
-                    .build())) {
-        override fun finishUsingItem(stack: ItemStack, world: Level, user: LivingEntity): ItemStack {
-            user.removeAllEffects()
-            return super.finishUsingItem(stack, world, user)
-        }
-    })
-
-    @JvmField
-    val LAVA_COOKIE = create("lava_cookie", object : Item(Properties().stacksTo(16) // todo add all the effects and/or an item class for it for special interactions?
-            .food(FoodProperties.Builder()
-                    .nutrition(10)
-                    .saturationModifier(1.2F)
-                    .effect(MobEffectInstance(MobEffects.ABSORPTION, 900, 0), 1F)
-                    .alwaysEdible()
-                    .build())) {
-        override fun finishUsingItem(stack: ItemStack, world: Level, user: LivingEntity): ItemStack {
-            user.removeAllEffects()
-            return super.finishUsingItem(stack, world, user)
-        }
-    })
-
-    @JvmField
-    val OLD_GATEAU = create("old_gateau", object : Item(Properties().stacksTo(16) // todo add all the effects and/or an item class for it for special interactions?
-            .food(FoodProperties.Builder()
-                    .nutrition(10)
-                    .saturationModifier(1.2F)
-                    .effect(MobEffectInstance(MobEffects.ABSORPTION, 900, 0), 1F)
-                    .alwaysEdible()
-                    .build())) {
-        override fun finishUsingItem(stack: ItemStack, world: Level, user: LivingEntity): ItemStack {
-            user.removeAllEffects()
-            return super.finishUsingItem(stack, world, user)
-        }
-    })
-
-    @JvmField
-    val CASTELIACONE = create("casteliacone", object : Item(Properties().stacksTo(16) // todo add all the effects and/or an item class for it for special interactions?
-            .food(FoodProperties.Builder()
-                    .nutrition(10)
-                    .saturationModifier(1.2F)
-                    .effect(MobEffectInstance(MobEffects.ABSORPTION, 900, 0), 1F)
-                    .alwaysEdible()
-                    .build())) {
-        override fun finishUsingItem(stack: ItemStack, world: Level, user: LivingEntity): ItemStack {
-            user.removeAllEffects()
-            return super.finishUsingItem(stack, world, user)
-        }
-    })
-
-    @JvmField
-    val SHALOR_SABLE = create("shalor_sable", object : Item(Properties().stacksTo(16) // todo add all the effects and/or an item class for it for special interactions?
-            .food(FoodProperties.Builder()
-                    .nutrition(10)
-                    .saturationModifier(1.2F)
-                    .effect(MobEffectInstance(MobEffects.ABSORPTION, 900, 0), 1F)
-                    .alwaysEdible()
-                    .build())) {
-        override fun finishUsingItem(stack: ItemStack, world: Level, user: LivingEntity): ItemStack {
-            user.removeAllEffects()
-            return super.finishUsingItem(stack, world, user)
-        }
-    })
-
-    @JvmField
-    val LUMIOSE_GALETTE = create("lumiose_galette", object : Item(Properties().stacksTo(16) // todo add all the effects and/or an item class for it for special interactions?
-            .food(FoodProperties.Builder()
-                    .nutrition(10)
-                    .saturationModifier(1.2F)
-                    .effect(MobEffectInstance(MobEffects.ABSORPTION, 900, 0), 1F)
-                    .alwaysEdible()
-                    .build())) {
-        override fun finishUsingItem(stack: ItemStack, world: Level, user: LivingEntity): ItemStack {
-            user.removeAllEffects()
-            return super.finishUsingItem(stack, world, user)
-        }
-    })
-
-    @JvmField
-    val BIG_MALASADA = create("big_malasada", object : Item(Properties().stacksTo(16) // todo add all the effects and/or an item class for it for special interactions?
-            .food(FoodProperties.Builder()
-                    .nutrition(10)
-                    .saturationModifier(1.2F)
-                    .effect(MobEffectInstance(MobEffects.ABSORPTION, 900, 0), 1F)
-                    .alwaysEdible()
-                    .build())) {
-        override fun finishUsingItem(stack: ItemStack, world: Level, user: LivingEntity): ItemStack {
-            user.removeAllEffects()
-            return super.finishUsingItem(stack, world, user)
-        }
-    })
-
-    /*@JvmField // todo see what we are doing for these (are there different kinds?)
-    val CURRY = create("curry", object : Item(Properties().stacksTo(16) // todo add all the effects and/or an item class for it for special interactions?
-            .food(FoodProperties.Builder()
-                    .nutrition(10)
-                    .saturationModifier(1.2F)
-                    .effect(MobEffectInstance(MobEffects.ABSORPTION, 900, 0), 1F)
-                    .alwaysEdible()
-                    .usingConvertsTo(Items.BOWL)
-                    .build())) {
-        override fun finishUsingItem(stack: ItemStack, world: Level, user: LivingEntity): ItemStack {
-            user.removeAllEffects()
-            return super.finishUsingItem(stack, world, user)
-        }
-    })*/
-
-    @JvmField
-    val JUBILIFE_MUFFIN = create("jubilife_muffin", object : Item(Properties().stacksTo(16) // todo add all the effects and/or an item class for it for special interactions?
-            .food(FoodProperties.Builder()
-                    .nutrition(10)
-                    .saturationModifier(1.2F)
-                    .effect(MobEffectInstance(MobEffects.ABSORPTION, 900, 0), 1F)
-                    .alwaysEdible()
-                    .build())) {
-        override fun finishUsingItem(stack: ItemStack, world: Level, user: LivingEntity): ItemStack {
-            user.removeAllEffects()
-            return super.finishUsingItem(stack, world, user)
-        }
-    })
-
-    /*@JvmField // todo see what we are doing for these (are there different kinds?)
-    val SANDWICH = create("sandwich", object : Item(Properties().stacksTo(16) // todo add all the effects and/or an item class for it for special interactions?
-            .food(FoodProperties.Builder()
-                    .nutrition(10)
-                    .saturationModifier(1.2F)
-                    .effect(MobEffectInstance(MobEffects.ABSORPTION, 900, 0), 1F)
-                    .alwaysEdible()
-                    .usingConvertsTo(Items.BOWL)
-                    .build())) {
-        override fun finishUsingItem(stack: ItemStack, world: Level, user: LivingEntity): ItemStack {
-            user.removeAllEffects()
-            return super.finishUsingItem(stack, world, user)
-        }
-    })*/
-
-    // todo we might need to wait on these for later?
-    /*@JvmField
-    val CHOICE_DUMPLING = noSettingsItem("choice_dumpling") // todo make a ChoiceDumpingItem class for breeding purposes
-    @JvmField
-    val SWAP_SNACK = noSettingsItem("swap_snack") // todo make a SwapSnackItem class for breeding purposes
-    @JvmField
-    val TWICE_SPICED_BEETROOT = noSettingsItem("twice_spiced_beetroot") // todo make a TwiceSpiceBeetrootItem class for breeding purposes
-*/
-    @JvmField
-    val POTATO_MOCHI = create("potato_mochi", object : Item(Properties().stacksTo(16)
-        .food(FoodProperties.Builder()
-            .nutrition(10)
-            .saturationModifier(1.2F)
-            .effect(MobEffectInstance(MobEffects.ABSORPTION, 900, 0), 1F)
-            .alwaysEdible()
-            .build())) {
-        override fun finishUsingItem(stack: ItemStack, world: Level, user: LivingEntity): ItemStack {
-            user.removeAllEffects()
-            return super.finishUsingItem(stack, world, user)
-        }
-    })
-    @JvmField
-    val FRIED_RICE = create("fried_rice", object : Item(Properties().stacksTo(16)
-        .food(FoodProperties.Builder()
-            .nutrition(10)
-            .saturationModifier(1.2F)
-            .effect(MobEffectInstance(MobEffects.ABSORPTION, 900, 0), 1F)
-            .alwaysEdible()
-            .build())) {
-        override fun finishUsingItem(stack: ItemStack, world: Level, user: LivingEntity): ItemStack {
-            user.removeAllEffects()
-            return super.finishUsingItem(stack, world, user)
-        }
-    })
-    @JvmField
-    val CANDIED_APPLE = create("candied_apple", object : Item(Properties().stacksTo(16)
-        .food(FoodProperties.Builder()
-            .nutrition(10)
-            .saturationModifier(1.2F)
-            .effect(MobEffectInstance(MobEffects.ABSORPTION, 900, 0), 1F)
-            .alwaysEdible()
-            .build())) {
-        override fun finishUsingItem(stack: ItemStack, world: Level, user: LivingEntity): ItemStack {
-            user.removeAllEffects()
-            return super.finishUsingItem(stack, world, user)
-        }
-    })
-    @JvmField
-    val CANDIED_BERRY = create("candied_berry", object : Item(Properties().stacksTo(16)
-        .food(FoodProperties.Builder()
-            .nutrition(10)
-            .saturationModifier(1.2F)
-            .effect(MobEffectInstance(MobEffects.ABSORPTION, 900, 0), 1F)
-            .alwaysEdible()
-            .build())) {
-        override fun finishUsingItem(stack: ItemStack, world: Level, user: LivingEntity): ItemStack {
-            user.removeAllEffects()
-            return super.finishUsingItem(stack, world, user)
-        }
-    })
-    @JvmField
-    val JELLY_DOUGHNUT = create("jelly_doughnut", object : Item(Properties().stacksTo(16)
-        .food(FoodProperties.Builder()
-            .nutrition(10)
-            .saturationModifier(1.2F)
-            .effect(MobEffectInstance(MobEffects.ABSORPTION, 900, 0), 1F)
-            .alwaysEdible()
-            .build())) {
-        override fun finishUsingItem(stack: ItemStack, world: Level, user: LivingEntity): ItemStack {
-            user.removeAllEffects()
-            return super.finishUsingItem(stack, world, user)
-        }
-    })
-
-
-
-    // todo etc?
-
-    //@JvmField
-    //val SCATTER_BANG = this.create("scatter_bang", ScatterBangItem(Item.Settings()))
-    //@JvmField
-    //val STICKY_GLOB = this.create("sticky_glob", StickyGlobItem(Item.Settings()))
-
     @JvmField
     val RESTORATION_TANK = blockItem("restoration_tank", CobblemonBlocks.RESTORATION_TANK)
     @JvmField
@@ -619,16 +272,18 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
     @JvmField
     val PC = blockItem("pc", CobblemonBlocks.PC)
     @JvmField
+    val STADIUM = blockItem("stadium_terminal", CobblemonBlocks.STADIUM)
+    @JvmField
     val PASTURE = blockItem("pasture", CobblemonBlocks.PASTURE)
     @JvmField
     val DISPLAY_CASE = blockItem("display_case", CobblemonBlocks.DISPLAY_CASE)
     @JvmField
-    val INCENSE_SWEET = blockItem("incense_sweet", CobblemonBlocks.INCENSE_SWEET)
-
+    val LECTERN = blockItem("lectern", CobblemonBlocks.LECTERN)
 
     // Evolution items
     @JvmField val LINK_CABLE = create("link_cable", LinkCableItem())
     @JvmField val DRAGON_SCALE = noSettingsItem("dragon_scale")
+    @JvmField val KINGS_ROCK = noSettingsItem("kings_rock")
     @JvmField val METAL_COAT = noSettingsItem("metal_coat")
     @JvmField val UPGRADE = noSettingsItem("upgrade")
     @JvmField val DUBIOUS_DISC = noSettingsItem("dubious_disc")
@@ -641,21 +296,20 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
     @JvmField val REAPER_CLOTH = noSettingsItem("reaper_cloth")
     @JvmField val PRISM_SCALE = noSettingsItem("prism_scale")
     @JvmField val SACHET = noSettingsItem("sachet")
-    @JvmField val WHIPPED_DREAM = create("whipped_dream", foodItem(8, 0.3f))
-    @JvmField val STRAWBERRY_SWEET = create("strawberry_sweet", foodItem(6, 0.125f))
-    @JvmField val LOVE_SWEET = create("love_sweet", foodItem(6, 0.125f))
-    @JvmField val BERRY_SWEET = create("berry_sweet", foodItem(6, 0.125f))
-    @JvmField val CLOVER_SWEET = create("clover_sweet", foodItem(6, 0.125f))
-    @JvmField val FLOWER_SWEET = create("flower_sweet", foodItem(6, 0.125f))
-    @JvmField val STAR_SWEET = create("star_sweet", foodItem(6, 0.125f))
-    @JvmField val RIBBON_SWEET = create("ribbon_sweet", foodItem(6, 0.125f))
+    @JvmField val WHIPPED_DREAM = noSettingsItem("whipped_dream")
+    @JvmField val STRAWBERRY_SWEET = noSettingsItem("strawberry_sweet")
+    @JvmField val LOVE_SWEET = noSettingsItem("love_sweet")
+    @JvmField val BERRY_SWEET = noSettingsItem("berry_sweet")
+    @JvmField val CLOVER_SWEET = noSettingsItem("clover_sweet")
+    @JvmField val FLOWER_SWEET = noSettingsItem("flower_sweet")
+    @JvmField val STAR_SWEET = noSettingsItem("star_sweet")
+    @JvmField val RIBBON_SWEET = noSettingsItem("ribbon_sweet")
     @JvmField val CHIPPED_POT = noSettingsItem("chipped_pot")
     @JvmField val CRACKED_POT = noSettingsItem("cracked_pot")
     @JvmField val MASTERPIECE_TEACUP = noSettingsItem("masterpiece_teacup")
     @JvmField val UNREMARKABLE_TEACUP = noSettingsItem("unremarkable_teacup")
-    @JvmField val SWEET_APPLE = create("sweet_apple", foodItem(4, 0.3f))
-    @JvmField val TART_APPLE = create("tart_apple", foodItem(4, 0.3f))
-    @JvmField val SYRUPY_APPLE = create("syrupy_apple", foodItem(4, 0.3f))
+    @JvmField val SWEET_APPLE = noSettingsItem("sweet_apple")
+    @JvmField val TART_APPLE = noSettingsItem("tart_apple")
     @JvmField val GALARICA_CUFF = noSettingsItem("galarica_cuff")
     @JvmField val GALARICA_WREATH = noSettingsItem("galarica_wreath")
     @JvmField val BLACK_AUGURITE = noSettingsItem("black_augurite")
@@ -769,20 +423,6 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
     @JvmField
     val ZINC = create("zinc", VitaminItem(Stats.SPECIAL_DEFENCE))
     @JvmField
-    val HEALTH_MOCHI = create("health_mochi", MochiItem(Stats.HP))
-    @JvmField
-    val MUSCLE_MOCHI = create("muscle_mochi", MochiItem(Stats.ATTACK))
-    @JvmField
-    val RESIST_MOCHI = create("resist_mochi", MochiItem(Stats.DEFENCE))
-    @JvmField
-    val GENIUS_MOCHI = create("genius_mochi", MochiItem(Stats.SPECIAL_ATTACK))
-    @JvmField
-    val CLEVER_MOCHI = create("clever_mochi", MochiItem(Stats.SPECIAL_DEFENCE))
-    @JvmField
-    val SWIFT_MOCHI = create("swift_mochi", MochiItem(Stats.SPEED))
-    @JvmField
-    val FRESH_START_MOCHI = create("fresh_start_mochi", FreshStartMochiItem())
-    @JvmField
     val GENIUS_FEATHER = create("genius_feather", FeatherItem(Stats.SPECIAL_ATTACK))
     @JvmField
     val SWIFT_FEATHER = create("swift_feather", FeatherItem(Stats.SPEED))
@@ -1022,19 +662,6 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
     @JvmField
     val WATER_STONE = noSettingsItem("water_stone")
 
-    val wearables = mutableListOf<WearableItem>()
-    //Wearable items (these items should have a corresponding 3D model)
-    @JvmField val BLACK_GLASSES = wearableItem("black_glasses")
-    @JvmField val CHOICE_BAND = wearableItem("choice_band")
-    @JvmField val CHOICE_SPECS = wearableItem("choice_specs")
-    @JvmField val EXP_SHARE = wearableItem("exp_share")
-    @JvmField val FOCUS_BAND = wearableItem("focus_band")
-    @JvmField val KINGS_ROCK = wearableItem("kings_rock")
-    @JvmField val MUSCLE_BAND = wearableItem("muscle_band")
-    @JvmField val ROCKY_HELMET = wearableItem("rocky_helmet")
-    @JvmField val SAFETY_GOGGLES = wearableItem("safety_goggles")
-    @JvmField val WISE_GLASSES = wearableItem("wise_glasses")
-
     // Held Items
     @JvmField
     val ABILITY_SHIELD = heldItem("ability_shield")
@@ -1051,6 +678,8 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
     @JvmField
     val BLACK_BELT = heldItem("black_belt")
     @JvmField
+    val BLACK_GLASSES = heldItem("black_glasses")
+    @JvmField
     val BLACK_SLUDGE = heldItem("black_sludge")
     @JvmField
     val BLUNDER_POLICY = heldItem("blunder_policy")
@@ -1059,8 +688,12 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
     @JvmField
     val CHARCOAL = heldItem("charcoal_stick", remappedName = "charcoal")
     @JvmField
+    val CHOICE_BAND = heldItem("choice_band")
+    @JvmField
     val CHOICE_SCARF = heldItem("choice_scarf")
     @JvmField
+    val CHOICE_SPECS = heldItem("choice_specs")
+    @JvmField
     val CLEANSE_TAG = heldItem("cleanse_tag")
    // @JvmField
    // val CLEAR_AMULET = heldItem("clear_amulet")
@@ -1081,6 +714,8 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
     @JvmField
     val EVIOLITE = heldItem("eviolite")
     @JvmField
+    val EXP_SHARE = heldItem("exp_share")
+    @JvmField
     val EXPERT_BELT = heldItem("expert_belt")
     @JvmField
     val FAIRY_FEATHER = heldItem("fairy_feather")
@@ -1089,6 +724,8 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
     @JvmField
     val FLOAT_STONE = heldItem("float_stone")
     @JvmField
+    val FOCUS_BAND = heldItem("focus_band")
+    @JvmField
     val FOCUS_SASH = heldItem("focus_sash")
     @JvmField
     val GRASSY_SEED = heldItem("grassy_seed")
@@ -1123,6 +760,8 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
     @JvmField
     val MIRACLE_SEED = heldItem("miracle_seed")
     @JvmField
+    val MUSCLE_BAND = heldItem("muscle_band")
+    @JvmField
     val MYSTIC_WATER = heldItem("mystic_water")
     @JvmField
     val NEVER_MELT_ICE = heldItem("never_melt_ice")
@@ -1153,8 +792,12 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
     @JvmField
     val RING_TARGET = heldItem("ring_target")
     @JvmField
+    val ROCKY_HELMET = heldItem("rocky_helmet")
+    @JvmField
     val ROOM_SERVICE = heldItem("room_service")
     @JvmField
+    val SAFETY_GOGGLES = heldItem("safety_goggles")
+    @JvmField
     val SCOPE_LENS = heldItem("scope_lens")
     @JvmField
     val SHARP_BEAK = heldItem("sharp_beak")
@@ -1191,6 +834,8 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
     @JvmField
     val WIDE_LENS = heldItem("wide_lens")
     @JvmField
+    val WISE_GLASSES = heldItem("wise_glasses")
+    @JvmField
     val ZOOM_LENS = heldItem("zoom_lens")
     @JvmField
     val MENTAL_HERB = compostableHeldItem("mental_herb", null, 1F)
@@ -1620,28 +1265,6 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
         return item
     }
 
-    private fun wearableItem(name: String, heldItemRemappedName: String? = null): CobblemonItem = create(
-        name,
-        WearableItem(name).also {
-            wearables.add(it)
-            if (heldItemRemappedName != null) {
-                CobblemonHeldItemManager.registerRemap(it, heldItemRemappedName)
-            }
-        }
-    )
-
-    private fun campfirePotItem(block: Block, type: String): CampfirePotItem {
-        val item = create("campfire_pot_${type}", CampfirePotItem(block))
-        campfire_pots.add(item)
-        return item
-    }
-
-    private fun aprijuiceItem(type: Apricorn): AprijuiceItem {
-        val item = create("aprijuice_${type.name.lowercase()}", AprijuiceItem(type))
-        aprijuices.add(item)
-        return item
-    }
-
     private fun heldItem(name: String, remappedName: String? = null): CobblemonItem = create(
         name,
         CobblemonItem(Item.Properties()).also {
@@ -1657,7 +1280,6 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
                 CobblemonHeldItemManager.registerRemap(it, remappedName)
                 CobblemonHeldItemManager.registerRemap(Items.BONE, "thickclub")
                 CobblemonHeldItemManager.registerRemap(Items.SNOWBALL, "snowball")
-                CobblemonHeldItemManager.registerRemap(Items.GOLD_BLOCK, "bignugget")
             }
         }
     )
@@ -1701,21 +1323,6 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
         return item
     }
 
-    private fun saccharineSaplingItem(name: String, saccharineSaplingItem: SaccharineSaplingItem): SaccharineSaplingItem {
-        val finalName = "saccharine_sapling"
-        val item = this.create(finalName, saccharineSaplingItem)
-        compostable(item, .65f)
-        return item
-    }
-
-    private fun bugwortItem(name: String, bugwortItem: BugwortItem): BugwortItem {
-        val finalName = "bugwort"
-        val item = this.create(finalName, bugwortItem)
-        compostable(item, .65f)
-        return item
-    }
-
-
     private fun mintSeed(name: String, mintBlock: MintBlock): Item {
         val finalName = "${name}_mint_seeds"
         val item = this.blockItem(finalName, mintBlock)
@@ -1748,7 +1355,4 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
         return createdItem
     }
 
-    private fun foodItem(nutrition: Int, saturationModifier: Float): Item {
-        return Item(Item.Properties().food(FoodProperties.Builder().nutrition(nutrition).saturationModifier(saturationModifier).build()))
-    }
 }

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

@@ -1,30 +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.block.campfirepot.CookingPotMenu
-import com.cobblemon.mod.common.client.gui.cookingpot.CookingPotScreen
-import com.cobblemon.mod.common.platform.PlatformRegistry
-import net.minecraft.client.gui.screens.MenuScreens
-import net.minecraft.core.Registry
-import net.minecraft.core.registries.BuiltInRegistries
-import net.minecraft.core.registries.Registries
-import net.minecraft.resources.ResourceKey
-import net.minecraft.world.inventory.MenuType
-
-object CobblemonMenuType : PlatformRegistry<Registry<MenuType<*>>, ResourceKey<Registry<MenuType<*>>>, MenuType<*>>() {
-
-    val COOKING_POT = MenuType.register("cooking_pot", ::CookingPotMenu)
-
-    override val registry: Registry<MenuType<*>>
-        get() = BuiltInRegistries.MENU
-    override val resourceKey: ResourceKey<Registry<MenuType<*>>>
-        get() = Registries.MENU
-}

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

@@ -9,7 +9,6 @@
 package com.cobblemon.mod.common
 
 import com.cobblemon.mod.common.api.net.NetworkPacket
-import com.cobblemon.mod.common.client.net.CalculateSeatPositionsHandler
 import com.cobblemon.mod.common.client.net.PlayerInteractOptionsHandler
 import com.cobblemon.mod.common.client.net.SetClientPlayerDataHandler
 import com.cobblemon.mod.common.client.net.animation.PlayPosableAnimationHandler
@@ -17,7 +16,6 @@ import com.cobblemon.mod.common.client.net.battle.*
 import com.cobblemon.mod.common.client.net.callback.move.OpenMoveCallbackHandler
 import com.cobblemon.mod.common.client.net.callback.party.OpenPartyCallbackHandler
 import com.cobblemon.mod.common.client.net.callback.partymove.OpenPartyMoveCallbackHandler
-import com.cobblemon.mod.common.client.net.cooking.ToggleCookingPotLidHandler
 import com.cobblemon.mod.common.client.net.data.DataRegistrySyncPacketHandler
 import com.cobblemon.mod.common.client.net.data.UnlockReloadPacketHandler
 import com.cobblemon.mod.common.client.net.dialogue.DialogueClosedHandler
@@ -30,13 +28,11 @@ import com.cobblemon.mod.common.client.net.gui.PokedexUIPacketHandler
 import com.cobblemon.mod.common.client.net.gui.SummaryUIPacketHandler
 import com.cobblemon.mod.common.client.net.npc.CloseNPCEditorHandler
 import com.cobblemon.mod.common.client.net.npc.OpenNPCEditorHandler
-import com.cobblemon.mod.common.client.net.orientation.S2CUpdateOrientationHandler
 import com.cobblemon.mod.common.client.net.pasture.ClosePastureHandler
 import com.cobblemon.mod.common.client.net.pasture.OpenPastureHandler
 import com.cobblemon.mod.common.client.net.pasture.PokemonPasturedHandler
 import com.cobblemon.mod.common.client.net.pasture.PokemonUnpasturedHandler
 import com.cobblemon.mod.common.client.net.pokedex.ServerConfirmedRegisterHandler
-import com.cobblemon.mod.common.client.net.pokemon.update.ClientboundUpdateRidingStateHandler
 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
@@ -51,16 +47,8 @@ import com.cobblemon.mod.common.client.net.storage.party.SetPartyPokemonHandler
 import com.cobblemon.mod.common.client.net.storage.party.SetPartyReferenceHandler
 import com.cobblemon.mod.common.client.net.storage.pc.*
 import com.cobblemon.mod.common.client.net.toast.ToastPacketHandler
-import com.cobblemon.mod.common.client.net.trade.TradeAcceptanceChangedHandler
-import com.cobblemon.mod.common.client.net.trade.TradeCancelledHandler
-import com.cobblemon.mod.common.client.net.trade.TradeCompletedHandler
-import com.cobblemon.mod.common.client.net.trade.TradeOfferExpiredHandler
-import com.cobblemon.mod.common.client.net.trade.TradeOfferNotificationHandler
-import com.cobblemon.mod.common.client.net.trade.TradeProcessStartedHandler
-import com.cobblemon.mod.common.client.net.trade.TradeStartedHandler
-import com.cobblemon.mod.common.client.net.trade.TradeUpdatedHandler
+import com.cobblemon.mod.common.client.net.trade.*
 import com.cobblemon.mod.common.net.PacketRegisterInfo
-import com.cobblemon.mod.common.net.messages.client.CalculateSeatPositionsPacket
 import com.cobblemon.mod.common.net.messages.client.PlayerInteractOptionsPacket
 import com.cobblemon.mod.common.net.messages.client.SetClientPlayerDataPacket
 import com.cobblemon.mod.common.net.messages.client.animation.PlayPosableAnimationPacket
@@ -68,8 +56,6 @@ import com.cobblemon.mod.common.net.messages.client.battle.*
 import com.cobblemon.mod.common.net.messages.client.callback.OpenMoveCallbackPacket
 import com.cobblemon.mod.common.net.messages.client.callback.OpenPartyCallbackPacket
 import com.cobblemon.mod.common.net.messages.client.callback.OpenPartyMoveCallbackPacket
-import com.cobblemon.mod.common.net.messages.client.cooking.SeasoningRegistrySyncPacket
-import com.cobblemon.mod.common.net.messages.client.cooking.ToggleCookingPotLidPacket
 import com.cobblemon.mod.common.net.messages.client.data.*
 import com.cobblemon.mod.common.net.messages.client.dialogue.DialogueClosedPacket
 import com.cobblemon.mod.common.net.messages.client.dialogue.DialogueOpenedPacket
@@ -78,7 +64,6 @@ import com.cobblemon.mod.common.net.messages.client.effect.SpawnSnowstormEntityP
 import com.cobblemon.mod.common.net.messages.client.effect.SpawnSnowstormParticlePacket
 import com.cobblemon.mod.common.net.messages.client.npc.CloseNPCEditorPacket
 import com.cobblemon.mod.common.net.messages.client.npc.OpenNPCEditorPacket
-import com.cobblemon.mod.common.net.messages.client.orientation.ClientboundUpdateOrientationPacket
 import com.cobblemon.mod.common.net.messages.client.pasture.ClosePasturePacket
 import com.cobblemon.mod.common.net.messages.client.pasture.OpenPasturePacket
 import com.cobblemon.mod.common.net.messages.client.pasture.PokemonPasturedPacket
@@ -102,42 +87,17 @@ import com.cobblemon.mod.common.net.messages.client.storage.party.InitializePart
 import com.cobblemon.mod.common.net.messages.client.storage.party.MoveClientPartyPokemonPacket
 import com.cobblemon.mod.common.net.messages.client.storage.party.SetPartyPokemonPacket
 import com.cobblemon.mod.common.net.messages.client.storage.party.SetPartyReferencePacket
-import com.cobblemon.mod.common.net.messages.client.storage.pc.ClosePCPacket
-import com.cobblemon.mod.common.net.messages.client.storage.pc.InitializePCPacket
-import com.cobblemon.mod.common.net.messages.client.storage.pc.MoveClientPCPokemonPacket
-import com.cobblemon.mod.common.net.messages.client.storage.pc.OpenPCPacket
-import com.cobblemon.mod.common.net.messages.client.storage.pc.RenamePCBoxPacket
-import com.cobblemon.mod.common.net.messages.client.storage.pc.SetPCBoxPacket
-import com.cobblemon.mod.common.net.messages.client.storage.pc.SetPCPokemonPacket
+import com.cobblemon.mod.common.net.messages.client.storage.pc.*
 import com.cobblemon.mod.common.net.messages.client.storage.pc.wallpaper.ChangePCBoxWallpaperPacket
 import com.cobblemon.mod.common.net.messages.client.storage.pc.wallpaper.RequestPCBoxWallpapersPacket
 import com.cobblemon.mod.common.net.messages.client.storage.pc.wallpaper.SetPCBoxWallpapersPacket
-import com.cobblemon.mod.common.net.messages.client.storage.pc.wallpaper.UnlockPCBoxWallpaperPacket
 import com.cobblemon.mod.common.net.messages.client.toast.ToastPacket
-import com.cobblemon.mod.common.net.messages.client.trade.TradeAcceptanceChangedPacket
-import com.cobblemon.mod.common.net.messages.client.trade.TradeCancelledPacket
-import com.cobblemon.mod.common.net.messages.client.trade.TradeCompletedPacket
-import com.cobblemon.mod.common.net.messages.client.trade.TradeOfferExpiredPacket
-import com.cobblemon.mod.common.net.messages.client.trade.TradeOfferNotificationPacket
-import com.cobblemon.mod.common.net.messages.client.trade.TradeProcessStartedPacket
-import com.cobblemon.mod.common.net.messages.client.trade.TradeStartedPacket
-import com.cobblemon.mod.common.net.messages.client.trade.TradeUpdatedPacket
+import com.cobblemon.mod.common.net.messages.client.trade.*
 import com.cobblemon.mod.common.net.messages.client.ui.InteractPokemonUIPacket
 import com.cobblemon.mod.common.net.messages.client.ui.PokedexUIPacket
 import com.cobblemon.mod.common.net.messages.client.ui.SummaryUIPacket
-import com.cobblemon.mod.common.net.messages.server.BattleChallengePacket
-import com.cobblemon.mod.common.net.messages.server.BattleChallengeResponsePacket
-import com.cobblemon.mod.common.net.messages.server.BenchMovePacket
-import com.cobblemon.mod.common.net.messages.server.RequestMoveSwapPacket
-import com.cobblemon.mod.common.net.messages.server.RequestPlayerInteractionsPacket
-import com.cobblemon.mod.common.net.messages.server.SelectStarterPacket
-import com.cobblemon.mod.common.net.messages.server.SendOutPokemonPacket
-import com.cobblemon.mod.common.net.messages.server.battle.BattleSelectActionsPacket
-import com.cobblemon.mod.common.net.messages.server.battle.BattleTeamLeavePacket
-import com.cobblemon.mod.common.net.messages.server.battle.BattleTeamRequestPacket
-import com.cobblemon.mod.common.net.messages.server.battle.BattleTeamResponsePacket
-import com.cobblemon.mod.common.net.messages.server.battle.RemoveSpectatorPacket
-import com.cobblemon.mod.common.net.messages.server.battle.SpectateBattlePacket
+import com.cobblemon.mod.common.net.messages.server.*
+import com.cobblemon.mod.common.net.messages.server.battle.*
 import com.cobblemon.mod.common.net.messages.server.block.AdjustBlockEntityViewerCountPacket
 import com.cobblemon.mod.common.net.messages.server.callback.move.MoveSelectCancelledPacket
 import com.cobblemon.mod.common.net.messages.server.callback.move.MoveSelectedPacket
@@ -145,45 +105,35 @@ import com.cobblemon.mod.common.net.messages.server.callback.party.PartyPokemonS
 import com.cobblemon.mod.common.net.messages.server.callback.party.PartySelectCancelledPacket
 import com.cobblemon.mod.common.net.messages.server.callback.partymove.PartyMoveSelectCancelledPacket
 import com.cobblemon.mod.common.net.messages.server.callback.partymove.PartyPokemonMoveSelectedPacket
-import com.cobblemon.mod.common.net.messages.server.debug.ServerboundUpdateRidingStatRangePacket
-import com.cobblemon.mod.common.net.messages.server.debug.ServerboundUpdateRidingStatsPacket
 import com.cobblemon.mod.common.net.messages.server.dialogue.EscapeDialoguePacket
 import com.cobblemon.mod.common.net.messages.server.dialogue.InputToDialoguePacket
 import com.cobblemon.mod.common.net.messages.server.npc.SaveNPCPacket
-import com.cobblemon.mod.common.net.messages.server.orientation.ServerboundUpdateOrientationPacket
 import com.cobblemon.mod.common.net.messages.server.pasture.PasturePokemonPacket
 import com.cobblemon.mod.common.net.messages.server.pasture.UnpastureAllPokemonPacket
 import com.cobblemon.mod.common.net.messages.server.pasture.UnpasturePokemonPacket
 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.SetActiveMarkPacket
-import com.cobblemon.mod.common.net.messages.server.pokemon.update.SetMarkingsPacket
-import com.cobblemon.mod.common.net.messages.server.pokemon.update.ServerboundUpdateRidingStatePacket
 import com.cobblemon.mod.common.net.messages.server.pokemon.update.evolution.AcceptEvolutionPacket
 import com.cobblemon.mod.common.net.messages.server.starter.RequestStarterScreenPacket
 import com.cobblemon.mod.common.net.messages.server.storage.SwapPCPartyPokemonPacket
 import com.cobblemon.mod.common.net.messages.server.storage.party.MovePartyPokemonPacket
 import com.cobblemon.mod.common.net.messages.server.storage.party.ReleasePartyPokemonPacket
 import com.cobblemon.mod.common.net.messages.server.storage.party.SwapPartyPokemonPacket
-import com.cobblemon.mod.common.net.messages.server.storage.pc.*
-import com.cobblemon.mod.common.net.messages.server.trade.AcceptTradeRequestPacket
-import com.cobblemon.mod.common.net.messages.server.trade.CancelTradePacket
-import com.cobblemon.mod.common.net.messages.server.trade.ChangeTradeAcceptancePacket
-import com.cobblemon.mod.common.net.messages.server.trade.OfferTradePacket
-import com.cobblemon.mod.common.net.messages.server.trade.PerformTradePacket
-import com.cobblemon.mod.common.net.messages.server.trade.UpdateTradeOfferPacket
-import com.cobblemon.mod.common.net.serverhandling.ChallengeHandler
-import com.cobblemon.mod.common.net.serverhandling.ChallengeResponseHandler
-import com.cobblemon.mod.common.net.serverhandling.RequestInteractionsHandler
-import com.cobblemon.mod.common.net.serverhandling.battle.BattleSelectActionsHandler
-import com.cobblemon.mod.common.net.serverhandling.battle.RemoveSpectatorHandler
-import com.cobblemon.mod.common.net.serverhandling.battle.SpectateBattleHandler
-import com.cobblemon.mod.common.net.serverhandling.battle.TeamLeaveHandler
-import com.cobblemon.mod.common.net.serverhandling.battle.TeamRequestHandler
-import com.cobblemon.mod.common.net.serverhandling.battle.TeamRequestResponseHandler
+import com.cobblemon.mod.common.net.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.PCBoxWallpapersPacket
+import com.cobblemon.mod.common.net.messages.server.storage.pc.ReleasePCPokemonPacket
+import com.cobblemon.mod.common.net.messages.server.storage.pc.RequestChangePCBoxWallpaperPacket
+import com.cobblemon.mod.common.net.messages.server.storage.pc.RequestRenamePCBoxPacket
+import com.cobblemon.mod.common.net.messages.server.storage.pc.SortPCBoxPacket
+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.*
+import com.cobblemon.mod.common.net.serverhandling.*
+import com.cobblemon.mod.common.net.serverhandling.battle.*
 import com.cobblemon.mod.common.net.serverhandling.block.AdjustBlockEntityViewerCountHandler
 import com.cobblemon.mod.common.net.serverhandling.callback.move.MoveSelectCancelledHandler
 import com.cobblemon.mod.common.net.serverhandling.callback.move.MoveSelectedHandler
@@ -191,24 +141,17 @@ import com.cobblemon.mod.common.net.serverhandling.callback.party.PartyPokemonSe
 import com.cobblemon.mod.common.net.serverhandling.callback.party.PartySelectCancelledHandler
 import com.cobblemon.mod.common.net.serverhandling.callback.partymove.PartyMoveSelectCancelledHandler
 import com.cobblemon.mod.common.net.serverhandling.callback.partymove.PartyPokemonMoveSelectedHandler
-import com.cobblemon.mod.common.net.serverhandling.debug.ServerboundUpdateRidingStatRangeHandler
-import com.cobblemon.mod.common.net.serverhandling.debug.ServerboundUpdateRidingStatsHandler
 import com.cobblemon.mod.common.net.serverhandling.dialogue.EscapeDialogueHandler
 import com.cobblemon.mod.common.net.serverhandling.dialogue.InputToDialogueHandler
 import com.cobblemon.mod.common.net.serverhandling.evolution.AcceptEvolutionHandler
 import com.cobblemon.mod.common.net.serverhandling.npc.SaveNPCHandler
-import com.cobblemon.mod.common.net.serverhandling.orientation.OrientationPacketHandler
 import com.cobblemon.mod.common.net.serverhandling.pasture.PasturePokemonHandler
 import com.cobblemon.mod.common.net.serverhandling.pasture.UnpastureAllPokemonHandler
 import com.cobblemon.mod.common.net.serverhandling.pasture.UnpasturePokemonHandler
 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.pokemon.update.SetActiveMarkHandler
-import com.cobblemon.mod.common.net.serverhandling.pokemon.update.SetMarkingsHandler
-import com.cobblemon.mod.common.net.serverhandling.pokemon.update.ServerboundUpdateRidingStateHandler
 import com.cobblemon.mod.common.net.serverhandling.starter.RequestStarterScreenHandler
 import com.cobblemon.mod.common.net.serverhandling.starter.SelectStarterPacketHandler
 import com.cobblemon.mod.common.net.serverhandling.storage.BenchMoveHandler
@@ -219,12 +162,7 @@ import com.cobblemon.mod.common.net.serverhandling.storage.party.MovePartyPokemo
 import com.cobblemon.mod.common.net.serverhandling.storage.party.ReleasePCPokemonHandler
 import com.cobblemon.mod.common.net.serverhandling.storage.party.SwapPartyPokemonHandler
 import com.cobblemon.mod.common.net.serverhandling.storage.pc.*
-import com.cobblemon.mod.common.net.serverhandling.trade.AcceptTradeRequestHandler
-import com.cobblemon.mod.common.net.serverhandling.trade.CancelTradeHandler
-import com.cobblemon.mod.common.net.serverhandling.trade.ChangeTradeAcceptanceHandler
-import com.cobblemon.mod.common.net.serverhandling.trade.OfferTradeHandler
-import com.cobblemon.mod.common.net.serverhandling.trade.PerformTradeHandler
-import com.cobblemon.mod.common.net.serverhandling.trade.UpdateTradeOfferHandler
+import com.cobblemon.mod.common.net.serverhandling.trade.*
 import com.cobblemon.mod.common.util.server
 import net.minecraft.server.level.ServerPlayer
 
@@ -237,11 +175,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)
@@ -280,15 +220,6 @@ object CobblemonNetwork {
         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()))
-        list.add(PacketRegisterInfo(ActiveMarkUpdatePacket.ID, ActiveMarkUpdatePacket::decode, PokemonUpdatePacketHandler()))
-        list.add(PacketRegisterInfo(MarkAddUpdatePacket.ID, MarkAddUpdatePacket::decode, PokemonUpdatePacketHandler()))
-        list.add(PacketRegisterInfo(MarkRemoveUpdatePacket.ID, MarkRemoveUpdatePacket::decode, PokemonUpdatePacketHandler()))
-        list.add(PacketRegisterInfo(MarkPotentialAddUpdatePacket.ID, MarkPotentialAddUpdatePacket::decode, PokemonUpdatePacketHandler()))
-        list.add(PacketRegisterInfo(MarksUpdatePacket.ID, MarksUpdatePacket::decode, PokemonUpdatePacketHandler()))
-        list.add(PacketRegisterInfo(MarksPotentialUpdatePacket.ID, MarksPotentialUpdatePacket::decode, PokemonUpdatePacketHandler()))
-        list.add(PacketRegisterInfo(MarkingsUpdatePacket.ID, MarkingsUpdatePacket::decode, PokemonUpdatePacketHandler()))
-        list.add(PacketRegisterInfo(RideBoostsUpdatePacket.ID, RideBoostsUpdatePacket::decode, PokemonUpdatePacketHandler()))
 
         // Evolution start
         list.add(PacketRegisterInfo(AddEvolutionPacket.ID, AddEvolutionPacket::decode, PokemonUpdatePacketHandler()))
@@ -314,7 +245,6 @@ object CobblemonNetwork {
         list.add(PacketRegisterInfo(RequestPCBoxWallpapersPacket.ID, RequestPCBoxWallpapersPacket::decode, RequestPCBoxWallpapersHandler))
         list.add(PacketRegisterInfo(SetPCBoxWallpapersPacket.ID, SetPCBoxWallpapersPacket::decode, SetPCBoxWallpapersHandler))
         list.add(PacketRegisterInfo(ChangePCBoxWallpaperPacket.ID, ChangePCBoxWallpaperPacket::decode, ChangePCBoxWallpaperHandler))
-        list.add(PacketRegisterInfo(UnlockPCBoxWallpaperPacket.ID, UnlockPCBoxWallpaperPacket::decode, UnlockPCBoxWallpaperHandler))
 
         // UI Packets
         list.add(PacketRegisterInfo(SummaryUIPacket.ID, SummaryUIPacket::decode, SummaryUIPacketHandler))
@@ -378,11 +308,8 @@ object CobblemonNetwork {
         list.add(PacketRegisterInfo(ScriptRegistrySyncPacket.ID, ScriptRegistrySyncPacket::decode, DataRegistrySyncPacketHandler()))
         list.add(PacketRegisterInfo(PokedexDexSyncPacket.ID, PokedexDexSyncPacket::decode, DataRegistrySyncPacketHandler()))
         list.add(PacketRegisterInfo(DexEntrySyncPacket.ID, DexEntrySyncPacket::decode, DataRegistrySyncPacketHandler()))
-        list.add(PacketRegisterInfo(SpawnBaitRegistrySyncPacket.ID, SpawnBaitRegistrySyncPacket::decode, DataRegistrySyncPacketHandler()))
-        list.add(PacketRegisterInfo(SeasoningRegistrySyncPacket.ID, SeasoningRegistrySyncPacket::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()))
-        list.add(PacketRegisterInfo(MarkRegistrySyncPacket.ID, MarkRegistrySyncPacket::decode, DataRegistrySyncPacketHandler()))
 
         // Effects
         list.add(PacketRegisterInfo(SpawnSnowstormParticlePacket.ID, SpawnSnowstormParticlePacket::decode, SpawnSnowstormParticleHandler))
@@ -413,9 +340,6 @@ object CobblemonNetwork {
         list.add(PacketRegisterInfo(PokemonPasturedPacket.ID, PokemonPasturedPacket::decode, PokemonPasturedHandler))
         list.add(PacketRegisterInfo(PokemonUnpasturedPacket.ID, PokemonUnpasturedPacket::decode, PokemonUnpasturedHandler))
 
-        // Orientation
-        list.add(PacketRegisterInfo(ClientboundUpdateOrientationPacket.ID, ClientboundUpdateOrientationPacket::decode, S2CUpdateOrientationHandler))
-
         // Behaviours
         list.add(PacketRegisterInfo(PlayPosableAnimationPacket.ID, PlayPosableAnimationPacket::decode, PlayPosableAnimationHandler))
 
@@ -438,13 +362,6 @@ object CobblemonNetwork {
 
         // Pokédex scanning
         list.add(PacketRegisterInfo(ServerConfirmedRegisterPacket.ID, ServerConfirmedRegisterPacket::decode, ServerConfirmedRegisterHandler))
-
-        // Debug / cheats
-        list.add(PacketRegisterInfo(CalculateSeatPositionsPacket.ID, CalculateSeatPositionsPacket::decode, CalculateSeatPositionsHandler))
-
-        // Riding
-        list.add(PacketRegisterInfo(ClientboundUpdateRidingStatePacket.ID, ClientboundUpdateRidingStatePacket::decode, ClientboundUpdateRidingStateHandler))
-
         return list
     }
 
@@ -452,9 +369,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))
-        list.add(PacketRegisterInfo(SetActiveMarkPacket.ID, SetActiveMarkPacket::decode, SetActiveMarkHandler))
-        list.add(PacketRegisterInfo(SetMarkingsPacket.ID, SetMarkingsPacket::decode, SetMarkingsHandler))
 
         // Evolution Packets
         list.add(PacketRegisterInfo(AcceptEvolutionPacket.ID, AcceptEvolutionPacket::decode, AcceptEvolutionHandler))
@@ -482,7 +396,6 @@ object CobblemonNetwork {
         list.add(PacketRegisterInfo(RequestRenamePCBoxPacket.Companion.ID, RequestRenamePCBoxPacket.Companion::decode, RequestRenamePCBoxHandler))
         list.add(PacketRegisterInfo(PCBoxWallpapersPacket.ID, PCBoxWallpapersPacket::decode, PCBoxWallpapersHandler))
         list.add(PacketRegisterInfo(RequestChangePCBoxWallpaperPacket.ID, RequestChangePCBoxWallpaperPacket::decode, RequestChangePCBoxWallpaperHandler))
-        list.add(PacketRegisterInfo(MarkPCBoxWallpapersSeenPacket.ID, MarkPCBoxWallpapersSeenPacket::decode, MarkPCBoxWallpapersSeenHandler))
 
         // Starter packets
         list.add(PacketRegisterInfo(SelectStarterPacket.ID, SelectStarterPacket::decode, SelectStarterPacketHandler))
@@ -542,19 +455,11 @@ object CobblemonNetwork {
         // NPC packets
         list.add(PacketRegisterInfo(SaveNPCPacket.ID, SaveNPCPacket::decode, SaveNPCHandler))
 
-        // Riding packet(s)
-        list.add(PacketRegisterInfo(ServerboundUpdateOrientationPacket.ID, ServerboundUpdateOrientationPacket::decode, OrientationPacketHandler))
-        list.add(PacketRegisterInfo(ServerboundUpdateRidingStatePacket.ID, ServerboundUpdateRidingStatePacket::decode, ServerboundUpdateRidingStateHandler))
-        list.add(PacketRegisterInfo(ServerboundUpdateRidingStatsPacket.ID, ServerboundUpdateRidingStatsPacket::decode, ServerboundUpdateRidingStatsHandler))
-        list.add(PacketRegisterInfo(ServerboundUpdateRidingStatRangePacket.ID, ServerboundUpdateRidingStatRangePacket::decode, ServerboundUpdateRidingStatRangeHandler))
-
-        // Cooking
-        list.add(PacketRegisterInfo(ToggleCookingPotLidPacket.ID, ToggleCookingPotLidPacket::decode, ToggleCookingPotLidHandler))
-
         return list
     }
 
     fun sendPacketToPlayer(player: ServerPlayer, packet: NetworkPacket<*>) {
+        //logger.info("[S->C] ${packet.type()}")
         Cobblemon.implementation.networkManager.sendPacketToPlayer(player, packet)
     }
-}
+}

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

@@ -1,40 +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 net.minecraft.client.RecipeBookCategories
-
-enum class CobblemonRecipeCategories {
-
-    COOKING_POT_SEARCH("COOKING_POT_SEARCH"),
-    COOKING_POT_FOODS("COOKING_POT_FOODS"),
-    COOKING_POT_MEDICINES("COOKING_POT_MEDICINES"),
-    COOKING_POT_BAITS("COOKING_POT_BAITS"),
-    COOKING_POT_MISC("COOKING_POT_MISC");
-
-    companion object {
-        val customAggregateCategories: Map<RecipeBookCategories, List<RecipeBookCategories>> = mapOf(
-            COOKING_POT_SEARCH.toVanillaCategory() to listOf(
-                COOKING_POT_FOODS.toVanillaCategory(), COOKING_POT_MISC.toVanillaCategory(), COOKING_POT_MEDICINES.toVanillaCategory(), COOKING_POT_BAITS.toVanillaCategory()
-            )
-        )
-    }
-
-    var id: String
-
-    constructor(id: String) {
-        this.id = id
-    }
-
-    fun toVanillaCategory(): RecipeBookCategories {
-        return RecipeBookCategories.valueOf(this.id)
-    }
-
-
-}

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

@@ -1,35 +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.item.crafting.CookingPotRecipe
-import com.cobblemon.mod.common.item.crafting.CookingPotShapelessRecipe
-import com.cobblemon.mod.common.platform.PlatformRegistry
-import net.minecraft.core.Registry
-import net.minecraft.core.registries.BuiltInRegistries
-import net.minecraft.core.registries.Registries
-import net.minecraft.resources.ResourceKey
-import net.minecraft.world.item.crafting.Recipe
-import net.minecraft.world.item.crafting.RecipeSerializer
-
-object CobblemonRecipeSerializers : PlatformRegistry<Registry<RecipeSerializer<*>>, ResourceKey<Registry<RecipeSerializer<*>>>, RecipeSerializer<*>>() {
-
-    val COOKING_POT_COOKING: RecipeSerializer<*> = register("cobblemon:cooking_pot", CookingPotRecipe.Serializer())
-    val COOKING_POT_SHAPELESS: RecipeSerializer<*> = register("cobblemon:cooking_pot_shapeless", CookingPotShapelessRecipe.Serializer())
-
-    override val registry: Registry<RecipeSerializer<*>>
-        get() = BuiltInRegistries.RECIPE_SERIALIZER
-    override val resourceKey: ResourceKey<Registry<RecipeSerializer<*>>>
-        get() = Registries.RECIPE_SERIALIZER
-
-    fun <S : RecipeSerializer<T>, T : Recipe<*>> register(key: String, recipeSerializer: S): S {
-        return Registry.register(BuiltInRegistries.RECIPE_SERIALIZER, key, recipeSerializer) as S
-    }
-}

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

@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common
-
-
-import com.cobblemon.mod.common.item.crafting.CookingPotRecipe
-import com.cobblemon.mod.common.item.crafting.CookingPotShapelessRecipe
-import com.cobblemon.mod.common.platform.PlatformRegistry
-import net.minecraft.core.Registry
-import net.minecraft.core.registries.BuiltInRegistries
-import net.minecraft.core.registries.Registries
-import net.minecraft.resources.ResourceKey
-import net.minecraft.world.item.crafting.Recipe
-import net.minecraft.world.item.crafting.RecipeType
-
-object CobblemonRecipeTypes : PlatformRegistry<Registry<RecipeType<*>>, ResourceKey<Registry<RecipeType<*>>>, RecipeType<*>>() {
-
-    val COOKING_POT_COOKING: RecipeType<CookingPotRecipe> = register("cobblemon:cooking_pot")
-    val COOKING_POT_SHAPELESS: RecipeType<CookingPotShapelessRecipe> = register("cobblemon:cooking_pot_shapeless")
-
-    override val registry: Registry<RecipeType<*>>
-        get() = BuiltInRegistries.RECIPE_TYPE
-    override val resourceKey: ResourceKey<Registry<RecipeType<*>>>
-        get() = Registries.RECIPE_TYPE
-
-    fun <T : Recipe<*>> register(identifier: String): RecipeType<T> {
-        return Registry.register(
-                BuiltInRegistries.RECIPE_TYPE,
-                identifier,
-                object : RecipeType<T> {
-                    override fun toString(): String {
-                        return identifier
-                    }
-                }
-        )
-    }
-
-}

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

@@ -40,8 +40,6 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, ResourceKey<Regi
     val PC_RELEASE = this.create("pc.release")
     @JvmField
     val PC_CLICK = this.create("pc.click")
-    @JvmField
-    val PC_WALLPAPER_UNLOCK = this.create("pc.wallpaper.unlock")
 
     @JvmField
     val VILLAGER_WORK_NURSE = this.create("entity.villager.work_nurse")
@@ -112,8 +110,6 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, ResourceKey<Regi
     val MEDICINE_SPRAY_USE = this.create("item.medicine.spray.use")
     @JvmField
     val MEDICINE_FEATHER_USE = this.create("item.medicine.feather.use")
-    @JvmField
-    val MOCHI_USE = this.create("item.medicine.feather.use")
 
     @JvmField
     val MULCH_PLACE = this.create("block.mulch.place")
@@ -427,37 +423,5 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, ResourceKey<Regi
         DISPLAY_CASE_STEP
     )
 
-    @JvmField
-    val CAMPFIRE_POT_PLACE_CAMPFIRE = this.create("block.campfire_pot.place_campfire")
-    @JvmField
-    val CAMPFIRE_POT_RETRIEVE = this.create("block.campfire_pot.retrieve")
-    @JvmField
-    val CAMPFIRE_POT_OPEN = this.create("block.campfire_pot.open")
-    @JvmField
-    val CAMPFIRE_POT_CLOSE = this.create("block.campfire_pot.close")
-    @JvmField
-    val CAMPFIRE_POT_USE = this.create("block.campfire_pot.use")
-    @JvmField
-    val CAMPFIRE_POT_COOK = this.create("block.campfire_pot.cook")
-    @JvmField
-    val CAMPFIRE_POT_CRAFT = this.create("block.campfire_pot.craft")
-    @JvmField
-    val CAMPFIRE_POT_PLACE = this.create("block.campfire_pot.place")
-    @JvmField
-    val CAMPFIRE_POT_BREAK = this.create("block.campfire_pot.break")
-    @JvmField
-    val CAMPFIRE_POT_HIT = this.create("block.campfire_pot.hit")
-    @JvmField
-    val CAMPFIRE_POT_STEP = this.create("block.campfire_pot.step")
-
-    @JvmField
-    val CAMPFIRE_POT_SOUNDS = SoundType(1f, 1.1f,
-        CAMPFIRE_POT_BREAK,
-        CAMPFIRE_POT_STEP,
-        CAMPFIRE_POT_PLACE,
-        CAMPFIRE_POT_HIT,
-        CAMPFIRE_POT_STEP
-    )
-
     private fun create(name: String): SoundEvent = this.create(name, SoundEvent.createVariableRangeEvent(cobblemonResource(name)))
 }

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

@@ -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.bedrockk.molang.Expression
-import com.cobblemon.mod.common.api.data.JsonDataRegistry
-import com.cobblemon.mod.common.api.molang.ExpressionLike
-import com.cobblemon.mod.common.api.reactive.SimpleObservable
-import com.cobblemon.mod.common.api.storage.pc.UnlockablePCWallpaper
-import com.cobblemon.mod.common.util.adapters.ExpressionAdapter
-import com.cobblemon.mod.common.util.adapters.ExpressionLikeAdapter
-import com.cobblemon.mod.common.util.adapters.IdentifierAdapter
-import com.cobblemon.mod.common.util.adapters.TextAdapter
-import com.cobblemon.mod.common.util.cobblemonResource
-import com.google.gson.Gson
-import com.google.gson.GsonBuilder
-import com.google.gson.reflect.TypeToken
-import net.minecraft.network.chat.Component
-import net.minecraft.resources.ResourceLocation
-import net.minecraft.server.level.ServerPlayer
-import net.minecraft.server.packs.PackType
-
-/**
- * A data registry for unlockable wallpapers that can be applied to a PC box. This is different to a resource packed
- * wallpaper, as those are purely client-side and don't require any unlocking.
- *
- * See docs/pc_wallpapers.md
- *
- * @author Hiroku
- * @since February 9th, 2025
- */
-object CobblemonUnlockableWallpapers : JsonDataRegistry<UnlockablePCWallpaper> {
-    override val gson: Gson = GsonBuilder()
-        .setPrettyPrinting()
-        .registerTypeAdapter(Expression::class.java, ExpressionAdapter)
-        .registerTypeAdapter(ExpressionLike::class.java, ExpressionLikeAdapter)
-        .registerTypeAdapter(ResourceLocation::class.java, IdentifierAdapter)
-        .registerTypeAdapter(Component::class.java, TextAdapter)
-        .create()
-
-    override val typeToken = TypeToken.get(UnlockablePCWallpaper::class.java)
-    override val resourcePath = "unlockable_pc_box_wallpapers"
-    override val id: ResourceLocation = cobblemonResource("unlockable_pc_box_wallpapers")
-    override val type = PackType.SERVER_DATA
-    override val observable = SimpleObservable<CobblemonUnlockableWallpapers>()
-
-    val unlockableWallpapers = mutableMapOf<ResourceLocation, UnlockablePCWallpaper>()
-
-    override fun sync(player: ServerPlayer) { /* These don't sync, they're applied to a PC instance from which they're hooked into RequestChangePCBoxWallpaperHandler. */ }
-
-    override fun reload(data: Map<ResourceLocation, UnlockablePCWallpaper>) {
-        unlockableWallpapers.clear()
-        data.forEach { (id, value) -> value.id = id }
-        unlockableWallpapers.putAll(data)
-        observable.emit(this)
-    }
-}

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

@@ -19,7 +19,7 @@ import net.minecraft.world.entity.ai.village.poi.PoiType
 import net.minecraft.world.level.block.Block
 import net.minecraft.world.level.block.state.BlockState
 
-object CobblemonPoiTypes: PlatformRegistry<Registry<PoiType>, ResourceKey<Registry<PoiType>>, PoiType>() {
+object CobblemonVillagerPoiTypes: PlatformRegistry<Registry<PoiType>, ResourceKey<Registry<PoiType>>, PoiType>() {
     override val registry: Registry<PoiType> = BuiltInRegistries.POINT_OF_INTEREST_TYPE
     override val resourceKey: ResourceKey<Registry<PoiType>> = Registries.POINT_OF_INTEREST_TYPE
 
@@ -27,20 +27,8 @@ object CobblemonPoiTypes: PlatformRegistry<Registry<PoiType>, ResourceKey<Regist
     val NURSE_KEY: ResourceKey<PoiType> = createKey("nurse")
     @JvmField
     val NURSE = create(NURSE_KEY.location().path, PoiType(getBlockStates(CobblemonBlocks.HEALING_MACHINE), 1, 1))
-    @JvmField
-    val LURE_CAKE_KEY: ResourceKey<PoiType> = createKey("lure_cake")
-    @JvmField
-    val LURE_CAKE = create(LURE_CAKE_KEY.location().path, PoiType(getBlockStates(CobblemonBlocks.LURE_CAKE), 0, 1))
-    @JvmField
-    val SACCHARINE_HONEY_LOG_KEY: ResourceKey<PoiType> = createKey("saccharine_honey_log")
-    @JvmField
-    val SACCHARINE_HONEY_LOG = create(SACCHARINE_HONEY_LOG_KEY.location().path, PoiType(getBlockStates(CobblemonBlocks.SACCHARINE_HONEY_LOG), 0, 1))
-    @JvmField
-    val INCENSE_SWEET_KEY: ResourceKey<PoiType> = createKey("saccharine_honey_log")
-    @JvmField
-    val INCENSE_SWEET = create(INCENSE_SWEET_KEY.location().path, PoiType(getBlockStates(CobblemonBlocks.INCENSE_SWEET), 0, 1))
 
     private fun createKey(string: String): ResourceKey<PoiType> = ResourceKey.create(Registries.POINT_OF_INTEREST_TYPE, cobblemonResource(string))
 
     private fun getBlockStates(block: Block): Set<BlockState> = ImmutableSet.copyOf(block.stateDefinition.possibleStates)
-}
+}

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

@@ -24,7 +24,7 @@ object CobblemonVillagerProfessions: PlatformRegistry<Registry<VillagerProfessio
     override val resourceKey: ResourceKey<Registry<VillagerProfession>> = Registries.VILLAGER_PROFESSION
 
     @JvmField
-    val NURSE = profession(CobblemonPoiTypes.NURSE_KEY, CobblemonSounds.VILLAGER_WORK_NURSE)
+    val NURSE = profession(CobblemonVillagerPoiTypes.NURSE_KEY, CobblemonSounds.VILLAGER_WORK_NURSE)
 
     /**
      * Register a villager profession texture override for Cobblemon villagers of the given [VillagerProfession] for specified names.

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

@@ -28,7 +28,7 @@ class BattleCountableCriterion(
         val CODEC: Codec<BattleCountableCriterion> = RecordCodecBuilder.create { it.group(
             ContextAwarePredicate.CODEC.optionalFieldOf("player").forGetter(BattleCountableCriterion::playerCtx),
             Codec.STRING.listOf().optionalFieldOf("battle_types", listOf("any")).forGetter(BattleCountableCriterion::battleTypes),
-            Codec.INT.optionalFieldOf("count", 0).forGetter(BattleCountableCriterion::count)
+            Codec.INT.optionalFieldOf( "count", 0).forGetter(BattleCountableCriterion::count)
         ).apply(it, ::BattleCountableCriterion) }
     }
 

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

@@ -20,8 +20,8 @@ import net.minecraft.resources.ResourceLocation
 class CastPokeRodContext(val baitId: ResourceLocation)
 
 class CastPokeRodCriterionCondition(
-    playerCtx: Optional<ContextAwarePredicate>,
-    val baitId: String
+        playerCtx: Optional<ContextAwarePredicate>,
+        val baitId: String
 ): SimpleCriterionCondition<CastPokeRodContext>(playerCtx) {
 
     companion object {

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

@@ -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
+    }
+}*/

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

@@ -10,7 +10,6 @@ package com.cobblemon.mod.common.api.apricorn
 
 import com.cobblemon.mod.common.CobblemonBlocks
 import com.cobblemon.mod.common.CobblemonItems
-import com.cobblemon.mod.common.api.cooking.Flavour
 import com.cobblemon.mod.common.block.ApricornBlock
 import com.cobblemon.mod.common.block.ApricornSaplingBlock
 import com.cobblemon.mod.common.item.ApricornItem
@@ -28,43 +27,15 @@ import net.minecraft.world.level.material.MapColor
  * @author Licious
  * @since October 29th, 2022
  */
-enum class Apricorn(
-    /** A value of true means it buffs that flavour, a value of false means it weakens that flavour. */
-    val flavourStrength: Map<Flavour, Boolean> = emptyMap()
-) : StringRepresentable {
+enum class Apricorn : StringRepresentable {
 
     BLACK,
-    BLUE(
-        mapOf(
-            Flavour.DRY to true,
-            Flavour.BITTER to false
-        )
-    ),
-    GREEN(
-        mapOf(
-            Flavour.BITTER to true,
-            Flavour.SWEET to false
-        )
-    ),
-    PINK(
-        mapOf(
-            Flavour.SWEET to true,
-            Flavour.SPICY to false
-        )
-    ),
-    RED(
-        mapOf(
-            Flavour.SPICY to true,
-            Flavour.SOUR to false
-        )
-    ),
+    BLUE,
+    GREEN,
+    PINK,
+    RED,
     WHITE,
-    YELLOW(
-        mapOf(
-            Flavour.SOUR to true,
-            Flavour.DRY to false
-        )
-    );
+    YELLOW;
 
     fun item(): ApricornItem = when(this) {
         BLACK -> CobblemonItems.BLACK_APRICORN

common/src/main/kotlin/com/cobblemon/mod/common/api/battles/interpreter/BattleContext.kt

@@ -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].
      *

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

@@ -11,7 +11,6 @@ package com.cobblemon.mod.common.api.berry
 import com.cobblemon.mod.common.CobblemonBlocks
 import com.cobblemon.mod.common.CobblemonItems
 import com.cobblemon.mod.common.api.berry.spawncondition.BerrySpawnCondition
-import com.cobblemon.mod.common.api.cooking.Flavour
 import com.cobblemon.mod.common.api.events.CobblemonEvents
 import com.cobblemon.mod.common.api.events.berry.BerryYieldCalculationEvent
 import com.cobblemon.mod.common.api.mulch.MulchVariant
@@ -21,10 +20,16 @@ import com.cobblemon.mod.common.item.berry.BerryItem
 import com.cobblemon.mod.common.pokemon.Nature
 import com.cobblemon.mod.common.util.readBox
 import com.cobblemon.mod.common.util.readEnumConstant
+import com.cobblemon.mod.common.util.readEnumSet
 import com.cobblemon.mod.common.util.readIdentifier
+import com.cobblemon.mod.common.util.readList
+import com.cobblemon.mod.common.util.readMap
 import com.cobblemon.mod.common.util.writeBox
+import com.cobblemon.mod.common.util.writeCollection
 import com.cobblemon.mod.common.util.writeEnumConstant
+import com.cobblemon.mod.common.util.writeEnumSet
 import com.cobblemon.mod.common.util.writeIdentifier
+import com.cobblemon.mod.common.util.writeMap
 import com.google.gson.annotations.SerializedName
 import net.minecraft.core.BlockPos
 import net.minecraft.network.RegistryFriendlyByteBuf
@@ -33,7 +38,6 @@ import java.util.EnumSet
 import net.minecraft.resources.ResourceLocation
 import net.minecraft.tags.TagKey
 import net.minecraft.world.entity.LivingEntity
-import net.minecraft.world.item.DyeColor
 import net.minecraft.world.level.Level
 import net.minecraft.world.level.biome.Biome
 import net.minecraft.world.level.block.Block
@@ -57,7 +61,7 @@ import net.minecraft.world.phys.shapes.VoxelShape
  * @property growthPoints A collection of [GrowthPoint]s for the berry flowers and fruit.
  * @property sproutShapeBoxes A collection of [Box]es that make up the tree [VoxelShape] during the sprouting stages.
  * @property matureShapeBoxes A collection of [Box]es that make up the tree [VoxelShape] during the mature stages.
- * @property flavours The [com.cobblemon.mod.common.api.cooking.Flavour] values.
+ * @property flavors The [Flavor] values.
  * @property tintIndexes Determines tints at specific indexes if any.
  * @property flowerModelIdentifier The [ResourceLocation] for the model of the berry in flower form.
  * @property flowerTexture The [ResourceLocation] for the texture of the berry in flower form. This is resolved into a [ModelPart] on the client.
@@ -83,10 +87,7 @@ class Berry(
     private val sproutShapeBoxes: Collection<AABB>,
     @SerializedName("matureShape")
     private val matureShapeBoxes: Collection<AABB>,
-    @SerializedName("flavours", alternate = ["flavor"])
-    val flavours: Map<Flavour, Int>,
-    @SerializedName("colour", alternate = ["color"])
-    val colour: DyeColor,
+    private val flavors: Map<Flavor, Int>,
     val tintIndexes: Map<Int, Color>,
     @SerializedName("flowerModel")
     val flowerModelIdentifier: ResourceLocation,
@@ -98,6 +99,7 @@ class Berry(
     val weight: Float,
     val boneMealChance: Float
 ) {
+
     @Transient
     var identifier: ResourceLocation = identifier
         internal set
@@ -143,13 +145,13 @@ class Berry(
     /**
      * Query the value of a certain flavor.
      *
-     * @param flavour The [Flavour] being queried.
+     * @param flavor The [Flavor] being queried.
      * @return The value if any or 0.
      */
-    fun flavor(flavour: Flavour): Int = this.flavours[flavour] ?: 0
+    fun flavor(flavor: Flavor): Int = this.flavors[flavor] ?: 0
 
     fun dislikedBy(nature: Nature): Boolean {
-        val dislikedFlavor = nature.dislikedFlavour ?: return false
+        val dislikedFlavor = nature.dislikedFlavor ?: return false
         return flavor(dislikedFlavor) > 0
     }
 
@@ -157,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.
@@ -171,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
@@ -192,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].
@@ -230,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")
@@ -247,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)
@@ -280,8 +284,7 @@ class Berry(
         buffer.writeCollection(this.matureShapeBoxes) { writer, value ->
             writer.writeBox(value)
         }
-        buffer.writeMap(this.flavours, { writer, key -> writer.writeEnumConstant(key) }, { writer, value -> writer.writeInt(value) })
-        buffer.writeEnumConstant(colour)
+        buffer.writeMap(this.flavors, { writer, key -> writer.writeEnumConstant(key) }, { writer, value -> writer.writeInt(value) })
         buffer.writeMap(this.tintIndexes, { writer, key -> writer.writeInt(key) }, { writer, value -> writer.writeInt(value.rgb) })
         buffer.writeIdentifier(this.flowerModelIdentifier)
         buffer.writeIdentifier(this.flowerTexture)
@@ -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()
@@ -353,8 +354,7 @@ class Berry(
             val mutations = buffer.readMap({ reader -> reader.readIdentifier() }, { reader -> reader.readIdentifier() })
             val sproutShapeBoxes = buffer.readList { it.readBox() }
             val matureShapeBoxes = buffer.readList { it.readBox() }
-            val flavors = buffer.readMap({ reader -> reader.readEnumConstant(Flavour::class.java) }, { reader -> reader.readInt() })
-            val colour = buffer.readEnumConstant(DyeColor::class.java)
+            val flavors = buffer.readMap({ reader -> reader.readEnumConstant(Flavor::class.java) }, { reader -> reader.readInt() })
             val tintIndexes = buffer.readMap({ reader -> reader.readInt() }, { reader -> Color(reader.readInt()) })
             val flowerModelIdentifier = buffer.readIdentifier()
             val flowerTexture = buffer.readIdentifier()
@@ -362,7 +362,7 @@ class Berry(
             val fruitTexture = buffer.readIdentifier()
             val stageOneYPos = GrowthPoint(Vec3(buffer.readDouble(), buffer.readDouble(), buffer.readDouble()), Vec3(buffer.readDouble(), buffer.readDouble(), buffer.readDouble()))
             val boneMealChance = buffer.readFloat()
-            return Berry(identifier, baseYield, emptyList(), growthTime, refreshRate, favMulchs, emptySet(), emptyList(), growthPoints, randomizedGrowthPoints, mutations, sproutShapeBoxes, matureShapeBoxes, flavors, colour, tintIndexes, flowerModelIdentifier, flowerTexture, fruitModelIdentifier, fruitTexture, stageOneYPos, 0F, boneMealChance)
+            return Berry(identifier, baseYield, emptyList(), growthTime, refreshRate, favMulchs, emptySet(), emptyList(), growthPoints, randomizedGrowthPoints, mutations, sproutShapeBoxes, matureShapeBoxes, flavors, tintIndexes, flowerModelIdentifier, flowerTexture, fruitModelIdentifier, fruitTexture, stageOneYPos, 0F, boneMealChance)
         }
 
     }

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

@@ -0,0 +1,26 @@
+/*
+ * 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.berry
+
+/**
+ * Represents the different flavors associated with berries and other Pokémon consumables.
+ * See the [Bulbapedia](https://bulbapedia.bulbagarden.net/wiki/Flavor) article for more information.
+ *
+ * @author Licious
+ * @since November 28th, 2022
+ */
+enum class Flavor {
+
+    SPICY,
+    DRY,
+    SWEET,
+    BITTER,
+    SOUR
+
+}

common/src/main/kotlin/com/cobblemon/mod/common/api/conditional/Codecs.kt

@@ -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." }
-    )
-}

common/src/main/kotlin/com/cobblemon/mod/common/api/conditional/RegistryLikeCondition.kt

@@ -8,7 +8,6 @@
 
 package com.cobblemon.mod.common.api.conditional
 
-import net.minecraft.core.Holder
 import net.minecraft.core.Registry
 
 /**
@@ -18,10 +17,5 @@ import net.minecraft.core.Registry
  * @since July 16th, 2022
  */
 interface RegistryLikeCondition<T> {
-    fun fits(t: T, registry: Registry<T>): Boolean {
-        val holder = registry.wrapAsHolder(t)
-        return holder != null && fits(holder)
-    }
-
-    fun fits(holder: Holder<T>): Boolean
+    fun fits(t: T, registry: Registry<T>): Boolean
 }

common/src/main/kotlin/com/cobblemon/mod/common/api/conditional/RegistryLikeIdentifierCondition.kt

@@ -9,7 +9,7 @@
 package com.cobblemon.mod.common.api.conditional
 
 import com.google.gson.JsonElement
-import net.minecraft.core.Holder
+import net.minecraft.core.Registry
 import net.minecraft.resources.ResourceLocation
 
 /**
@@ -24,6 +24,5 @@ open class RegistryLikeIdentifierCondition<T : Any>(val identifier: ResourceLoca
             constructor: (ResourceLocation) -> RegistryLikeIdentifierCondition<T>
         ): (JsonElement) -> RegistryLikeIdentifierCondition<T>? = { constructor(ResourceLocation.parse(it.asString)) }
     }
-
-    override fun fits(t: Holder<T>) = t.`is`(identifier)
+    override fun fits(t: T, registry: Registry<T>) = registry.getKey(t) == identifier
 }

common/src/main/kotlin/com/cobblemon/mod/common/api/conditional/RegistryLikeTagCondition.kt

@@ -9,7 +9,6 @@
 package com.cobblemon.mod.common.api.conditional
 
 import com.google.gson.JsonElement
-import net.minecraft.core.Holder
 import net.minecraft.core.Registry
 import net.minecraft.resources.ResourceKey
 import net.minecraft.resources.ResourceLocation
@@ -27,18 +26,29 @@ 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
             }
         }
     }
 
-    override fun fits(t: Holder<T>) = t.`is`(tag)
+    override fun fits(t: T, registry: Registry<T>): Boolean {
+//        val registryHasTag = registry.containsTag(tag)
+//        if (!registryHasTag) {
+////            LOGGER.warn("No tag in registry: ${tag.id}")
+//            return false
+//        }
+
+        return registry.getResourceKey(t)
+            .flatMap(registry::getHolder)
+            .map { entry -> entry.`is`(tag) }
+            .orElse(false)
+    }
 }

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

@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.cooking
-
-import net.minecraft.ChatFormatting
-import net.minecraft.util.StringRepresentable
-
-/**
- * Represents the different flavors associated with berries and other Pokémon consumables.
- * See the [Bulbapedia](https://bulbapedia.bulbagarden.net/wiki/Flavor) article for more information.
- *
- * @author Licious
- * @since November 28th, 2022
- */
-enum class Flavour(val colour: Int, val chatFormatting: ChatFormatting): StringRepresentable {
-    SPICY(0x00FF00, ChatFormatting.RED),
-    DRY(0xFF0000, ChatFormatting.DARK_AQUA),
-    SWEET(0x0000FF, ChatFormatting.LIGHT_PURPLE),
-    BITTER(0xFFFF00, ChatFormatting.GREEN),
-    SOUR(0xFF00FF, ChatFormatting.YELLOW);
-
-    override fun getSerializedName() = name
-    companion object {
-        val CODEC = StringRepresentable.fromEnum<Flavour> { Flavour.entries.toTypedArray() }
-    }
-}

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

@@ -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.api.cooking
-
-import net.minecraft.util.FastColor
-import net.minecraft.world.item.ItemStack
-
-private val colourMap = mapOf(
-    Flavour.SPICY to 0xFEB37D,
-    Flavour.DRY to 0x8AE9FC,
-    Flavour.SWEET to 0xFFBEED,
-    Flavour.BITTER to 0x9EED8F,
-    Flavour.SOUR to 0xFCF38A
-)
-
-private val bubbleColourMap = mapOf(
-    Flavour.SPICY to 0xFFD9AD,
-    Flavour.DRY to 0xBCF8FE,
-    Flavour.SWEET to 0xFEE3F9,
-    Flavour.BITTER to 0xC8F7BC,
-    Flavour.SOUR to 0xFDFAB8
-)
-
-fun getColourMixFromSeasonings(seasonings: List<ItemStack>, forBubbles: Boolean = false): Int? {
-    val flavors = seasonings
-        .flatMap { Seasonings.getFlavoursFromItemStack(it).entries }
-        .groupingBy { it.key }
-        .fold(0) { acc, entry -> acc + entry.value }
-
-    val maxFlavorValue = flavors.values.maxOrNull()
-    val dominantFlavors = flavors.filter { it.value == maxFlavorValue }.map { it.key }
-
-    return getColourMixFromFlavours(dominantFlavors, forBubbles)
-}
-
-fun getColourMixFromFlavours(dominantFlavours: List<Flavour>, forBubbles: Boolean = false): Int? {
-    val colors =
-        dominantFlavours.mapNotNull { if (forBubbles) bubbleColourMap[it] else colourMap[it] }
-            .map { FastColor.ARGB32.opaque(it) }
-
-    if (colors.isEmpty()) return null
-
-    val (alphaSum, redSum, greenSum, blueSum) = colors.fold(IntArray(4)) { acc, color ->
-        acc[0] += FastColor.ARGB32.alpha(color)
-        acc[1] += FastColor.ARGB32.red(color)
-        acc[2] += FastColor.ARGB32.green(color)
-        acc[3] += FastColor.ARGB32.blue(color)
-        acc
-    }
-
-    return FastColor.ARGB32.color(
-        alphaSum / colors.size,
-        redSum / colors.size,
-        greenSum / colors.size,
-        blueSum / colors.size
-    )
-}

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

@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.cooking
-
-import com.cobblemon.mod.common.api.conditional.ITEM_REGISTRY_LIKE_CODEC
-import com.cobblemon.mod.common.api.conditional.RegistryLikeCondition
-import com.cobblemon.mod.common.api.conditional.RegistryLikeIdentifierCondition
-import com.cobblemon.mod.common.api.fishing.SpawnBait
-import com.cobblemon.mod.common.util.cobblemonResource
-import com.google.gson.annotations.SerializedName
-import com.mojang.serialization.Codec
-import com.mojang.serialization.codecs.RecordCodecBuilder
-import io.netty.buffer.ByteBuf
-import net.minecraft.network.codec.ByteBufCodecs
-import net.minecraft.network.codec.StreamCodec
-import net.minecraft.world.item.DyeColor
-import net.minecraft.world.item.Item
-
-data class Seasoning(
-    val ingredient: RegistryLikeCondition<Item>,
-    @SerializedName("flavours", alternate = ["flavors"])
-    val flavours: Map<Flavour, Int>,
-    @SerializedName("colour", alternate = ["color"])
-    val colour: DyeColor,
-    @SerializedName("baitEffects")
-    val baitEffects: List<SpawnBait.Effect> = emptyList()
-) {
-    companion object {
-        val CODEC: Codec<Seasoning> = RecordCodecBuilder.create { builder ->
-            builder.group(
-                ITEM_REGISTRY_LIKE_CODEC.fieldOf("ingredient").forGetter { it.ingredient },
-                Codec.unboundedMap(Flavour.CODEC, Codec.INT).fieldOf("flavours").forGetter { it.flavours }, // Use map codec
-                DyeColor.CODEC.fieldOf("colour").forGetter { it.colour },
-                SpawnBait.Effect.CODEC.listOf().optionalFieldOf("baitEffects", emptyList()).forGetter { it.baitEffects }
-            ).apply(builder, ::Seasoning)
-        }
-
-        val STREAM_CODEC: StreamCodec<ByteBuf, Seasoning> = ByteBufCodecs.fromCodec(CODEC)
-
-        val BLANK_SEASONING = Seasoning(
-            ingredient = RegistryLikeIdentifierCondition<Item>(cobblemonResource("blank")),
-            flavours = Flavour.entries.associate { it to 0 },
-            colour = DyeColor.WHITE,
-            baitEffects = emptyList()
-        )
-    }
-}

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

@@ -1,92 +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.cooking
-
-import com.cobblemon.mod.common.CobblemonItemComponents
-import com.cobblemon.mod.common.api.berry.Berries
-import com.cobblemon.mod.common.api.conditional.RegistryLikeCondition
-import com.cobblemon.mod.common.api.conditional.RegistryLikeIdentifierCondition
-import com.cobblemon.mod.common.api.data.JsonDataRegistry
-import com.cobblemon.mod.common.api.fishing.SpawnBait
-import com.cobblemon.mod.common.api.reactive.SimpleObservable
-import com.cobblemon.mod.common.net.messages.client.cooking.SeasoningRegistrySyncPacket
-import com.cobblemon.mod.common.util.adapters.IdentifierAdapter
-import com.cobblemon.mod.common.util.adapters.ItemLikeConditionAdapter
-import com.cobblemon.mod.common.util.cobblemonResource
-import com.google.gson.Gson
-import com.google.gson.GsonBuilder
-import com.google.gson.reflect.TypeToken
-import net.minecraft.resources.ResourceLocation
-import net.minecraft.server.level.ServerPlayer
-import net.minecraft.server.packs.PackType
-import net.minecraft.world.item.DyeColor
-import net.minecraft.world.item.Item
-import net.minecraft.world.item.ItemStack
-
-object Seasonings : JsonDataRegistry<Seasoning> {
-    override val id = cobblemonResource("seasonings")
-    override val type = PackType.SERVER_DATA
-    override val observable = SimpleObservable<Seasonings>()
-    override val typeToken: TypeToken<Seasoning> = TypeToken.get(Seasoning::class.java)
-    override val resourcePath = "seasonings"
-    override val gson: Gson = GsonBuilder()
-        .registerTypeAdapter(ResourceLocation::class.java, IdentifierAdapter)
-        .registerTypeAdapter(TypeToken.getParameterized(RegistryLikeCondition::class.java, Item::class.java).type, ItemLikeConditionAdapter)
-        .setPrettyPrinting()
-        .create()
-
-    val seasonings = mutableListOf<Seasoning>()
-
-    val BLANK_SEASONING = Seasoning(
-        ingredient = RegistryLikeIdentifierCondition<Item>(cobblemonResource("blank")),
-        flavours = emptyMap(),
-        colour = DyeColor.WHITE
-    )
-
-    override fun sync(player: ServerPlayer) {
-        SeasoningRegistrySyncPacket(seasonings.toList()).sendToPlayer(player)
-    }
-
-    override fun reload(data: Map<ResourceLocation, Seasoning>) {
-        // this needs to sideload the berry data so we don't get duplicate JSONs.
-        val finalData = Berries.all().associate {
-            it.identifier to Seasoning(
-                ingredient = RegistryLikeIdentifierCondition(it.identifier),
-                flavours = it.flavours.toMap(),
-                colour = it.colour
-            )
-        }.toMutableMap()
-        finalData.putAll(data)
-        seasonings.addAll(finalData.values)
-    }
-
-    fun reloadEntries(seasonings: Collection<Seasoning>) {
-        this.seasonings.clear()
-        this.seasonings.addAll(seasonings)
-    }
-
-    fun getFlavoursFromItemStack(stack: ItemStack): Map<Flavour, Int> {
-        val holder = stack.itemHolder
-        val seasoning = seasonings.find { it.ingredient.fits(holder) } ?: BLANK_SEASONING
-        val inherentFlavours = stack.get(CobblemonItemComponents.FLAVOUR)?.flavours ?: emptyMap()
-
-        return seasoning.flavours.mapValues { (flavour, value) -> inherentFlavours.getOrDefault(flavour, 0) + value }
-    }
-
-    fun getBaitEffectsFromItemStack(stack: ItemStack): List<SpawnBait.Effect> {
-        return getFromItemStack(stack)?.baitEffects ?: emptyList()
-    }
-
-    fun getFromItemStack(stack: ItemStack): Seasoning? {
-        val holder = stack.itemHolder
-        return seasonings.find { it.ingredient.fits(holder) }
-    }
-
-    fun isSeasoning(stack: ItemStack) = getFromItemStack(stack) != null
-}

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

@@ -20,4 +20,4 @@ interface EntitySideDelegate<T : Entity> {
     fun tick(entity: T) {}
     fun onSyncedDataUpdated(data: EntityDataAccessor<*>) {}
     fun addToStruct(struct: QueryStruct) {}
-}
+}

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

@@ -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> {
@@ -21,6 +19,4 @@ interface PokemonSideDelegate : EntitySideDelegate<PokemonEntity> {
     fun updatePostDeath() {}
     fun handleStatus(status: Byte) {}
     fun spawnShinyParticle(player: Player) {}
-    fun positionRider(passenger: Entity, positionUpdater: MoveFunction)
-    fun updateAge(age: Int) {}
-}
+}

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

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

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

@@ -46,14 +46,12 @@ 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.storage.WallpaperUnlockedEvent
 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
 import com.cobblemon.mod.common.api.reactive.Observable.Companion.filter
 import com.cobblemon.mod.common.api.reactive.Observable.Companion.map
 import com.cobblemon.mod.common.api.reactive.SimpleObservable
-import com.cobblemon.mod.common.api.riding.events.SelectDriverEvent
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import net.minecraft.server.level.ServerPlayer
 
@@ -180,8 +178,6 @@ object CobblemonEvents {
 
     @JvmField
     val WALLPAPER_COLLECTION_EVENT = EventObservable<WallpaperCollectionEvent>()
-    @JvmField
-    val WALLPAPER_UNLOCKED_EVENT = CancelableObservable<WallpaperUnlockedEvent>()
 
     @JvmField
     val CHANGE_PC_BOX_WALLPAPER_EVENT_PRE = CancelableObservable<ChangePCBoxWallpaperEvent.Pre>()
@@ -215,10 +211,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>()
@@ -255,23 +247,10 @@ object CobblemonEvents {
     @JvmField
     val BAIT_EFFECT_REGISTRATION = EventObservable<BaitEffectFunctionRegistryEvent>()
 
-    // Baits and Lures
-    @JvmField
-    val BAIT_SPAWN_POKEMON_MODIFY = EventObservable<BaitSpawnPokemonEvent.Modify>()
-
-
     @JvmField
     val COLLECT_EGG = CancelableObservable<CollectEggEvent>()
     @JvmField
     val HATCH_EGG_PRE = CancelableObservable<HatchEggEvent.Pre>()
     @JvmField
     val HATCH_EGG_POST = EventObservable<HatchEggEvent.Post>()
-
-    // -------------------------------------------------------------------------------------
-    //
-    // Riding
-    //
-    // -------------------------------------------------------------------------------------
-    @JvmField
-    val SELECT_DRIVER = EventObservable<SelectDriverEvent>()
 }

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

@@ -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()) },
+            )
+        )
     )
 }

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

@@ -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)
 }
 
 /**

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

@@ -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 },

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

@@ -8,19 +8,19 @@
 
 package com.cobblemon.mod.common.api.events.fishing
 
-import com.cobblemon.mod.common.api.fishing.SpawnBait
+import com.cobblemon.mod.common.api.fishing.FishingBait
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import net.minecraft.resources.ResourceLocation
 
 /**
  * Event to register code-based functions for bait effects.
- * @see SpawnBait.Effect
- * @see SpawnBait.Effects
+ * @see FishingBait.Effect
+ * @see FishingBait.Effects
  */
 class BaitEffectFunctionRegistryEvent {
-    val functions = mutableMapOf<ResourceLocation, (PokemonEntity, SpawnBait.Effect) -> Unit>()
+    val functions = mutableMapOf<ResourceLocation, (PokemonEntity, FishingBait.Effect) -> Unit>()
 
-    fun registerFunction(id: ResourceLocation, function: (PokemonEntity, SpawnBait.Effect) -> Unit) {
+    fun registerFunction(id: ResourceLocation, function: (PokemonEntity, FishingBait.Effect) -> Unit) {
         functions[id] = function
     }
 }

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

@@ -1,59 +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.fishing
-
-import com.cobblemon.mod.common.api.events.Cancelable
-import com.cobblemon.mod.common.api.spawning.SpawnBucket
-import com.cobblemon.mod.common.entity.fishing.PokeRodFishingBobberEntity
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
-import net.minecraft.world.item.ItemStack
-
-/**
- * Event that is fired when a Pokemon is spawned by a bobber.
- */
-interface BaitSpawnPokemonEvent {
-
-    /**
-     * Event that is fired before a Pokemon is spawned by a bobber.
-     * @param bobber The PokeRodFishingBobberEntity that is spawning the Pokemon.
-     * @param chosenBucket The bucket that is chosen.
-     * @param rod The ItemStack of the rod that the bobber is attached to.
-     */
-    data class Pre(
-        val bobber: PokeRodFishingBobberEntity, // todo replace this with the bait entity
-        val chosenBucket: SpawnBucket,
-        val rod: ItemStack
-    ) : Cancelable(), BobberSpawnPokemonEvent
-
-    /**
-     * Event that is fired when a Pokemon is modified before it is spawned by a bobber.
-     * @param chosenBucket The bucket that is chosen.
-     * @param rod The ItemStack of the rod that the bobber is attached to.
-     * @param pokemon The Pokemon that is modified.
-     */
-    data class Modify(
-        val chosenBucket: SpawnBucket,
-        val rod: ItemStack,
-        val pokemon: PokemonEntity
-    ) : BobberSpawnPokemonEvent
-
-    /**
-     * Event that is fired after a Pokemon is spawned by a bobber.
-     * @param bobber The PokeRodFishingBobberEntity that is spawning the Pokemon.
-     * @param chosenBucket The bucket that is chosen.
-     * @param bait The ItemStack of the bait that is set on the rod.
-     * @param pokemon The Pokemon that is spawned.
-     */
-    data class Post(
-        val bobber: PokeRodFishingBobberEntity,
-        val chosenBucket: SpawnBucket,
-        val bait: ItemStack,
-        val pokemon: PokemonEntity
-    ) : BobberSpawnPokemonEvent
-}

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

@@ -8,16 +8,10 @@
 
 package com.cobblemon.mod.common.api.events.fishing
 
-import com.bedrockk.molang.runtime.value.DoubleValue
-import com.bedrockk.molang.runtime.value.MoValue
 import com.cobblemon.mod.common.api.events.Cancelable
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMoLangValue
-import com.cobblemon.mod.common.api.molang.ObjectValue
 import com.cobblemon.mod.common.api.spawning.SpawnBucket
 import com.cobblemon.mod.common.entity.fishing.PokeRodFishingBobberEntity
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
-import com.cobblemon.mod.common.util.itemRegistry
-import net.minecraft.core.registries.Registries
 import net.minecraft.world.item.ItemStack
 
 /**
@@ -61,11 +55,5 @@ interface BobberSpawnPokemonEvent {
         val chosenBucket: SpawnBucket,
         val bait: ItemStack,
         val pokemon: PokemonEntity
-    ) : BobberSpawnPokemonEvent {
-        val context = mutableMapOf<String, MoValue>(
-            "chosen_bucket" to ObjectValue(chosenBucket, { it.name }),
-            "bait" to pokemon.level().itemRegistry.wrapAsHolder(bait.item).asMoLangValue(Registries.ITEM),
-            "pokemon_entity" to pokemon.asMoLangValue()
-        )
-    }
+    ) : BobberSpawnPokemonEvent
 }

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

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

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

@@ -8,18 +8,10 @@
 
 package com.cobblemon.mod.common.api.events.pokemon
 
-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.pokemon.Pokemon
 import net.minecraft.server.level.ServerPlayer
 
 data class FossilRevivedEvent (
     val pokemon: Pokemon,
     val player: ServerPlayer?
-) {
-    val context = mutableMapOf<String, MoValue>(
-        "pokemon" to pokemon.struct,
-        "player" to (player?.asMoLangValue() ?: DoubleValue.ZERO)
-    )
-}
+)

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

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

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

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

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

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

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

@@ -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,

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

@@ -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 },
-    )
 }

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

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

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

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

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

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

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

@@ -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) {
@@ -31,7 +28,7 @@ data class PokemonInteractionGUICreationEvent(
 
     private fun getNextFreeOrientation(): Orientation {
         var largest = Orientation.TOP_LEFT
-        for (orientation in Orientation.entries) {
+        for(orientation in Orientation.values()) {
             if(!options.containsKey(orientation)) {
                 return orientation
             } else {

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

@@ -22,5 +22,5 @@ import net.minecraft.server.level.ServerPlayer
  */
 data class WallpaperCollectionEvent(
     val player: ServerPlayer,
-    val wallpapers: MutableSet<ResourceLocation>
+    val wallpapers: MutableList<ResourceLocation>
 )

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

@@ -1,57 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.events.storage
-
-import com.bedrockk.molang.runtime.value.DoubleValue
-import com.bedrockk.molang.runtime.value.MoValue
-import com.cobblemon.mod.common.api.events.Cancelable
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMoLangValue
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.moLangFunctionMap
-import com.cobblemon.mod.common.api.storage.pc.PCStore
-import com.cobblemon.mod.common.api.storage.pc.UnlockablePCWallpaper
-import com.cobblemon.mod.common.util.asArrayValue
-import com.cobblemon.mod.common.util.getBoolean
-import net.minecraft.server.level.ServerPlayer
-
-/**
- * Event fired when a wallpaper is unlocked for a PC. Typically, this will have a single player, but it is not
- * technically guaranteed to due to shared PCs and offline support.
- *
- * @author Hiroku
- * @since February 10th, 2025
- */
-data class WallpaperUnlockedEvent(
-    val pc: PCStore,
-    val wallpaper: UnlockablePCWallpaper,
-    var shouldNotify: Boolean
-): Cancelable() {
-    /** For shared PCs with multiple players online, and for offline PC access, the player will be null. */
-    val player: ServerPlayer?
-        get() = pc.getObservingPlayers().takeIf { it.size == 1 }?.first()
-
-    /** All online, observing players for the PC. This would typically have a single player in it. */
-    val players = pc.getObservingPlayers()
-
-    val context: MutableMap<String, MoValue>
-        get() = mutableMapOf(
-            "pc" to pc.struct,
-            "wallpaper" to wallpaper.struct,
-            "player" to (player?.asMoLangValue() ?: DoubleValue.ZERO),
-            "players" to players.asArrayValue { it.asMoLangValue() },
-            "should_notify" to DoubleValue(shouldNotify)
-        )
-
-    val functions = moLangFunctionMap(
-        cancelFunc,
-        "set_should_notify" to { params ->
-            shouldNotify = params.getBoolean(0)
-            DoubleValue.ONE
-        }
-    )
-}

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

@@ -8,8 +8,6 @@
 
 package com.cobblemon.mod.common.api.fishing
 
-import com.cobblemon.mod.common.api.conditional.ITEM_REGISTRY_LIKE_CODEC
-import com.cobblemon.mod.common.api.conditional.RegistryLikeCondition
 import com.cobblemon.mod.common.api.events.CobblemonEvents
 import com.cobblemon.mod.common.api.events.fishing.BaitEffectFunctionRegistryEvent
 import com.cobblemon.mod.common.api.spawning.fishing.FishingSpawnCause
@@ -18,14 +16,18 @@ import com.cobblemon.mod.common.util.cobblemonResource
 import com.mojang.serialization.Codec
 import com.mojang.serialization.codecs.RecordCodecBuilder
 import java.util.Optional
+import net.minecraft.core.Registry
 import net.minecraft.network.codec.ByteBufCodecs
 import net.minecraft.resources.ResourceLocation
 import net.minecraft.world.item.Item
+import net.minecraft.world.item.ItemStack
 
-class SpawnBait(
-    val item: RegistryLikeCondition<Item>,
+data class FishingBait(
+    val item: ResourceLocation,
     val effects: List<Effect>,
 ) {
+    fun toItemStack(itemRegistry: Registry<Item>) = item.let(itemRegistry::get)?.let { ItemStack(it) } ?: ItemStack.EMPTY
+
     data class Effect(
         val type: ResourceLocation,
         val subcategory: ResourceLocation?,
@@ -47,14 +49,19 @@ class SpawnBait(
     }
 
     companion object {
-        val CODEC = RecordCodecBuilder.create<SpawnBait> { instance ->
+        val CODEC = RecordCodecBuilder.create<FishingBait> { instance ->
             instance.group(
-                ITEM_REGISTRY_LIKE_CODEC.fieldOf("item").forGetter { it.item },
+                ResourceLocation.CODEC.fieldOf("item").forGetter { it.item },
                 Effect.CODEC.listOf().fieldOf("effects").forGetter {it.effects}
-            ).apply(instance, ::SpawnBait)
+            ).apply(instance, ::FishingBait)
         }
 
         val STREAM_CODEC = ByteBufCodecs.fromCodec(CODEC)
+
+        val BLANK_BAIT = FishingBait(
+            cobblemonResource("blank"),
+            emptyList()
+        )
     }
 
     object Effects {
@@ -71,7 +78,7 @@ class SpawnBait(
         val HIDDEN_ABILITY_CHANCE = cobblemonResource("ha_chance")
         val POKEMON_CHANCE = cobblemonResource("pokemon_chance")
         val FRIENDSHIP = cobblemonResource("friendship")
-        val RARITY_BUCKET = cobblemonResource("rarity_bucket")
+        val INERT = cobblemonResource("inert")
 
         fun registerEffect(type: ResourceLocation, effect: (PokemonEntity, Effect) -> Unit) {
             EFFECT_FUNCTIONS[type] = effect
@@ -82,15 +89,15 @@ class SpawnBait(
         }
 
         fun setupEffects() {
-            registerEffect(NATURE) { entity, effect -> FishingSpawnCause.alterNatureAttempt(entity, effect) }
-            registerEffect(IV) { entity, effect -> FishingSpawnCause.alterIVAttempt(entity, effect) }
-            registerEffect(SHINY_REROLL) { entity, effect -> FishingSpawnCause.shinyReroll(entity, effect) }
-            registerEffect(GENDER_CHANCE) { entity, effect -> FishingSpawnCause.alterGenderAttempt(entity, effect) }
-            registerEffect(LEVEL_RAISE) { entity, effect -> FishingSpawnCause.alterLevelAttempt(entity, effect) }
-            registerEffect(HIDDEN_ABILITY_CHANCE) { entity, _ -> FishingSpawnCause.alterHAAttempt(entity) }
-            registerEffect(FRIENDSHIP) { entity, effect -> FishingSpawnCause.alterFriendshipAttempt(entity, effect) }
+            EFFECT_FUNCTIONS[NATURE] = { entity, effect -> FishingSpawnCause.alterNatureAttempt(entity, effect) }
+            EFFECT_FUNCTIONS[IV] = { entity, effect -> FishingSpawnCause.alterIVAttempt(entity, effect) }
+            EFFECT_FUNCTIONS[SHINY_REROLL] = { entity, effect -> FishingSpawnCause.shinyReroll(entity, effect) }
+            EFFECT_FUNCTIONS[GENDER_CHANCE] = { entity, effect -> FishingSpawnCause.alterGenderAttempt(entity, effect) }
+            EFFECT_FUNCTIONS[LEVEL_RAISE] = { entity, effect -> FishingSpawnCause.alterLevelAttempt(entity, effect) }
+            EFFECT_FUNCTIONS[HIDDEN_ABILITY_CHANCE] = { entity, _ -> FishingSpawnCause.alterHAAttempt(entity) }
+            EFFECT_FUNCTIONS[FRIENDSHIP] = { entity, effect -> FishingSpawnCause.alterFriendshipAttempt(entity, effect) }
             CobblemonEvents.BAIT_EFFECT_REGISTRATION.post(BaitEffectFunctionRegistryEvent()) { event ->
-                event.functions.forEach { (type, function) -> registerEffect(type, function) }
+                EFFECT_FUNCTIONS.putAll(event.functions)
             }
         }
     }

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

@@ -0,0 +1,114 @@
+/*
+ * 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.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.util.adapters.IdentifierAdapter
+import com.cobblemon.mod.common.util.cobblemonResource
+import com.google.gson.Gson
+import com.google.gson.GsonBuilder
+import com.google.gson.reflect.TypeToken
+import net.minecraft.core.registries.BuiltInRegistries
+import net.minecraft.resources.ResourceLocation
+import net.minecraft.server.level.ServerPlayer
+import net.minecraft.server.packs.PackType
+import net.minecraft.world.item.ItemStack
+
+object FishingBaits : JsonDataRegistry<FishingBait>{
+    override val id = cobblemonResource("fishing_baits")
+    override val type = PackType.SERVER_DATA
+    override val observable = SimpleObservable<FishingBaits>()
+    override val typeToken: TypeToken<FishingBait> = TypeToken.get(FishingBait::class.java)
+    override val resourcePath = "fishing_baits"
+    override val gson: Gson = GsonBuilder()
+        .registerTypeAdapter(ResourceLocation::class.java, IdentifierAdapter)
+        .setPrettyPrinting()
+        .create()
+
+    private val itemMap = mutableMapOf<ResourceLocation, FishingBait>()
+
+    override fun sync(player: ServerPlayer) {
+        FishingBaitRegistrySyncPacket(this.itemMap.values.toList()).sendToPlayer(player)
+    }
+
+    override fun reload(data: Map<ResourceLocation, FishingBait>) {
+        itemMap.clear()
+        data.forEach { id, bait ->
+            itemMap[bait.item] = bait
+        }
+    }
+
+    fun getFromRodItemStack(stack: ItemStack): FishingBait? {
+        return stack.components.get(CobblemonItemComponents.BAIT)?.bait
+    }
+
+    fun getFromBaitItemStack(stack: ItemStack): FishingBait? {
+        return getFromIdentifier(BuiltInRegistries.ITEM.getKey(stack.item))
+    }
+
+    fun getFromIdentifier(identifier: ResourceLocation): FishingBait? {
+        return itemMap[identifier]
+    }
+
+    fun isFishingBait(stack: ItemStack) = itemMap.containsKey(BuiltInRegistries.ITEM.getKey(stack.item))
+
+//
+//
+//    fun getBaitSubcategory(item: ItemStack): String? {
+//        val itemId = Registries.ITEM.getId(item.item)
+//        if (itemId in itemMap.keys) {
+//            return itemMap[itemId]?.subcategory
+//        }
+//        val tag = tagMap.keys.firstOrNull { it.fits(item.item, Registries.ITEM) }
+//        if (tag != null) {
+//            return tagMap[tag]?.subcategory
+//        }
+//        return null
+//    }
+//
+//    fun getBaitSuccessChance(item: ItemStack): Double? {
+//        val itemId = Registries.ITEM.getId(item.item)
+//        if (itemId in itemMap.keys) {
+//            return itemMap[itemId]?.chance
+//        }
+//        val tag = tagMap.keys.firstOrNull { it.fits(item.item, Registries.ITEM) }
+//        if (tag != null) {
+//            return tagMap[tag]?.chance
+//        }
+//        return null
+//    }
+//
+//    fun getBaitEffectValue(item: ItemStack): Double? {
+//        val itemId = Registries.ITEM.getId(item.item)
+//        if (itemId in itemMap.keys) {
+//            return itemMap[itemId]?.value
+//        }
+//        val tag = tagMap.keys.firstOrNull { it.fits(item.item, Registries.ITEM) }
+//        if (tag != null) {
+//            return tagMap[tag]?.value
+//        }
+//        return null
+//    }
+//
+//
+//    fun getBaitNote(item: ItemStack): String? {
+//        val itemId = Registries.ITEM.getId(item.item)
+//        if (itemId in itemMap.keys) {
+//            return itemMap[itemId]?.note
+//        }
+//        val tag = tagMap.keys.firstOrNull { it.fits(item.item, Registries.ITEM) }
+//        if (tag != null) {
+//            return tagMap[tag]?.note
+//        }
+//        return null
+//    }
+}

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

@@ -1,103 +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.fishing
-
-import com.cobblemon.mod.common.CobblemonItemComponents
-import com.cobblemon.mod.common.api.conditional.RegistryLikeCondition
-import com.cobblemon.mod.common.api.conditional.RegistryLikeIdentifierCondition
-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.SpawnBaitRegistrySyncPacket
-import com.cobblemon.mod.common.util.adapters.IdentifierAdapter
-import com.cobblemon.mod.common.util.adapters.ItemLikeConditionAdapter
-import com.cobblemon.mod.common.util.cobblemonResource
-import com.google.gson.Gson
-import com.google.gson.GsonBuilder
-import com.google.gson.reflect.TypeToken
-import net.minecraft.core.Holder
-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 SpawnBaitEffects : JsonDataRegistry<SpawnBait> {
-    override val id = cobblemonResource("spawn_bait_effects")
-    override val type = PackType.SERVER_DATA
-    override val observable = SimpleObservable<SpawnBaitEffects>()
-    override val typeToken: TypeToken<SpawnBait> = TypeToken.get(SpawnBait::class.java)
-    override val resourcePath = "spawn_bait_effects"
-    override val gson: Gson = GsonBuilder()
-        .registerTypeAdapter(ResourceLocation::class.java, IdentifierAdapter)
-        .registerTypeAdapter(TypeToken.getParameterized(RegistryLikeCondition::class.java, Item::class.java).type, ItemLikeConditionAdapter)
-        .setPrettyPrinting()
-        .create()
-
-    private val effectsMap = mutableMapOf<ResourceLocation, SpawnBait>()
-
-    override fun sync(player: ServerPlayer) {
-        SpawnBaitRegistrySyncPacket(this.effectsMap.toMap()).sendToPlayer(player)
-    }
-
-    override fun reload(data: Map<ResourceLocation, SpawnBait>) {
-        effectsMap.clear()
-        data.forEach { id, bait ->
-            effectsMap[id] = bait
-        }
-    }
-
-    fun getEffectsFromRodItemStack(stack: ItemStack): List<SpawnBait.Effect> {
-        return getEffectsFromItemStack(stack.components.get(CobblemonItemComponents.BAIT)?.stack ?: ItemStack.EMPTY)
-    }
-
-    fun getEffectsFromItemStack(stack: ItemStack): List<SpawnBait.Effect> {
-        val componentEffects = stack.get(CobblemonItemComponents.BAIT_EFFECTS)?.effects ?: emptyList()
-        return componentEffects.mapNotNull(::getFromIdentifier).flatMap { it.effects } +
-                getEffectsFromItem(stack.itemHolder)
-    }
-
-    fun getBaitIdentifiersFromItem(holder: Holder<Item>): List<ResourceLocation> {
-        return effectsMap.entries.filter { it.value.item.fits(holder) }.map { it.key }
-    }
-
-    fun getBaitFromItemStack(holder: Holder<Item>): List<SpawnBait> {
-        return effectsMap.values.filter { it.item.fits(holder) }
-    }
-
-    private fun getEffectsFromItem(holder: Holder<Item>): List<SpawnBait.Effect> {
-        return getBaitFromItemStack(holder).flatMap { it.effects }
-    }
-
-    fun getFromIdentifier(identifier: ResourceLocation): SpawnBait? {
-        // Check normal spawn bait registry
-        effectsMap[identifier]?.let { return it }
-
-        // check seasoning spawn bait registry
-        if (identifier.namespace == "seasonings") {
-            val seasoning = com.cobblemon.mod.common.api.cooking.Seasonings.seasonings.find {
-                it.ingredient is RegistryLikeIdentifierCondition &&
-                        (it.ingredient as RegistryLikeIdentifierCondition<Item>).identifier.path == identifier.path
-            }
-
-            if (seasoning != null && seasoning.baitEffects.isNotEmpty()) {
-                return SpawnBait(
-                    item = seasoning.ingredient,
-                    effects = seasoning.baitEffects
-                )
-            }
-        }
-
-        return null
-    }
-
-    fun isFishingBait(stack: ItemStack): Boolean {
-        val holder = stack.itemHolder
-        return stack.has(CobblemonItemComponents.BAIT_EFFECTS) || effectsMap.values.any { it.item.fits(holder) }
-    }
-}

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

@@ -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.fishing
-
-object SpawnBaitUtils {
-    fun mergeEffects(effects: List<SpawnBait.Effect>): List<SpawnBait.Effect> {
-        val grouped = effects.groupBy { Pair(it.type, it.subcategory) }
-
-        return grouped.map { (key, groupEffects) ->
-            val (type, subcategory) = key
-
-            if (type == SpawnBait.Effects.RARITY_BUCKET) {
-                // we want to keep the highest rarity bucket effect instead of merging them
-                groupEffects.maxByOrNull { it.value }!!
-            } else {
-                val count = groupEffects.size
-                val totalChance = groupEffects.sumOf { it.chance }
-                val totalValue = groupEffects.sumOf { it.value }
-
-                val multiplier = when (count) {
-                    2 -> 0.8
-                    3 -> 0.9
-                    else -> 1.0
-                }
-
-                val adjustedChance = (totalChance * multiplier).coerceAtMost(1.0)
-                val adjustedValue = totalValue * multiplier
-
-                SpawnBait.Effect(type, subcategory, adjustedChance, adjustedValue)
-            }
-        }
-    }
-}