Custom Rendering for Overlay, Am not satisfied yet

# Conflicts:
#	common/src/main/kotlin/com/cobblemon/mod/common/CobblemonCommands.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/CobblemonItems.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/CobblemonNetwork.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/api/molang/MoLangFunctions.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/api/riding/RidingManager.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/PosableModel.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/PokemonEntity.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/PokemonServerDelegate.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/spawn/SpawnPokemonPacket.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/pokemon/Species.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/pokemon/ai/PokemonBrain.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/util/EntityExtensions.kt
#	common/src/main/resources/data/cobblemon/behaviours/pokemon/pokemon_breeding.json
#	common/src/main/resources/data/cobblemon/behaviours/pokemon/pokemon_core.json

CHANGELOG-AI.md

@@ -2,8 +2,6 @@
 - Rebuilt Pokémon AI to use Minecraft's Brain system, allowing for more complex behaviours and interactions.
   - As an early pass of this, pastured Pokémon will now sleep when appropriate, and may come up to you when they see you.
   - Probably also added a whole bunch of bugs.
-  - Growlithe and Arcanine intimidate Skeletons.
-  - Meowth intimidate Creepers and Phantoms.
 - Added a Behaviour Editor to the NPC editing screen.
 - Added /behaviouredit command for opening the Behaviour Editor on Pokémon and NPCs.
   - Editing variables for Pokémon is not yet supported.

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-PC.md

@@ -6,8 +6,6 @@
 - 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.
-- improved filter by Name, now is available search by exact names or partial matches, for example "cha" will show Charmander, Charmeleon and Charizard among others that match.
 
 ### Developer
 - Added `RenamePCBoxEvent.Pre` and `RenamePCBoxEvent.Post` events to prevent players from renaming a box or changing their input.

CHANGELOG-SPAWNING.md

@@ -1,16 +0,0 @@
-
-### Additions
-- Pokémon can now spawn in herds, either as distinct herd groupings or simply several Pokémon spawning at once.
-
-### Fixes
-- Fixed the "enabled" property in spawn files not actually being respected. Where do they find these devs?
-
-### Developer
-- Spawning Influences now have the context of what the other buckets are when adjusting bucket weights. This will break existing influences that do bucket weight adjustment.
-- Renamed heaps of things in the spawning system to make more sense.
-  - SpawningContext is now SpawnablePosition
-  - WorldSlice is SpawningZone
-  - SpawningProspector is now SpawningZoneGenerator
-- Renamed things in Spawn Rules to go with the other renames:
-  - contextSelector is now spawnablePositionSelector
-  - context is now spawnable_position

CHANGELOG.md

@@ -19,17 +19,6 @@
   - 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.
-- Added the Clear Amulet, Grip Claw, Lagging Tail, Luminous Moss, Metal Alloy, Scroll of Darkness, Scroll of Waters
-- Added Recipes for Masterpiece Cup, Eject Pack
-- Added modification to Minecraft Creative Inventory search to account for item names that contain `poké` when input contains `poke`.
-- Added Campfire Pot as well as loads of new food items (Poke Puffs, Ponigiri, Sinister Tea, etc)
-- Added Hearty Grains, a new crop used in the new cooking mechanic
-- Added Tatami blocks and Tatami Mat blocks, made from Hearty Grain, for decorating builds
-- Added `/pcsearch <player> <pokemonProperties>` command that searches for a specific Pokémon within a player's PC.
-- Added `/pctake <player> <box> <slot>` command that takes a specific Pokémon from a player's PC. Removes the pokemon if target is self or ran from the server.
-- Added Hyper Training items (IV Modification) as well as some additional candy items to do so (Health Candy, Sickly Candy)
 
 ### Pokémon Added
 
@@ -123,13 +112,12 @@
 - 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, Chipped Pot, Cracked Pot, Unremarkable Cup, Loaded Dice, Charcoal Stick, Dragon Fang, Miracle Seed, Mystic Water, Never Melt Ice, Twisted Spoon, Black Glasses, Fairy Feather, Hard Stone, Silver Powder, Soft Sand
-- Added alternate ingredient options to the following recipes: Cell Battery, Damp Rock, Heat Rock, Icy Rock, Smooth Rock
+- 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.
-- Added herbs and snowballs to the consumable in PvE and Wild battle 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.
@@ -139,20 +127,6 @@
 - 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
-- Changed the recipes for Level, Lure, and Moon Balls to be cleaner
-- Renamed `pokemonId` and `type` to `species` in relevant Advancement triggers for conformity, this is a breaking change.
-- Added a separate `species` argument to the `pick_starter`, `pasture_use` and `resurrect_pokemon` Advancement triggers.
-- Made `CobblemonAgingDespawner` thresholds configurable via the config file.
-- Tweaked Berry flavor data to balance cooking pot mechanics
-- Made Red, Yellow, Green, Blue, Pink, Black, and White Apricorn Sprout and Saccharine Sapling able to be placed into flower pots.
-- Added all Potted Apricorn Sprouts, Potted Saccharine Saplings, and Potted Pep-Up Flowers to the `#minecraft:flower_pots` block tag
-- Corrected the healing values of the remedies and energy root, and reintroduced the friendship lowering mechanics for them, revivl herb, and heal powder
-- Updated battle language keys for side effects to use position-specific formats, improving grammatical consistency
 
 ### Fixes
 - Fixed Particles sometimes facing the wrong direction (looking at you, Swords Dance)
@@ -182,21 +156,8 @@
 - 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
 - Fixed Moon Stones not interacting properly with dripstone blocks.
-- Fixed some effects like particles from fishing rods appearing for players in the same coordinates in another world.
-- Fixed an issue with Sketch where the Pokémon using Sketch would not properly learn moves with special characters in their name (e.g. King's Shield, Baby-Doll Eyes, etc.)
-- Fixed wild Pokémon sometimes spawning with incorrect friendship values
-- Fixed typo while saving/loading NPCEntity causes data loss
-- Fixed an issue where catching a Pokémon while it was leashed to a fence would not update the fence.
-- Fixed the `dimensions` spawning condition using the incorrect ResourceLocation, causing it to not function properly.
-- Fix issue where locator X axis was not aligned with blockbench.
-- Fix issue where particle effects that play on frame 1 on sendout would never play (Gastly)
-- Fixed the block texture name for the Pep-Up Flower being inaccurate
-- Fixed issue where the restoration tank would not accept valid items from a hopper.
-- Fixed energy root not being shearable
-- Fixed energy root always spreading into more energy roots instead of by chance (same as big root)
 
 ### Developer
 - A finished battle now has winners and losers set inside of `PokemonBattle` instead of them always being empty.
@@ -215,17 +176,7 @@
 - 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
-    }
-  }
-  `
-- The IVs class has now been extended to include Hyper Trained values.
-- Added `Pokemon#hyperTrainIV()` and `IVs#setHyperTrainedIV(Stat, Int)`
-  
+
 ### 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
@@ -244,14 +195,6 @@
 - 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}`.
-- Added `play_sound_on_server` as an available Molang function for the `worldHolder` & `player` functions.
-- Added `run_molang_after` as an available Molang function for the `entity` functions when schedulable.
-- Added an optional parameter for `run_molang` to schedule the function.
-- Added `labels` & `has_label` as available Molang functions for the `speciesFunctions`
-- Added datapack-defined starter categories via `data/<namespace>/starters/*.json`, with built-in fallback and `useConfigStarters` merge option.
-- The format of the `remedies.json` file has changed to allow for individual friendshipDrop amounts per remedy
-- Fixed `entity.find_nearby_block` causing crashes when attempting to use a block tag
-- Spawn Filters can now access `v.spawn.class` to get the identifier of an NPC class for when trying to influence NPC spawns
 
 ## [1.6.1 (January 26th, 2025)](#1-6-1)
 

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/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/EntitySkeletonMixin.java

@@ -28,7 +28,7 @@ public class EntitySkeletonMixin extends Mob {
         super(entityType, world);
     }
 
-    @Inject(method = "registerGoals", at = @At(value = "TAIL"))
+    @Inject(method = "registerGoals", at = @At(value = "TAIL"), cancellable = false)
     private void cobblemon$initGoals(CallbackInfo callbackInfo) {
         final AbstractSkeleton skeleton = (AbstractSkeleton) (Object) this;
         // Pokemon Entities

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

@@ -0,0 +1,37 @@
+/*
+ * 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.client.player.LocalPlayer;
+import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
+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(LocalPlayer.class)
+public abstract class LocalPlayerMixin {
+    @Shadow
+    private float jumpRidingScale;
+
+    @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);
+            }
+        }
+    }
+}

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

@@ -15,9 +15,12 @@ import com.cobblemon.mod.common.api.events.CobblemonEvents;
 import com.cobblemon.mod.common.api.events.item.LeftoversCreatedEvent;
 import com.cobblemon.mod.common.api.orientation.OrientationController;
 import com.cobblemon.mod.common.api.pokemon.PokemonSpecies;
+import com.cobblemon.mod.common.api.riding.Seat;
 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.client.entity.PokemonClientDelegate;
+import com.cobblemon.mod.common.client.render.MatrixWrapper;
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
 import com.cobblemon.mod.common.pokedex.scanner.PokedexEntityData;
 import com.cobblemon.mod.common.pokedex.scanner.ScannableEntity;
@@ -37,16 +40,18 @@ 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.*;
 import net.minecraft.world.entity.item.ItemEntity;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.food.FoodProperties;
 import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.level.ClipContext;
 import net.minecraft.world.level.Level;
+import net.minecraft.world.phys.HitResult;
+import net.minecraft.world.phys.Vec3;
 import org.jetbrains.annotations.Nullable;
+import org.joml.Matrix3f;
+import org.joml.Vector3f;
 import org.objectweb.asm.Opcodes;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
@@ -279,4 +284,41 @@ public abstract class PlayerMixin extends LivingEntity implements ScannableEntit
     public OrientationController getOrientationController() {
         return cobblemon$orientationController;
     }
+
+    @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();
+            Matrix3f orientation = controller.isActive() && controller.getOrientation() != null ? controller.getOrientation() : new Matrix3f();
+            Vec3 rotatedEyeHeight = new Vec3(orientation.transform(new Vector3f(0f, currEyeHeight - (this.getBbHeight() / 2), 0f)));
+
+            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);
+    }
 }

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/StructureMixin.java

@@ -1,67 +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.world.CobblemonStructureIDs;
-import com.llamalad7.mixinextras.sugar.Local;
-import net.minecraft.core.Holder;
-import net.minecraft.core.RegistryAccess;
-import net.minecraft.core.registries.Registries;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.level.ChunkPos;
-import net.minecraft.world.level.LevelHeightAccessor;
-import net.minecraft.world.level.biome.Biome;
-import net.minecraft.world.level.biome.BiomeSource;
-import net.minecraft.world.level.chunk.ChunkGenerator;
-import net.minecraft.world.level.levelgen.RandomState;
-import net.minecraft.world.level.levelgen.structure.Structure;
-import net.minecraft.world.level.levelgen.structure.StructurePiece;
-import net.minecraft.world.level.levelgen.structure.StructureStart;
-import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplateManager;
-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.CallbackInfoReturnable;
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.function.Predicate;
-
-@Mixin(Structure.class)
-public abstract class StructureMixin {
-    // Define a set of structures that should not spawn below Sea Level
-    @Unique
-    private static final Set<ResourceLocation> RESTRICTED_STRUCTURES = new HashSet<>(Arrays.asList(
-            CobblemonStructureIDs.STONJOURNER_HENGE,
-            CobblemonStructureIDs.LUNA_HENGE,
-            CobblemonStructureIDs.SOL_HENGE
-    ));
-
-    @Inject(method = "generate", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/levelgen/structure/StructureStart;isValid()Z"),
-            cancellable = true)
-    public void cobblemon$isValid(RegistryAccess registryAccess, ChunkGenerator chunkGenerator, BiomeSource biomeSource,
-                                  RandomState randomState, StructureTemplateManager structureTemplateManager, long seed,
-                                  ChunkPos chunkPos, int references, LevelHeightAccessor heightAccessor,
-                                  Predicate<Holder<Biome>> validBiome,
-                                  CallbackInfoReturnable<StructureStart> cir,
-                                  @Local StructureStart structureStart) {
-        ResourceLocation structureKey = registryAccess.registryOrThrow(Registries.STRUCTURE).getKey((Structure) (Object) this);
-        if(!RESTRICTED_STRUCTURES.contains(structureKey)) {
-            return;
-        }
-        for (StructurePiece piece : structureStart.getPieces()) {
-            if (piece.getBoundingBox().minY() < chunkGenerator.getSeaLevel()) {
-                cir.setReturnValue(StructureStart.INVALID_START);
-                return;
-            }
-        }
-    }
-}

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/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/client/CameraMixin.java

@@ -12,15 +12,24 @@ import com.cobblemon.mod.common.Cobblemon;
 import com.cobblemon.mod.common.OrientationControllable;
 import com.cobblemon.mod.common.api.orientation.OrientationController;
 import com.cobblemon.mod.common.api.riding.Rideable;
+import com.cobblemon.mod.common.api.riding.Seat;
 import com.cobblemon.mod.common.client.MountedPokemonAnimationRenderController;
-import com.cobblemon.mod.common.client.render.camera.MountedCameraRenderer;
+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.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.util.Mth;
 import net.minecraft.world.entity.Entity;
+import net.minecraft.world.level.BlockGetter;
+import net.minecraft.world.level.ClipContext;
+import net.minecraft.world.phys.HitResult;
 import net.minecraft.world.phys.Vec3;
 import org.joml.Matrix3f;
 import org.joml.Quaternionf;
@@ -33,6 +42,8 @@ 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(Camera.class)
 public abstract class CameraMixin {
     @Shadow private Entity entity;
@@ -48,14 +59,19 @@ public abstract class CameraMixin {
 
     @Shadow protected abstract void setPosition(Vec3 pos);
 
+    @Shadow
+    private BlockGetter level;
+
+    @Shadow private float partialTickTime;
     @Unique private float returnTimer = 0;
     @Unique private float rollAngleStart = 0;
     @Unique Minecraft minecraft = Minecraft.getInstance();
 
-    @Inject(method = "setRotation", at = @At("HEAD"), cancellable = true)
+    @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) || Cobblemon.config.getDisableRoll()) return;
+        if (!(this.entity instanceof OrientationControllable controllable) || disableRollableCameraDebug) return;
         var controller = controllable.getOrientationController();
         if (!controller.isActive() && controller.getOrientation() != null) {
             if(this.returnTimer < 1) {
@@ -89,6 +105,7 @@ public abstract class CameraMixin {
         ci.cancel();
     }
 
+    //If you want to move this to a delagate you need an AW for position
     @WrapOperation(method = "setup", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/Camera;setPosition(DDD)V"))
     public void cobblemon$positionCamera(Camera instance, double x, double y, double z, Operation<Void> original, @Local(ordinal = 1, argsOnly = true) boolean thirdPersonReverse) {
         Entity entity = instance.getEntity();
@@ -96,25 +113,75 @@ public abstract class CameraMixin {
         MountedPokemonAnimationRenderController.INSTANCE.reset();
 
         if(vehicle instanceof Rideable){
-            Vec3 position = MountedCameraRenderer.INSTANCE.getCameraPosition(
-                    instance,
-                    entity,
-                    vehicle,
-                    x,
-                    y,
-                    z,
-                    thirdPersonReverse,
-                    eyeHeightOld,
-                    eyeHeight
-            );
-
-            if(position != null){
-                setPosition(position);
+            //RidingCameraDelagate.INSTANCE.positionCamera(instance, x, y, z, original);
+            if (!(vehicle instanceof PokemonEntity pokemon)) {
+                original.call(instance, x, y, z);
                 return;
             }
-        }
 
-        original.call(instance, x, y, z);
+            PokemonClientDelegate delegate = (PokemonClientDelegate) pokemon.getDelegate();
+            Vec3 entityPos = new Vec3(
+                    Mth.lerp(instance.getPartialTickTime(), pokemon.xOld, pokemon.getX()),
+                    Mth.lerp(instance.getPartialTickTime(), pokemon.yOld, pokemon.getY()),
+                    Mth.lerp(instance.getPartialTickTime(), pokemon.zOld, pokemon.getZ())
+            );
+            MountedPokemonAnimationRenderController.INSTANCE.setup(pokemon, partialTickTime);
+            int seatIndex = pokemon.getPassengers().indexOf(entity);
+            Seat seat = pokemon.getSeats().get(seatIndex);
+
+            OrientationControllable rollable = (OrientationControllable) entity;
+            OrientationController controller = rollable.getOrientationController();
+
+            if (!instance.isDetached() || Cobblemon.config.getThirdPartyViewBobbing()) {
+                MatrixWrapper locator = delegate.getLocatorStates().get(seat.getLocator());
+
+                if (locator == null) {
+                    original.call(instance, x, y, z);
+                    return;
+                }
+
+                Vec3 locatorOffset = new Vec3(locator.getMatrix().getTranslation(new Vector3f()));
+
+                float currEyeHeight = Mth.lerp(instance.getPartialTickTime(), eyeHeightOld, eyeHeight);
+                var rotatedEyeHeight = new Vector3f(0f, currEyeHeight - (entity.getBbHeight() / 2), 0f);
+                if (controller.isActive()) {
+                    rotatedEyeHeight = controller.getRenderOrientation(partialTickTime).transform(rotatedEyeHeight);
+                }
+
+                Vec3 position = locatorOffset.add(entityPos).add(new Vec3(rotatedEyeHeight));
+                setPosition(position);
+            } else {
+                Vector3f pos = entityPos.add(new Vec3(0, pokemon.getBbHeight() / 2, 0)).toVector3f();
+
+                PosableModel model = VaryingModelRepository.INSTANCE.getPoser(pokemon.getPokemon().getSpecies().getResourceIdentifier(), new FloatingState());
+                Map<String, Vec3> cameraOffsets = model.getSeatToCameraOffset();
+
+                Vec3 cameraOffset;
+                if (thirdPersonReverse && cameraOffsets.containsKey(seat.getLocator() + "_reverse")) {
+                    cameraOffset = cameraOffsets.get(seat.getLocator() + "_reverse");
+                } else if (cameraOffsets.containsKey(seat.getLocator())) {
+                    cameraOffset = cameraOffsets.get(seat.getLocator());
+                } else {
+                    cameraOffset = new Vec3(0f, 2f, 4f);
+                }
+
+                Vector3f offset = cameraOffset.toVector3f();
+
+                if (thirdPersonReverse) offset.z *= -1;
+                float xRot = (float) (-1 * Math.toRadians(instance.getXRot()));
+
+                Matrix3f orientation = controller.isActive() && controller.getOrientation() != null ? controller.getOrientation() : new Matrix3f().rotateY((float) Math.toRadians(180f - instance.getYRot())).rotateX(xRot);
+                Vector3f rotatedOffset = orientation.transform(offset);
+                float offsetDistance = rotatedOffset.length();
+                Vector3f offsetDirection = rotatedOffset.mul(1 / offsetDistance);
+
+                float maxZoom = cobblemon$getMaxZoom(offsetDistance, offsetDirection, pos);
+
+                setPosition(new Vec3(offsetDirection.mul(maxZoom).add(pos)));
+            }
+        } else {
+            original.call(instance, x, y, z);
+        }
     }
 
     @Unique
@@ -128,9 +195,9 @@ public abstract class CameraMixin {
         this.rotation.set(newRotation);
         this.xRot = controller.getPitch();
         this.yRot = controller.getYaw();
-        OrientationController.Companion.getFORWARDS().rotate(this.rotation, this.forwards);
-        OrientationController.Companion.getUP().rotate(this.rotation, this.up);
-        OrientationController.Companion.getLEFT().rotate(this.rotation, this.left);
+        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))
@@ -138,8 +205,30 @@ public abstract class CameraMixin {
         Entity entity = instance.getEntity();
         Entity vehicle = entity.getVehicle();
 
-        if (!(vehicle instanceof PokemonEntity) || Cobblemon.config.getThirdPersonViewBobbing()) {
+        if (!(vehicle instanceof PokemonEntity) || Cobblemon.config.getThirdPartyViewBobbing()) {
             original.call(instance, zoom, dy, dx);
         }
     }
+
+    //Modified vanilla code
+    @Unique
+    private float cobblemon$getMaxZoom(float maxZoom, Vector3f directionVector, Vector3f positionVector) {
+        Vec3 pos = new Vec3(positionVector);
+        for (int i = 0; i < 8; i++) {
+            float g = (float) ((i & 1) * 2 - 1);
+            float h = (float) ((i >> 1 & 1) * 2 - 1);
+            float j = (float) ((i >> 2 & 1) * 2 - 1);
+            Vec3 vec3 = pos.add(g * 0.1F, h * 0.1F, j * 0.1F);
+            Vec3 vec32 = vec3.add(new Vec3(directionVector).scale(maxZoom));
+            HitResult hitResult = this.level.clip(new ClipContext(vec3, vec32, ClipContext.Block.VISUAL, ClipContext.Fluid.NONE, this.entity));
+            if (hitResult.getType() != HitResult.Type.MISS) {
+                float k = (float) hitResult.getLocation().distanceToSqr(pos);
+                if (k < Mth.square(maxZoom)) {
+                    maxZoom = Mth.sqrt(k);
+                }
+            }
+        }
+
+        return maxZoom;
+    }
 }

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 COMPLEX_DISHES -> var7 = CobblemonRecipeCategories.COOKING_POT_COMPLEX_DISHES.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/LocalPlayerMixin.java

@@ -10,51 +10,27 @@ package com.cobblemon.mod.common.mixin.client;
 
 import com.cobblemon.mod.common.CobblemonNetwork;
 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.cobblemon.mod.common.net.messages.server.orientation.ServerboundUpdateOrientationPacket;
-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.entity.EntityType;
 import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.level.ClipContext;
 import net.minecraft.world.level.Level;
-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.CallbackInfo;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-
-import java.util.Map;
 
 @Mixin(LocalPlayer.class)
-public abstract class LocalPlayerMixin extends AbstractClientPlayer implements OrientationControllable{
+public abstract class LocalPlayerMixin extends LivingEntity {
 
     @Unique Matrix3f cobblemon$lastOrientation;
 
-    @Shadow
-    private float jumpRidingScale;
-
-    public LocalPlayerMixin(ClientLevel clientLevel, GameProfile gameProfile) {
-        super(clientLevel, gameProfile);
+    protected LocalPlayerMixin(EntityType<? extends LivingEntity> entityType, Level level) {
+        super(entityType, level);
     }
 
 //    @Inject(method = "sendPosition", at = @At("TAIL"))
@@ -100,73 +76,4 @@ public abstract class LocalPlayerMixin extends AbstractClientPlayer implements O
         if (!(this instanceof OrientationControllable controllable)) return;
         controllable.getOrientationController().setActive(false);
     }
-
-    @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/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.LEEK_AND_POTATO_STEW)));
-        types.add(cobblemon$createCategory("COOKING_POT_MEDICINES", $VALUES.length + 2, new ItemStack(CobblemonItems.POTION)));
-        types.add(cobblemon$createCategory("COOKING_POT_COMPLEX_DISHES", $VALUES.length + 3, new ItemStack(CobblemonItems.POKE_PUFF)));
-        types.add(cobblemon$createCategory("COOKING_POT_MISC", $VALUES.length + 4, new ItemStack(CobblemonItems.PROTEIN)));
-        $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_COMPLEX_DISHES.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/client/SearchTreeMixin.java

@@ -1,60 +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.searchtree.IdSearchTree;
-import net.minecraft.client.searchtree.SearchTree;
-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.CallbackInfoReturnable;
-
-import java.util.ArrayList;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
-
-@Mixin(IdSearchTree.class)
-public abstract class SearchTreeMixin {
-    @Unique
-    private static final ThreadLocal<Boolean> reentryFlag = ThreadLocal.withInitial(() -> false);
-
-    /**
-     * Runs an additional search using the original search term where every instance of 'e' is replaced with 'é'
-     * Appends additional search results to original search results.
-     */
-    @Inject(method = "search(Ljava/lang/String;)Ljava/util/List;", at = @At("RETURN"), cancellable = true)
-    private void onSearch(String string, CallbackInfoReturnable<List> cir) {
-        // If flag is true, skip to avoid infinite loop
-        if (reentryFlag.get()) {
-            return;
-        }
-
-        try {
-            reentryFlag.set(true);
-            List originalResults = cir.getReturnValue();
-
-            if (!string.contains("poke")) {
-                return;
-            }
-
-            String modifiedString = string.replace("poke", "poké");
-            List additionalResults = ((SearchTree)this).search(modifiedString);
-
-            Set combinedSet = new LinkedHashSet<>();
-            combinedSet.addAll(originalResults);
-            combinedSet.addAll(additionalResults);
-
-            cir.setReturnValue(new ArrayList<>(combinedSet));
-        } finally {
-            reentryFlag.set(false);
-        }
-    }
-}

common/src/main/java/com/cobblemon/mod/common/mixin/client/StringRenderOutputMixin.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.client;
-
-import com.cobblemon.mod.common.client.render.TextClipping;
-import net.minecraft.client.gui.Font;
-import net.minecraft.network.chat.Style;
-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;
-
-/**
- * This mixin facilitates the gradual reveal of text with NPC dialogue. If there is a better way
- * to do this, I'd love to hear it.
- *
- * The idea is that somewhere static in the mod we have a control for how many characters can be drawn
- * and how many have been drawn so far, and this mixin will add to the latter and stop drawing characters
- * once it reaches the former.
- *
- * This relies STRONGLY on the code that sets the character cap to reset it to -1 after the text is rendered,
- * otherwise all text in Minecraft will stop drawing.
- *
- * Sites that take advantage of this mixin will do the following:
- * 1: Set the character cap, which resets the drawn counter to zero.
- * 2: Call whatever Minecraft function draws your text.
- * 3: Reset the character cap to -1, which will allow regular text to draw again.
- *
- * @author Hiroku
- * @since April 18th, 2025
- */
-@Mixin(Font.StringRenderOutput.class)
-public class StringRenderOutputMixin {
-    @Inject(method = "accept", at = @At(value = "HEAD"), cancellable = true)
-    public void onAccept(int i, Style style, int j, CallbackInfoReturnable<Boolean> cir) {
-        if (!TextClipping.canDrawAnotherCharacter()) {
-            cir.setReturnValue(true);
-        }
-    }
-}

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

@@ -40,9 +40,9 @@ import com.cobblemon.mod.common.api.properties.CustomPokemonProperty
 import com.cobblemon.mod.common.api.scheduling.ServerRealTimeTaskTracker
 import com.cobblemon.mod.common.api.scheduling.ServerTaskTracker
 import com.cobblemon.mod.common.api.spawning.BestSpawner
-import com.cobblemon.mod.common.api.spawning.CobblemonSpawningZoneGenerator
-import com.cobblemon.mod.common.api.spawning.position.AreaSpawnablePositionResolver
-import com.cobblemon.mod.common.api.spawning.SpawningZoneGenerator
+import com.cobblemon.mod.common.api.spawning.CobblemonSpawningProspector
+import com.cobblemon.mod.common.api.spawning.context.AreaContextResolver
+import com.cobblemon.mod.common.api.spawning.prospecting.SpawningProspector
 import com.cobblemon.mod.common.api.starter.StarterHandler
 import com.cobblemon.mod.common.api.storage.PokemonStoreManager
 import com.cobblemon.mod.common.api.storage.adapter.conversions.ReforgedConversion
@@ -128,7 +128,6 @@ 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
@@ -160,8 +159,8 @@ object Cobblemon {
     var isDedicatedServer = false
     val showdownThread = ShowdownThread()
     lateinit var config: CobblemonConfig
-    var spawningZoneGenerator: SpawningZoneGenerator = CobblemonSpawningZoneGenerator
-    var areaSpawnablePositionResolver: AreaSpawnablePositionResolver = object : AreaSpawnablePositionResolver {}
+    var prospector: SpawningProspector = CobblemonSpawningProspector
+    var areaContextResolver: AreaContextResolver = object : AreaContextResolver {}
     val bestSpawner = BestSpawner
     val battleRegistry = BattleRegistry
     var storage = PokemonStoreManager()
@@ -195,8 +194,8 @@ object Cobblemon {
             this.LOGGER.info("  - Branch: ${CobblemonBuildDetails.BRANCH}")
         }
 
-        implementation.registerRecipeSerializers()
-        implementation.registerRecipeTypes()
+        this.loadConfig()
+
         implementation.registerPermissionValidator()
         implementation.registerSoundEvents()
         implementation.registerDataComponents()
@@ -205,11 +204,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()
@@ -221,7 +218,6 @@ object Cobblemon {
         ExperienceGroups.registerDefaults()
         CaptureCalculators.registerDefaults()
 
-        this.loadConfig()
 //        CobblemonBlockPredicates.touch()
         CobblemonOrePlacedFeatures.register()
         CobblemonPlacedFeatures.register()

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

@@ -18,6 +18,7 @@ object CobblemonActivities {
     val POKEMON_SLEEPING_ACTIVITY = register(Activity("pokemon_sleeping"))
     val POKEMON_GROW_CROP = register(Activity("pokemon_grow_crop"))
     val POKEMON_SLEEP_ON_TRAINER_BED = register(Activity("pokemon_sleep_on_trainer_bed"))
+    val GUARD_NEST = register(Activity("guard_nest"))
 
     fun register(activity: Activity): Activity {
         activities.add(activity)

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

@@ -20,7 +20,7 @@ import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
 import com.cobblemon.mod.common.api.reactive.SimpleObservable
 import com.cobblemon.mod.common.net.messages.client.data.BehaviourSyncPacket
 import com.cobblemon.mod.common.util.adapters.ActivityAdapter
-import com.cobblemon.mod.common.util.adapters.BehaviourConfigAdapter
+import com.cobblemon.mod.common.util.adapters.BrainConfigAdapter
 import com.cobblemon.mod.common.util.adapters.ExpressionAdapter
 import com.cobblemon.mod.common.util.adapters.ExpressionLikeAdapter
 import com.cobblemon.mod.common.util.adapters.ExpressionOrEntityVariableAdapter
@@ -47,7 +47,7 @@ object CobblemonBehaviours : JsonDataRegistry<CobblemonBehaviour> {
         .registerTypeAdapter(Activity::class.java, ActivityAdapter)
         .registerTypeAdapter(Expression::class.java, ExpressionAdapter)
         .registerTypeAdapter(ExpressionLike::class.java, ExpressionLikeAdapter)
-        .registerTypeAdapter(BehaviourConfig::class.java, BehaviourConfigAdapter)
+        .registerTypeAdapter(BehaviourConfig::class.java, BrainConfigAdapter)
         .registerTypeAdapter(TaskConfig::class.java, TaskConfigAdapter)
         .registerTypeAdapter(
             TypeToken.getParameterized(Either::class.java, Expression::class.java, MoLangConfigVariable::class.java).type,

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
@@ -46,9 +45,14 @@ 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 GROTTO_BLOCK: BlockEntityType<GrottoBlockEntity> = this.create("grotto_block",
+            BlockEntityType.Builder.of(::GrottoBlockEntity, CobblemonBlocks.GROTTO_BLOCK).build(null)
+    )
 
     @JvmField
     val GILDED_CHEST: BlockEntityType<GildedChestBlockEntity> = this.create("chest", BlockEntityType.Builder.of(::GildedChestBlockEntity,
@@ -83,40 +87,48 @@ object CobblemonBlockEntities : PlatformRegistry<Registry<BlockEntityType<*>>, R
         ).build(null)
     )
 
+    val NEST: BlockEntityType<NestBlockEntity> = this.create("nest",
+        BlockEntityType.Builder.of(
+            ::NestBlockEntity,
+            CobblemonBlocks.NEST_STICK,
+            CobblemonBlocks.NEST_LEAF,
+            CobblemonBlocks.NEST_STONE,
+            CobblemonBlocks.NEST_DEEPSLATE,
+            CobblemonBlocks.NEST_BASALT,
+            CobblemonBlocks.NEST_SNOW,
+            CobblemonBlocks.NEST_NETHER,
+            CobblemonBlocks.NEST_SOUL_SAND,
+            CobblemonBlocks.NEST_WARM_OCEAN,
+            CobblemonBlocks.NEST_SEAGRASS,
+            CobblemonBlocks.NEST_LUSH,
+            CobblemonBlocks.NEST_HAY,
+            CobblemonBlocks.NEST_SAND,
+            CobblemonBlocks.NEST_RED_SAND,
+            CobblemonBlocks.NEST_CHORUS,
+
+            CobblemonBlocks.WATER_NEST,
+            CobblemonBlocks.CAVE_NEST,
+            CobblemonBlocks.BASIC_NEST
+        ).build(null))
+
+    val EGG: BlockEntityType<EggBlockEntity> = this.create("egg",
+            BlockEntityType.Builder.of(
+                ::EggBlockEntity,
+                CobblemonBlocks.EGG
+            ).build(null)
+        )
+
+    @JvmField
+    val INCUBATOR: BlockEntityType<IncubatorBlockEntity> = this.create("incubator",
+        BlockEntityType.Builder.of(
+            ::IncubatorBlockEntity,
+            CobblemonBlocks.INCUBATOR
+        ).build(null)
+    )
+
+
     @JvmField
     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
@@ -488,9 +360,6 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<
     @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,32 +381,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)))
-
-    @JvmField
-    val POTTED_RED_APRICORN_SAPLING = this.create("potted_red_apricorn_sapling", BlocksInvoker.createFlowerPotBlock(RED_APRICORN_SAPLING))
-    @JvmField
-    val POTTED_YELLOW_APRICORN_SAPLING = this.create("potted_yellow_apricorn_sapling", BlocksInvoker.createFlowerPotBlock(YELLOW_APRICORN_SAPLING))
-    @JvmField
-    val POTTED_GREEN_APRICORN_SAPLING = this.create("potted_green_apricorn_sapling", BlocksInvoker.createFlowerPotBlock(GREEN_APRICORN_SAPLING))
-    @JvmField
-    val POTTED_BLUE_APRICORN_SAPLING = this.create("potted_blue_apricorn_sapling", BlocksInvoker.createFlowerPotBlock(BLUE_APRICORN_SAPLING))
-    @JvmField
-    val POTTED_PINK_APRICORN_SAPLING = this.create("potted_pink_apricorn_sapling", BlocksInvoker.createFlowerPotBlock(PINK_APRICORN_SAPLING))
-    @JvmField
-    val POTTED_BLACK_APRICORN_SAPLING = this.create("potted_black_apricorn_sapling", BlocksInvoker.createFlowerPotBlock(BLACK_APRICORN_SAPLING))
-    @JvmField
-    val POTTED_WHITE_APRICORN_SAPLING = this.create("potted_white_apricorn_sapling", BlocksInvoker.createFlowerPotBlock(WHITE_APRICORN_SAPLING))
-    @JvmField
-    val POTTED_SACCHARINE_SAPLING = this.create("potted_saccharine_sapling", BlocksInvoker.createFlowerPotBlock(SACCHARINE_SAPLING))
-
-    @JvmField
-    val HEARTY_GRAIN_BALE = this.create("hearty_grain_bale", HeartyGrainBaleBlock(BlockBehaviour.Properties.of().mapColor(MapColor.PLANT).instrument(NoteBlockInstrument.BANJO).strength(0.5F).sound(SoundType.GRASS)))
-    @JvmField
-    val TATAMI_BLOCK = this.create("tatami_block", TatamiBlock(BlockBehaviour.Properties.of().ignitedByLava().mapColor(MapColor.PLANT).sound(SoundType.GRASS)))
-    @JvmField
-    val TATAMI_MAT = this.create("tatami_mat", TatamiMatBlock(BlockBehaviour.Properties.of().ignitedByLava().mapColor(MapColor.PLANT).sound(SoundType.GRASS)))
 
     /**
      * Returns a map of all the blocks that can be stripped with an axe in the format of input - output.
@@ -546,10 +389,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
     )
 
 
@@ -638,6 +478,61 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<
     val YACHE_BERRY = this.berryBlock("yache")
     //val BINDING_SOIL = this.create("binding_soil", BindingSoilBlock(BlockBehaviour.Properties.of()))
 
+    val NEST_STICK = nestBlock(NestBlock.NestVariant.STICK)
+    val NEST_LEAF = nestBlock(NestBlock.NestVariant.LEAF)
+    val NEST_STONE = nestBlock(NestBlock.NestVariant.STONE)
+    val NEST_DEEPSLATE = nestBlock(NestBlock.NestVariant.DEEPSLATE)
+    val NEST_BASALT = nestBlock(NestBlock.NestVariant.BASALT)
+    val NEST_SNOW = nestBlock(NestBlock.NestVariant.SNOW)
+
+    val NEST_NETHER = this.create(
+            "nest_nether",
+            NestBlock(NestBlock.NestVariant.NETHER, BlockBehaviour.Properties.of().noOcclusion().pushReaction(PushReaction.DESTROY).lightLevel { 2 })
+    )
+    val NEST_SOUL_SAND = nestBlock(NestBlock.NestVariant.SOUL_SAND)
+    val NEST_WARM_OCEAN = this.create(
+            "nest_warm_ocean",
+            NestBlock(NestBlock.NestVariant.WARM_OCEAN, BlockBehaviour.Properties.of().noOcclusion().pushReaction(PushReaction.DESTROY).lightLevel { 6 })
+    )
+    val NEST_SEAGRASS = nestBlock(NestBlock.NestVariant.SEAGRASS)
+    val NEST_LUSH = nestBlock(NestBlock.NestVariant.LUSH)
+    val NEST_HAY = nestBlock(NestBlock.NestVariant.HAY)
+    val NEST_SAND = nestBlock(NestBlock.NestVariant.SAND)
+    val NEST_RED_SAND = nestBlock(NestBlock.NestVariant.RED_SAND)
+    val NEST_CHORUS = nestBlock(NestBlock.NestVariant.CHORUS)
+
+
+
+    val BASIC_NEST = nestBlock(NestBlock.NestVariant.BASIC)
+    val CAVE_NEST = nestBlock(NestBlock.NestVariant.CAVE)
+    //val NETHER_NEST = nestBlock(NestBlock.NestVariant.NETHER)
+    val WATER_NEST = nestBlock(NestBlock.NestVariant.WATER)
+
+    val EGG = this.create("egg", EggBlock(BlockBehaviour.Properties
+        .ofFullCopy(Blocks.DRAGON_EGG)
+        .pushReaction(PushReaction.BLOCK)
+        .sound(SoundType.BONE_BLOCK)
+    ))
+
+    @JvmField
+    val GROTTO_BLOCK = this.create("grotto_block", GrottoBlock(BlockBehaviour.Properties.of()
+            .mapColor(MapColor.STONE)
+            .strength(1.5F)
+            .pushReaction(PushReaction.BLOCK)
+    ))
+
+    @JvmField
+    val INCUBATOR = this.create("incubator", IncubatorBlock(BlockBehaviour.Properties.of()
+        .mapColor(MapColor.COLOR_LIGHT_GRAY)
+        .sound(SoundType.METAL)
+        .strength(Blocks.COAL_BLOCK.defaultDestroyTime(), Blocks.DIAMOND_ORE.explosionResistance)
+        .noOcclusion()
+        .pushReaction(PushReaction.BLOCK)
+        .lightLevel { state ->
+            if (state.getValue(IncubatorBlock.HAS_EGG)) 5 else 0 // Emit 5 light when HAS_EGG is true
+        }
+    ))
+
     init {
         /**
          * Makes all blocks in array flammable by adding them to FireBlock's flammableRegistry.
@@ -666,6 +561,12 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<
         return block
     }
 
+    private fun nestBlock(variant: NestBlock.NestVariant): NestBlock {
+        val identifier = cobblemonResource(variant.serializedName)
+        val block = NestBlock(variant, BlockBehaviour.Properties.of().noOcclusion().pushReaction(PushReaction.DESTROY))
+        return this.create(identifier.path, block)
+    }
+
     /**
      * Calls helper method from Vanilla
      */

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

@@ -60,6 +60,8 @@ object CobblemonCommands {
         RenameBoxCommand.register(dispatcher)
         ChangeBoxWallpaperCommand.register(dispatcher)
         RunMolangScriptCommand.register(dispatcher)
+        GivePokemonEggCommand.register(dispatcher)
+        GiveAllPokemonEggCommand.register(dispatcher)
         SpectateBattleCommand.register(dispatcher)
         CobblemonConfigCommand.register(dispatcher)
         UnlockPCBoxWallpaperCommand.register(dispatcher)
@@ -68,8 +70,6 @@ object CobblemonCommands {
         MarkGiveCommand.register(dispatcher)
         MarkTakeCommand.register(dispatcher)
         MarkGiveAllCommand.register(dispatcher)
-        PcSearchCommand.register(dispatcher)
-        PcTakeCommand.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

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,15 +8,17 @@
 
 package com.cobblemon.mod.common
 
-import com.cobblemon.mod.common.block.PotComponent
-import com.cobblemon.mod.common.item.components.*
+import com.cobblemon.mod.common.api.pokemon.breeding.Egg
+import com.cobblemon.mod.common.block.entity.EggBlockEntity
+import com.cobblemon.mod.common.item.components.HeldItemCapableComponent
+import com.cobblemon.mod.common.item.components.PokemonItemComponent
+import com.cobblemon.mod.common.item.RodBaitComponent
+import com.cobblemon.mod.common.item.components.EggComponent
 import com.cobblemon.mod.common.platform.PlatformRegistry
-import com.mojang.serialization.Codec
 import net.minecraft.core.Registry
 import net.minecraft.core.component.DataComponentType
 import net.minecraft.core.registries.BuiltInRegistries
 import net.minecraft.core.registries.Registries
-import net.minecraft.network.codec.ByteBufCodecs
 import net.minecraft.resources.ResourceKey
 import net.minecraft.resources.ResourceLocation
 
@@ -37,56 +39,18 @@ 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())
-
-    val INGREDIENT: DataComponentType<IngredientComponent> = create("ingredient", DataComponentType.builder<IngredientComponent>()
-            .persistent(IngredientComponent.CODEC)
-            .networkSynchronized(IngredientComponent.PACKET_CODEC)
+    val EGG_DATA: DataComponentType<EggComponent> = create("egg", DataComponentType.builder<EggComponent>()
+            .persistent(EggComponent.CODEC) // For saving/loading
+            .networkSynchronized(EggComponent.PACKET_CODEC) // For network synchronization
             .build())
 
-    val FOOD: DataComponentType<FoodComponent> = create("food", DataComponentType.builder<FoodComponent>()
-            .persistent(FoodComponent.CODEC)
-            .networkSynchronized(FoodComponent.PACKET_CODEC)
-            .build())
 
-    val MOB_EFFECTS: DataComponentType<MobEffectsComponent> = create("mob_effects", DataComponentType.builder<MobEffectsComponent>()
-        .persistent(MobEffectsComponent.CODEC)
-        .networkSynchronized(MobEffectsComponent.PACKET_CODEC)
-        .build())
 
-    val CRAFTED: DataComponentType<Boolean> = create("crafted", DataComponentType.builder<Boolean>()
-            .persistent(Codec.BOOL)
-            .networkSynchronized(ByteBufCodecs.BOOL)
-            .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)
-        Registry.register(BuiltInRegistries.DATA_COMPONENT_TYPE, ResourceLocation.parse("cobblemon:ingredient"), INGREDIENT)
-        Registry.register(BuiltInRegistries.DATA_COMPONENT_TYPE, ResourceLocation.parse("cobblemon:food"), FOOD)
-        Registry.register(BuiltInRegistries.DATA_COMPONENT_TYPE, ResourceLocation.parse("cobblemon:mob_effects"), MOB_EFFECTS)
+        Registry.register(BuiltInRegistries.DATA_COMPONENT_TYPE, ResourceLocation.parse("cobblemon:egg_data"), EGG_DATA)
     }
 
     override val registry = BuiltInRegistries.DATA_COMPONENT_TYPE

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

@@ -8,12 +8,10 @@
 
 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
 import com.cobblemon.mod.common.api.pokemon.Natures
-import com.cobblemon.mod.common.api.pokemon.stats.Stat
 import com.cobblemon.mod.common.api.pokemon.stats.Stats
 import com.cobblemon.mod.common.api.pokemon.status.Statuses
 import com.cobblemon.mod.common.api.text.blue
@@ -21,6 +19,7 @@ import com.cobblemon.mod.common.api.text.gray
 import com.cobblemon.mod.common.block.BerryBlock
 import com.cobblemon.mod.common.block.MintBlock
 import com.cobblemon.mod.common.block.MintBlock.MintType
+import com.cobblemon.mod.common.block.NestBlock
 import com.cobblemon.mod.common.client.pokedex.PokedexType
 import com.cobblemon.mod.common.entity.boat.CobblemonBoatType
 import com.cobblemon.mod.common.item.*
@@ -28,20 +27,12 @@ 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.food.PonigiriItem
-import com.cobblemon.mod.common.item.food.SinisterTeaItem
+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
-import com.cobblemon.mod.common.pokemon.IVs
 import com.cobblemon.mod.common.pokemon.helditem.CobblemonHeldItemManager
 import com.cobblemon.mod.common.util.cobblemonResource
 import net.minecraft.core.Registry
@@ -51,18 +42,11 @@ import net.minecraft.network.chat.Component
 import net.minecraft.resources.ResourceKey
 import net.minecraft.resources.ResourceLocation
 import net.minecraft.world.effect.MobEffectInstance
+import net.minecraft.world.item.Item.Properties
 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.Item.Properties
-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
 
@@ -189,32 +173,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 HEARTY_GRAIN_BALE = compostableBlockItem("hearty_grain_bale", CobblemonBlocks.HEARTY_GRAIN_BALE, 0.85f)
-
-    @JvmField
-    val TATAMI_BLOCK = blockItem("tatami_block", CobblemonBlocks.TATAMI_BLOCK)
-    @JvmField
-    val TATAMI_MAT = blockItem("tatami_mat", CobblemonBlocks.TATAMI_MAT)
-
     @JvmField
     val VIVICHOKE = compostableItem("vivichoke")
 
@@ -305,166 +263,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_RED = aprijuiceItem(Apricorn.RED)
-    @JvmField
-    val APRIJUICE_YELLOW = aprijuiceItem(Apricorn.YELLOW)
-    @JvmField
-    val APRIJUICE_GREEN = aprijuiceItem(Apricorn.GREEN)
-    @JvmField
-    val APRIJUICE_BLUE = aprijuiceItem(Apricorn.BLUE)
-    @JvmField
-    val APRIJUICE_PINK = aprijuiceItem(Apricorn.PINK)
-    @JvmField
-    val APRIJUICE_BLACK = aprijuiceItem(Apricorn.BLACK)
-    @JvmField
-    val APRIJUICE_WHITE = aprijuiceItem(Apricorn.WHITE)
-
-    @JvmField
-    val PONIGIRI = create("ponigiri", PonigiriItem())
-
-    @JvmField
-    val SINISTER_TEA = create("sinister_tea", SinisterTeaItem())
-
-    @JvmField
-    val POKE_PUFF = pokepuffItem("poke_puff")
-
-    // FOODS
-    @JvmField
-    val SWEET_HEART = noSettingsItem("sweet_heart") // todo make a SweetHeartItem class for breeding purposes
-
-    @JvmField
-    val TASTY_TAIL = noSettingsItem("tasty_tail")
-
-    @JvmField // todo get final values for this from vera
-    val PEWTER_CRUNCHIES = regionalFoodItem("pewter_crunchies", 16, 10, 1.2f, MobEffectInstance(MobEffects.ABSORPTION, 900, 0), 1f, false)
-
-    @JvmField // todo get final values for this from vera
-    val RAGE_CANDY_BAR = regionalFoodItem("rage_candy_bar", 16, 10, 1.2f, MobEffectInstance(MobEffects.ABSORPTION, 900, 0), 1f, false)
-
-    @JvmField // todo get final values for this from vera
-    val LAVA_COOKIE = regionalFoodItem("lava_cookie", 16, 10, 1.2f, MobEffectInstance(MobEffects.ABSORPTION, 900, 0), 1f)
-
-    @JvmField // todo get final values for this from vera
-    val OLD_GATEAU = regionalFoodItem("old_gateau", 16, 10, 1.2f, MobEffectInstance(MobEffects.ABSORPTION, 900, 0), 1f)
-
-    @JvmField // todo get final values for this from vera
-    val CASTELIACONE = regionalFoodItem("casteliacone", 16, 10, 1.2f, MobEffectInstance(MobEffects.ABSORPTION, 900, 0), 1f)
-
-    @JvmField // todo get final values for this from vera
-    val SHALOUR_SABLE = regionalFoodItem("shalour_sable", 16, 10, 1.2f, MobEffectInstance(MobEffects.ABSORPTION, 900, 0), 1f)
-
-    @JvmField // todo get final values for this from vera
-    val LUMIOSE_GALETTE = regionalFoodItem("lumiose_galette", 16, 10, 1.2f, MobEffectInstance(MobEffects.ABSORPTION, 900, 0), 1f)
-
-    @JvmField // todo get final values for this from vera
-    val BIG_MALASADA = regionalFoodItem("big_malasada", 16, 10, 1.2f, MobEffectInstance(MobEffects.ABSORPTION, 900, 0), 1f)
-
-    @JvmField // todo get final values for this from vera
-    val SMOKED_TAIL_CURRY = regionalFoodItem("smoked_tail_curry", 16, 10, 1.2f, MobEffectInstance(MobEffects.ABSORPTION, 900, 0), 1f, false, ItemStack(Items.BOWL, 1))
-
-    @JvmField // todo get final values for this from vera
-    val JUBILIFE_MUFFIN = regionalFoodItem("jubilife_muffin", 16, 10, 1.2f, MobEffectInstance(MobEffects.ABSORPTION, 900, 0), 1f)
-
-    @JvmField // todo get final values for this from vera
-    val OPEN_FACED_SANDWICH = regionalFoodItem("open_faced_sandwich", 16, 10, 1.2f, MobEffectInstance(MobEffects.ABSORPTION, 900, 0), 1f)
-
-    // todo we might need to wait on these for later? These impact battles and may be harder to do
-    /*@JvmField
-    val CHOICE_DUMPLING = noSettingsItem("choice_dumpling") // todo make a ChoiceDumpingItem class for battle purposes
-    @JvmField
-    val SWAP_SNACK = noSettingsItem("swap_snack") // todo make a SwapSnackItem class for battle purposes
-    @JvmField
-    val TWICE_SPICED_BEETROOT = noSettingsItem("twice_spiced_beetroot") // todo make a TwiceSpiceBeetrootItem class for battle purposes
-*/
-    @JvmField
-    val POTATO_MOCHI = create("potato_mochi", object : Item(Properties().stacksTo(16)
-        .food(FoodProperties.Builder()
-            .nutrition(10) // todo get final values for this from vera
-            .saturationModifier(1.2F) // todo get final values for this from vera
-            .alwaysEdible()
-            .build())) {})
-    @JvmField
-    val FRIED_RICE = create("fried_rice", object : Item(Properties().stacksTo(16)
-        .food(FoodProperties.Builder()
-            .nutrition(10) // todo get final values for this from vera
-            .saturationModifier(1.2F) // todo get final values for this from vera
-            .alwaysEdible()
-            .build())) {})
-    @JvmField
-    val CANDIED_APPLE = create("candied_apple", object : Item(Properties().stacksTo(16)
-        .food(FoodProperties.Builder()
-            .nutrition(10) // todo get final values for this from vera
-            .saturationModifier(1.2F) // todo get final values for this from vera
-            .alwaysEdible()
-            .build())) {})
-    @JvmField
-    val CANDIED_BERRY = create("candied_berry", object : Item(Properties().stacksTo(16)
-        .food(FoodProperties.Builder()
-            .nutrition(10) // todo get final values for this from vera
-            .saturationModifier(1.2F) // todo get final values for this from vera
-            .alwaysEdible()
-            .build())) {})
-
-    //@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
@@ -480,8 +278,7 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
     @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())
@@ -522,9 +319,6 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
     @JvmField val AUSPICIOUS_ARMOR = heldItem("auspicious_armor")
     @JvmField val MALICIOUS_ARMOR = heldItem("malicious_armor")
     @JvmField val SHELL_HELMET = heldItem("shell_helmet")
-    @JvmField val METAL_ALLOY = noSettingsItem("metal_alloy")
-    @JvmField val SCROLL_OF_DARKNESS = noSettingsItem("scroll_of_darkness")
-    @JvmField val SCROLL_OF_WATERS = noSettingsItem("scroll_of_waters")
 
     private val berries = mutableMapOf<ResourceLocation, BerryItem>()
     // Plants
@@ -600,36 +394,36 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
 
     @JvmField val BERRY_JUICE = this.create("berry_juice", BerryJuiceItem())
 
+    val NEST_STICK = blockItem(NestBlock.NestVariant.STICK.serializedName, CobblemonBlocks.NEST_STICK)
+    val NEST_LEAF = blockItem(NestBlock.NestVariant.LEAF.serializedName, CobblemonBlocks.NEST_LEAF)
+    val NEST_STONE = blockItem(NestBlock.NestVariant.STONE.serializedName, CobblemonBlocks.NEST_STONE)
+    val NEST_DEEPSLATE = blockItem(NestBlock.NestVariant.DEEPSLATE.serializedName, CobblemonBlocks.NEST_DEEPSLATE)
+    val NEST_BASALT = blockItem(NestBlock.NestVariant.BASALT.serializedName, CobblemonBlocks.NEST_BASALT)
+    val NEST_SNOW = blockItem(NestBlock.NestVariant.SNOW.serializedName, CobblemonBlocks.NEST_SNOW)
+
+    val NEST_NETHER = blockItem(NestBlock.NestVariant.NETHER.serializedName, CobblemonBlocks.NEST_NETHER)
+    val NEST_SOUL_SAND = blockItem(NestBlock.NestVariant.SOUL_SAND.serializedName, CobblemonBlocks.NEST_SOUL_SAND)
+    val NEST_WARM_OCEAN = blockItem(NestBlock.NestVariant.WARM_OCEAN.serializedName, CobblemonBlocks.NEST_WARM_OCEAN)
+    val NEST_SEAGRASS = blockItem(NestBlock.NestVariant.SEAGRASS.serializedName, CobblemonBlocks.NEST_SEAGRASS)
+    val NEST_LUSH = blockItem(NestBlock.NestVariant.LUSH.serializedName, CobblemonBlocks.NEST_LUSH)
+    val NEST_HAY = blockItem(NestBlock.NestVariant.HAY.serializedName, CobblemonBlocks.NEST_HAY)
+    val NEST_SAND = blockItem(NestBlock.NestVariant.SAND.serializedName, CobblemonBlocks.NEST_SAND)
+    val NEST_RED_SAND = blockItem(NestBlock.NestVariant.RED_SAND.serializedName, CobblemonBlocks.NEST_RED_SAND)
+    val NEST_CHORUS = blockItem(NestBlock.NestVariant.CHORUS.serializedName, CobblemonBlocks.NEST_CHORUS)
+
+    val BASIC_NEST = blockItem(NestBlock.NestVariant.BASIC.serializedName, CobblemonBlocks.BASIC_NEST)
+    val CAVE_NEST = blockItem(NestBlock.NestVariant.CAVE.serializedName, CobblemonBlocks.CAVE_NEST)
+    val WATER_NEST = blockItem(NestBlock.NestVariant.WATER.serializedName, CobblemonBlocks.WATER_NEST)
+
+    @JvmField
+    val INCUBATOR = blockItem("incubator", CobblemonBlocks.INCUBATOR)
+
+    @JvmField
+    val GROTTO_BLOCK = blockItem("grotto_block", CobblemonBlocks.GROTTO_BLOCK)
+
     @JvmField
     val GALARICA_NUTS = create("galarica_nuts", GalaricaNutItem())
 
-    // Hyper Training Items
-    val hyperTrainingItems = mutableListOf<HyperTrainingItem>()
-    @JvmField
-    val HEALTH_CANDY = hyperTrainingItem("health_candy", 1, setOf(Stats.HP), 0..IVs.MAX_VALUE)
-    @JvmField
-    val MIGHTY_CANDY = hyperTrainingItem("mighty_candy", 1, setOf(Stats.ATTACK), 0..IVs.MAX_VALUE)
-    @JvmField
-    val TOUGH_CANDY = hyperTrainingItem("tough_candy", 1, setOf(Stats.DEFENCE), 0..IVs.MAX_VALUE)
-    @JvmField
-    val SMART_CANDY = hyperTrainingItem("smart_candy", 1, setOf(Stats.SPECIAL_ATTACK), 0..IVs.MAX_VALUE)
-    @JvmField
-    val COURAGE_CANDY = hyperTrainingItem("courage_candy", 1, setOf(Stats.SPECIAL_DEFENCE), 0..IVs.MAX_VALUE)
-    @JvmField
-    val QUICK_CANDY = hyperTrainingItem("quick_candy", 1, setOf(Stats.SPEED), 0..IVs.MAX_VALUE)
-    @JvmField
-    val SICKLY_CANDY = hyperTrainingItem("sickly_candy", -1, setOf(Stats.HP), 0..IVs.MAX_VALUE)
-    @JvmField
-    val WEAK_CANDY = hyperTrainingItem("weak_candy", -1, setOf(Stats.ATTACK), 0..IVs.MAX_VALUE)
-    @JvmField
-    val BRITTLE_CANDY = hyperTrainingItem("brittle_candy", -1, setOf(Stats.DEFENCE), 0..IVs.MAX_VALUE)
-    @JvmField
-    val NUMB_CANDY = hyperTrainingItem("numb_candy", -1, setOf(Stats.SPECIAL_ATTACK), 0..IVs.MAX_VALUE)
-    @JvmField
-    val COWARD_CANDY = hyperTrainingItem("coward_candy", -1, setOf(Stats.SPECIAL_DEFENCE), 0..IVs.MAX_VALUE)
-    @JvmField
-    val SLOW_CANDY = hyperTrainingItem("slow_candy", -1, setOf(Stats.SPEED), 0..IVs.MAX_VALUE)
-
     // Medicine
     @JvmField
     val RARE_CANDY = candyItem("rare_candy", Rarity.RARE) { _, pokemon -> pokemon.getExperienceToNextLevel() }
@@ -656,20 +450,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))
@@ -715,8 +495,6 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
     val FINE_REMEDY = create("fine_remedy", RemedyItem(RemedyItem.FINE))
     @JvmField
     val SUPERB_REMEDY = create("superb_remedy", RemedyItem(RemedyItem.SUPERB))
-    @JvmField
-    val MOOMOO_MILK = create("moomoo_milk", Item(Item.Properties()))
 
     @JvmField
     val POTION = create("potion", PotionItem(PotionType.POTION))
@@ -951,12 +729,12 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
     val CHOICE_SCARF = heldItem("choice_scarf")
     @JvmField
     val CLEANSE_TAG = heldItem("cleanse_tag")
-    @JvmField
-    val CLEAR_AMULET = heldItem("clear_amulet")
+   // @JvmField
+   // val CLEAR_AMULET = heldItem("clear_amulet")
     @JvmField
     val COVERT_CLOAK = heldItem("covert_cloak")
     @JvmField
-    val DESTINY_KNOT = heldItem("destiny_knot")
+    val DESTINY_KNOT = heldItem("destiny_knot", null, if (Cobblemon.config.canDestinyKnotBreak) Properties().durability(Cobblemon.config.destinyKnotDurability) else Properties())
     @JvmField
     val DRAGON_FANG = heldItem("dragon_fang")
     @JvmField
@@ -981,16 +759,16 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
     val FOCUS_SASH = heldItem("focus_sash")
     @JvmField
     val GRASSY_SEED = heldItem("grassy_seed")
-    @JvmField
-    val GRIP_CLAW = heldItem("grip_claw")
+   // @JvmField
+   // val GRIP_CLAW = heldItem("grip_claw")
     @JvmField
     val HARD_STONE = heldItem("hard_stone")
     @JvmField
     val HEAVY_DUTY_BOOTS = heldItem("heavy_duty_boots")
     @JvmField
     val IRON_BALL = heldItem("iron_ball")
-    @JvmField
-    val LAGGING_TAIL = heldItem("lagging_tail")
+   // @JvmField
+   // val LAGGING_TAIL = heldItem("lagging_tail")
     @JvmField
     val LEFTOVERS = heldItem("leftovers")
     @JvmField
@@ -1003,8 +781,8 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
     val LOADED_DICE = heldItem("loaded_dice")
     @JvmField
     val LUCKY_EGG = heldItem("lucky_egg")
-    @JvmField
-    val LUMINOUS_MOSS = heldItem("luminous_moss")
+   // @JvmField
+   // val LUMINOUS_MOSS = heldItem("luminous_moss")
     @JvmField
     val MAGNET = heldItem("magnet")
     @JvmField
@@ -1476,6 +1254,10 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
     val FAIRY_GEM = noSettingsItem("fairy_gem")
     //@JvmField
     //val BINDING_SOIL = blockItem("binding_soil", CobblemonBlocks.BINDING_SOIL)
+    @JvmField
+    val POKEMON_EGG = eggItem("egg", CobblemonBlocks.EGG, Item.Properties().stacksTo(1))
+
+    private fun eggItem(name: String, block: Block, settings: Item.Properties = Item.Properties()): BlockItem = this.create(name, BlockItem(block, settings))
 
     private fun blockItem(name: String, block: Block, rarity: Rarity = Rarity.COMMON): BlockItem = this.create(name, BlockItem(block, Item.Properties().rarity(rarity)))
 
@@ -1519,59 +1301,9 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
         }
     )
 
-    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 pokepuffItem(name: String): PokePuffItem {
-        val item = create("poke_puff", PokePuffItem())
-        return item
-    }
-
-    private fun regionalFoodItem(
-        name: String,
-        stacksTo: Int,
-        nutrition: Int,
-        saturationModifier: Float,
-        effect: MobEffectInstance? = null,
-        effectChance: Float? = null,
-        alwaysEdible: Boolean = false,
-        convertsToOnUse: ItemStack? = null
-    ): RegionalFoodItem {
-        val foodPropertiesBuilder = FoodProperties.Builder()
-            .nutrition(nutrition)
-            .saturationModifier(saturationModifier)
-
-        if (effect != null && effectChance != null) {
-            foodPropertiesBuilder.effect(effect, effectChance)
-        }
-
-        if (alwaysEdible == true) {
-            foodPropertiesBuilder.alwaysEdible()
-        }
-
-        if (convertsToOnUse != null && !convertsToOnUse.isEmpty) {
-            foodPropertiesBuilder.usingConvertsTo(convertsToOnUse.item)
-        }
-
-        val properties = Item.Properties()
-            .stacksTo(stacksTo)
-            .food(foodPropertiesBuilder.build())
-
-        return create(name, RegionalFoodItem(properties))
-    }
-
-    private fun heldItem(name: String, remappedName: String? = null): CobblemonItem = create(
+    private fun heldItem(name: String, remappedName: String? = null, settings:Item.Properties = Item.Properties()): CobblemonItem = create(
         name,
-        CobblemonItem(Item.Properties()).also {
+        CobblemonItem(settings).also {
             if (remappedName != null) {
                 CobblemonHeldItemManager.registerRemap(it, remappedName)
             }
@@ -1614,12 +1346,6 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
         return item
     }
 
-    private fun hyperTrainingItem(name: String, increaseAmount: Int, targetStats: Set<Stat>, validRange: IntRange): HyperTrainingItem {
-        val item = this.create(name, HyperTrainingItem(increaseAmount, targetStats, validRange))
-        hyperTrainingItems.add(item)
-        return item
-    }
-
     private fun apricornItem(name: String, apricornItem: ApricornItem): ApricornItem {
         val finalName = "${name}_apricorn"
         val item = this.create(finalName, apricornItem)
@@ -1634,21 +1360,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)

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

@@ -10,15 +10,18 @@ package com.cobblemon.mod.common
 
 import com.cobblemon.mod.common.api.dialogue.ActiveDialogue
 import com.cobblemon.mod.common.api.moves.animations.ActionEffectContext
+import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.mojang.serialization.Codec
 import com.mojang.serialization.codecs.ListCodec
 import com.mojang.serialization.codecs.PrimitiveCodec
+import net.minecraft.core.BlockPos
 import net.minecraft.core.UUIDUtil
 import net.minecraft.world.entity.ai.memory.MemoryModuleType
 import java.util.Optional
 import java.util.UUID
-import net.minecraft.core.BlockPos
 import net.minecraft.world.entity.LivingEntity
+import net.minecraft.world.entity.item.ItemEntity
+import net.minecraft.world.entity.player.Player
 
 object CobblemonMemories {
     val memories = mutableMapOf<String, MemoryModuleType<*>>()
@@ -33,6 +36,11 @@ object CobblemonMemories {
     val NPC_BATTLING = register("npc_battling", PrimitiveCodec.BOOL)
     val DIALOGUES = register<List<ActiveDialogue>>("npc_dialogues")
     val ACTIVE_ACTION_EFFECT = register<ActionEffectContext>("active_action_effect")
+    val POTENTIAL_MATE = register<PokemonEntity>("potential_mate")
+    val MATE_SCAN_COOLDOWN = register("mate_scan_cooldown", PrimitiveCodec.BOOL)
+    val NEST_LOCATION = register<BlockPos>("nest_location")
+    val PATERNAL_NEST_LOCATION = register<BlockPos>("paternal_nest")
+    val IRRITATED_AT = register<UUID>("irritated_at")
     val POKEMON_FLYING = register("pokemon_flying", PrimitiveCodec.BOOL)
     val POKEMON_DROWSY = register("pokemon_drowsy", PrimitiveCodec.BOOL)
     val POKEMON_SLEEPING = register("pokemon_sleeping", PrimitiveCodec.BOOL)
@@ -41,6 +49,16 @@ object CobblemonMemories {
     val TARGETED_BATTLE_POKEMON = register<UUID>("targeted_battle_pokemon")
     val NEAREST_VISIBLE_ATTACKER = register<LivingEntity>("nearest_visible_attacker")
     val NEARBY_GROWABLE_CROPS = register<BlockPos>("nearby_growable_crops")
+    val EGG_THIEF = register<Player>("egg_thief") // Stores the player stealing the egg
+    val EGG_LOCATION = register<BlockPos>("egg_location") // Stores the last known location of the egg
+    val EGG_IN_NEST = register("egg_in_nest", PrimitiveCodec.BOOL)
+    val READY_TO_GRAB_EGG = register("ready_to_grab_egg", PrimitiveCodec.BOOL)
+    val HOLDING_EGG = register("holding_egg", PrimitiveCodec.BOOL)
+    val EGG_SEARCH_COUNTDOWN = register ("egg_search_countdown", PrimitiveCodec.BOOL)
+    val NESTING_MATERIAL_LOCATION = register<BlockPos>("nesting_material_location")
+    val SENSED_NEST_MATERIAL = register<ItemEntity>("sensed_nest_material")
+    val IDEAL_NEST_LOCATION = register<BlockPos>("ideal_nest_location")
+    val READY_TO_BUILD_NEST = register("ready_to_build_nest", PrimitiveCodec.BOOL)
     val RECENTLY_ATE_GRASS = register<Boolean>("recently_ate_grass")
 
     fun <U> register(id: String, codec: Codec<U>): MemoryModuleType<U> {

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

@@ -18,7 +18,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
@@ -67,11 +66,10 @@ 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
 import com.cobblemon.mod.common.net.messages.client.battle.*
+import com.cobblemon.mod.common.net.messages.client.breeding.BreedingRuleRegistrySyncPacket
 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
@@ -108,9 +106,9 @@ 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.SetPCPokemonPacket
 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.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
@@ -142,14 +140,13 @@ 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.behaviour.SetEntityBehaviourPacket
 import com.cobblemon.mod.common.net.messages.server.block.AdjustBlockEntityViewerCountPacket
+import com.cobblemon.mod.common.net.messages.server.breeding.TriggerEggHatchPacket
 import com.cobblemon.mod.common.net.messages.server.callback.move.MoveSelectCancelledPacket
 import com.cobblemon.mod.common.net.messages.server.callback.move.MoveSelectedPacket
 import com.cobblemon.mod.common.net.messages.server.callback.party.PartyPokemonSelectedPacket
 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
@@ -171,6 +168,12 @@ import com.cobblemon.mod.common.net.messages.server.storage.SwapPCPartyPokemonPa
 import com.cobblemon.mod.common.net.messages.server.storage.party.MovePartyPokemonPacket
 import com.cobblemon.mod.common.net.messages.server.storage.party.ReleasePartyPokemonPacket
 import com.cobblemon.mod.common.net.messages.server.storage.party.SwapPartyPokemonPacket
+import com.cobblemon.mod.common.net.messages.server.storage.pc.MovePCPokemonPacket
+import com.cobblemon.mod.common.net.messages.server.storage.pc.MovePCPokemonToPartyPacket
+import com.cobblemon.mod.common.net.messages.server.storage.pc.MovePartyPokemonToPCPacket
+import com.cobblemon.mod.common.net.messages.server.storage.pc.ReleasePCPokemonPacket
+import com.cobblemon.mod.common.net.messages.server.storage.pc.SwapPCPokemonPacket
+import com.cobblemon.mod.common.net.messages.server.storage.pc.UnlinkPlayerFromPCPacket
 import com.cobblemon.mod.common.net.messages.server.storage.pc.*
 import com.cobblemon.mod.common.net.messages.server.trade.AcceptTradeRequestPacket
 import com.cobblemon.mod.common.net.messages.server.trade.CancelTradePacket
@@ -188,15 +191,15 @@ import com.cobblemon.mod.common.net.serverhandling.battle.TeamLeaveHandler
 import com.cobblemon.mod.common.net.serverhandling.battle.TeamRequestHandler
 import com.cobblemon.mod.common.net.serverhandling.battle.TeamRequestResponseHandler
 import com.cobblemon.mod.common.net.serverhandling.behaviour.SetEntityBehaviourHandler
+import com.cobblemon.mod.common.net.messages.server.storage.pc.*
 import com.cobblemon.mod.common.net.serverhandling.block.AdjustBlockEntityViewerCountHandler
+import com.cobblemon.mod.common.net.serverhandling.breeding.TriggerEggHatchHandler
 import com.cobblemon.mod.common.net.serverhandling.callback.move.MoveSelectCancelledHandler
 import com.cobblemon.mod.common.net.serverhandling.callback.move.MoveSelectedHandler
 import com.cobblemon.mod.common.net.serverhandling.callback.party.PartyPokemonSelectedHandler
 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
@@ -222,6 +225,12 @@ import com.cobblemon.mod.common.net.serverhandling.storage.SwapPCPartyPokemonHan
 import com.cobblemon.mod.common.net.serverhandling.storage.party.MovePartyPokemonHandler
 import com.cobblemon.mod.common.net.serverhandling.storage.party.ReleasePCPokemonHandler
 import com.cobblemon.mod.common.net.serverhandling.storage.party.SwapPartyPokemonHandler
+import com.cobblemon.mod.common.net.serverhandling.storage.pc.MovePCPokemonHandler
+import com.cobblemon.mod.common.net.serverhandling.storage.pc.MovePCPokemonToPartyHandler
+import com.cobblemon.mod.common.net.serverhandling.storage.pc.MovePartyPokemonToPCHandler
+import com.cobblemon.mod.common.net.serverhandling.storage.pc.ReleasePartyPokemonHandler
+import com.cobblemon.mod.common.net.serverhandling.storage.pc.SwapPCPokemonHandler
+import com.cobblemon.mod.common.net.serverhandling.storage.pc.UnlinkPlayerFromPCHandler
 import com.cobblemon.mod.common.net.serverhandling.storage.pc.*
 import com.cobblemon.mod.common.net.serverhandling.trade.AcceptTradeRequestHandler
 import com.cobblemon.mod.common.net.serverhandling.trade.CancelTradeHandler
@@ -229,6 +238,7 @@ import com.cobblemon.mod.common.net.serverhandling.trade.ChangeTradeAcceptanceHa
 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.storage.pc.*
 import com.cobblemon.mod.common.util.server
 import net.minecraft.server.level.ServerPlayer
 
@@ -259,7 +269,6 @@ object CobblemonNetwork {
 
         // Pokemon Update Packets
         list.add(PacketRegisterInfo(FriendshipUpdatePacket.ID, FriendshipUpdatePacket::decode, PokemonUpdatePacketHandler()))
-        list.add(PacketRegisterInfo(FullnessUpdatePacket.ID, FullnessUpdatePacket::decode, PokemonUpdatePacketHandler()))
         list.add(PacketRegisterInfo(MoveSetUpdatePacket.ID, MoveSetUpdatePacket::decode, PokemonUpdatePacketHandler()))
         list.add(PacketRegisterInfo(NatureUpdatePacket.ID, NatureUpdatePacket::decode, PokemonUpdatePacketHandler()))
         list.add(PacketRegisterInfo(ShinyUpdatePacket.ID, ShinyUpdatePacket::decode, PokemonUpdatePacketHandler()))
@@ -293,7 +302,6 @@ object CobblemonNetwork {
         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()))
@@ -383,8 +391,9 @@ 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(BreedingRuleRegistrySyncPacket.ID, BreedingRuleRegistrySyncPacket::decode, DataRegistrySyncPacketHandler()))
+        list.add(PacketRegisterInfo(HabitatSyncPacket.ID, HabitatSyncPacket::decode, DataRegistrySyncPacketHandler()))
         list.add(PacketRegisterInfo(FlowRegistrySyncPacket.ID, FlowRegistrySyncPacket::decode, DataRegistrySyncPacketHandler()))
         list.add(PacketRegisterInfo(CosmeticItemAssignmentSyncPacket.ID, CosmeticItemAssignmentSyncPacket::decode, DataRegistrySyncPacketHandler()))
         list.add(PacketRegisterInfo(BehaviourSyncPacket.ID, BehaviourSyncPacket::decode, DataRegistrySyncPacketHandler()))
@@ -554,11 +563,9 @@ object CobblemonNetwork {
         // 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))
+        // Breeding Packets
+        list.add(PacketRegisterInfo(TriggerEggHatchPacket.ID, TriggerEggHatchPacket::decode, TriggerEggHatchHandler))
 
         // Behaviour Packets
         list.add(PacketRegisterInfo(SetEntityBehaviourPacket.ID, SetEntityBehaviourPacket::decode, SetEntityBehaviourHandler))

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

@@ -28,19 +28,12 @@ object CobblemonPoiTypes: PlatformRegistry<Registry<PoiType>, ResourceKey<Regist
     @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")
+    val GROTTO_BLOCK_KEY: ResourceKey<PoiType> = createKey("grotto_block")
     @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("incense_sweet")
-    @JvmField
-    val INCENSE_SWEET = create(INCENSE_SWEET_KEY.location().path, PoiType(getBlockStates(CobblemonBlocks.INCENSE_SWEET), 0, 1))
+    val GROTTO_BLOCK = create(GROTTO_BLOCK_KEY.location().path, PoiType(getBlockStates(CobblemonBlocks.GROTTO_BLOCK), 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/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_COMPLEX_DISHES("COOKING_POT_COMPLEX_DISHES"),
-    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_COMPLEX_DISHES.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/CobblemonSensors.kt

@@ -8,10 +8,7 @@
 
 package com.cobblemon.mod.common
 
-import com.cobblemon.mod.common.entity.pokemon.ai.sensors.DefendOwnerSensor
-import com.cobblemon.mod.common.entity.pokemon.ai.sensors.DrowsySensor
-import com.cobblemon.mod.common.entity.pokemon.ai.sensors.PokemonAdultSensor
-import com.cobblemon.mod.common.entity.pokemon.ai.sensors.PokemonGrowableCropSensor
+import com.cobblemon.mod.common.entity.pokemon.ai.sensors.*
 import com.cobblemon.mod.common.pokemon.ai.PokemonDisturbancesSensor
 import com.cobblemon.mod.common.entity.sensor.BattlingPokemonSensor
 import com.cobblemon.mod.common.entity.sensor.NPCBattlingSensor
@@ -25,6 +22,11 @@ object CobblemonSensors {
 
     val NPC_BATTLING = register("npc_battling", ::NPCBattlingSensor)
     val BATTLING_POKEMON = register("battling_pokemon", ::BattlingPokemonSensor)
+    val MATE_SENSOR = register("mate_sensor", ::MateSensor)
+    val NEST_SENSOR = register("nest_sensor", ::NestSensor)
+    val EGG_SENSOR = register("egg_sensor", :: EggSensor)
+    val NEST_MATERIAL_SENSOR = register("nest_material_sensor", :: NestMaterialSensor)
+    val IDEAL_NEST_LOCATION_SENSOR = register("ideal_nest_location_sensor", ::IdealNestPlacementSensor)
 //    val NPC_BATTLING = register("npc_battling", ::NPCBattlingSensor)
     val POKEMON_DROWSY = register("pokemon_drowsy", ::DrowsySensor)
 

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

@@ -43,18 +43,8 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, ResourceKey<Regi
     @JvmField
     val PC_WALLPAPER_UNLOCK = this.create("pc.wallpaper.unlock")
 
-    @JvmField
-    val NPC_GIBBER_GENERIC = this.create("entity.npc.gibber.generic")
-    @JvmField
-    val NPC_GIBBER_SPEECH_TYPE_1_1 = this.create("entity.npc.gibber.speech_type_1_1")
-    @JvmField
-    val NPC_GIBBER_SPEECH_TYPE_1_2 = this.create("entity.npc.gibber.speech_type_1_2")
-    @JvmField
-    val NPC_GIBBER_SPEECH_TYPE_1_3 = this.create("entity.npc.gibber.speech_type_1_3")
-
     @JvmField
     val VILLAGER_WORK_NURSE = this.create("entity.villager.work_nurse")
-
     @JvmField
     val HEALING_MACHINE_ACTIVE = this.create("block.healing_machine.active")
 
@@ -94,6 +84,9 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, ResourceKey<Regi
     @JvmField
     val POKEDEX_SCAN_ZOOM_INCREMENT = this.create("item.pokedex.scan_zoom_increment")
 
+    @JvmField
+    val BREEDING_EGG_HATCH = this.create("breeding.egg_hatch")
+
     @JvmField
     val ITEM_USE = this.create("item.use")
     @JvmField
@@ -122,9 +115,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")
@@ -217,8 +207,6 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, ResourceKey<Regi
     val BERRY_HARVEST = this.create("block.berry_bush.harvest")
     @JvmField
     val BERRY_EAT = this.create("item.berry.eat")
-    @JvmField
-    val BERRY_EAT_FULL = this.create("item.berry.eat.full")
 
     @JvmField
     val BIG_ROOT_BREAK = this.create("block.big_root.break")
@@ -440,37 +428,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/advancement/criterion/AspectCriterion.kt

@@ -18,7 +18,7 @@ import java.util.Optional
 
 class AspectCriterion(
     playerCtx: Optional<ContextAwarePredicate>,
-    val species: ResourceLocation,
+    val pokemon: ResourceLocation,
     val aspects: List<String>
 ): SimpleCriterionCondition<MutableMap<ResourceLocation, MutableSet<String>>>(playerCtx) {
 
@@ -26,13 +26,42 @@ class AspectCriterion(
         val CODEC: Codec<AspectCriterion> = RecordCodecBuilder.create { it.group(
             //All three of these codecs used to use Codecs.createStrictOptionalFieldCodec, that no longer exists
             ContextAwarePredicate.CODEC.optionalFieldOf("player").forGetter(AspectCriterion::playerCtx),
-            ResourceLocation.CODEC.optionalFieldOf("species", cobblemonResource("pikachu")).forGetter(AspectCriterion::species),
+            ResourceLocation.CODEC.optionalFieldOf("pokemon", cobblemonResource("pikachu")).forGetter(AspectCriterion::pokemon),
             Codec.STRING.listOf().optionalFieldOf("aspects", listOf()).forGetter(AspectCriterion::aspects)
         ) .apply(it, ::AspectCriterion) }
     }
 
     override fun matches(player: ServerPlayer, context: MutableMap<ResourceLocation, MutableSet<String>>): Boolean {
-        val caughtAspects = context.getOrDefault(species, mutableSetOf())
+        val caughtAspects = context.getOrDefault(pokemon, mutableSetOf())
         return this.aspects.all { it in caughtAspects }
     }
 }
+
+//open class AspectCriterionTrigger(identifier: Identifier, criterionClass: Class<AspectCriterionCondition>) : SimpleCriterionTrigger<MutableMap<Identifier, MutableSet<String>>, AspectCriterionCondition>(identifier, criterionClass) {
+//
+//}
+//
+//class AspectCriterionCondition(id: Identifier, predicate: LootContextPredicate) : SimpleCriterionCondition<MutableMap<Identifier, MutableSet<String>>>(id, predicate) {
+//    var pokemon = Identifier.of("cobblemon:pikachu")
+//    var aspects = mutableListOf<String>()
+//    override fun toJson(json: JsonObject) {
+//        json.add("aspects", JsonArray(aspects.size).also {
+//            aspects.forEach { aspect -> it.add(aspect) }
+//        })
+//        json.addProperty("pokemon", pokemon.toString())
+//    }
+//
+//    override fun fromJson(json: JsonObject) {
+//        aspects.clear()
+//        json.getAsJsonArray("aspects").forEach { element ->
+//            aspects.add(element.asString)
+//        }
+//        pokemon = json.get("pokemon").asString.asIdentifierDefaultingNamespace()
+//    }
+//
+//    override fun matches(player: ServerPlayer, context: MutableMap<Identifier, MutableSet<String>>): Boolean {
+//        val caughtAspects = context.getOrDefault(pokemon, mutableSetOf())
+//        return this.aspects.all { it in caughtAspects }
+//    }
+//
+//}

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/CatchPokemonCriterion.kt

@@ -21,23 +21,40 @@ import java.util.Optional
  * @author Hiroku
  * @since November 4th, 2022
  */
-open class CountablePokemonTypeContext(times: Int, var species: String) : CountableContext(times)
+open class CountablePokemonTypeContext(times: Int, var type: String) : CountableContext(times)
 
 class CaughtPokemonCriterion(
     playerCtx: Optional<ContextAwarePredicate>,
-    val species: String,
+    val type: String,
     count: Int
 ): CountableCriterion<CountablePokemonTypeContext>(playerCtx, count) {
 
     companion object {
         val CODEC: Codec<CaughtPokemonCriterion> = RecordCodecBuilder.create { it.group(
             EntityPredicate.ADVANCEMENT_CODEC.optionalFieldOf("player").forGetter(CaughtPokemonCriterion::playerCtx),
-            Codec.STRING.optionalFieldOf("species", "any").forGetter(CaughtPokemonCriterion::species),
+            Codec.STRING.optionalFieldOf("type", "any").forGetter(CaughtPokemonCriterion::type),
             Codec.INT.optionalFieldOf("count", 0).forGetter(CaughtPokemonCriterion::count)
         ).apply(it, ::CaughtPokemonCriterion) }
     }
 
     override fun matches(player: ServerPlayer, context: CountablePokemonTypeContext): Boolean {
-        return super.matches(player, context) && (context.species == species || species == "any")
+        return super.matches(player, context) && (context.type == type || type == "any")
     }
 }
+
+//class CaughtPokemonCriterionCondition(id: Identifier, predicate: LootContextPredicate) : CountableCriterionCondition<CountablePokemonTypeContext>(id, predicate) {
+//    var type = "any"
+//    override fun toJson(json: JsonObject) {
+//        super.toJson(json)
+//        json.addProperty("type", type)
+//    }
+//
+//    override fun fromJson(json: JsonObject) {
+//        super.fromJson(json)
+//        type = json.get("type")?.asString ?: "any"
+//    }
+//
+//    override fun matches(player: ServerPlayer, context: CountablePokemonTypeContext): Boolean {
+//        return super.matches(player, context) && (context.type == type || type == "any")
+//    }
+//}

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

@@ -0,0 +1,35 @@
+/*
+ * 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.advancement.criterion
+
+import com.cobblemon.mod.common.api.pokemon.PokemonProperties
+import com.cobblemon.mod.common.pokemon.Pokemon
+import com.mojang.serialization.Codec
+import com.mojang.serialization.codecs.RecordCodecBuilder
+import net.minecraft.advancements.critereon.ContextAwarePredicate
+import net.minecraft.advancements.critereon.EntityPredicate
+import net.minecraft.server.level.ServerPlayer
+import java.util.Optional
+
+class PokemonCriterion(
+    playerCtx: Optional<ContextAwarePredicate>,
+    val properties: PokemonProperties
+): SimpleCriterionCondition<Pokemon>(playerCtx) {
+
+    companion object {
+        val CODEC: Codec<PokemonCriterion> = RecordCodecBuilder.create { it.group(
+            EntityPredicate.ADVANCEMENT_CODEC.optionalFieldOf("player").forGetter(PokemonCriterion::playerCtx),
+            PokemonProperties.CODEC.optionalFieldOf("properties", PokemonProperties()).forGetter(PokemonCriterion::properties)
+        ).apply(it, ::PokemonCriterion) }
+    }
+
+    override fun matches(player: ServerPlayer, context: Pokemon): Boolean {
+        return properties.matches(context)
+    }
+}

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

@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.advancement.criterion
-
-import com.cobblemon.mod.common.api.pokemon.PokemonProperties
-import com.cobblemon.mod.common.pokemon.Pokemon
-import com.mojang.serialization.Codec
-import com.mojang.serialization.codecs.RecordCodecBuilder
-import net.minecraft.advancements.critereon.ContextAwarePredicate
-import net.minecraft.advancements.critereon.EntityPredicate
-import net.minecraft.server.level.ServerPlayer
-import java.util.Optional
-
-class PokemonCriterion(
-    playerCtx: Optional<ContextAwarePredicate>,
-    val species: String,
-    val properties: PokemonProperties
-): SimpleCriterionCondition<Pokemon>(playerCtx) {
-
-    companion object {
-        val CODEC: Codec<PokemonCriterion> = RecordCodecBuilder.create { it.group(
-            EntityPredicate.ADVANCEMENT_CODEC.optionalFieldOf("player").forGetter(PokemonCriterion::playerCtx),
-            Codec.STRING.optionalFieldOf("species", "any").forGetter(PokemonCriterion::species),
-            PokemonProperties.CODEC.optionalFieldOf("properties", PokemonProperties()).forGetter(PokemonCriterion::properties)
-        ).apply(it, ::PokemonCriterion) }
-    }
-
-    override fun matches(player: ServerPlayer, context: Pokemon): Boolean {
-        var speciesCheck = (species.equals(context.species.resourceIdentifier.path) || species.equals(context.species.resourceIdentifier.toString())) || species.equals("any")
-        return speciesCheck && properties.matches(context)
-    }
-}

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

@@ -17,22 +17,22 @@ import net.minecraft.server.level.ServerPlayer
 import net.minecraft.resources.ResourceLocation
 import java.util.Optional
 
-class PokemonInteractContext(val species: ResourceLocation, val item: ResourceLocation)
+class PokemonInteractContext(val type: ResourceLocation, val item: ResourceLocation)
 
 class PokemonInteractCriterion(
     playerCtx: Optional<ContextAwarePredicate>,
-    val species: String,
+    val type: String,
     val item: String
 ): SimpleCriterionCondition<PokemonInteractContext>(playerCtx) {
     companion object {
         val CODEC: Codec<PokemonInteractCriterion> = RecordCodecBuilder.create { it.group(
             EntityPredicate.ADVANCEMENT_CODEC.optionalFieldOf("player").forGetter(PokemonInteractCriterion::playerCtx),
-            Codec.STRING.optionalFieldOf("species", "any").forGetter(PokemonInteractCriterion::species),
+            Codec.STRING.optionalFieldOf("type", "any").forGetter(PokemonInteractCriterion::type),
             Codec.STRING.optionalFieldOf("item", "any").forGetter(PokemonInteractCriterion::item)
         ).apply(it, ::PokemonInteractCriterion) }
     }
 
     override fun matches(player: ServerPlayer, context: PokemonInteractContext): Boolean {
-        return (context.species == this.species.asIdentifierDefaultingNamespace() || this.species == "any") && (context.item == this.item.asIdentifierDefaultingNamespace() || this.item == "any")
+        return (context.type == this.type.asIdentifierDefaultingNamespace() || this.type == "any") && (context.item == this.item.asIdentifierDefaultingNamespace() || this.item == "any")
     }
-}
+}

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

@@ -17,23 +17,23 @@ import net.minecraft.advancements.critereon.EntityPredicate
 import net.minecraft.server.level.ServerPlayer
 import net.minecraft.resources.ResourceLocation
 
-class ReelInPokemonContext(val species : ResourceLocation, val baitId: ResourceLocation)
+class ReelInPokemonContext(val pokemonId : ResourceLocation, val baitId: ResourceLocation)
 
 class ReelInPokemonCriterionCondition(
         playerCtx: Optional<ContextAwarePredicate>,
-        val species: String,
+        val pokemonId: String,
         val baitId: String
 ) : SimpleCriterionCondition<ReelInPokemonContext>(playerCtx) {
 
     companion object {
         val CODEC: Codec<ReelInPokemonCriterionCondition> = RecordCodecBuilder.create { it.group(
             EntityPredicate.ADVANCEMENT_CODEC.optionalFieldOf("player").forGetter { it.playerCtx },
-            Codec.STRING.optionalFieldOf("species", "any").forGetter { it.species },
+            Codec.STRING.optionalFieldOf("pokemonId", "any").forGetter { it.pokemonId },
             Codec.STRING.optionalFieldOf("baitId", "empty_bait").forGetter { it.baitId }
         ).apply(it, { playerCtx, pokemonId, baitId -> ReelInPokemonCriterionCondition(playerCtx, pokemonId, baitId.ifEmpty { "empty_bait" }) }) }
     }
 
     override fun matches(player: ServerPlayer, context: ReelInPokemonContext): Boolean {
-        return (context.species == this.species.asIdentifierDefaultingNamespace() || this.species == "any") && (context.baitId == this.baitId.asIdentifierDefaultingNamespace() || this.baitId == "empty_bait")
+        return (context.pokemonId == this.pokemonId.asIdentifierDefaultingNamespace() || this.pokemonId == "any") && (context.baitId == this.baitId.asIdentifierDefaultingNamespace() || this.baitId == "empty_bait")
     }
 }

common/src/main/kotlin/com/cobblemon/mod/common/api/ai/BehaviourConfigurationContext.kt

@@ -16,7 +16,7 @@ import net.minecraft.world.entity.schedule.Activity
 import net.minecraft.world.entity.schedule.Schedule
 
 class BehaviourConfigurationContext {
-    var appliedBehaviours: Set<ResourceLocation> = setOf()
+    var appliedBehaviours: MutableSet<ResourceLocation> = mutableSetOf()
 
     var defaultActivity = Activity.IDLE
     var coreActivities = setOf(Activity.CORE)

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

@@ -15,10 +15,8 @@ import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangV
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.setup
 import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
 import com.cobblemon.mod.common.util.asExpression
-import com.cobblemon.mod.common.util.cobblemonResource
 import com.cobblemon.mod.common.util.resolveBoolean
 import com.cobblemon.mod.common.util.withQueryValue
-import net.minecraft.resources.ResourceLocation
 import net.minecraft.world.entity.LivingEntity
 
 /**
@@ -35,16 +33,17 @@ import net.minecraft.world.entity.LivingEntity
  */
 interface BehaviourConfig {
     companion object {
-        val types = mutableMapOf<ResourceLocation, Class<out BehaviourConfig>>(
-            cobblemonResource("script") to ScriptBehaviourConfig::class.java,
-            cobblemonResource("custom_script") to CustomScriptBehaviourConfig::class.java,
-            cobblemonResource("add_tasks_to_activity") to AddTasksToActivity::class.java,
-            cobblemonResource("apply_behaviours") to ApplyBehaviours::class.java,
-            cobblemonResource("set_default_activity") to SetDefaultActivity::class.java,
-            cobblemonResource("set_core_activities") to SetCoreActivities::class.java,
-            cobblemonResource("add_variables") to AddVariablesConfig::class.java,
-            cobblemonResource("set_variables") to SetVariablesConfig::class.java,
+        val types = mutableMapOf<String, Class<out BehaviourConfig>>(
+            "script" to ScriptBehaviourConfig::class.java,
+            "custom_script" to CustomScriptBehaviourConfig::class.java,
+            "add_tasks_to_activity" to AddTasksToActivity::class.java,
+            "apply_behaviours" to ApplyBehaviours::class.java,
+            "set_default_activity" to SetDefaultActivity::class.java,
+            "set_core_activities" to SetCoreActivities::class.java,
+            "add_variables" to AddVariablesConfig::class.java,
+            "set_variables" to SetVariablesConfig::class.java,
         )
+
     }
 
     fun checkCondition(entity: LivingEntity, expressionOrEntityVariable: ExpressionOrEntityVariable): Boolean {

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

@@ -15,7 +15,6 @@ import com.cobblemon.mod.common.api.ai.config.task.WanderTaskConfig.Companion.WA
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
 import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
 import com.cobblemon.mod.common.util.asExpression
-import com.cobblemon.mod.common.util.resolveFloat
 import com.cobblemon.mod.common.util.withQueryValue
 import com.mojang.datafixers.util.Either
 import net.minecraft.world.entity.LivingEntity
@@ -47,7 +46,6 @@ class AirWanderTaskConfig : SingleTaskConfig {
     ): BehaviorControl<in LivingEntity>? {
         runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
         if (!condition.resolveBoolean()) return null
-        val wanderChanceExpression = wanderChance.asSimplifiedExpression(entity)
 
         return BehaviorBuilder.create {
             it.group(
@@ -60,7 +58,7 @@ class AirWanderTaskConfig : SingleTaskConfig {
                     }
 
                     runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
-                    val wanderChance = runtime.resolveFloat(wanderChanceExpression)
+                    val wanderChance = wanderChance.resolveFloat()
                     if (wanderChance <= 0 || world.random.nextFloat() > wanderChance) return@Trigger false
 
                     val rotVec = entity.getViewVector(0F)

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

@@ -0,0 +1,148 @@
+package com.cobblemon.mod.common.api.ai.config.task
+
+import com.cobblemon.mod.common.CobblemonMemories
+import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
+import com.cobblemon.mod.common.api.ai.WrapperLivingEntityTask
+import com.cobblemon.mod.common.api.ai.asVariables
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
+import com.cobblemon.mod.common.api.pokemon.breeding.Egg
+import com.cobblemon.mod.common.api.text.green
+import com.cobblemon.mod.common.block.entity.NestBlockEntity
+import com.cobblemon.mod.common.breeding.BreedingLogicManager
+import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
+import com.cobblemon.mod.common.entity.pokemon.ai.tasks.AttackEggThiefTask
+import com.cobblemon.mod.common.entity.pokemon.ai.tasks.BreedAtNestTask
+import com.cobblemon.mod.common.entity.pokemon.ai.tasks.SearchForEggTask
+import com.cobblemon.mod.common.util.withQueryValue
+import com.mojang.datafixers.kinds.IdF
+import net.minecraft.core.BlockPos
+import net.minecraft.world.entity.LivingEntity
+import net.minecraft.world.entity.PathfinderMob
+import net.minecraft.world.entity.ai.behavior.BehaviorControl
+import net.minecraft.world.entity.ai.behavior.declarative.BehaviorBuilder
+import net.minecraft.world.entity.ai.behavior.declarative.Trigger
+import net.minecraft.world.entity.ai.memory.MemoryModuleType
+import net.minecraft.world.item.ItemStack
+import net.minecraft.world.phys.Vec3
+
+class AttackEggThiefTaskConfig : SingleTaskConfig {
+    companion object {
+        const val BREED = "breed_at_nest" // Category
+    }
+
+    val condition = booleanVariable(BREED, "can_breed", true).asExpressible()
+
+    override fun getVariables(entity: LivingEntity) = listOf(
+        condition
+    ).asVariables()
+
+    override fun createTask(
+        entity: LivingEntity,
+        brainConfigurationContext: BehaviourConfigurationContext
+    ): BehaviorControl<in LivingEntity>? {
+        return WrapperLivingEntityTask(AttackEggThiefTask.create(), PokemonEntity::class.java)
+    }
+}
+
+    /*override fun createTask(
+        entity: LivingEntity,
+        brainConfigurationContext: BrainConfigurationContext
+    ): BehaviorControl<in LivingEntity>? {
+        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+        if (!condition.resolveBoolean() || entity !is PokemonEntity) return null
+
+        return BehaviorBuilder.create {
+            it.group(
+                it.present(CobblemonMemories.NEST_LOCATION),
+                it.present(CobblemonMemories.POTENTIAL_MATE),
+                it.absent(MemoryModuleType.WALK_TARGET)
+            ).apply(it) { nestMemory, mateMemory, walkTarget ->
+                Trigger { world, entity, time ->
+                    if (entity !is PathfinderMob || !entity.isAlive) return@Trigger false
+
+                    runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+
+                    // Retrieve nest location and mate entity from memory
+                    val nestLocation: BlockPos = (nestMemory.value() as? IdF<BlockPos>)?.value() ?: return@Trigger false
+                    val mate = (mateMemory.value() as? IdF<PokemonEntity>)?.value() ?: return@Trigger false
+
+                    // Convert nest location to Vec3
+                    val targetVec = Vec3.atCenterOf(nestLocation)
+
+                    // Check proximity to the nest
+                    if (entity.distanceToSqr(targetVec) > 2.0 && mate.distanceToSqr(targetVec) > 2.0) {
+                        return@Trigger false
+                    }
+
+                    // Access the nest block entity
+                    val nestBlockEntity = world.getBlockEntity(nestLocation) as? NestBlockEntity
+                        ?: return@Trigger false
+
+                    // double check to make sure the nest is not taken yet and cancel if it is
+                    if (nestBlockEntity.getItem(0) != ItemStack.EMPTY) return@Trigger false
+
+                    // Generate the egg using BreedingLogicManager
+                    val parentOne = (entity as PokemonEntity).pokemon
+                    val parentTwo = mate.pokemon
+                    val breedingResult = BreedingLogicManager.breed(parentOne, parentTwo)
+                    val form = BreedingLogicManager.calculateForm(parentOne, parentTwo)
+
+                    // Ensure the breeding result is valid
+                    val egg = breedingResult.pokemon?.let { result ->
+                        Egg(
+                            species = result.species.resourceIdentifier,
+                            parentOne = parentOne,
+                            parentTwo = parentTwo,
+                            form = form.name.lowercase(),
+                            timeToHatch = 6000F
+                        )
+                    } ?: return@Trigger false
+
+                    // Set the egg in the nest
+                    nestBlockEntity.setItem(egg.createEggItemStack())
+
+                    // set the parents of the nest if it/they are wild so they guard it
+                    if (nestBlockEntity.ownerUUID == null)
+                        nestBlockEntity.parents = Pair((entity as PokemonEntity).uuid, mate.uuid)
+
+
+                    // set breeding cooldown for both
+                    parentOne.breedingCooldown = BreedingLogicManager.resetBreedingCooldown(parentOne)
+                    parentTwo.breedingCooldown = BreedingLogicManager.resetBreedingCooldown(parentTwo)
+
+                    // Display heart particles above parents
+
+                    (world as net.minecraft.server.level.ServerLevel).sendParticles(
+                            net.minecraft.core.particles.ParticleTypes.HEART,
+                            entity.getRandomX(1.0), // Particle X position with slight randomness
+                            entity.getRandomY() + 0.5, // Slightly raised Y position
+                            entity.getRandomZ(1.0), // Particle Z position with slight randomness
+                            4 + kotlin.random.Random.nextInt(2), // Particle count
+                            0.2 * entity.random.nextGaussian(), // X velocity with slight variance
+                            0.1 * entity.random.nextGaussian(), // Y velocity with upwards variance
+                            0.2 * entity.random.nextGaussian(), // Z velocity with slight variance
+                            0.02 // Particle speed
+                    )
+                    (world as net.minecraft.server.level.ServerLevel).sendParticles(
+                            net.minecraft.core.particles.ParticleTypes.HEART,
+                            mate.getRandomX(1.0), // Particle X position with slight randomness
+                            mate.getRandomY() + 0.5, // Slightly raised Y position
+                            mate.getRandomZ(1.0), // Particle Z position with slight randomness
+                            4 + kotlin.random.Random.nextInt(2), // Particle count
+                            0.2 * mate.random.nextGaussian(), // X velocity with slight variance
+                            0.1 * mate.random.nextGaussian(), // Y velocity with upwards variance
+                            0.2 * mate.random.nextGaussian(), // Z velocity with slight variance
+                            0.02 // Particle speed
+                    )
+
+                    // Notify nearby players
+                    world.players().forEach { player ->
+                        player.displayClientMessage("An egg has been laid in the nest!".green(), true)
+                    }
+
+                    // todo maybe have them fall asleep after?
+
+                    return@Trigger true
+                }
+            }
+        }*/

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

@@ -0,0 +1,146 @@
+package com.cobblemon.mod.common.api.ai.config.task
+
+import com.cobblemon.mod.common.CobblemonMemories
+import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
+import com.cobblemon.mod.common.api.ai.WrapperLivingEntityTask
+import com.cobblemon.mod.common.api.ai.asVariables
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
+import com.cobblemon.mod.common.api.pokemon.breeding.Egg
+import com.cobblemon.mod.common.api.text.green
+import com.cobblemon.mod.common.block.entity.NestBlockEntity
+import com.cobblemon.mod.common.breeding.BreedingLogicManager
+import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
+import com.cobblemon.mod.common.entity.pokemon.ai.tasks.BreedAtNestTask
+import com.cobblemon.mod.common.util.withQueryValue
+import com.mojang.datafixers.kinds.IdF
+import net.minecraft.core.BlockPos
+import net.minecraft.world.entity.LivingEntity
+import net.minecraft.world.entity.PathfinderMob
+import net.minecraft.world.entity.ai.behavior.BehaviorControl
+import net.minecraft.world.entity.ai.behavior.declarative.BehaviorBuilder
+import net.minecraft.world.entity.ai.behavior.declarative.Trigger
+import net.minecraft.world.entity.ai.memory.MemoryModuleType
+import net.minecraft.world.item.ItemStack
+import net.minecraft.world.phys.Vec3
+
+class BreedAtNestTaskConfig : SingleTaskConfig {
+    companion object {
+        const val BREED = "breed_at_nest" // Category
+    }
+
+    val condition = booleanVariable(BREED, "can_breed", true).asExpressible()
+
+    override fun getVariables(entity: LivingEntity) = listOf(
+        condition
+    ).asVariables()
+
+    override fun createTask(
+        entity: LivingEntity,
+        brainConfigurationContext: BehaviourConfigurationContext
+    ): BehaviorControl<in LivingEntity>? {
+        return WrapperLivingEntityTask(BreedAtNestTask.create(), PokemonEntity::class.java)
+    }
+}
+
+    /*override fun createTask(
+        entity: LivingEntity,
+        brainConfigurationContext: BrainConfigurationContext
+    ): BehaviorControl<in LivingEntity>? {
+        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+        if (!condition.resolveBoolean() || entity !is PokemonEntity) return null
+
+        return BehaviorBuilder.create {
+            it.group(
+                it.present(CobblemonMemories.NEST_LOCATION),
+                it.present(CobblemonMemories.POTENTIAL_MATE),
+                it.absent(MemoryModuleType.WALK_TARGET)
+            ).apply(it) { nestMemory, mateMemory, walkTarget ->
+                Trigger { world, entity, time ->
+                    if (entity !is PathfinderMob || !entity.isAlive) return@Trigger false
+
+                    runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+
+                    // Retrieve nest location and mate entity from memory
+                    val nestLocation: BlockPos = (nestMemory.value() as? IdF<BlockPos>)?.value() ?: return@Trigger false
+                    val mate = (mateMemory.value() as? IdF<PokemonEntity>)?.value() ?: return@Trigger false
+
+                    // Convert nest location to Vec3
+                    val targetVec = Vec3.atCenterOf(nestLocation)
+
+                    // Check proximity to the nest
+                    if (entity.distanceToSqr(targetVec) > 2.0 && mate.distanceToSqr(targetVec) > 2.0) {
+                        return@Trigger false
+                    }
+
+                    // Access the nest block entity
+                    val nestBlockEntity = world.getBlockEntity(nestLocation) as? NestBlockEntity
+                        ?: return@Trigger false
+
+                    // double check to make sure the nest is not taken yet and cancel if it is
+                    if (nestBlockEntity.getItem(0) != ItemStack.EMPTY) return@Trigger false
+
+                    // Generate the egg using BreedingLogicManager
+                    val parentOne = (entity as PokemonEntity).pokemon
+                    val parentTwo = mate.pokemon
+                    val breedingResult = BreedingLogicManager.breed(parentOne, parentTwo)
+                    val form = BreedingLogicManager.calculateForm(parentOne, parentTwo)
+
+                    // Ensure the breeding result is valid
+                    val egg = breedingResult.pokemon?.let { result ->
+                        Egg(
+                            species = result.species.resourceIdentifier,
+                            parentOne = parentOne,
+                            parentTwo = parentTwo,
+                            form = form.name.lowercase(),
+                            timeToHatch = 6000F
+                        )
+                    } ?: return@Trigger false
+
+                    // Set the egg in the nest
+                    nestBlockEntity.setItem(egg.createEggItemStack())
+
+                    // set the parents of the nest if it/they are wild so they guard it
+                    if (nestBlockEntity.ownerUUID == null)
+                        nestBlockEntity.parents = Pair((entity as PokemonEntity).uuid, mate.uuid)
+
+
+                    // set breeding cooldown for both
+                    parentOne.breedingCooldown = BreedingLogicManager.resetBreedingCooldown(parentOne)
+                    parentTwo.breedingCooldown = BreedingLogicManager.resetBreedingCooldown(parentTwo)
+
+                    // Display heart particles above parents
+
+                    (world as net.minecraft.server.level.ServerLevel).sendParticles(
+                            net.minecraft.core.particles.ParticleTypes.HEART,
+                            entity.getRandomX(1.0), // Particle X position with slight randomness
+                            entity.getRandomY() + 0.5, // Slightly raised Y position
+                            entity.getRandomZ(1.0), // Particle Z position with slight randomness
+                            4 + kotlin.random.Random.nextInt(2), // Particle count
+                            0.2 * entity.random.nextGaussian(), // X velocity with slight variance
+                            0.1 * entity.random.nextGaussian(), // Y velocity with upwards variance
+                            0.2 * entity.random.nextGaussian(), // Z velocity with slight variance
+                            0.02 // Particle speed
+                    )
+                    (world as net.minecraft.server.level.ServerLevel).sendParticles(
+                            net.minecraft.core.particles.ParticleTypes.HEART,
+                            mate.getRandomX(1.0), // Particle X position with slight randomness
+                            mate.getRandomY() + 0.5, // Slightly raised Y position
+                            mate.getRandomZ(1.0), // Particle Z position with slight randomness
+                            4 + kotlin.random.Random.nextInt(2), // Particle count
+                            0.2 * mate.random.nextGaussian(), // X velocity with slight variance
+                            0.1 * mate.random.nextGaussian(), // Y velocity with upwards variance
+                            0.2 * mate.random.nextGaussian(), // Z velocity with slight variance
+                            0.02 // Particle speed
+                    )
+
+                    // Notify nearby players
+                    world.players().forEach { player ->
+                        player.displayClientMessage("An egg has been laid in the nest!".green(), true)
+                    }
+
+                    // todo maybe have them fall asleep after?
+
+                    return@Trigger true
+                }
+            }
+        }*/

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

@@ -0,0 +1,106 @@
+package com.cobblemon.mod.common.api.ai.config.task
+
+import com.cobblemon.mod.common.CobblemonMemories
+import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
+import com.cobblemon.mod.common.api.ai.WrapperLivingEntityTask
+import com.cobblemon.mod.common.api.ai.asVariables
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
+import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
+import com.cobblemon.mod.common.entity.pokemon.ai.tasks.BuildNestTask
+import com.cobblemon.mod.common.entity.pokemon.ai.tasks.PathToNestTask
+import com.cobblemon.mod.common.util.withQueryValue
+import com.mojang.datafixers.kinds.IdF
+import net.minecraft.core.BlockPos
+import net.minecraft.world.entity.LivingEntity
+import net.minecraft.world.entity.PathfinderMob
+import net.minecraft.world.entity.ai.behavior.BehaviorControl
+import net.minecraft.world.entity.ai.behavior.BlockPosTracker
+import net.minecraft.world.entity.ai.behavior.declarative.BehaviorBuilder
+import net.minecraft.world.entity.ai.behavior.declarative.Trigger
+import net.minecraft.world.entity.ai.memory.MemoryModuleType
+import net.minecraft.world.entity.ai.memory.WalkTarget
+import net.minecraft.world.phys.Vec3
+
+class BuildNestTaskConfig : SingleTaskConfig {
+    companion object {
+        const val BREED = "breed" // Category
+    }
+
+    val condition = booleanVariable(BREED, "breeds", true).asExpressible()
+    val speedMultiplier = numberVariable(BREED, "speed_multiplier", 0.6).asExpressible()
+
+    override fun getVariables(entity: LivingEntity) = listOf(
+        condition,
+        speedMultiplier
+    ).asVariables()
+
+    override fun createTask(
+        entity: LivingEntity,
+        brainConfigurationContext: BehaviourConfigurationContext
+    ): BehaviorControl<in LivingEntity>? {
+        return WrapperLivingEntityTask(BuildNestTask.create(), PokemonEntity::class.java)
+    }
+}
+
+    /*override fun createTask(
+        entity: LivingEntity,
+        brainConfigurationContext: BrainConfigurationContext
+    ): BehaviorControl<in LivingEntity>? {
+        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+        if (!condition.resolveBoolean() || entity !is PokemonEntity) return null
+
+        return BehaviorBuilder.create {
+            it.group(
+                 it.present(MemoryModuleType.LOOK_TARGET), // todo This might need to be it.absent but only it.present works atm
+                it.absent(MemoryModuleType.WALK_TARGET),
+                it.present(CobblemonMemories.NEST_LOCATION),
+                it.present(CobblemonMemories.POTENTIAL_MATE)
+            ).apply(it) { lookTarget, walkTarget, nestMemory, mateMemory ->
+                Trigger { world, entity, time ->
+                    if (entity !is PathfinderMob || !entity.isAlive) return@Trigger false
+
+                    // Don't do anything if the pokemon has a breeding cooldown
+                    if ((entity as PokemonEntity).pokemon.breedingCooldown != 0) return@Trigger false
+
+                    runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+
+                    // Retrieve nest location and mate entity from memory
+                    //val nestLocation = it.get(nestMemory)
+                    val nestLocation: BlockPos = (nestMemory.value() as? IdF<BlockPos>)?.value() ?: return@Trigger false
+
+                    //val mate = it.get(mateMemory) as? PokemonEntity ?: return@Trigger false
+                    val mate = (mateMemory.value() as? IdF<PokemonEntity>)?.value() ?: return@Trigger false
+
+                    // todo try to find a way to only have pairs of mates instead of an orgy
+
+                    // Create a target vector at the nest location
+                    val targetVec = Vec3.atCenterOf(nestLocation)
+
+                    // Check if Pokémon are close enough to the nest
+                    if (entity.distanceToSqr(targetVec) <= 2.0 && mate.distanceToSqr(targetVec) <= 2.0) {
+                        return@Trigger false // Task ends when both are close enough
+                    }
+
+                    *//*if ((entity as PokemonEntity).tethering.tetheringId != null) {
+                        val test1 = 1 // for breakpointing here to test my pastured mons
+                    }*//*
+
+                    // try to get the main pokemon to path and look at the nest
+
+                    walkTarget.set(WalkTarget(targetVec, speedMultiplier.resolveFloat(), 1))
+                    lookTarget.set(BlockPosTracker(targetVec.add(0.0, entity.eyeHeight.toDouble(), 0.0)))
+
+                    // try to find a way to get the mate to pathfind and look at the nest too...
+                    mate.brain.setMemory(
+                        MemoryModuleType.WALK_TARGET,
+                        WalkTarget(targetVec, speedMultiplier.resolveFloat(), 1)
+                    )
+                    mate.brain.setMemory(MemoryModuleType.LOOK_TARGET, BlockPosTracker(targetVec.add(0.0, entity.eyeHeight.toDouble(), 0.0)))
+
+                    return@Trigger true
+                }
+            }
+        }
+    }
+}*/

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

@@ -0,0 +1,173 @@
+package com.cobblemon.mod.common.api.ai.config.task
+
+import com.cobblemon.mod.common.Cobblemon
+import com.cobblemon.mod.common.CobblemonMemories
+import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
+import com.cobblemon.mod.common.api.ai.WrapperLivingEntityTask
+import com.cobblemon.mod.common.api.ai.asVariables
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
+import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
+import com.cobblemon.mod.common.entity.pokemon.ai.tasks.GuardNestTask
+import com.cobblemon.mod.common.util.withQueryValue
+import com.mojang.datafixers.kinds.IdF
+import net.minecraft.core.BlockPos
+import net.minecraft.server.level.ServerLevel
+import net.minecraft.server.level.ServerPlayer
+import net.minecraft.world.entity.LivingEntity
+import net.minecraft.world.entity.PathfinderMob
+import net.minecraft.world.entity.ai.behavior.BehaviorControl
+import net.minecraft.world.entity.ai.behavior.BlockPosTracker
+import net.minecraft.world.entity.ai.behavior.declarative.BehaviorBuilder
+import net.minecraft.world.entity.ai.behavior.declarative.Trigger
+import net.minecraft.world.entity.ai.memory.MemoryModuleType
+import net.minecraft.world.entity.ai.memory.WalkTarget
+import net.minecraft.world.entity.player.Player
+import net.minecraft.world.phys.Vec3
+
+class GuardNestTaskConfig : SingleTaskConfig {
+    // todo make new variables
+    companion object {
+        const val BREED = "breed"
+    }
+
+    val condition = booleanVariable(BREED, "breeds", true).asExpressible()
+    val speedMultiplier = numberVariable(BREED, "speed_multiplier", 0.6).asExpressible()
+
+    override fun getVariables(entity: LivingEntity) = listOf(
+        condition,
+        speedMultiplier
+    ).asVariables()
+
+    override fun createTask(
+        entity: LivingEntity,
+        brainConfigurationContext: BehaviourConfigurationContext
+    ): BehaviorControl<in LivingEntity>? {
+        return WrapperLivingEntityTask(GuardNestTask.create(), PokemonEntity::class.java)
+    }
+
+    /*override fun createTask(
+        entity: LivingEntity,
+        brainConfigurationContext: BrainConfigurationContext
+    ): BehaviorControl<in LivingEntity>? {
+        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+        if (!condition.resolveBoolean() || entity !is PokemonEntity) return null
+
+        return BehaviorBuilder.create {
+            it.group(
+                it.present(MemoryModuleType.LOOK_TARGET),
+                it.absent(MemoryModuleType.WALK_TARGET),
+                it.present(CobblemonMemories.PATERNAL_NEST_LOCATION),
+                it.registered(MemoryModuleType.NEAREST_VISIBLE_PLAYER), // if player is invisible they do not patrol
+                it.registered(MemoryModuleType.ANGRY_AT),
+                it.absent(MemoryModuleType.ATTACK_TARGET),
+                it.registered(CobblemonMemories.IRRITATED_AT)
+            ).apply(it) { lookTarget, walkTarget, paternalNest, nearestVisiblePlayer, angryAt, attackTarget, irritatedAt ->
+                Trigger { world, entity, time ->
+                    if (entity !is PathfinderMob || !entity.isAlive || entity !is PokemonEntity) return@Trigger false
+
+                    runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+
+                    // Retrieve nest location and mate entity from memory
+                    //val nestLocation = it.get(nestMemory)
+                    val nestLocation: BlockPos = (paternalNest.value() as? IdF<BlockPos>)?.value() ?: return@Trigger false
+                    val nestCenter = Vec3.atCenterOf(nestLocation)
+
+                    // todo maybe cancel task if player is close to nest and set angry at task to that player
+                    val nearestPlayerOptional = entity.brain.getMemory(MemoryModuleType.NEAREST_VISIBLE_PLAYER)
+                    val player = nearestPlayerOptional.orElse(null) as? ServerPlayer
+                    val irritatedAtTarget = entity.brain.getMemory(CobblemonMemories.IRRITATED_AT)
+
+                    if (player != null) {
+                        val playerDistanceSquared = player.position().distanceToSqr(nestCenter)
+
+                        if (!irritatedAtTarget.isPresent && playerDistanceSquared <= 15 * 15) {
+                            // Player is within 15 blocks, set angry and cry
+                            entity.cry()
+
+                            // set irritated at target to player near egg
+                            irritatedAt.set(player.uuid)
+
+                            // Display angry particles above parent
+                            (world as net.minecraft.server.level.ServerLevel).sendParticles(
+                                    net.minecraft.core.particles.ParticleTypes.ANGRY_VILLAGER,
+                                    entity.getRandomX(1.0), // Particle X position with slight randomness
+                                    entity.getRandomY() + 0.5, // Slightly raised Y position
+                                    entity.getRandomZ(1.0), // Particle Z position with slight randomness
+                                    4 + kotlin.random.Random.nextInt(2), // Particle count
+                                    0.2 * entity.random.nextGaussian(), // X velocity with slight variance
+                                    0.1 * entity.random.nextGaussian(), // Y velocity with upwards variance
+                                    0.2 * entity.random.nextGaussian(), // Z velocity with slight variance
+                                    0.02 // Particle speed
+                            )
+                        }
+
+                        if (playerDistanceSquared <= 8 * 8) {
+                            // Player is within 8 blocks, attack
+                            entity.cry()
+
+                            // Display angry particles above parent
+                            (world as net.minecraft.server.level.ServerLevel).sendParticles(
+                                    net.minecraft.core.particles.ParticleTypes.ANGRY_VILLAGER,
+                                    entity.getRandomX(1.0), // Particle X position with slight randomness
+                                    entity.getRandomY() + 0.5, // Slightly raised Y position
+                                    entity.getRandomZ(1.0), // Particle Z position with slight randomness
+                                    4 + kotlin.random.Random.nextInt(2), // Particle count
+                                    0.2 * entity.random.nextGaussian(), // X velocity with slight variance
+                                    0.1 * entity.random.nextGaussian(), // Y velocity with upwards variance
+                                    0.2 * entity.random.nextGaussian(), // Z velocity with slight variance
+                                    0.02 // Particle speed
+                            )
+                            angryAt.set(player.uuid)
+                            attackTarget.set(player)
+                            return@Trigger false // Cancel the task
+                        }
+                    }
+
+
+
+                    // Scan for a valid walkable position within an 8-block sphere
+                    val validPosition = findValidWalkablePosition(world, nestCenter, entity, 8)
+                    if (validPosition == null) {
+                        return@Trigger false // No valid position found
+                    }
+
+                    // Set the entity's walk and look targets
+                    walkTarget.set(WalkTarget(validPosition, speedMultiplier.resolveFloat(), 1))
+                    lookTarget.set(BlockPosTracker(validPosition.add(0.0, entity.eyeHeight.toDouble(), 0.0)))
+
+                    return@Trigger true
+                }
+            }
+        }
+    }
+
+    private fun findValidWalkablePosition(
+        world: ServerLevel,
+        center: Vec3,
+        entity: PathfinderMob,
+        radius: Int
+    ): Vec3? {
+        val random = world.random
+
+        // Try a number of random positions within the radius
+        repeat(20) { // Attempt up to 20 random positions
+            val offsetX = random.nextDouble() * 2 * radius - radius
+            val offsetY = random.nextDouble() * 2 * radius - radius
+            val offsetZ = random.nextDouble() * 2 * radius - radius
+            val candidate = center.add(offsetX, offsetY, offsetZ)
+
+            // Convert to block position
+            val blockPos = BlockPos(candidate.x.toInt(), candidate.y.toInt(), candidate.z.toInt())
+
+            // Check if the position is walkable and not inside a solid block
+            if (world.getBlockState(blockPos).isSolidRender(world, blockPos).not() &&
+                entity.navigation.isStableDestination(blockPos)
+            ) {
+                return Vec3.atCenterOf(blockPos) // Return the valid position
+            }
+        }
+
+        return null // No valid position found
+    }*/
+}

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

@@ -0,0 +1,139 @@
+package com.cobblemon.mod.common.api.ai.config.task
+
+import com.cobblemon.mod.common.Cobblemon
+import com.cobblemon.mod.common.CobblemonMemories
+import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
+import com.cobblemon.mod.common.api.ai.asVariables
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
+import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
+import com.cobblemon.mod.common.util.withQueryValue
+import com.mojang.datafixers.kinds.IdF
+import net.minecraft.core.BlockPos
+import net.minecraft.server.level.ServerLevel
+import net.minecraft.world.entity.LivingEntity
+import net.minecraft.world.entity.PathfinderMob
+import net.minecraft.world.entity.ai.behavior.BehaviorControl
+import net.minecraft.world.entity.ai.behavior.BlockPosTracker
+import net.minecraft.world.entity.ai.behavior.declarative.BehaviorBuilder
+import net.minecraft.world.entity.ai.behavior.declarative.Trigger
+import net.minecraft.world.entity.ai.memory.MemoryModuleType
+import net.minecraft.world.entity.ai.memory.WalkTarget
+import net.minecraft.world.entity.player.Player
+import net.minecraft.world.phys.Vec3
+import java.util.UUID
+
+class HuntPlayerTaskConfig : SingleTaskConfig {
+    // todo make new variables
+    companion object {
+        const val BREED = "breed"
+    }
+
+    val condition = booleanVariable(BREED, "breeds", true).asExpressible()
+    val speedMultiplier = numberVariable(BREED, "speed_multiplier", 0.6).asExpressible()
+
+    override fun getVariables(entity: LivingEntity) = listOf(
+        condition,
+        speedMultiplier
+    ).asVariables()
+
+    override fun createTask(
+        entity: LivingEntity,
+        brainConfigurationContext: BehaviourConfigurationContext
+    ): BehaviorControl<in LivingEntity>? {
+        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+        if (!condition.resolveBoolean() || entity !is PokemonEntity) return null
+
+        return BehaviorBuilder.create {
+            it.group(
+                it.present(MemoryModuleType.LOOK_TARGET),
+                it.absent(MemoryModuleType.WALK_TARGET),
+                it.present(MemoryModuleType.NEAREST_PLAYERS), // this will be null most of the time
+                it.present(MemoryModuleType.ANGRY_AT),
+                it.registered(MemoryModuleType.ATTACK_TARGET),
+                it.registered(MemoryModuleType.DISTURBANCE_LOCATION),
+            ).apply(it) { lookTarget, walkTarget, nearestPlayers, angryAt, attackTarget, disturbanceLocation ->
+                Trigger { world, entity, time ->
+                    if (entity !is PathfinderMob || !entity.isAlive || entity !is PokemonEntity) return@Trigger false
+
+                    runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+
+                    val angryAtUuid = (angryAt.value() as? IdF<UUID?>)?.value() ?: return@Trigger false
+                    val disturbancePos = (disturbanceLocation.value() as? IdF<BlockPos>)?.value()
+
+                    val players = (nearestPlayers.value() as? IdF<List<Player?>?>)?.value()
+                    val targetPlayer = players?.find { it?.uuid == angryAtUuid }
+
+                    if (targetPlayer != null) {
+                        // If the angry player is nearby, set them as the attack target
+                        entity.cry()
+                        attackTarget.set(targetPlayer)
+                        return@Trigger true
+                    }
+
+                    // If the angry player is not nearby, search around the Pokémon
+                    val maxTicksToSearch = 200L
+                    if (time > maxTicksToSearch) {
+                        // Timeout after 200 ticks
+                        return@Trigger false
+                    }
+
+                    // If no disturbance location or it is caused by a nearby player, skip
+                    if (disturbancePos != null) {
+                        val disturberCausingDisturbance = players?.any {
+                            it?.position()?.distanceToSqr(Vec3.atCenterOf(disturbancePos))!! <= 4.0 * 4.0
+                        }
+                        disturberCausingDisturbance?.let { it1 ->
+                            if (!it1) {
+                                // Pathfind toward disturbance location
+                                walkTarget.set(WalkTarget(Vec3.atCenterOf(disturbancePos), speedMultiplier.resolveFloat(), 1))
+                                lookTarget.set(BlockPosTracker(Vec3.atCenterOf(disturbancePos)))
+                                return@Trigger true
+                            }
+                        }
+                    }
+
+                    // If no valid disturbance location, pathfind randomly within proximity
+                    val validPosition = findValidWalkablePosition(world, entity.position(), entity, 8)
+                    if (validPosition == null) {
+                        return@Trigger false // No valid position found
+                    }
+
+                    walkTarget.set(WalkTarget(validPosition, speedMultiplier.resolveFloat(), 1))
+                    lookTarget.set(BlockPosTracker(validPosition.add(0.0, entity.eyeHeight.toDouble(), 0.0)))
+
+                    return@Trigger true
+                }
+            }
+        }
+    }
+
+    private fun findValidWalkablePosition(
+        world: ServerLevel,
+        center: Vec3,
+        entity: PathfinderMob,
+        radius: Int
+    ): Vec3? {
+        val random = world.random
+
+        // Try a number of random positions within the radius
+        repeat(20) { // Attempt up to 20 random positions
+            val offsetX = random.nextDouble() * 2 * radius - radius
+            val offsetY = random.nextDouble() * 2 * radius - radius
+            val offsetZ = random.nextDouble() * 2 * radius - radius
+            val candidate = center.add(offsetX, offsetY, offsetZ)
+
+            // Convert to block position
+            val blockPos = BlockPos(candidate.x.toInt(), candidate.y.toInt(), candidate.z.toInt())
+
+            // Check if the position is walkable and not inside a solid block
+            if (world.getBlockState(blockPos).isSolidRender(world, blockPos).not() &&
+                entity.navigation.isStableDestination(blockPos)
+            ) {
+                return Vec3.atCenterOf(blockPos) // Return the valid position
+            }
+        }
+
+        return null // No valid position found
+    }
+}

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

@@ -0,0 +1,45 @@
+package com.cobblemon.mod.common.api.ai.config.task
+
+import com.cobblemon.mod.common.CobblemonMemories
+import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
+import com.cobblemon.mod.common.api.ai.WrapperLivingEntityTask
+import com.cobblemon.mod.common.api.ai.asVariables
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
+import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
+import com.cobblemon.mod.common.entity.pokemon.ai.tasks.PathToIdealNestLocationTask
+import com.cobblemon.mod.common.entity.pokemon.ai.tasks.PathToNestMaterialTask
+import com.cobblemon.mod.common.entity.pokemon.ai.tasks.PathToNestTask
+import com.cobblemon.mod.common.util.withQueryValue
+import com.mojang.datafixers.kinds.IdF
+import net.minecraft.core.BlockPos
+import net.minecraft.world.entity.LivingEntity
+import net.minecraft.world.entity.PathfinderMob
+import net.minecraft.world.entity.ai.behavior.BehaviorControl
+import net.minecraft.world.entity.ai.behavior.BlockPosTracker
+import net.minecraft.world.entity.ai.behavior.declarative.BehaviorBuilder
+import net.minecraft.world.entity.ai.behavior.declarative.Trigger
+import net.minecraft.world.entity.ai.memory.MemoryModuleType
+import net.minecraft.world.entity.ai.memory.WalkTarget
+import net.minecraft.world.phys.Vec3
+
+class PathToIdealNestLocationTaskConfig : SingleTaskConfig {
+    companion object {
+        const val BREED = "breed" // Category
+    }
+
+    val condition = booleanVariable(BREED, "breeds", true).asExpressible()
+    val speedMultiplier = numberVariable(BREED, "speed_multiplier", 0.6).asExpressible()
+
+    override fun getVariables(entity: LivingEntity) = listOf(
+        condition,
+        speedMultiplier
+    ).asVariables()
+
+    override fun createTask(
+        entity: LivingEntity,
+        brainConfigurationContext: BehaviourConfigurationContext
+    ): BehaviorControl<in LivingEntity>? {
+        return WrapperLivingEntityTask(PathToIdealNestLocationTask.create(), PokemonEntity::class.java)
+    }
+}

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

@@ -0,0 +1,106 @@
+package com.cobblemon.mod.common.api.ai.config.task
+
+import com.cobblemon.mod.common.CobblemonMemories
+import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
+import com.cobblemon.mod.common.api.ai.WrapperLivingEntityTask
+import com.cobblemon.mod.common.api.ai.asVariables
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
+import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
+import com.cobblemon.mod.common.entity.pokemon.ai.tasks.PathToNestMaterialTask
+import com.cobblemon.mod.common.entity.pokemon.ai.tasks.PathToNestTask
+import com.cobblemon.mod.common.util.withQueryValue
+import com.mojang.datafixers.kinds.IdF
+import net.minecraft.core.BlockPos
+import net.minecraft.world.entity.LivingEntity
+import net.minecraft.world.entity.PathfinderMob
+import net.minecraft.world.entity.ai.behavior.BehaviorControl
+import net.minecraft.world.entity.ai.behavior.BlockPosTracker
+import net.minecraft.world.entity.ai.behavior.declarative.BehaviorBuilder
+import net.minecraft.world.entity.ai.behavior.declarative.Trigger
+import net.minecraft.world.entity.ai.memory.MemoryModuleType
+import net.minecraft.world.entity.ai.memory.WalkTarget
+import net.minecraft.world.phys.Vec3
+
+class PathToNestMaterialTaskConfig : SingleTaskConfig {
+    companion object {
+        const val BREED = "breed" // Category
+    }
+
+    val condition = booleanVariable(BREED, "breeds", true).asExpressible()
+    val speedMultiplier = numberVariable(BREED, "speed_multiplier", 0.6).asExpressible()
+
+    override fun getVariables(entity: LivingEntity) = listOf(
+        condition,
+        speedMultiplier
+    ).asVariables()
+
+    override fun createTask(
+        entity: LivingEntity,
+        brainConfigurationContext: BehaviourConfigurationContext
+    ): BehaviorControl<in LivingEntity>? {
+        return WrapperLivingEntityTask(PathToNestMaterialTask.create(), PokemonEntity::class.java)
+    }
+}
+
+    /*override fun createTask(
+        entity: LivingEntity,
+        brainConfigurationContext: BrainConfigurationContext
+    ): BehaviorControl<in LivingEntity>? {
+        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+        if (!condition.resolveBoolean() || entity !is PokemonEntity) return null
+
+        return BehaviorBuilder.create {
+            it.group(
+                 it.present(MemoryModuleType.LOOK_TARGET), // todo This might need to be it.absent but only it.present works atm
+                it.absent(MemoryModuleType.WALK_TARGET),
+                it.present(CobblemonMemories.NEST_LOCATION),
+                it.present(CobblemonMemories.POTENTIAL_MATE)
+            ).apply(it) { lookTarget, walkTarget, nestMemory, mateMemory ->
+                Trigger { world, entity, time ->
+                    if (entity !is PathfinderMob || !entity.isAlive) return@Trigger false
+
+                    // Don't do anything if the pokemon has a breeding cooldown
+                    if ((entity as PokemonEntity).pokemon.breedingCooldown != 0) return@Trigger false
+
+                    runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+
+                    // Retrieve nest location and mate entity from memory
+                    //val nestLocation = it.get(nestMemory)
+                    val nestLocation: BlockPos = (nestMemory.value() as? IdF<BlockPos>)?.value() ?: return@Trigger false
+
+                    //val mate = it.get(mateMemory) as? PokemonEntity ?: return@Trigger false
+                    val mate = (mateMemory.value() as? IdF<PokemonEntity>)?.value() ?: return@Trigger false
+
+                    // todo try to find a way to only have pairs of mates instead of an orgy
+
+                    // Create a target vector at the nest location
+                    val targetVec = Vec3.atCenterOf(nestLocation)
+
+                    // Check if Pokémon are close enough to the nest
+                    if (entity.distanceToSqr(targetVec) <= 2.0 && mate.distanceToSqr(targetVec) <= 2.0) {
+                        return@Trigger false // Task ends when both are close enough
+                    }
+
+                    *//*if ((entity as PokemonEntity).tethering.tetheringId != null) {
+                        val test1 = 1 // for breakpointing here to test my pastured mons
+                    }*//*
+
+                    // try to get the main pokemon to path and look at the nest
+
+                    walkTarget.set(WalkTarget(targetVec, speedMultiplier.resolveFloat(), 1))
+                    lookTarget.set(BlockPosTracker(targetVec.add(0.0, entity.eyeHeight.toDouble(), 0.0)))
+
+                    // try to find a way to get the mate to pathfind and look at the nest too...
+                    mate.brain.setMemory(
+                        MemoryModuleType.WALK_TARGET,
+                        WalkTarget(targetVec, speedMultiplier.resolveFloat(), 1)
+                    )
+                    mate.brain.setMemory(MemoryModuleType.LOOK_TARGET, BlockPosTracker(targetVec.add(0.0, entity.eyeHeight.toDouble(), 0.0)))
+
+                    return@Trigger true
+                }
+            }
+        }
+    }
+}*/

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

@@ -0,0 +1,105 @@
+package com.cobblemon.mod.common.api.ai.config.task
+
+import com.cobblemon.mod.common.CobblemonMemories
+import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
+import com.cobblemon.mod.common.api.ai.WrapperLivingEntityTask
+import com.cobblemon.mod.common.api.ai.asVariables
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
+import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
+import com.cobblemon.mod.common.entity.pokemon.ai.tasks.PathToNestTask
+import com.cobblemon.mod.common.util.withQueryValue
+import com.mojang.datafixers.kinds.IdF
+import net.minecraft.core.BlockPos
+import net.minecraft.world.entity.LivingEntity
+import net.minecraft.world.entity.PathfinderMob
+import net.minecraft.world.entity.ai.behavior.BehaviorControl
+import net.minecraft.world.entity.ai.behavior.BlockPosTracker
+import net.minecraft.world.entity.ai.behavior.declarative.BehaviorBuilder
+import net.minecraft.world.entity.ai.behavior.declarative.Trigger
+import net.minecraft.world.entity.ai.memory.MemoryModuleType
+import net.minecraft.world.entity.ai.memory.WalkTarget
+import net.minecraft.world.phys.Vec3
+
+class PathToNestTaskConfig : SingleTaskConfig {
+    companion object {
+        const val BREED = "breed" // Category
+    }
+
+    val condition = booleanVariable(BREED, "breeds", true).asExpressible()
+    val speedMultiplier = numberVariable(BREED, "speed_multiplier", 0.6).asExpressible()
+
+    override fun getVariables(entity: LivingEntity) = listOf(
+        condition,
+        speedMultiplier
+    ).asVariables()
+
+    override fun createTask(
+        entity: LivingEntity,
+        brainConfigurationContext: BehaviourConfigurationContext
+    ): BehaviorControl<in LivingEntity>? {
+        return WrapperLivingEntityTask(PathToNestTask.create(), PokemonEntity::class.java)
+    }
+}
+
+    /*override fun createTask(
+        entity: LivingEntity,
+        brainConfigurationContext: BrainConfigurationContext
+    ): BehaviorControl<in LivingEntity>? {
+        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+        if (!condition.resolveBoolean() || entity !is PokemonEntity) return null
+
+        return BehaviorBuilder.create {
+            it.group(
+                 it.present(MemoryModuleType.LOOK_TARGET), // todo This might need to be it.absent but only it.present works atm
+                it.absent(MemoryModuleType.WALK_TARGET),
+                it.present(CobblemonMemories.NEST_LOCATION),
+                it.present(CobblemonMemories.POTENTIAL_MATE)
+            ).apply(it) { lookTarget, walkTarget, nestMemory, mateMemory ->
+                Trigger { world, entity, time ->
+                    if (entity !is PathfinderMob || !entity.isAlive) return@Trigger false
+
+                    // Don't do anything if the pokemon has a breeding cooldown
+                    if ((entity as PokemonEntity).pokemon.breedingCooldown != 0) return@Trigger false
+
+                    runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+
+                    // Retrieve nest location and mate entity from memory
+                    //val nestLocation = it.get(nestMemory)
+                    val nestLocation: BlockPos = (nestMemory.value() as? IdF<BlockPos>)?.value() ?: return@Trigger false
+
+                    //val mate = it.get(mateMemory) as? PokemonEntity ?: return@Trigger false
+                    val mate = (mateMemory.value() as? IdF<PokemonEntity>)?.value() ?: return@Trigger false
+
+                    // todo try to find a way to only have pairs of mates instead of an orgy
+
+                    // Create a target vector at the nest location
+                    val targetVec = Vec3.atCenterOf(nestLocation)
+
+                    // Check if Pokémon are close enough to the nest
+                    if (entity.distanceToSqr(targetVec) <= 2.0 && mate.distanceToSqr(targetVec) <= 2.0) {
+                        return@Trigger false // Task ends when both are close enough
+                    }
+
+                    *//*if ((entity as PokemonEntity).tethering.tetheringId != null) {
+                        val test1 = 1 // for breakpointing here to test my pastured mons
+                    }*//*
+
+                    // try to get the main pokemon to path and look at the nest
+
+                    walkTarget.set(WalkTarget(targetVec, speedMultiplier.resolveFloat(), 1))
+                    lookTarget.set(BlockPosTracker(targetVec.add(0.0, entity.eyeHeight.toDouble(), 0.0)))
+
+                    // try to find a way to get the mate to pathfind and look at the nest too...
+                    mate.brain.setMemory(
+                        MemoryModuleType.WALK_TARGET,
+                        WalkTarget(targetVec, speedMultiplier.resolveFloat(), 1)
+                    )
+                    mate.brain.setMemory(MemoryModuleType.LOOK_TARGET, BlockPosTracker(targetVec.add(0.0, entity.eyeHeight.toDouble(), 0.0)))
+
+                    return@Trigger true
+                }
+            }
+        }
+    }
+}*/

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

@@ -0,0 +1,149 @@
+package com.cobblemon.mod.common.api.ai.config.task
+
+import com.cobblemon.mod.common.CobblemonMemories
+import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
+import com.cobblemon.mod.common.api.ai.WrapperLivingEntityTask
+import com.cobblemon.mod.common.api.ai.asVariables
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
+import com.cobblemon.mod.common.api.pokemon.breeding.Egg
+import com.cobblemon.mod.common.api.text.green
+import com.cobblemon.mod.common.block.entity.NestBlockEntity
+import com.cobblemon.mod.common.breeding.BreedingLogicManager
+import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
+import com.cobblemon.mod.common.entity.pokemon.ai.tasks.BreedAtNestTask
+import com.cobblemon.mod.common.entity.pokemon.ai.tasks.PickUpEggTask
+import com.cobblemon.mod.common.entity.pokemon.ai.tasks.PlaceEggInNestTask
+import com.cobblemon.mod.common.entity.pokemon.ai.tasks.SearchForEggTask
+import com.cobblemon.mod.common.util.withQueryValue
+import com.mojang.datafixers.kinds.IdF
+import net.minecraft.core.BlockPos
+import net.minecraft.world.entity.LivingEntity
+import net.minecraft.world.entity.PathfinderMob
+import net.minecraft.world.entity.ai.behavior.BehaviorControl
+import net.minecraft.world.entity.ai.behavior.declarative.BehaviorBuilder
+import net.minecraft.world.entity.ai.behavior.declarative.Trigger
+import net.minecraft.world.entity.ai.memory.MemoryModuleType
+import net.minecraft.world.item.ItemStack
+import net.minecraft.world.phys.Vec3
+
+class PickUpEggTaskConfig : SingleTaskConfig {
+    companion object {
+        const val BREED = "breed_at_nest" // Category
+    }
+
+    val condition = booleanVariable(BREED, "can_breed", true).asExpressible()
+
+    override fun getVariables(entity: LivingEntity) = listOf(
+        condition
+    ).asVariables()
+
+    override fun createTask(
+        entity: LivingEntity,
+        brainConfigurationContext: BehaviourConfigurationContext
+    ): BehaviorControl<in LivingEntity>? {
+        return WrapperLivingEntityTask(PickUpEggTask.create(), PokemonEntity::class.java)
+    }
+}
+
+    /*override fun createTask(
+        entity: LivingEntity,
+        brainConfigurationContext: BrainConfigurationContext
+    ): BehaviorControl<in LivingEntity>? {
+        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+        if (!condition.resolveBoolean() || entity !is PokemonEntity) return null
+
+        return BehaviorBuilder.create {
+            it.group(
+                it.present(CobblemonMemories.NEST_LOCATION),
+                it.present(CobblemonMemories.POTENTIAL_MATE),
+                it.absent(MemoryModuleType.WALK_TARGET)
+            ).apply(it) { nestMemory, mateMemory, walkTarget ->
+                Trigger { world, entity, time ->
+                    if (entity !is PathfinderMob || !entity.isAlive) return@Trigger false
+
+                    runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+
+                    // Retrieve nest location and mate entity from memory
+                    val nestLocation: BlockPos = (nestMemory.value() as? IdF<BlockPos>)?.value() ?: return@Trigger false
+                    val mate = (mateMemory.value() as? IdF<PokemonEntity>)?.value() ?: return@Trigger false
+
+                    // Convert nest location to Vec3
+                    val targetVec = Vec3.atCenterOf(nestLocation)
+
+                    // Check proximity to the nest
+                    if (entity.distanceToSqr(targetVec) > 2.0 && mate.distanceToSqr(targetVec) > 2.0) {
+                        return@Trigger false
+                    }
+
+                    // Access the nest block entity
+                    val nestBlockEntity = world.getBlockEntity(nestLocation) as? NestBlockEntity
+                        ?: return@Trigger false
+
+                    // double check to make sure the nest is not taken yet and cancel if it is
+                    if (nestBlockEntity.getItem(0) != ItemStack.EMPTY) return@Trigger false
+
+                    // Generate the egg using BreedingLogicManager
+                    val parentOne = (entity as PokemonEntity).pokemon
+                    val parentTwo = mate.pokemon
+                    val breedingResult = BreedingLogicManager.breed(parentOne, parentTwo)
+                    val form = BreedingLogicManager.calculateForm(parentOne, parentTwo)
+
+                    // Ensure the breeding result is valid
+                    val egg = breedingResult.pokemon?.let { result ->
+                        Egg(
+                            species = result.species.resourceIdentifier,
+                            parentOne = parentOne,
+                            parentTwo = parentTwo,
+                            form = form.name.lowercase(),
+                            timeToHatch = 6000F
+                        )
+                    } ?: return@Trigger false
+
+                    // Set the egg in the nest
+                    nestBlockEntity.setItem(egg.createEggItemStack())
+
+                    // set the parents of the nest if it/they are wild so they guard it
+                    if (nestBlockEntity.ownerUUID == null)
+                        nestBlockEntity.parents = Pair((entity as PokemonEntity).uuid, mate.uuid)
+
+
+                    // set breeding cooldown for both
+                    parentOne.breedingCooldown = BreedingLogicManager.resetBreedingCooldown(parentOne)
+                    parentTwo.breedingCooldown = BreedingLogicManager.resetBreedingCooldown(parentTwo)
+
+                    // Display heart particles above parents
+
+                    (world as net.minecraft.server.level.ServerLevel).sendParticles(
+                            net.minecraft.core.particles.ParticleTypes.HEART,
+                            entity.getRandomX(1.0), // Particle X position with slight randomness
+                            entity.getRandomY() + 0.5, // Slightly raised Y position
+                            entity.getRandomZ(1.0), // Particle Z position with slight randomness
+                            4 + kotlin.random.Random.nextInt(2), // Particle count
+                            0.2 * entity.random.nextGaussian(), // X velocity with slight variance
+                            0.1 * entity.random.nextGaussian(), // Y velocity with upwards variance
+                            0.2 * entity.random.nextGaussian(), // Z velocity with slight variance
+                            0.02 // Particle speed
+                    )
+                    (world as net.minecraft.server.level.ServerLevel).sendParticles(
+                            net.minecraft.core.particles.ParticleTypes.HEART,
+                            mate.getRandomX(1.0), // Particle X position with slight randomness
+                            mate.getRandomY() + 0.5, // Slightly raised Y position
+                            mate.getRandomZ(1.0), // Particle Z position with slight randomness
+                            4 + kotlin.random.Random.nextInt(2), // Particle count
+                            0.2 * mate.random.nextGaussian(), // X velocity with slight variance
+                            0.1 * mate.random.nextGaussian(), // Y velocity with upwards variance
+                            0.2 * mate.random.nextGaussian(), // Z velocity with slight variance
+                            0.02 // Particle speed
+                    )
+
+                    // Notify nearby players
+                    world.players().forEach { player ->
+                        player.displayClientMessage("An egg has been laid in the nest!".green(), true)
+                    }
+
+                    // todo maybe have them fall asleep after?
+
+                    return@Trigger true
+                }
+            }
+        }*/

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

@@ -0,0 +1,106 @@
+package com.cobblemon.mod.common.api.ai.config.task
+
+import com.cobblemon.mod.common.CobblemonMemories
+import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
+import com.cobblemon.mod.common.api.ai.WrapperLivingEntityTask
+import com.cobblemon.mod.common.api.ai.asVariables
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
+import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
+import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
+import com.cobblemon.mod.common.entity.pokemon.ai.tasks.PathToNestTask
+import com.cobblemon.mod.common.entity.pokemon.ai.tasks.PickUpNestMaterialTask
+import com.cobblemon.mod.common.util.withQueryValue
+import com.mojang.datafixers.kinds.IdF
+import net.minecraft.core.BlockPos
+import net.minecraft.world.entity.LivingEntity
+import net.minecraft.world.entity.PathfinderMob
+import net.minecraft.world.entity.ai.behavior.BehaviorControl
+import net.minecraft.world.entity.ai.behavior.BlockPosTracker
+import net.minecraft.world.entity.ai.behavior.declarative.BehaviorBuilder
+import net.minecraft.world.entity.ai.behavior.declarative.Trigger
+import net.minecraft.world.entity.ai.memory.MemoryModuleType
+import net.minecraft.world.entity.ai.memory.WalkTarget
+import net.minecraft.world.phys.Vec3
+
+class PickUpNestMaterialTaskConfig : SingleTaskConfig {
+    companion object {
+        const val BREED = "breed" // Category
+    }
+
+    val condition = booleanVariable(BREED, "breeds", true).asExpressible()
+    val speedMultiplier = numberVariable(BREED, "speed_multiplier", 0.6).asExpressible()
+
+    override fun getVariables(entity: LivingEntity) = listOf(
+        condition,
+        speedMultiplier
+    ).asVariables()
+
+    override fun createTask(
+        entity: LivingEntity,
+        brainConfigurationContext: BehaviourConfigurationContext
+    ): BehaviorControl<in LivingEntity>? {
+        return WrapperLivingEntityTask(PickUpNestMaterialTask.create(), PokemonEntity::class.java)
+    }
+}
+
+    /*override fun createTask(
+        entity: LivingEntity,
+        brainConfigurationContext: BrainConfigurationContext
+    ): BehaviorControl<in LivingEntity>? {
+        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+        if (!condition.resolveBoolean() || entity !is PokemonEntity) return null
+
+        return BehaviorBuilder.create {
+            it.group(
+                 it.present(MemoryModuleType.LOOK_TARGET), // todo This might need to be it.absent but only it.present works atm
+                it.absent(MemoryModuleType.WALK_TARGET),
+                it.present(CobblemonMemories.NEST_LOCATION),
+                it.present(CobblemonMemories.POTENTIAL_MATE)
+            ).apply(it) { lookTarget, walkTarget, nestMemory, mateMemory ->
+                Trigger { world, entity, time ->
+                    if (entity !is PathfinderMob || !entity.isAlive) return@Trigger false
+
+                    // Don't do anything if the pokemon has a breeding cooldown
+                    if ((entity as PokemonEntity).pokemon.breedingCooldown != 0) return@Trigger false
+
+                    runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+
+                    // Retrieve nest location and mate entity from memory
+                    //val nestLocation = it.get(nestMemory)
+                    val nestLocation: BlockPos = (nestMemory.value() as? IdF<BlockPos>)?.value() ?: return@Trigger false
+
+                    //val mate = it.get(mateMemory) as? PokemonEntity ?: return@Trigger false
+                    val mate = (mateMemory.value() as? IdF<PokemonEntity>)?.value() ?: return@Trigger false
+
+                    // todo try to find a way to only have pairs of mates instead of an orgy
+
+                    // Create a target vector at the nest location
+                    val targetVec = Vec3.atCenterOf(nestLocation)
+
+                    // Check if Pokémon are close enough to the nest
+                    if (entity.distanceToSqr(targetVec) <= 2.0 && mate.distanceToSqr(targetVec) <= 2.0) {
+                        return@Trigger false // Task ends when both are close enough
+                    }
+
+                    *//*if ((entity as PokemonEntity).tethering.tetheringId != null) {
+                        val test1 = 1 // for breakpointing here to test my pastured mons
+                    }*//*
+
+                    // try to get the main pokemon to path and look at the nest
+
+                    walkTarget.set(WalkTarget(targetVec, speedMultiplier.resolveFloat(), 1))
+                    lookTarget.set(BlockPosTracker(targetVec.add(0.0, entity.eyeHeight.toDouble(), 0.0)))
+
+                    // try to find a way to get the mate to pathfind and look at the nest too...
+                    mate.brain.setMemory(
+                        MemoryModuleType.WALK_TARGET,
+                        WalkTarget(targetVec, speedMultiplier.resolveFloat(), 1)
+                    )
+                    mate.brain.setMemory(MemoryModuleType.LOOK_TARGET, BlockPosTracker(targetVec.add(0.0, entity.eyeHeight.toDouble(), 0.0)))
+
+                    return@Trigger true
+                }
+            }
+        }
+    }
+}*/

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

@@ -0,0 +1,148 @@
+package com.cobblemon.mod.common.api.ai.config.task
+
+import com.cobblemon.mod.common.CobblemonMemories
+import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
+import com.cobblemon.mod.common.api.ai.WrapperLivingEntityTask
+import com.cobblemon.mod.common.api.ai.asVariables
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
+import com.cobblemon.mod.common.api.pokemon.breeding.Egg
+import com.cobblemon.mod.common.api.text.green
+import com.cobblemon.mod.common.block.entity.NestBlockEntity
+import com.cobblemon.mod.common.breeding.BreedingLogicManager
+import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
+import com.cobblemon.mod.common.entity.pokemon.ai.tasks.BreedAtNestTask
+import com.cobblemon.mod.common.entity.pokemon.ai.tasks.PlaceEggInNestTask
+import com.cobblemon.mod.common.entity.pokemon.ai.tasks.SearchForEggTask
+import com.cobblemon.mod.common.util.withQueryValue
+import com.mojang.datafixers.kinds.IdF
+import net.minecraft.core.BlockPos
+import net.minecraft.world.entity.LivingEntity
+import net.minecraft.world.entity.PathfinderMob
+import net.minecraft.world.entity.ai.behavior.BehaviorControl
+import net.minecraft.world.entity.ai.behavior.declarative.BehaviorBuilder
+import net.minecraft.world.entity.ai.behavior.declarative.Trigger
+import net.minecraft.world.entity.ai.memory.MemoryModuleType
+import net.minecraft.world.item.ItemStack
+import net.minecraft.world.phys.Vec3
+
+class PlaceEggInNestTaskConfig : SingleTaskConfig {
+    companion object {
+        const val BREED = "breed_at_nest" // Category
+    }
+
+    val condition = booleanVariable(BREED, "can_breed", true).asExpressible()
+
+    override fun getVariables(entity: LivingEntity) = listOf(
+        condition
+    ).asVariables()
+
+    override fun createTask(
+        entity: LivingEntity,
+        brainConfigurationContext: BehaviourConfigurationContext
+    ): BehaviorControl<in LivingEntity>? {
+        return WrapperLivingEntityTask(PlaceEggInNestTask.create(), PokemonEntity::class.java)
+    }
+}
+
+    /*override fun createTask(
+        entity: LivingEntity,
+        brainConfigurationContext: BrainConfigurationContext
+    ): BehaviorControl<in LivingEntity>? {
+        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+        if (!condition.resolveBoolean() || entity !is PokemonEntity) return null
+
+        return BehaviorBuilder.create {
+            it.group(
+                it.present(CobblemonMemories.NEST_LOCATION),
+                it.present(CobblemonMemories.POTENTIAL_MATE),
+                it.absent(MemoryModuleType.WALK_TARGET)
+            ).apply(it) { nestMemory, mateMemory, walkTarget ->
+                Trigger { world, entity, time ->
+                    if (entity !is PathfinderMob || !entity.isAlive) return@Trigger false
+
+                    runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+
+                    // Retrieve nest location and mate entity from memory
+                    val nestLocation: BlockPos = (nestMemory.value() as? IdF<BlockPos>)?.value() ?: return@Trigger false
+                    val mate = (mateMemory.value() as? IdF<PokemonEntity>)?.value() ?: return@Trigger false
+
+                    // Convert nest location to Vec3
+                    val targetVec = Vec3.atCenterOf(nestLocation)
+
+                    // Check proximity to the nest
+                    if (entity.distanceToSqr(targetVec) > 2.0 && mate.distanceToSqr(targetVec) > 2.0) {
+                        return@Trigger false
+                    }
+
+                    // Access the nest block entity
+                    val nestBlockEntity = world.getBlockEntity(nestLocation) as? NestBlockEntity
+                        ?: return@Trigger false
+
+                    // double check to make sure the nest is not taken yet and cancel if it is
+                    if (nestBlockEntity.getItem(0) != ItemStack.EMPTY) return@Trigger false
+
+                    // Generate the egg using BreedingLogicManager
+                    val parentOne = (entity as PokemonEntity).pokemon
+                    val parentTwo = mate.pokemon
+                    val breedingResult = BreedingLogicManager.breed(parentOne, parentTwo)
+                    val form = BreedingLogicManager.calculateForm(parentOne, parentTwo)
+
+                    // Ensure the breeding result is valid
+                    val egg = breedingResult.pokemon?.let { result ->
+                        Egg(
+                            species = result.species.resourceIdentifier,
+                            parentOne = parentOne,
+                            parentTwo = parentTwo,
+                            form = form.name.lowercase(),
+                            timeToHatch = 6000F
+                        )
+                    } ?: return@Trigger false
+
+                    // Set the egg in the nest
+                    nestBlockEntity.setItem(egg.createEggItemStack())
+
+                    // set the parents of the nest if it/they are wild so they guard it
+                    if (nestBlockEntity.ownerUUID == null)
+                        nestBlockEntity.parents = Pair((entity as PokemonEntity).uuid, mate.uuid)
+
+
+                    // set breeding cooldown for both
+                    parentOne.breedingCooldown = BreedingLogicManager.resetBreedingCooldown(parentOne)
+                    parentTwo.breedingCooldown = BreedingLogicManager.resetBreedingCooldown(parentTwo)
+
+                    // Display heart particles above parents
+
+                    (world as net.minecraft.server.level.ServerLevel).sendParticles(
+                            net.minecraft.core.particles.ParticleTypes.HEART,
+                            entity.getRandomX(1.0), // Particle X position with slight randomness
+                            entity.getRandomY() + 0.5, // Slightly raised Y position
+                            entity.getRandomZ(1.0), // Particle Z position with slight randomness
+                            4 + kotlin.random.Random.nextInt(2), // Particle count
+                            0.2 * entity.random.nextGaussian(), // X velocity with slight variance
+                            0.1 * entity.random.nextGaussian(), // Y velocity with upwards variance
+                            0.2 * entity.random.nextGaussian(), // Z velocity with slight variance
+                            0.02 // Particle speed
+                    )
+                    (world as net.minecraft.server.level.ServerLevel).sendParticles(
+                            net.minecraft.core.particles.ParticleTypes.HEART,
+                            mate.getRandomX(1.0), // Particle X position with slight randomness
+                            mate.getRandomY() + 0.5, // Slightly raised Y position
+                            mate.getRandomZ(1.0), // Particle Z position with slight randomness
+                            4 + kotlin.random.Random.nextInt(2), // Particle count
+                            0.2 * mate.random.nextGaussian(), // X velocity with slight variance
+                            0.1 * mate.random.nextGaussian(), // Y velocity with upwards variance
+                            0.2 * mate.random.nextGaussian(), // Z velocity with slight variance
+                            0.02 // Particle speed
+                    )
+
+                    // Notify nearby players
+                    world.players().forEach { player ->
+                        player.displayClientMessage("An egg has been laid in the nest!".green(), true)
+                    }
+
+                    // todo maybe have them fall asleep after?
+
+                    return@Trigger true
+                }
+            }
+        }*/

common/src/main/kotlin/com/cobblemon/mod/common/api/ai/config/task/README.md

@@ -1,7 +1,7 @@
 # Task Configuration
 
 A task configuration is responsible for producing one or multiple tasks as part of a
-[Behaviour Configuration](../README.md). Tasks are the smallest unit of behaviour in a brain and are executed
+[BrainConfiguration](../README.md). Tasks are the smallest unit of behaviour in a brain and are executed
 as part of an activity.
 
 A task configuration can be a simple string that represents the type of task to create, or a JSON object

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

@@ -0,0 +1,148 @@
+package com.cobblemon.mod.common.api.ai.config.task
+
+import com.cobblemon.mod.common.CobblemonMemories
+import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
+import com.cobblemon.mod.common.api.ai.WrapperLivingEntityTask
+import com.cobblemon.mod.common.api.ai.asVariables
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
+import com.cobblemon.mod.common.api.pokemon.breeding.Egg
+import com.cobblemon.mod.common.api.text.green
+import com.cobblemon.mod.common.block.entity.NestBlockEntity
+import com.cobblemon.mod.common.breeding.BreedingLogicManager
+import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
+import com.cobblemon.mod.common.entity.pokemon.ai.tasks.BreedAtNestTask
+import com.cobblemon.mod.common.entity.pokemon.ai.tasks.RetrieveEggTask
+import com.cobblemon.mod.common.entity.pokemon.ai.tasks.SearchForEggTask
+import com.cobblemon.mod.common.util.withQueryValue
+import com.mojang.datafixers.kinds.IdF
+import net.minecraft.core.BlockPos
+import net.minecraft.world.entity.LivingEntity
+import net.minecraft.world.entity.PathfinderMob
+import net.minecraft.world.entity.ai.behavior.BehaviorControl
+import net.minecraft.world.entity.ai.behavior.declarative.BehaviorBuilder
+import net.minecraft.world.entity.ai.behavior.declarative.Trigger
+import net.minecraft.world.entity.ai.memory.MemoryModuleType
+import net.minecraft.world.item.ItemStack
+import net.minecraft.world.phys.Vec3
+
+class RetrieveEggTaskConfig : SingleTaskConfig {
+    companion object {
+        const val BREED = "breed_at_nest" // Category
+    }
+
+    val condition = booleanVariable(BREED, "can_breed", true).asExpressible()
+
+    override fun getVariables(entity: LivingEntity) = listOf(
+        condition
+    ).asVariables()
+
+    override fun createTask(
+        entity: LivingEntity,
+        brainConfigurationContext: BehaviourConfigurationContext
+    ): BehaviorControl<in LivingEntity>? {
+        return WrapperLivingEntityTask(RetrieveEggTask.create(), PokemonEntity::class.java)
+    }
+}
+
+    /*override fun createTask(
+        entity: LivingEntity,
+        brainConfigurationContext: BrainConfigurationContext
+    ): BehaviorControl<in LivingEntity>? {
+        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+        if (!condition.resolveBoolean() || entity !is PokemonEntity) return null
+
+        return BehaviorBuilder.create {
+            it.group(
+                it.present(CobblemonMemories.NEST_LOCATION),
+                it.present(CobblemonMemories.POTENTIAL_MATE),
+                it.absent(MemoryModuleType.WALK_TARGET)
+            ).apply(it) { nestMemory, mateMemory, walkTarget ->
+                Trigger { world, entity, time ->
+                    if (entity !is PathfinderMob || !entity.isAlive) return@Trigger false
+
+                    runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+
+                    // Retrieve nest location and mate entity from memory
+                    val nestLocation: BlockPos = (nestMemory.value() as? IdF<BlockPos>)?.value() ?: return@Trigger false
+                    val mate = (mateMemory.value() as? IdF<PokemonEntity>)?.value() ?: return@Trigger false
+
+                    // Convert nest location to Vec3
+                    val targetVec = Vec3.atCenterOf(nestLocation)
+
+                    // Check proximity to the nest
+                    if (entity.distanceToSqr(targetVec) > 2.0 && mate.distanceToSqr(targetVec) > 2.0) {
+                        return@Trigger false
+                    }
+
+                    // Access the nest block entity
+                    val nestBlockEntity = world.getBlockEntity(nestLocation) as? NestBlockEntity
+                        ?: return@Trigger false
+
+                    // double check to make sure the nest is not taken yet and cancel if it is
+                    if (nestBlockEntity.getItem(0) != ItemStack.EMPTY) return@Trigger false
+
+                    // Generate the egg using BreedingLogicManager
+                    val parentOne = (entity as PokemonEntity).pokemon
+                    val parentTwo = mate.pokemon
+                    val breedingResult = BreedingLogicManager.breed(parentOne, parentTwo)
+                    val form = BreedingLogicManager.calculateForm(parentOne, parentTwo)
+
+                    // Ensure the breeding result is valid
+                    val egg = breedingResult.pokemon?.let { result ->
+                        Egg(
+                            species = result.species.resourceIdentifier,
+                            parentOne = parentOne,
+                            parentTwo = parentTwo,
+                            form = form.name.lowercase(),
+                            timeToHatch = 6000F
+                        )
+                    } ?: return@Trigger false
+
+                    // Set the egg in the nest
+                    nestBlockEntity.setItem(egg.createEggItemStack())
+
+                    // set the parents of the nest if it/they are wild so they guard it
+                    if (nestBlockEntity.ownerUUID == null)
+                        nestBlockEntity.parents = Pair((entity as PokemonEntity).uuid, mate.uuid)
+
+
+                    // set breeding cooldown for both
+                    parentOne.breedingCooldown = BreedingLogicManager.resetBreedingCooldown(parentOne)
+                    parentTwo.breedingCooldown = BreedingLogicManager.resetBreedingCooldown(parentTwo)
+
+                    // Display heart particles above parents
+
+                    (world as net.minecraft.server.level.ServerLevel).sendParticles(
+                            net.minecraft.core.particles.ParticleTypes.HEART,
+                            entity.getRandomX(1.0), // Particle X position with slight randomness
+                            entity.getRandomY() + 0.5, // Slightly raised Y position
+                            entity.getRandomZ(1.0), // Particle Z position with slight randomness
+                            4 + kotlin.random.Random.nextInt(2), // Particle count
+                            0.2 * entity.random.nextGaussian(), // X velocity with slight variance
+                            0.1 * entity.random.nextGaussian(), // Y velocity with upwards variance
+                            0.2 * entity.random.nextGaussian(), // Z velocity with slight variance
+                            0.02 // Particle speed
+                    )
+                    (world as net.minecraft.server.level.ServerLevel).sendParticles(
+                            net.minecraft.core.particles.ParticleTypes.HEART,
+                            mate.getRandomX(1.0), // Particle X position with slight randomness
+                            mate.getRandomY() + 0.5, // Slightly raised Y position
+                            mate.getRandomZ(1.0), // Particle Z position with slight randomness
+                            4 + kotlin.random.Random.nextInt(2), // Particle count
+                            0.2 * mate.random.nextGaussian(), // X velocity with slight variance
+                            0.1 * mate.random.nextGaussian(), // Y velocity with upwards variance
+                            0.2 * mate.random.nextGaussian(), // Z velocity with slight variance
+                            0.02 // Particle speed
+                    )
+
+                    // Notify nearby players
+                    world.players().forEach { player ->
+                        player.displayClientMessage("An egg has been laid in the nest!".green(), true)
+                    }
+
+                    // todo maybe have them fall asleep after?
+
+                    return@Trigger true
+                }
+            }
+        }*/

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

@@ -50,10 +50,7 @@ class RunScript : SingleTaskConfig {
         ).apply(it) { _ ->
             Trigger { world, entity, _ ->
                 runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
-                return@Trigger CobblemonScripts.run(
-                    identifier = script.resolveString().asIdentifierDefaultingNamespace(),
-                    runtime = runtime
-                ) == DoubleValue.ONE
+                return@Trigger CobblemonScripts.run(script.resolveString().asIdentifierDefaultingNamespace(), runtime) == DoubleValue.ONE
             }
         }
     }

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

@@ -0,0 +1,147 @@
+package com.cobblemon.mod.common.api.ai.config.task
+
+import com.cobblemon.mod.common.CobblemonMemories
+import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
+import com.cobblemon.mod.common.api.ai.WrapperLivingEntityTask
+import com.cobblemon.mod.common.api.ai.asVariables
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
+import com.cobblemon.mod.common.api.pokemon.breeding.Egg
+import com.cobblemon.mod.common.api.text.green
+import com.cobblemon.mod.common.block.entity.NestBlockEntity
+import com.cobblemon.mod.common.breeding.BreedingLogicManager
+import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
+import com.cobblemon.mod.common.entity.pokemon.ai.tasks.BreedAtNestTask
+import com.cobblemon.mod.common.entity.pokemon.ai.tasks.SearchForEggTask
+import com.cobblemon.mod.common.util.withQueryValue
+import com.mojang.datafixers.kinds.IdF
+import net.minecraft.core.BlockPos
+import net.minecraft.world.entity.LivingEntity
+import net.minecraft.world.entity.PathfinderMob
+import net.minecraft.world.entity.ai.behavior.BehaviorControl
+import net.minecraft.world.entity.ai.behavior.declarative.BehaviorBuilder
+import net.minecraft.world.entity.ai.behavior.declarative.Trigger
+import net.minecraft.world.entity.ai.memory.MemoryModuleType
+import net.minecraft.world.item.ItemStack
+import net.minecraft.world.phys.Vec3
+
+class SearchForEggTaskConfig : SingleTaskConfig {
+    companion object {
+        const val BREED = "breed_at_nest" // Category
+    }
+
+    val condition = booleanVariable(BREED, "can_breed", true).asExpressible()
+
+    override fun getVariables(entity: LivingEntity) = listOf(
+        condition
+    ).asVariables()
+
+    override fun createTask(
+        entity: LivingEntity,
+        brainConfigurationContext: BehaviourConfigurationContext
+    ): BehaviorControl<in LivingEntity>? {
+        return WrapperLivingEntityTask(SearchForEggTask.create(), PokemonEntity::class.java)
+    }
+}
+
+    /*override fun createTask(
+        entity: LivingEntity,
+        brainConfigurationContext: BrainConfigurationContext
+    ): BehaviorControl<in LivingEntity>? {
+        runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+        if (!condition.resolveBoolean() || entity !is PokemonEntity) return null
+
+        return BehaviorBuilder.create {
+            it.group(
+                it.present(CobblemonMemories.NEST_LOCATION),
+                it.present(CobblemonMemories.POTENTIAL_MATE),
+                it.absent(MemoryModuleType.WALK_TARGET)
+            ).apply(it) { nestMemory, mateMemory, walkTarget ->
+                Trigger { world, entity, time ->
+                    if (entity !is PathfinderMob || !entity.isAlive) return@Trigger false
+
+                    runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+
+                    // Retrieve nest location and mate entity from memory
+                    val nestLocation: BlockPos = (nestMemory.value() as? IdF<BlockPos>)?.value() ?: return@Trigger false
+                    val mate = (mateMemory.value() as? IdF<PokemonEntity>)?.value() ?: return@Trigger false
+
+                    // Convert nest location to Vec3
+                    val targetVec = Vec3.atCenterOf(nestLocation)
+
+                    // Check proximity to the nest
+                    if (entity.distanceToSqr(targetVec) > 2.0 && mate.distanceToSqr(targetVec) > 2.0) {
+                        return@Trigger false
+                    }
+
+                    // Access the nest block entity
+                    val nestBlockEntity = world.getBlockEntity(nestLocation) as? NestBlockEntity
+                        ?: return@Trigger false
+
+                    // double check to make sure the nest is not taken yet and cancel if it is
+                    if (nestBlockEntity.getItem(0) != ItemStack.EMPTY) return@Trigger false
+
+                    // Generate the egg using BreedingLogicManager
+                    val parentOne = (entity as PokemonEntity).pokemon
+                    val parentTwo = mate.pokemon
+                    val breedingResult = BreedingLogicManager.breed(parentOne, parentTwo)
+                    val form = BreedingLogicManager.calculateForm(parentOne, parentTwo)
+
+                    // Ensure the breeding result is valid
+                    val egg = breedingResult.pokemon?.let { result ->
+                        Egg(
+                            species = result.species.resourceIdentifier,
+                            parentOne = parentOne,
+                            parentTwo = parentTwo,
+                            form = form.name.lowercase(),
+                            timeToHatch = 6000F
+                        )
+                    } ?: return@Trigger false
+
+                    // Set the egg in the nest
+                    nestBlockEntity.setItem(egg.createEggItemStack())
+
+                    // set the parents of the nest if it/they are wild so they guard it
+                    if (nestBlockEntity.ownerUUID == null)
+                        nestBlockEntity.parents = Pair((entity as PokemonEntity).uuid, mate.uuid)
+
+
+                    // set breeding cooldown for both
+                    parentOne.breedingCooldown = BreedingLogicManager.resetBreedingCooldown(parentOne)
+                    parentTwo.breedingCooldown = BreedingLogicManager.resetBreedingCooldown(parentTwo)
+
+                    // Display heart particles above parents
+
+                    (world as net.minecraft.server.level.ServerLevel).sendParticles(
+                            net.minecraft.core.particles.ParticleTypes.HEART,
+                            entity.getRandomX(1.0), // Particle X position with slight randomness
+                            entity.getRandomY() + 0.5, // Slightly raised Y position
+                            entity.getRandomZ(1.0), // Particle Z position with slight randomness
+                            4 + kotlin.random.Random.nextInt(2), // Particle count
+                            0.2 * entity.random.nextGaussian(), // X velocity with slight variance
+                            0.1 * entity.random.nextGaussian(), // Y velocity with upwards variance
+                            0.2 * entity.random.nextGaussian(), // Z velocity with slight variance
+                            0.02 // Particle speed
+                    )
+                    (world as net.minecraft.server.level.ServerLevel).sendParticles(
+                            net.minecraft.core.particles.ParticleTypes.HEART,
+                            mate.getRandomX(1.0), // Particle X position with slight randomness
+                            mate.getRandomY() + 0.5, // Slightly raised Y position
+                            mate.getRandomZ(1.0), // Particle Z position with slight randomness
+                            4 + kotlin.random.Random.nextInt(2), // Particle count
+                            0.2 * mate.random.nextGaussian(), // X velocity with slight variance
+                            0.1 * mate.random.nextGaussian(), // Y velocity with upwards variance
+                            0.2 * mate.random.nextGaussian(), // Z velocity with slight variance
+                            0.02 // Particle speed
+                    )
+
+                    // Notify nearby players
+                    world.players().forEach { player ->
+                        player.displayClientMessage("An egg has been laid in the nest!".green(), true)
+                    }
+
+                    // todo maybe have them fall asleep after?
+
+                    return@Trigger true
+                }
+            }
+        }*/

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

@@ -14,27 +14,25 @@ import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
 import com.cobblemon.mod.common.api.pokemon.status.Statuses
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import net.minecraft.world.entity.LivingEntity
+import net.minecraft.world.entity.TamableAnimal
 import net.minecraft.world.entity.ai.behavior.BehaviorControl
 import net.minecraft.world.entity.ai.behavior.declarative.BehaviorBuilder
 import net.minecraft.world.entity.ai.behavior.declarative.Trigger
 
 class SwitchFromSleepOnTrainerBedTaskConfig : SingleTaskConfig {
-    override fun getVariables(entity: LivingEntity) = emptyList<MoLangConfigVariable>()
     override fun createTask(
         entity: LivingEntity,
         behaviourConfigurationContext: BehaviourConfigurationContext
-    ): BehaviorControl<in LivingEntity>? {
-        // Why'd you give them this task then, dipshit?
-        if (entity !is PokemonEntity) {
-            return null
-        }
-
+    ): BehaviorControl<in LivingEntity> {
         return BehaviorBuilder.create {
             it.group(
                 it.registered(CobblemonMemories.POKEMON_SLEEPING)
             ).apply(it) { pokemonSleeping ->
                 Trigger { world, entity, _ ->
-                    entity as PokemonEntity
+                    // Why'd you give them this task then, dipshit?
+                    if (entity !is TamableAnimal) {
+                        return@Trigger false
+                    }
 
                     // If they're owner is gone then we can consider that a reason to wake up, dogs do this too
                     val owner = entity.owner
@@ -43,7 +41,7 @@ class SwitchFromSleepOnTrainerBedTaskConfig : SingleTaskConfig {
                     // If we should move back to regular behaviours...
                     if (owner == null || !owner.isSleeping) {
                         // If it's willingly sleeping then it can lose the sleeping memory
-                        if (isCurrentlySleeping && entity.pokemon.status?.status != Statuses.SLEEP) {
+                        if (isCurrentlySleeping && (entity !is PokemonEntity || entity.pokemon.status?.status != Statuses.SLEEP)) {
                             pokemonSleeping.erase()
                             return@Trigger false
                         }
@@ -59,4 +57,7 @@ class SwitchFromSleepOnTrainerBedTaskConfig : SingleTaskConfig {
         }
     }
 
+    override fun getVariables(entity: LivingEntity): List<MoLangConfigVariable> {
+        return emptyList()
+    }
 }

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

@@ -32,9 +32,8 @@ class SwitchToFightTaskConfig : SingleTaskConfig {
             it.present(MemoryModuleType.ATTACK_TARGET)
         ).apply(it) { _ ->
             Trigger { world, entity, _ ->
-                if (entity.commandSenderWorld.getCurrentDifficultyAt(entity.blockPosition()).difficulty == Difficulty.PEACEFUL) {
-                    return@Trigger false
-                }
+                runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+                if (entity.commandSenderWorld.getCurrentDifficultyAt(entity.blockPosition()).difficulty == Difficulty.PEACEFUL) return@Trigger false
 
                 entity.brain.setActiveActivityIfPossible(activity)
                 return@Trigger true

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

@@ -8,20 +8,13 @@
 
 package com.cobblemon.mod.common.api.ai.config.task
 
-import com.bedrockk.molang.Expression
-import com.bedrockk.molang.ast.NumberExpression
-import com.bedrockk.molang.ast.StringExpression
 import com.bedrockk.molang.runtime.MoLangRuntime
-import com.bedrockk.molang.runtime.value.DoubleValue
-import com.bedrockk.molang.runtime.value.StringValue
 import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
 import com.cobblemon.mod.common.api.ai.ExpressionOrEntityVariable
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.setup
 import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
-import com.cobblemon.mod.common.entity.MoLangScriptingEntity
 import com.cobblemon.mod.common.util.asExpression
-import com.cobblemon.mod.common.util.cobblemonResource
 import com.cobblemon.mod.common.util.lang
 import com.cobblemon.mod.common.util.resolveBoolean
 import com.cobblemon.mod.common.util.resolveDouble
@@ -29,7 +22,6 @@ import com.cobblemon.mod.common.util.resolveFloat
 import com.cobblemon.mod.common.util.resolveInt
 import com.cobblemon.mod.common.util.resolveString
 import com.cobblemon.mod.common.util.withQueryValue
-import net.minecraft.resources.ResourceLocation
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.BehaviorControl
 
@@ -44,59 +36,72 @@ import net.minecraft.world.entity.ai.behavior.BehaviorControl
  */
 interface TaskConfig {
     companion object {
-        val types = mutableMapOf<ResourceLocation, Class<out TaskConfig>>(
-            cobblemonResource("one_of") to OneOfTaskConfig::class.java,
-            cobblemonResource("wander") to WanderTaskConfig::class.java,
-            cobblemonResource("water_wander") to WaterWanderTaskConfig::class.java,
-            cobblemonResource("air_wander") to AirWanderTaskConfig::class.java,
-            cobblemonResource("look_at_target") to LookAtTargetTaskConfig::class.java,
-            cobblemonResource("follow_walk_target") to FollowWalkTargetTaskConfig::class.java,
-            cobblemonResource("random") to RandomTaskConfig::class.java,
-            cobblemonResource("stay_afloat") to StayAfloatTaskConfig::class.java,
-            cobblemonResource("look_at_entities") to LookAtEntitiesTaskConfig::class.java,
-            cobblemonResource("do_nothing") to DoNothingTaskConfig::class.java,
-            cobblemonResource("get_angry_at_attacker") to GetAngryAtAttackerTaskConfig::class.java,
-            cobblemonResource("stop_being_angry_if_attacker_dead") to StopBeingAngryIfAttackerDeadTaskConfig::class.java,
-            cobblemonResource("switch_npc_to_battle") to SwitchToNPCBattleTaskConfig::class.java,
-            cobblemonResource("look_at_battling_pokemon") to LookAtBattlingPokemonTaskConfig::class.java,
-            cobblemonResource("switch_npc_from_battle") to SwitchFromNPCBattleTaskConfig::class.java,
-            cobblemonResource("switch_pokemon_to_battle") to SwitchToPokemonBattleTaskConfig::class.java,
-            cobblemonResource("look_at_targeted_battle_pokemon") to LookAtTargetedBattlePokemonTaskConfig::class.java,
-            cobblemonResource("switch_pokemon_from_battle") to SwitchFromPokemonBattleTaskConfig::class.java,
-            cobblemonResource("go_to_healing_machine") to GoToHealingMachineTaskConfig::class.java,
-            cobblemonResource("heal_using_healing_machine") to HealUsingHealingMachineTaskConfig::class.java,
-            cobblemonResource("all_of") to AllOfTaskConfig::class.java,
-            cobblemonResource("attack_angry_at") to AttackAngryAtTaskConfig::class.java,
-            cobblemonResource("move_to_attack_target") to MoveToAttackTargetTaskConfig::class.java,
-            cobblemonResource("melee_attack") to MeleeAttackTaskConfig::class.java,
-            cobblemonResource("switch_from_fight") to SwitchFromFightTaskConfig::class.java,
-            cobblemonResource("switch_to_fight") to SwitchToFightTaskConfig::class.java,
-            cobblemonResource("switch_to_chatting") to SwitchToChattingTaskConfig::class.java,
-            cobblemonResource("switch_from_chatting") to SwitchFromChattingTaskConfig::class.java,
-            cobblemonResource("look_at_speaker") to LookAtSpeakerTaskConfig::class.java,
-            cobblemonResource("switch_to_action_effect") to SwitchToActionEffectTaskConfig::class.java,
-            cobblemonResource("switch_from_action_effect") to SwitchFromActionEffectTaskConfig::class.java,
-            cobblemonResource("exit_battle_when_hurt") to ExitBattleWhenHurtTaskConfig::class.java,
-            cobblemonResource("switch_to_panic_when_hurt") to SwitchToPanicWhenHurtTaskConfig::class.java,
-            cobblemonResource("switch_to_panic_when_hostiles_nearby") to SwitchToPanicWhenHostilesNearbyTaskConfig::class.java,
-            cobblemonResource("calm_down") to CalmDownTaskConfig::class.java,
-            cobblemonResource("flee_attacker") to FleeAttackerTaskConfig::class.java,
-            cobblemonResource("flee_nearest_hostile") to FleeNearestHostileTaskConfig::class.java,
-            cobblemonResource("run_script") to RunScript::class.java,
-            cobblemonResource("look_in_direction") to LookInDirectionTaskConfig::class.java,
-            cobblemonResource("wake_up") to WakeUpTaskConfig::class.java,
-            cobblemonResource("go_to_sleep") to GoToSleepTaskConfig::class.java,
-            cobblemonResource("find_resting_place") to FindRestingPlaceTaskConfig::class.java,
-            cobblemonResource("move_to_owner") to MoveToOwnerTaskConfig::class.java,
-            cobblemonResource("switch_to_sleep_on_trainer_bed") to SwitchToSleepOnTrainerBedTaskConfig::class.java,
-            cobblemonResource("switch_from_sleep_on_trainer_bed") to SwitchFromSleepOnTrainerBedTaskConfig::class.java,
-            cobblemonResource("sleep_if_on_trainer_bed") to SleepIfOnTrainerBedTaskConfig::class.java,
-            cobblemonResource("point_to_spawn") to PointToSpawnTaskConfig::class.java,
-            cobblemonResource("eat_grass") to EatGrassTaskConfig::class.java,
-            cobblemonResource("find_air") to FindAirTaskConfig::class.java,
-            cobblemonResource("go_to_land") to GoToLandTaskConfig::class.java
+        val types = mutableMapOf<String, Class<out TaskConfig>>(
+            "one_of" to OneOfTaskConfig::class.java,
+            "wander" to WanderTaskConfig::class.java,
+            "water_wander" to WaterWanderTaskConfig::class.java,
+            "air_wander" to AirWanderTaskConfig::class.java,
+            "look_at_target" to LookAtTargetTaskConfig::class.java,
+            "follow_walk_target" to FollowWalkTargetTaskConfig::class.java,
+            "random" to RandomTaskConfig::class.java,
+            "stay_afloat" to StayAfloatTaskConfig::class.java,
+            "look_at_entities" to LookAtEntitiesTaskConfig::class.java,
+            "do_nothing" to DoNothingTaskConfig::class.java,
+            "get_angry_at_attacker" to GetAngryAtAttackerTaskConfig::class.java,
+            "stop_being_angry_if_attacker_dead" to StopBeingAngryIfAttackerDeadTaskConfig::class.java,
+            "switch_npc_to_battle" to SwitchToNPCBattleTaskConfig::class.java,
+            "look_at_battling_pokemon" to LookAtBattlingPokemonTaskConfig::class.java,
+            "switch_npc_from_battle" to SwitchFromNPCBattleTaskConfig::class.java,
+            "switch_pokemon_to_battle" to SwitchToPokemonBattleTaskConfig::class.java,
+            "look_at_targeted_battle_pokemon" to LookAtTargetedBattlePokemonTaskConfig::class.java,
+            "switch_pokemon_from_battle" to SwitchFromPokemonBattleTaskConfig::class.java,
+            "go_to_healing_machine" to GoToHealingMachineTaskConfig::class.java,
+            "heal_using_healing_machine" to HealUsingHealingMachineTaskConfig::class.java,
+            "all_of" to AllOfTaskConfig::class.java,
+            "attack_angry_at" to AttackAngryAtTaskConfig::class.java,
+            "move_to_attack_target" to MoveToAttackTargetTaskConfig::class.java,
+            "melee_attack" to MeleeAttackTaskConfig::class.java,
+            "switch_from_fight" to SwitchFromFightTaskConfig::class.java,
+            "switch_to_fight" to SwitchToFightTaskConfig::class.java,
+            "switch_to_chatting" to SwitchToChattingTaskConfig::class.java,
+            "switch_from_chatting" to SwitchFromChattingTaskConfig::class.java,
+            "look_at_speaker" to LookAtSpeakerTaskConfig::class.java,
+            "switch_to_action_effect" to SwitchToActionEffectTaskConfig::class.java,
+            "switch_from_action_effect" to SwitchFromActionEffectTaskConfig::class.java,
+            "exit_battle_when_hurt" to ExitBattleWhenHurtTaskConfig::class.java,
+            "switch_to_panic_when_hurt" to SwitchToPanicWhenHurtTaskConfig::class.java,
+            "switch_to_panic_when_hostiles_nearby" to SwitchToPanicWhenHostilesNearbyTaskConfig::class.java,
+            "calm_down" to CalmDownTaskConfig::class.java,
+            "flee_attacker" to FleeAttackerTaskConfig::class.java,
+            "flee_nearest_hostile" to FleeNearestHostileTaskConfig::class.java,
+            "run_script" to RunScript::class.java,
+            "look_in_direction" to LookInDirectionTaskConfig::class.java,
+            "path_to_nest" to PathToNestTaskConfig::class.java,
+            "path_to_nest_material" to PathToNestMaterialTaskConfig::class.java,
+            "breed_at_nest" to BreedAtNestTaskConfig::class.java,
+            "guard_nest" to GuardNestTaskConfig::class.java,
+            "search_for_egg" to SearchForEggTaskConfig::class.java,
+            "attack_egg_thief" to AttackEggThiefTaskConfig::class.java,
+            "retrieve_egg" to RetrieveEggTaskConfig::class.java,
+            "pick_up_egg" to PickUpEggTaskConfig::class.java,
+            "pick_up_nest_material" to PickUpNestMaterialTaskConfig::class.java,
+            "path_to_ideal_nest_location" to PathToIdealNestLocationTaskConfig::class.java,
+            "place_egg_in_nest" to PlaceEggInNestTaskConfig::class.java,
+            "build_nest" to BuildNestTaskConfig::class.java,
+            "hunt_player" to HuntPlayerTaskConfig::class.java,
+            "wake_up" to WakeUpTaskConfig::class.java,
+            "go_to_sleep" to GoToSleepTaskConfig::class.java,
+            "find_resting_place" to FindRestingPlaceTaskConfig::class.java,
+            "move_to_owner" to MoveToOwnerTaskConfig::class.java,
+            "switch_to_sleep_on_trainer_bed" to SwitchToSleepOnTrainerBedTaskConfig::class.java,
+            "switch_from_sleep_on_trainer_bed" to SwitchFromSleepOnTrainerBedTaskConfig::class.java,
+            "sleep_if_on_trainer_bed" to SleepIfOnTrainerBedTaskConfig::class.java,
+            "point_to_spawn" to PointToSpawnTaskConfig::class.java,
+            "eat_grass" to EatGrassTaskConfig::class.java,
+            "find_air" to FindAirTaskConfig::class.java,
+            "go_to_land" to GoToLandTaskConfig::class.java
         )
-        
+
         val runtime = MoLangRuntime().setup()
     }
 
@@ -108,23 +113,6 @@ interface TaskConfig {
         return expressionOrEntityVariable.resolveBoolean()
     }
 
-    fun ExpressionOrEntityVariable.asSimplifiedExpression(entity: LivingEntity): Expression {
-        return map(
-            { it },
-            {
-                if (entity is MoLangScriptingEntity) {
-                    val variable = entity.config.map[it.variableName]
-                    if (variable is DoubleValue) {
-                        return@map NumberExpression(variable.value)
-                    } else if (variable is StringValue) {
-                        return@map StringExpression(variable)
-                    }
-                }
-                return@map "q.entity.config.${it.variableName}".asExpression()
-            }
-        )
-    }
-
     fun ExpressionOrEntityVariable.asExpression() = map({ it }, { "q.entity.config.${it.variableName}".asExpression() })
     fun ExpressionOrEntityVariable.resolveString() = runtime.resolveString(asExpression())
     fun ExpressionOrEntityVariable.resolveBoolean() = runtime.resolveBoolean(asExpression())

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

@@ -13,7 +13,6 @@ import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
 import com.cobblemon.mod.common.api.ai.asVariables
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
 import com.cobblemon.mod.common.entity.ai.CobblemonWalkTarget
-import com.cobblemon.mod.common.util.resolveFloat
 import com.cobblemon.mod.common.util.withQueryValue
 import net.minecraft.core.BlockPos
 import net.minecraft.world.entity.LivingEntity
@@ -52,8 +51,6 @@ class WanderTaskConfig : SingleTaskConfig {
         runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
         if (!condition.resolveBoolean()) return null
 
-        val wanderChanceExpression = wanderChance.asSimplifiedExpression(entity)
-
         return BehaviorBuilder.create {
             it.group(
                 it.absent(MemoryModuleType.WALK_TARGET),
@@ -66,7 +63,7 @@ class WanderTaskConfig : SingleTaskConfig {
                     }
 
                     runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
-                    val wanderChance = runtime.resolveFloat(wanderChanceExpression)
+                    val wanderChance = wanderChance.resolveFloat()
                     if (wanderChance <= 0 || world.random.nextFloat() > wanderChance) return@Trigger false
 
                     pathCooldown.setWithExpiry(true, 40L)

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

@@ -15,7 +15,6 @@ import com.cobblemon.mod.common.api.ai.config.task.WanderTaskConfig.Companion.WA
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
 import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
 import com.cobblemon.mod.common.util.asExpression
-import com.cobblemon.mod.common.util.resolveFloat
 import com.cobblemon.mod.common.util.withQueryValue
 import com.mojang.datafixers.util.Either
 import net.minecraft.world.entity.LivingEntity
@@ -46,8 +45,6 @@ class WaterWanderTaskConfig : SingleTaskConfig {
         runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
         if (!condition.resolveBoolean()) return null
 
-        val wanderChanceExpression = wanderChance.asSimplifiedExpression(entity)
-
         return BehaviorBuilder.create {
             it.group(
                 it.absent(MemoryModuleType.WALK_TARGET),
@@ -59,7 +56,7 @@ class WaterWanderTaskConfig : SingleTaskConfig {
                     }
 
                     runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
-                    val wanderChance = runtime.resolveFloat(wanderChanceExpression)
+                    val wanderChance = wanderChance.resolveFloat()
                     if (wanderChance <= 0 || world.random.nextFloat() > wanderChance) {
                         return@Trigger false
                     }

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/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,
@@ -143,13 +144,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
     }
 
@@ -280,8 +281,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)
@@ -353,8 +353,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 +361,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,24 @@
+/*
+ * 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(val colour: Int) {
+    SPICY(0x00FF00),
+    DRY(0xFF0000),
+    SWEET(0x0000FF),
+    BITTER(0xFFFF00),
+    SOUR(0xFF00FF);
+}

common/src/main/kotlin/com/cobblemon/mod/common/api/breeding/BreedingRule.kt

@@ -0,0 +1,185 @@
+package com.cobblemon.mod.common.api.breeding
+
+import com.mojang.serialization.Codec
+import com.mojang.serialization.codecs.RecordCodecBuilder
+import net.minecraft.resources.ResourceLocation
+import java.util.Optional
+
+data class BreedingRule(
+        val parent1rules: ParentRules,
+        val parent2rules: ParentRules,
+
+        // The resulting baby data (all strings except hasItem will appear in ParentRules)
+        val species: String?,
+        val form: String?,
+        val nature: String?,
+        val ability: String?,
+
+        val moves: Moves,
+        val ivs: Ivs,
+        val gender: String?,
+
+        // If you want a separate pokeball string field:
+        val pokeball: String?
+) {
+    companion object {
+        val CODEC: Codec<BreedingRule> = RecordCodecBuilder.create { builder ->
+            builder.group(
+                    // Parent rules
+                    ParentRules.CODEC.fieldOf("parent1rules")
+                            .forGetter<BreedingRule> { it.parent1rules },
+
+                    ParentRules.CODEC.fieldOf("parent2rules")
+                            .forGetter<BreedingRule> { it.parent2rules },
+
+                    // ---- All optional string fields for the baby data ----
+                    Codec.STRING.optionalFieldOf("species")
+                            .xmap({ it.orElse(null) }, { Optional.ofNullable(it) })
+                            .forGetter<BreedingRule> { it.species },
+
+                    Codec.STRING.optionalFieldOf("form")
+                            .xmap({ it.orElse(null) }, { Optional.ofNullable(it) })
+                            .forGetter<BreedingRule> { it.form },
+
+                    Codec.STRING.optionalFieldOf("nature")
+                            .xmap({ it.orElse(null) }, { Optional.ofNullable(it) })
+                            .forGetter<BreedingRule> { it.nature },
+
+                    Codec.STRING.optionalFieldOf("ability")
+                            .xmap({ it.orElse(null) }, { Optional.ofNullable(it) })
+                            .forGetter<BreedingRule> { it.ability },
+
+                    // Moves & IVs can be empty objects but must exist in the JSON
+                    Moves.CODEC.fieldOf("moves")
+                            .forGetter<BreedingRule> { it.moves },
+
+                    Ivs.CODEC.fieldOf("ivs")
+                            .forGetter<BreedingRule> { it.ivs },
+
+                    Codec.STRING.optionalFieldOf("gender")
+                            .xmap({ it.orElse(null) }, { Optional.ofNullable(it) })
+                            .forGetter<BreedingRule> { it.gender },
+
+                    // If you want pokeball to be a string instead of ResourceLocation
+                    Codec.STRING.optionalFieldOf("pokeball")
+                            .xmap({ it.orElse(null) }, { Optional.ofNullable(it) })
+                            .forGetter<BreedingRule> { it.pokeball }
+
+            ).apply(builder, ::BreedingRule)
+        }
+    }
+
+    data class ParentRules(
+            val species: String?,
+            val form: String?,
+            val ability: String?,
+            val gender: String?,
+
+            // hasMove is also just a string now
+            val hasMove: String?,
+
+            // hasItem stays as a ResourceLocation?
+            val hasItem: ResourceLocation?
+    ) {
+        companion object {
+            val CODEC: Codec<ParentRules> = RecordCodecBuilder.create { builder ->
+                builder.group(
+                        Codec.STRING.optionalFieldOf("species")
+                                .xmap({ it.orElse(null) }, { Optional.ofNullable(it) })
+                                .forGetter<ParentRules> { it.species },
+
+                        Codec.STRING.optionalFieldOf("form")
+                                .xmap({ it.orElse(null) }, { Optional.ofNullable(it) })
+                                .forGetter<ParentRules> { it.form },
+
+                        Codec.STRING.optionalFieldOf("ability")
+                                .xmap({ it.orElse(null) }, { Optional.ofNullable(it) })
+                                .forGetter<ParentRules> { it.ability },
+
+                        Codec.STRING.optionalFieldOf("gender")
+                                .xmap({ it.orElse(null) }, { Optional.ofNullable(it) })
+                                .forGetter<ParentRules> { it.gender },
+
+                        Codec.STRING.optionalFieldOf("hasMove")
+                                .xmap({ it.orElse(null) }, { Optional.ofNullable(it) })
+                                .forGetter<ParentRules> { it.hasMove },
+
+                        // Keep hasItem as a ResourceLocation
+                        ResourceLocation.CODEC.optionalFieldOf("hasItem")
+                                .xmap({ it.orElse(null) }, { Optional.ofNullable(it) })
+                                .forGetter<ParentRules> { it.hasItem }
+
+                ).apply(builder, ::ParentRules)
+            }
+        }
+    }
+
+    data class Moves(
+            val move1: String?,
+            val move2: String?,
+            val move3: String?,
+            val move4: String?
+    ) {
+        companion object {
+            val CODEC: Codec<Moves> = RecordCodecBuilder.create { builder ->
+                builder.group(
+                        Codec.STRING.optionalFieldOf("move1")
+                                .xmap({ it.orElse(null) }, { Optional.ofNullable(it) })
+                                .forGetter<Moves> { it.move1 },
+
+                        Codec.STRING.optionalFieldOf("move2")
+                                .xmap({ it.orElse(null) }, { Optional.ofNullable(it) })
+                                .forGetter<Moves> { it.move2 },
+
+                        Codec.STRING.optionalFieldOf("move3")
+                                .xmap({ it.orElse(null) }, { Optional.ofNullable(it) })
+                                .forGetter<Moves> { it.move3 },
+
+                        Codec.STRING.optionalFieldOf("move4")
+                                .xmap({ it.orElse(null) }, { Optional.ofNullable(it) })
+                                .forGetter<Moves> { it.move4 }
+
+                ).apply(builder, ::Moves)
+            }
+        }
+    }
+
+    data class Ivs(
+            val hp: Int?,
+            val attack: Int?,
+            val defence: Int?,
+            val special_attack: Int?,
+            val special_defence: Int?,
+            val speed: Int?
+    ) {
+        companion object {
+            val CODEC: Codec<Ivs> = RecordCodecBuilder.create { builder ->
+                builder.group(
+                        Codec.INT.optionalFieldOf("hp")
+                                .xmap({ it.orElse(null) }, { Optional.ofNullable(it) })
+                                .forGetter<Ivs> { it.hp },
+
+                        Codec.INT.optionalFieldOf("attack")
+                                .xmap({ it.orElse(null) }, { Optional.ofNullable(it) })
+                                .forGetter<Ivs> { it.attack },
+
+                        Codec.INT.optionalFieldOf("defence")
+                                .xmap({ it.orElse(null) }, { Optional.ofNullable(it) })
+                                .forGetter<Ivs> { it.defence },
+
+                        Codec.INT.optionalFieldOf("special_attack")
+                                .xmap({ it.orElse(null) }, { Optional.ofNullable(it) })
+                                .forGetter<Ivs> { it.special_attack },
+
+                        Codec.INT.optionalFieldOf("special_defence")
+                                .xmap({ it.orElse(null) }, { Optional.ofNullable(it) })
+                                .forGetter<Ivs> { it.special_defence },
+
+                        Codec.INT.optionalFieldOf("speed")
+                                .xmap({ it.orElse(null) }, { Optional.ofNullable(it) })
+                                .forGetter<Ivs> { it.speed }
+                ).apply(builder, ::Ivs)
+            }
+        }
+    }
+}

common/src/main/kotlin/com/cobblemon/mod/common/api/breeding/BreedingRules.kt

@@ -0,0 +1,108 @@
+package com.cobblemon.mod.common.api.breeding
+
+import com.cobblemon.mod.common.api.data.JsonDataRegistry
+import com.cobblemon.mod.common.api.moves.MoveTemplate
+import com.cobblemon.mod.common.api.moves.Moves
+import com.cobblemon.mod.common.api.pokemon.PokemonSpecies
+import com.cobblemon.mod.common.api.pokemon.stats.Stats
+import com.cobblemon.mod.common.api.reactive.SimpleObservable
+import com.cobblemon.mod.common.net.messages.client.breeding.BreedingRuleRegistrySyncPacket
+import com.cobblemon.mod.common.pokemon.Gender
+import com.cobblemon.mod.common.pokemon.Pokemon
+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
+
+object BreedingRules : JsonDataRegistry<BreedingRule> {
+    override val id = cobblemonResource("breeding_rules")
+    override val type = PackType.SERVER_DATA
+    override val observable = SimpleObservable<BreedingRules>()
+    override val typeToken: TypeToken<BreedingRule> = TypeToken.get(BreedingRule::class.java)
+    override val resourcePath = "breeding_rules"
+    override val gson: Gson = GsonBuilder()
+            .registerTypeAdapter(ResourceLocation::class.java, IdentifierAdapter)
+            .setPrettyPrinting()
+            .create()
+
+    private val registry = mutableMapOf<ResourceLocation, BreedingRule>()
+
+    override fun sync(player: ServerPlayer) {
+        // Send the entire list of BreedingRule entries to the player
+        BreedingRuleRegistrySyncPacket(this.registry.values.toList()).sendToPlayer(player)
+    }
+
+    override fun reload(data: Map<ResourceLocation, BreedingRule>) {
+        // Clear existing data and load new data from JSON
+        registry.clear()
+        data.forEach { (id, breedingRule) ->
+            registry[id] = breedingRule
+        }
+        println("Loaded Breeding Rules: ${registry.size}")
+    }
+
+    /**
+     * Attempts to find a single BreedingRule that matches the given mother/father conditions.
+     * Returns the first matching BreedingRule, or null if no match is found.
+     */
+    fun getBreedingRule(mother: Pokemon, father: Pokemon): BreedingRule? {
+        // 1. Prepare the actual ParentRules objects for mother/father.
+        val motherRules = createParentRules(mother)
+        val fatherRules = createParentRules(father)
+
+        // 2. Find all matching breeding rules in the registry.
+        //    A rule matches if parent1rules & parent2rules match the mother/father conditions.
+        //    If multiple rules match, we just return the first (or you could randomize).
+        val matchingRules = registry.values.firstOrNull { rule ->
+            rule.species != null && (
+                    (checkParentRules(rule.parent1rules, motherRules) && checkParentRules(rule.parent2rules, fatherRules)) ||
+                    (checkParentRules(rule.parent1rules, fatherRules) && checkParentRules(rule.parent2rules, motherRules))
+            )
+        }
+
+        // 3. If none match, return null. Otherwise return the first match.
+        return matchingRules
+    }
+
+    /**
+     * Helper function to create a BreedingRule.ParentRules object from an actual Pokémon instance.
+     * Adjust as needed if you'd like more robust checking (e.g. multiple moves, alt forms, etc.).
+     */
+    private fun createParentRules(parent: Pokemon): BreedingRule.ParentRules {
+        // NOTE: Adjust these calls if your Pokemon class has different ways to get form/ability
+        val speciesId = parent.species.name.lowercase()
+        val formId = parent.form.name.lowercase()         // If you store form as a ResourceLocation
+        val abilityId = parent.ability.name.lowercase()   // If you store ability as a ResourceLocation
+
+        return BreedingRule.ParentRules(
+                species = speciesId,
+                form = formId,
+                ability = abilityId,
+                gender = parent.gender.name.lowercase(),
+                hasMove = parent.moveSet.getMoves().firstOrNull()?.template?.name,
+                hasItem = parent.heldItemNoCopy().item.let {
+                    BuiltInRegistries.ITEM.getKey(it) // If empty, might be minecraft:air
+                }
+        )
+    }
+
+    /**
+     * Check if a parent's actual rules match the expected parent rules from the data.
+     */
+    private fun checkParentRules(
+            expected: BreedingRule.ParentRules,
+            actual: BreedingRule.ParentRules
+    ): Boolean {
+        return (expected.species == null || expected.species == actual.species) &&
+                (expected.form == null || expected.form == actual.form) &&
+                (expected.ability == null || expected.ability == actual.ability) &&
+                (expected.gender == null || expected.gender == actual.gender) &&
+                (expected.hasMove == null || expected.hasMove == actual.hasMove) &&
+                (expected.hasItem == null || expected.hasItem == actual.hasItem)
+    }
+}

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

@@ -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.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),
-    MILD(0xFF00FF, ChatFormatting.DARK_PURPLE);
-
-    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,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.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
-            .mapNotNull { Seasonings.getFlavoursFromItemStack(it) }
-            .flatMap { it.entries }
-            .groupingBy { it.key }
-            .fold(0) { acc, entry -> acc + entry.value }
-
-    if (flavors.isEmpty()) return null
-
-    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
-    )
-}
-
-fun getColourMixFromColors(colors: List<Int>): Int? {
-    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/Food.kt

@@ -1,29 +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.item.components.FoodComponent
-import com.mojang.serialization.Codec
-import com.mojang.serialization.codecs.RecordCodecBuilder
-
-data class Food(
-        val hunger: Int = 0,
-        val saturation: Float = 0f,
-) {
-    companion object {
-        val CODEC: Codec<Food> = RecordCodecBuilder.create { builder ->
-            builder.group(
-                    Codec.INT.optionalFieldOf("hunger", 0).forGetter { it.hunger },
-                    Codec.FLOAT.optionalFieldOf("saturation", 0f).forGetter { it.saturation },
-            ).apply(builder, ::Food)
-        }
-    }
-
-    fun toComponent(): FoodComponent = FoodComponent(hunger, saturation)
-}

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

@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.cooking
-
-import com.cobblemon.mod.common.item.components.FoodComponent
-import kotlin.math.ceil
-import kotlin.math.round
-
-object FoodUtils {
-    fun merge(components: List<FoodComponent>, extraHunger: Int = 0, extraSaturation: Float = 0f): FoodComponent {
-        if (components.isEmpty()) return FoodComponent(0, 0f)
-
-        val count = components.size
-        val totalHunger = components.sumOf { it.hunger.toDouble() } + extraHunger
-        val totalSaturation = components.sumOf { it.saturation.toDouble() } + extraSaturation
-
-        val multiplier = when (count) {
-            1 -> 1.0
-            2 -> 0.8
-            3 -> 0.6
-            else -> 0.4
-        }
-
-        val adjustedHunger = ceil(totalHunger * multiplier)
-        val adjustedSaturation = totalSaturation * multiplier
-
-        return FoodComponent(
-                hunger = adjustedHunger.toInt(),
-                saturation = (round(adjustedSaturation * 100) / 100f).toFloat()
-        )
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/api/cooking/MobEffectUtils.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.cooking
-
-import net.minecraft.world.effect.MobEffectInstance
-import kotlin.math.ceil
-import kotlin.math.max
-
-object MobEffectUtils {
-    fun mergeEffects(effects: List<SerializableMobEffectInstance>): List<SerializableMobEffectInstance> {
-        val grouped = effects.groupBy { it.effect }
-
-        return grouped.map { (effectId, group) ->
-            val amplifier = mergeAmplifiers(group.map { it.amplifier })
-            val duration = mergeDurations(group.map { it.duration })
-
-            val first = group.first()
-            SerializableMobEffectInstance(
-                    effect = effectId,
-                    duration = duration,
-                    amplifier = amplifier,
-                    ambient = first.ambient,
-                    visible = first.visible,
-                    showIcon = first.showIcon
-            )
-        }
-    }
-
-    private fun mergeDurations(durations: List<Int>): Int {
-        if (durations.isEmpty()) return 0
-
-        val sorted = durations.sortedDescending()
-        var result = 0.0
-
-        for ((index, value) in sorted.withIndex()) {
-            val multiplier = when (index) {
-                0 -> 1.0
-                1 -> 0.75
-                2 -> 0.5
-                else -> 0.25
-            }
-            result += value * multiplier
-        }
-
-        return ceil(result).toInt()
-    }
-
-    private fun mergeAmplifiers(amplifiers: List<Int>): Int {
-        return amplifiers.maxOrNull() ?: 0 // we do not want the power of the effects to combine, just take the highest one used of that type
-    }
-}

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

@@ -1,95 +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.item.PokePuffItem
-import com.cobblemon.mod.common.item.PokePuffItem.Companion.DISLIKED_FLAVOR_MULTIPLIER
-import com.cobblemon.mod.common.item.PokePuffItem.Companion.LIKED_FLAVOR_MULTIPLIER
-import com.cobblemon.mod.common.pokemon.Nature
-import net.minecraft.resources.ResourceLocation
-import net.minecraft.world.item.ItemStack
-import net.minecraft.core.registries.BuiltInRegistries
-
-object PokePuffUtils {
-
-    fun calculateFriendshipChange(stack: ItemStack, nature: Nature): Int {
-        val dominantFlavour = getDominantFlavour(stack) ?: return 0
-        val isNeutralNature = nature.favouriteFlavour == nature.dislikedFlavour
-
-        val (baseFriendship) = calculateBaseFriendship(stack)
-
-        return when {
-            dominantFlavour == nature.favouriteFlavour -> (baseFriendship / LIKED_FLAVOR_MULTIPLIER).toInt()
-            dominantFlavour == Flavour.MILD && isNeutralNature -> (baseFriendship / 2.0).coerceAtLeast(1.0).toInt()
-            else -> (-baseFriendship / DISLIKED_FLAVOR_MULTIPLIER).toInt()
-        }
-    }
-
-    fun calculateBaseFriendship(stack: ItemStack): Pair<Double, Double> {
-        val ingredientIds = stack.get(CobblemonItemComponents.INGREDIENT)?.ingredientIds ?: emptyList()
-        var baseFriendship = 0.0
-
-        for (id in ingredientIds) {
-            val item = BuiltInRegistries.ITEM.get(id)
-            val itemStack = ItemStack(item)
-            val seasoning = Seasonings.getFromItemStack(itemStack) ?: continue
-            val dominantValue = seasoning.flavours?.values?.maxOrNull() ?: 0
-            baseFriendship += dominantValue
-        }
-
-        val ingredientStrings = ingredientIds.map { it.toString() }
-        val hasSugar = "minecraft:sugar" in ingredientStrings
-        val hasSweet = ingredientStrings.any { it.startsWith("cobblemon:") && it.endsWith("_sweet") }
-
-        val multiplier = when {
-            hasSugar && hasSweet -> 5.0
-            hasSweet -> 2.25
-            hasSugar -> 1.75
-            else -> 1.0
-        }
-
-        val finalBaseFriendship = baseFriendship * multiplier
-
-        return finalBaseFriendship to multiplier
-    }
-
-    fun getDominantFlavour(stack: ItemStack): Flavour? {
-        val flavours = stack.get(CobblemonItemComponents.FLAVOUR)?.flavours ?: return null
-        val max = flavours.values.maxOrNull() ?: return null
-        val dominant = flavours.filterValues { it == max }.keys
-
-        return when {
-            dominant.isEmpty() -> null
-            dominant.size > 1 -> Flavour.MILD
-            else -> dominant.first()
-        }
-    }
-
-    fun getFlavorNatureLabel(flavour: Flavour): String {
-        return when (flavour) {
-            Flavour.SPICY -> "attack"
-            Flavour.DRY -> "special_attack"
-            Flavour.SWEET -> "speed"
-            Flavour.BITTER -> "special_defense"
-            Flavour.SOUR -> "defense"
-            Flavour.MILD -> "neutral"
-        }
-    }
-
-    fun getFriendshipChangeLiked(stack: ItemStack): Int {
-        val (baseFriendship) = calculateBaseFriendship(stack)
-        return (baseFriendship / LIKED_FLAVOR_MULTIPLIER).toInt()
-    }
-
-    fun getFriendshipChangeDisliked(stack: ItemStack): Int {
-        val (baseFriendship) = calculateBaseFriendship(stack)
-        return (baseFriendship / DISLIKED_FLAVOR_MULTIPLIER).toInt()
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/api/cooking/Seasoning.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 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
-import java.util.Optional
-import kotlin.jvm.optionals.getOrNull
-
-data class Seasoning(
-    val ingredient: RegistryLikeCondition<Item>,
-    @SerializedName("flavours", alternate = ["flavors"])
-    val flavours: Map<Flavour, Int>? = null,
-    @SerializedName("colour", alternate = ["color"])
-    val colour: DyeColor,
-    @SerializedName("baitEffects")
-    val baitEffects: List<SpawnBait.Effect>? = null,
-    @SerializedName("food")
-    val food: Food? = null,
-    @SerializedName("mobEffects")
-    val mobEffects: List<SerializableMobEffectInstance>? = null
-) {
-    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).optionalFieldOf("flavours").forGetter { Optional.ofNullable(it.flavours) },
-                DyeColor.CODEC.fieldOf("colour").forGetter { it.colour },
-                SpawnBait.Effect.CODEC.listOf().optionalFieldOf("baitEffects").forGetter { Optional.ofNullable(it.baitEffects) },
-                Food.CODEC.optionalFieldOf("food").forGetter { Optional.ofNullable(it.food) },
-                SerializableMobEffectInstance.CODEC.listOf().optionalFieldOf("mobEffects").forGetter { Optional.ofNullable(it.mobEffects) }
-            ).apply(builder) { item, flavours, colour, baitEffects, food, mobEffects ->
-                Seasoning(
-                    item,
-                    flavours.getOrNull(),
-                    colour,
-                    baitEffects.getOrNull(),
-                    food.getOrNull(),
-                    mobEffects.getOrNull()
-                )
-            }
-        }
-
-        val STREAM_CODEC: StreamCodec<ByteBuf, Seasoning> = ByteBufCodecs.fromCodec(CODEC)
-    }
-}

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

@@ -1,130 +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.fishing.SpawnBaitEffects
-import com.cobblemon.mod.common.api.fishing.SpawnBaitUtils
-import com.cobblemon.mod.common.api.reactive.SimpleObservable
-import com.cobblemon.mod.common.item.components.FoodComponent
-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>()
-
-    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,
-                baitEffects = emptyList(),
-                food = Food(),
-                mobEffects = emptyList()
-            )
-        }.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) }
-        val inherentFlavours = stack.get(CobblemonItemComponents.FLAVOUR)?.flavours
-        val seasoningFlavours = seasoning?.flavours
-
-        if (seasoningFlavours.isNullOrEmpty() && inherentFlavours.isNullOrEmpty())
-            return null
-
-        return (seasoningFlavours ?: emptyMap()).mapValues { (flavour, value) ->
-            value + (inherentFlavours?.getOrDefault(flavour, 0) ?: 0)
-        }
-    }
-
-    fun hasFlavors(stack: ItemStack): Boolean {
-        val flavors = getFlavoursFromItemStack(stack)
-        return !flavors.isNullOrEmpty() && flavors.any { it.value != 0 }
-    }
-
-    fun getFoodComponentFromItemStack(stack: ItemStack): FoodComponent? {
-        return getFromItemStack(stack)?.food?.toComponent()
-    }
-
-    fun hasFood(stack: ItemStack): Boolean {
-        val effects = getFromItemStack(stack)?.food ?: return false
-        return effects.hunger > 0 || effects.saturation > 0f
-    }
-
-    fun getMobEffectsFromItemStack(stack: ItemStack): List<SerializableMobEffectInstance> {
-        return getFromItemStack(stack)?.mobEffects ?: emptyList()
-    }
-
-    fun hasMobEffect(stack: ItemStack): Boolean {
-        return !getFromItemStack(stack)?.mobEffects.isNullOrEmpty()
-    }
-
-    fun getBaitEffectsFromItemStack(stack: ItemStack): List<SpawnBait.Effect> {
-        val primaryEffects = SpawnBaitEffects.getEffectsFromItemStack(stack)
-        return if (primaryEffects.isNotEmpty()) {
-            primaryEffects
-        } else {
-            getFromItemStack(stack)?.baitEffects ?: emptyList()
-        }
-    }
-
-    fun hasBaitEffects(stack: ItemStack): Boolean {
-        return SpawnBaitEffects.getEffectsFromItemStack(stack).isNotEmpty() ||
-               !(getFromItemStack(stack)?.baitEffects.isNullOrEmpty())
-    }
-
-    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/cooking/SerializableMobEffectInstance.kt

@@ -1,45 +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.mojang.serialization.Codec
-import com.mojang.serialization.codecs.RecordCodecBuilder
-import net.minecraft.core.Holder
-import net.minecraft.core.registries.BuiltInRegistries
-import net.minecraft.resources.ResourceLocation
-import net.minecraft.world.effect.MobEffect
-import net.minecraft.world.effect.MobEffectInstance
-
-data class SerializableMobEffectInstance(
-        val effect: ResourceLocation,
-        val duration: Int,
-        val amplifier: Int = 0,
-        val ambient: Boolean = false,
-        val visible: Boolean = true,
-        val showIcon: Boolean = true
-) {
-    fun toInstance(): MobEffectInstance {
-        val holder = BuiltInRegistries.MOB_EFFECT.getHolder(effect)
-                .orElseThrow { IllegalArgumentException("Unknown MobEffect: $effect") }
-        return MobEffectInstance(holder, duration, amplifier, ambient, visible, showIcon)
-    }
-
-    companion object {
-        val CODEC: Codec<SerializableMobEffectInstance> = RecordCodecBuilder.create { builder ->
-            builder.group(
-                    ResourceLocation.CODEC.fieldOf("effect").forGetter { it.effect },
-                    Codec.INT.fieldOf("duration").forGetter { it.duration },
-                    Codec.INT.fieldOf("amplifier").forGetter { it.amplifier },
-                    Codec.BOOL.optionalFieldOf("ambient", false).forGetter { it.ambient },
-                    Codec.BOOL.optionalFieldOf("visible", true).forGetter { it.visible },
-                    Codec.BOOL.optionalFieldOf("showIcon", true).forGetter { it.showIcon }
-            ).apply(builder, ::SerializableMobEffectInstance)
-        }
-    }
-}

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

@@ -1,37 +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.dialogue
-
-import com.cobblemon.mod.common.util.cobblemonResource
-import net.minecraft.resources.ResourceLocation
-
-/**
- * Settings for the gibbering sound effect that plays gradually as dialogue appears.
- *
- * @author Hiroku, landonjw
- * @since April 19th, 2025
- */
-class DialogueGibber(
-    /** Whether text will gradually appear while the gibbering occurs. */
-    val graduallyShowText: Boolean = true,
-    /** Whether clicking will make the gibber skip to the end. */
-    val allowSkip: Boolean = true,
-    /** The space between gibbers in terms of characters. 'Holy cow' would play 2 sounds if step = 4. */
-    val step: Int = 4,
-    /** The time (in seconds) between gibbers. The smaller this is, the faster the text will progress. */
-    val interval: Double = 0.1,
-    val minPitch: Float = 0.9F,
-    val maxPitch: Float = 1.1F,
-    val minVolume: Float = 0.9F,
-    val maxVolume: Float = 1.0F,
-    /** The possible sounds to play when gibbering. */
-    val sounds: List<ResourceLocation> = listOf(
-        cobblemonResource("entity.npc.gibber.generic")
-    )
-)

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

@@ -31,7 +31,6 @@ class DialoguePage(
     var lines: MutableList<DialogueText> = mutableListOf(),
     var input: DialogueInput = DialogueNoInput(),
     var background: ResourceLocation? = null,
-    var gibber: DialogueGibber? = null,
     var clientActions: MutableList<Expression> = mutableListOf(),
     var escapeAction: DialogueAction? = null,
 ) {
@@ -43,7 +42,6 @@ class DialoguePage(
             speaker: String? = null,
             lines: Iterable<MutableComponent>,
             input: DialogueInput = DialogueNoInput(),
-            gibber: DialogueGibber? = null,
             background: ResourceLocation? = null,
             clientActions: Iterable<Expression> = emptyList(),
             /** The thing to do when the player presses ESC while on this page. If null, falls back to the same property on [Dialogue]. */
@@ -54,7 +52,6 @@ class DialoguePage(
                 speaker = speaker,
                 lines = lines.map { WrappedDialogueText(it) }.toMutableList(),
                 input = input,
-                gibber = gibber,
                 background = background,
                 clientActions = clientActions.toMutableList(),
                 escapeAction = escapeAction?.let { func -> FunctionDialogueAction { activeDialogue, _ -> func(activeDialogue) } }

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

@@ -19,16 +19,7 @@ import net.minecraft.network.chat.MutableComponent
  */
 class DialogueSpeaker(
     val name: DialogueText? = null,
-    val face: DialogueFaceProvider? = null,
-    val gibber: DialogueGibber? = null
+    val face: DialogueFaceProvider? = null
 ) {
-    fun of(
-        name: MutableComponent = "".text(),
-        face: DialogueFaceProvider? = null,
-        gibber: DialogueGibber? = null
-    ) = DialogueSpeaker(
-        name = WrappedDialogueText(name),
-        face = face,
-        gibber = gibber
-    )
+    fun of(name: MutableComponent = "".text(), face: DialogueFaceProvider? = null) = DialogueSpeaker(WrappedDialogueText(name), face)
 }

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

@@ -21,11 +21,12 @@ import com.cobblemon.mod.common.api.events.berry.BerryHarvestEvent
 import com.cobblemon.mod.common.api.events.berry.BerryMutationOfferEvent
 import com.cobblemon.mod.common.api.events.berry.BerryMutationResultEvent
 import com.cobblemon.mod.common.api.events.berry.BerryYieldCalculationEvent
+import com.cobblemon.mod.common.api.events.breeding.BreedingEligibilityEvent
+import com.cobblemon.mod.common.api.events.breeding.BreedingResultEvent
 import com.cobblemon.mod.common.api.events.drops.LootDroppedEvent
 import com.cobblemon.mod.common.api.events.entity.PokemonEntityLoadEvent
 import com.cobblemon.mod.common.api.events.entity.PokemonEntitySaveEvent
 import com.cobblemon.mod.common.api.events.entity.PokemonEntitySaveToWorldEvent
-import com.cobblemon.mod.common.api.events.entity.SpawnBucketChosenEvent
 import com.cobblemon.mod.common.api.events.entity.SpawnEvent
 import com.cobblemon.mod.common.api.events.farming.ApricornHarvestEvent
 import com.cobblemon.mod.common.api.events.fishing.*
@@ -72,8 +73,6 @@ object CobblemonEvents {
     @JvmField
     val FRIENDSHIP_UPDATED = EventObservable<FriendshipUpdatedEvent>()
     @JvmField
-    val FULLNESS_UPDATED = EventObservable<FullnessUpdatedEvent>()
-    @JvmField
     val POKEMON_FAINTED = EventObservable<PokemonFaintedEvent>()
     @JvmField
     val EVOLUTION_ACCEPTED = CancelableObservable<EvolutionAcceptedEvent>()
@@ -248,6 +247,8 @@ object CobblemonEvents {
     @JvmField
     val POKEROD_REEL = CancelableObservable<PokerodReelEvent>()
     @JvmField
+    val BOBBER_BUCKET_CHOSEN = EventObservable<BobberBucketChosenEvent>()
+    @JvmField
     val BOBBER_SPAWN_POKEMON_PRE = CancelableObservable<BobberSpawnPokemonEvent.Pre>()
     @JvmField
     val BOBBER_SPAWN_POKEMON_MODIFY = EventObservable<BobberSpawnPokemonEvent.Modify>()
@@ -256,14 +257,6 @@ object CobblemonEvents {
     @JvmField
     val BAIT_EFFECT_REGISTRATION = EventObservable<BaitEffectFunctionRegistryEvent>()
 
-    @JvmField
-    val SPAWN_BUCKET_CHOSEN = EventObservable<SpawnBucketChosenEvent>()
-
-    // Baits and Lures
-    @JvmField
-    val BAIT_SPAWN_POKEMON_MODIFY = EventObservable<BaitSpawnPokemonEvent.Modify>()
-
-
     @JvmField
     val COLLECT_EGG = CancelableObservable<CollectEggEvent>()
     @JvmField
@@ -271,6 +264,12 @@ object CobblemonEvents {
     @JvmField
     val HATCH_EGG_POST = EventObservable<HatchEggEvent.Post>()
 
+    //Breeding
+    @JvmField
+    val BREEDING_RESULT = EventObservable<BreedingResultEvent>()
+    @JvmField
+    val BREEDING_ELIGIBLE = EventObservable<BreedingEligibilityEvent>()
+
     // -------------------------------------------------------------------------------------
     //
     // Riding

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

@@ -0,0 +1,17 @@
+/*
+ * 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.breeding
+
+import com.cobblemon.mod.common.pokemon.Pokemon
+
+data class BreedingEligibilityEvent(
+    val canBreed: Boolean,
+    val mother: Pokemon,
+    val father: Pokemon
+)

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

@@ -0,0 +1,18 @@
+/*
+ * 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.breeding
+
+import com.cobblemon.mod.common.api.pokemon.breeding.BreedingResult
+import com.cobblemon.mod.common.pokemon.Pokemon
+
+data class BreedingResultEvent(
+    val breedingResult: BreedingResult,
+    val mother: Pokemon,
+    val father: Pokemon
+)

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

@@ -23,7 +23,7 @@ import net.minecraft.nbt.CompoundTag
  * reload.
  *
  * @property pokemonEntity The Pokémon entity being saved.
- * @property nbt The [NbtCompound] that the Pokémon is being saved to.
+ * @property nbt The [CompoundTag] that the Pokémon is being saved to.
  *      You should add or remove from this for whatever you
  *      want to accomplish. The existing contents will be all
  *      of what Cobblemon saves natively.

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

@@ -1,27 +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.entity
-
-import com.cobblemon.mod.common.api.spawning.SpawnBucket
-import com.cobblemon.mod.common.api.spawning.SpawnCause
-import com.cobblemon.mod.common.api.spawning.spawner.Spawner
-
-/**
- * Event fired when the spawning system makes a decision on which bucket to spawn from.
- */
-class SpawnBucketChosenEvent(
-    /** The spawner this is happening within. */
-    val spawner: Spawner,
-    /** The cause of the spawn. */
-    val spawnCause: SpawnCause,
-    /** The bucket that was chosen. You can alter this. */
-    var bucket: SpawnBucket,
-    /** The final weights that were used to make the choice. */
-    val bucketWeights: Map<SpawnBucket, Float>
-)

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

@@ -10,15 +10,15 @@ package com.cobblemon.mod.common.api.events.entity
 
 import com.cobblemon.mod.common.api.events.Cancelable
 import com.cobblemon.mod.common.api.spawning.BestSpawner
-import com.cobblemon.mod.common.api.spawning.position.SpawnablePosition
+import com.cobblemon.mod.common.api.spawning.context.SpawningContext
 import net.minecraft.world.entity.Entity
 
 /**
  * Event fired when an entity is spawned using the [BestSpawner]. The entity that was spawned
- * and the [SpawnablePosition] of the spawn are provided. Cancelling this event will prevent the
+ * and the [SpawningContext] of the spawn are provided. Cancelling this event will prevent the
  * entity from spawning.
  *
  * @author Hiroku
  * @since April 22nd, 2023
  */
-class SpawnEvent<T : Entity>(val entity: T, val spawnablePosition: SpawnablePosition) : Cancelable()
+class SpawnEvent<T : Entity>(val entity: T, val ctx: SpawningContext) : Cancelable()

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,12 +8,12 @@
 
 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.api.spawning.detail.SpawnAction
 import com.cobblemon.mod.common.entity.fishing.PokeRodFishingBobberEntity
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.util.itemRegistry
@@ -28,23 +28,23 @@ interface BobberSpawnPokemonEvent {
     /**
      * Event that is fired before a Pokemon is spawned by a bobber.
      * @param bobber The PokeRodFishingBobberEntity that is spawning the Pokemon.
-     * @param spawnAction The spawn that is planned.
+     * @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,
-        val spawnAction: SpawnAction<*>,
+        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 spawnAction The [SpawnAction] that is motivating the spawn.
+     * @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 spawnAction: SpawnAction<*>,
+        val chosenBucket: SpawnBucket,
         val rod: ItemStack,
         val pokemon: PokemonEntity
     ) : BobberSpawnPokemonEvent
@@ -58,12 +58,12 @@ interface BobberSpawnPokemonEvent {
      */
     data class Post(
         val bobber: PokeRodFishingBobberEntity,
-        val spawnAction: SpawnAction<*>,
+        val chosenBucket: SpawnBucket,
         val bait: ItemStack,
         val pokemon: PokemonEntity
     ) : BobberSpawnPokemonEvent {
         val context = mutableMapOf<String, MoValue>(
-            "chosen_bucket" to ObjectValue(spawnAction.bucket, { it.name }),
+            "chosen_bucket" to ObjectValue(chosenBucket, { it.name }),
             "bait" to pokemon.level().itemRegistry.wrapAsHolder(bait.item).asMoLangValue(Registries.ITEM),
             "pokemon_entity" to pokemon.asMoLangValue()
         )

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

@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.events.pokemon
-
-import com.cobblemon.mod.common.Cobblemon
-import com.cobblemon.mod.common.pokemon.Pokemon
-
-/**
- * Event that is fired when a player owned Pokémon has its fullness changed
- */
-data class FullnessUpdatedEvent(
-        val pokemon: Pokemon,
-        val newFullnessInitial: Int
-) {
-    var newFullness: Int = newFullnessInitial
-        set(value) {
-            field = value.coerceIn(0, pokemon.getMaxFullness())
-        }
-}