page buttons

.gitlab-ci.yml

@@ -1,4 +1,4 @@
-image: amazoncorretto:25
+image: amazoncorretto:21
 
 before_script:
   - export GRADLE_USER_HOME=`pwd`/.gradle
@@ -184,8 +184,8 @@ deploy_artifacts:
   script:
     - yum install -y findutils
     - echo "Collecting artifacts..."
-    - find neoforge/build/libs/ -type f -name "*.jar" | grep -vE "dev-slim|sources|javadoc" | xargs -I {} mv {} ./
-    - find fabric/build/libs/ -type f -name "*.jar" | grep -vE "dev-slim|sources|javadoc" | xargs -I {} mv {} ./
+    - find neoforge/build/libs/ -type f -name "*.jar" | grep -vE "dev-shadow|sources|javadoc" | xargs -I {} mv {} ./
+    - find fabric/build/libs/ -type f -name "*.jar" | grep -vE "dev-shadow|sources|javadoc" | xargs -I {} mv {} ./
     - for f in *.jar; do mv "$f" "$(echo "$f" | sed s/+/b$CI_PIPELINE_IID+/)"; done
   artifacts:
     paths:

CHANGELOG.md

@@ -3,75 +3,43 @@
 
 ### Additions
 
-### Cries added/updated for the following Pokémon
-- Hoppip
-- Skiploom
-- Jumpluff
-- Houndour
-- Houndoom
-- Wurmple
-- Silcoon
-- Beautifly
-- Cascoon
-- Dustox
-- Surskit
-- Masquerain
-- Torkoal
-- Starly
-- Staravia
-- Staraptor
-- Combee
-- Vespiquen
-- Dusknoir
-- Helioptile
-- Heliolisk
-- Grubbin
-- Charjabug
-- Vikavolt
-- Applin (updated)
-- Flapple (updated)
-- Appletun
-- Runerigus
-- Dipplin
+### Pokémon Added
+#### Generation 4
+
+#### Generation 5
+
+#### Generation 6
+
+#### Generation 7
+
+#### Generation 8
+
+#### Generation 9
 
 ### Model updates for the following Pokémon
 
 ### Animation updates for the following Pokémon
-- Vikavolt
 
 ### Changes
 - Changed the Misc icon in the Campfire Pot Recipe Book to Health Candy
 - Moved EXP Candies from the Medicine recipe book category to the Misc category
-- Removed Dynamic Lights data from the Magmarizer item for consistency with the block
-- Added `doPokemonPredation` gamerule, which controls aggressiveness of Pokémon with `hate_entity` brain task defined
-- Added `predation_chance` server config value, which controls the possibility of attacking the hated entity found by `hate_entity` brain task 
-- Prehistoric Eroded Pillar generates slightly more frequently
 
 ### Fixes
 - Fixed datapacks with item interaction evolutions that don't specify an item crashing the world on load.
 - Fixed the Pokédex evolution tree crashing when a datapack's dex entry is missing an evolution's form.
 - Fixed the Pokédex evolution tree crashing with a stack overflow on evolutions that loop back on themselves.
 - Fixed the Pokédex evolution tree crashing when looking at a dex that is not part of the "National Dex" aggregate.
-- Fixed evolution trees not building properly when a Pokémon has several Pokédex entries for different regions.
+- Fixed evolution trees not building properly when a pokemon has several pokedex entries for different regions.
 - Fixed form-changing evolutions sometimes resolving to the source form in the Pokédex evolution tree.
 - Broken datapack evolutions are now logged and skipped in the Pokédex evolution tree instead of crashing.
-- Fixed the `alpha` property having no tab completion in commands such as `/pokespawn`, `/pokegive` and `/pokeedit`, and added the missing `dmax_level`, `gmax_factor` and `tradable` aliases to tab completion
 - Fixed friendship booster items not being recognised as such
 - Fixed conflicts with other mods that would make use of recipe books in certain ways (Farmer's Delight Cooking Pot)
 - Fixed Pokémon battles stalling when a sidemod cancels the `THROWN_POKEBALL_HIT` hit event
 - Fixed choice feature tab completion in `spawnpokemon/pokegive/pokeedit` commands
 - Fixed MoLang that's targeting players intermittedly failing when they have died, needing them to relog
-- Fixed a NeoForge bug where none of the Cobblemon plants/berries could be placed into pots
-- Fixed party overlay not hiding when the player opens the Pokédex scanner 
+- Fixed all pots of mod on NeoForge
+- Fixed party overlay not hiding when player opens the pokedex scanner 
 - Added compat for AppleSkin
-- Fixed some display names having unintended font colours
-- Fixed `hate_entity` task focusing on its own entity
-  - Thus enabled deadly warfare between Zangoose and Seviper
-- Prehistoric Frozen Pond, Prehistoric Frozen Spike, and Prehistoric Lush Den now generate
-- Fixed Frogadier floating in its battle_idle animation
-- Fixed absence or incorrect mergers in spawning conditions, making max height/depth of conditions to use the min value instead
-- Added stricter riding checks on server side to prevent possible packet forgery when player tries to ride pokemon
-- Fixed Pokémon cries and animation sounds played from GUIs, such as the starter selection screen and the Pokédex, being tied to the Master volume slider instead of Friendly Creatures
 
 ### Developer
 - Bumped NeoForge to `21.1.195` to get access to MixinExtras `0.5` and the expressions annotation
@@ -82,7 +50,6 @@
 ### Molang & Datapacks
 - Fixed `q.pokemon.nature` returning class instance instead of proper string value (`cobblemon:adamant`)
 - Fixed `q.entity.is_looking_at` result being always `1` for whatever entity passed as target
-- Added hate chance optional parameter to `hate_entity` task. `1.0` will make an entity always attack the target 
 
 ### Localization
 - Updated translations for:

ai_bugs.txt

@@ -0,0 +1,9 @@
+
+- Nodemaker bug, it thinks jumps are possible from water up an entire block - they aint
+   https://gyazo.com/759b8285e7c07046ff2e54adf0d7a7ac
+
+- Why is magikarp trying to path through ice
+  https://gyazo.com/ae230758c529f885eeb0dd91e60530d2
+
+- We should use mixins to put the path node filtering from OmniPathNodeMaker in the base classes otherwise
+  NPC wandering will be jank too.

common/build.gradle.kts

@@ -1,3 +1,4 @@
+
 import utilities.isSnapshot
 import utilities.version
 import utilities.gitBranch
@@ -16,9 +17,13 @@ import utilities.gitCommit
 plugins {
     id("cobblemon.base-conventions")
     id("cobblemon.publish-conventions")
+
     id("net.kyori.blossom")
     id("org.jetbrains.gradle.plugin.idea-ext")
-    kotlin("kapt")
+}
+
+architectury {
+    common("neoforge", "fabric")
 }
 
 repositories {
@@ -27,42 +32,35 @@ repositories {
     maven(url = "https://maven.neoforged.net/releases")
     maven(url = "https://maven.gegy.dev")
     mavenLocal()
-    mavenCentral()
 }
 
-val mappingsAttribute = Attribute.of("net.minecraft.mappings", String::class.java)
 dependencies {
     implementation(libs.bundles.kotlin)
-    compileOnly(libs.bundles.common.mixin.compileOnly)
-    annotationProcessor(libs.mixinExtras.common)
-
-    api(libs.molang)
+    modImplementation(libs.fabric.loader)
+    modApi(libs.molang)
 
     // Integrations
     compileOnlyApi(libs.jei.api)
-    compileOnly(libs.bundles.common.integrations.compileOnly) {
+    modCompileOnly(libs.bundles.common.integrations.compileOnly) {
         isTransitive = false
     }
     // LambDynamicLights is handled differently because we need the Mojang-mappings version of it.
-    compileOnly(libs.lambDynamicLights) {
-        attributes {
-            attribute(mappingsAttribute, "mojmap")
+    modCompileOnly(libs.lambDynamicLights) {
+        capabilities {
+            requireCapability("dev.lambdaurora.lambdynamiclights:api-mojmap")
         }
     }
     // Flywheel has no common dep so just pick one and don't use any platform specific code in common
     // modCompileOnly(libs.flywheelFabric)
 
     // Showdown
-    compileOnly(libs.graal.core)
-    compileOnly(libs.graal.polyglot)
+    modCompileOnly(libs.graal.core)
 
     // Data Storage
-    compileOnly(libs.bundles.mongo)
+    modCompileOnly(libs.bundles.mongo)
 
     // Unit Testing
     testImplementation(libs.bundles.unitTesting)
-    testRuntimeOnly(libs.junit.platform)
-    testImplementation(kotlin("test"))
 }
 
 tasks.withType<Test> {
@@ -73,16 +71,6 @@ tasks.withType<Test> {
     }
 }
 
-tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
-    compilerOptions {
-        freeCompilerArgs.addAll(
-            "-Xno-param-assertions",
-            "-Xno-call-assertions",
-            "-Xno-receiver-assertions"
-        )
-    }
-}
-
 // Git info lives in its own output dir (not processResources) so a new commit only rewrites this one file.
 val writeGitInfo by tasks.registering(WriteProperties::class) {
     destinationFile = layout.buildDirectory.file("generated/gitInfo/cobblemon-git.properties")
@@ -99,11 +87,11 @@ sourceSets {
     main {
         blossom {
             kotlinSources {
-                fun generateLicenseHeader(): String {
+                fun generateLicenseHeader() : String {
                     val builder = StringBuilder()
                     builder.append("/*\n")
                     rootProject.file("HEADER").forEachLine {
-                        if (it.isEmpty()) {
+                        if(it.isEmpty()) {
                             builder.append(" *").append("\n")
                         } else {
                             builder.append(" * ").append(it).append("\n")
@@ -116,7 +104,7 @@ sourceSets {
                 property("license", generateLicenseHeader())
                 property("modid", "cobblemon")
                 property("version", project.version())
-                property("isSnapshot", if (rootProject.isSnapshot()) "true" else "false")
+                property("isSnapshot", if(rootProject.isSnapshot()) "true" else "false")
                 System.getProperty("buildNumber")?.let { property("buildNumber", it) }
             }
         }

common/gradle.properties

@@ -1,2 +1 @@
-maven.artifactId = mod
-fabric.loom.disableObfuscation=true
+maven.artifactId = mod

common/src/main/java/com/cobblemon/mod/common/client/render/models/blockbench/pose/Bone.java

@@ -36,7 +36,7 @@ public interface Bone {
     /**
      * Renders a particular bone in relation to a particular entity.
      *
-     * @param context The extractRenderState context this bone is being drawn for.
+     * @param context The render context this bone is being drawn for.
      * @param stack The current [MatrixStack] for the renderer
      * @param buffer The vertex consumer deployed by the renderer
      * @param packedLight The light level to be applied to the bone

common/src/main/java/com/cobblemon/mod/common/compat/lambdynamiclights/LambDynamicLightsInitializer.java

@@ -9,21 +9,20 @@
 package com.cobblemon.mod.common.compat.lambdynamiclights;
 
 import com.cobblemon.mod.common.Cobblemon;
-import com.cobblemon.mod.common.CobblemonEntities;
 import dev.lambdaurora.lambdynlights.api.DynamicLightsContext;
 import dev.lambdaurora.lambdynlights.api.DynamicLightsInitializer;
 import dev.lambdaurora.lambdynlights.api.entity.luminance.EntityLuminance;
 import dev.lambdaurora.lambdynlights.api.item.ItemLightSourceManager;
-import net.minecraft.resources.Identifier;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.entity.EntityType;
 
 public class LambDynamicLightsInitializer implements DynamicLightsInitializer {
     public static final EntityLuminance.Type POKEMON_LUMINANCE = EntityLuminance.Type.registerSimple(
-            Identifier.fromNamespaceAndPath(Cobblemon.MODID, "pokemon"),
+            ResourceLocation.fromNamespaceAndPath(Cobblemon.MODID, "pokemon"),
             PokemonLuminance.INSTANCE
     );
     public static final EntityLuminance.Type PLAYER_LUMINANCE = EntityLuminance.Type.registerSimple(
-            Identifier.fromNamespaceAndPath(Cobblemon.MODID, "shoulder"),
+            ResourceLocation.fromNamespaceAndPath(Cobblemon.MODID, "shoulder"),
             PlayerLuminance.INSTANCE
     );
 
@@ -33,8 +32,11 @@ public class LambDynamicLightsInitializer implements DynamicLightsInitializer {
 
         context.entityLightSourceManager().onRegisterEvent().register(ctx -> {
             ctx.register(EntityType.PLAYER, PlayerLuminance.INSTANCE);
-            ctx.register(CobblemonEntities.POKEMON, PokemonLuminance.INSTANCE);
         });
     }
+
+    @SuppressWarnings({"removal", "UnstableApiUsage"})
+    @Override
+    public void onInitializeDynamicLights(ItemLightSourceManager itemLightSourceManager) {}
 }
 

common/src/main/java/com/cobblemon/mod/common/compat/lambdynamiclights/PlayerLuminance.java

@@ -10,11 +10,10 @@ package com.cobblemon.mod.common.compat.lambdynamiclights;
 
 import com.cobblemon.mod.common.Cobblemon;
 import com.cobblemon.mod.common.client.render.layer.PokemonOnShoulderRenderer;
-import com.cobblemon.mod.common.duck.PlayerDuck;
 import dev.lambdaurora.lambdynlights.api.entity.luminance.EntityLuminance;
 import dev.lambdaurora.lambdynlights.api.item.ItemLightSourceManager;
 import net.minecraft.core.registries.Registries;
-import net.minecraft.resources.Identifier;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraft.tags.TagKey;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.player.Player;
@@ -26,7 +25,7 @@ import org.jetbrains.annotations.Range;
 
 public final class PlayerLuminance extends CustomLuminance implements EntityLuminance {
     public static final PlayerLuminance INSTANCE = new PlayerLuminance();
-    private static final TagKey<Item> POKEDEX = TagKey.create(Registries.ITEM, Identifier.fromNamespaceAndPath(Cobblemon.MODID, "pokedex"));
+    private static final TagKey<Item> POKEDEX = TagKey.create(Registries.ITEM, ResourceLocation.fromNamespaceAndPath(Cobblemon.MODID, "pokedex"));
 
     @Override
     public @NotNull Type type() {
@@ -47,8 +46,8 @@ public final class PlayerLuminance extends CustomLuminance implements EntityLumi
     }
 
     private @Range(from = 0L, to = 15L) static int shoulderLuminance(@NotNull ItemLightSourceManager itemLightSourceManager, @NotNull Player player) {
-        final var leftShoulder = PokemonOnShoulderRenderer.shoulderDataFrom(((PlayerDuck)player).getShoulderEntityLeft());
-        final var rightShoulder = PokemonOnShoulderRenderer.shoulderDataFrom(((PlayerDuck)player).getShoulderEntityRight());
+        final var leftShoulder = PokemonOnShoulderRenderer.shoulderDataFrom(player.getShoulderEntityLeft());
+        final var rightShoulder = PokemonOnShoulderRenderer.shoulderDataFrom(player.getShoulderEntityRight());
 
         if (leftShoulder == null && rightShoulder == null) {
             return 0;

common/src/main/java/com/cobblemon/mod/common/duck/AvatarRenderStateDuck.java

@@ -1,21 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.duck;
-
-import net.minecraft.client.player.AbstractClientPlayer;
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
-import org.jetbrains.annotations.Nullable;
-
-public interface AvatarRenderStateDuck {
-    @Nullable AbstractClientPlayer cobblemon$getMountedPlayer();
-    void cobblemon$setMountedPlayer(@Nullable AbstractClientPlayer player);
-
-    @Nullable PokemonEntity cobblemon$getMountedPokemon();
-    void cobblemon$setMountedPokemon(@Nullable PokemonEntity pokemonEntity);
-}

common/src/main/java/com/cobblemon/mod/common/duck/CameraDuck.java

@@ -30,6 +30,4 @@ public interface CameraDuck {
 
     float cobblemon$getYRot();
     void cobblemon$setYRot(float yRot);
-
-    void cobblemon$markDirty();
 }

common/src/main/java/com/cobblemon/mod/common/duck/LivingEntityRenderStateDuck.java

@@ -1,30 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.duck;
-
-import com.cobblemon.mod.common.entity.PoseType;
-import net.minecraft.world.entity.LivingEntity;
-import org.jetbrains.annotations.Nullable;
-
-public interface LivingEntityRenderStateDuck {
-    @Nullable LivingEntity cobblemon$getMountedEntity();
-    void cobblemon$setMountedEntity(@Nullable LivingEntity entity);
-
-    float cobblemon$getMountedPartialTick();
-    void cobblemon$setMountedPartialTick(float partialTick);
-
-    int cobblemon$getMountedSeatIndex();
-    void cobblemon$setMountedSeatIndex(int seatIndex);
-
-    @Nullable String cobblemon$getMountedSeatLocator();
-    void cobblemon$setMountedSeatLocator(@Nullable String seatLocator);
-
-    @Nullable PoseType cobblemon$getMountedPoseType();
-    void cobblemon$setMountedPoseType(@Nullable PoseType poseType);
-}

common/src/main/java/com/cobblemon/mod/common/duck/PlayerDuck.java

@@ -8,7 +8,6 @@
 
 package com.cobblemon.mod.common.duck;
 
-import net.minecraft.nbt.CompoundTag;
 import org.joml.Vector3f;
 
 public interface PlayerDuck {
@@ -16,8 +15,4 @@ public interface PlayerDuck {
 	Vector3f getDriverInput();
 	void setLastSentDriverInput(Vector3f driverInput);
 	Vector3f getLastSentDriverInput();
-	CompoundTag getShoulderEntityLeft();
-	CompoundTag getShoulderEntityRight();
-	void setShoulderEntityLeft(CompoundTag entityNbt);
-	void setShoulderEntityRight(CompoundTag entityNbt);
 }

common/src/main/java/com/cobblemon/mod/common/duck/RecipeAwareSlot.java

@@ -8,8 +8,8 @@
 
 package com.cobblemon.mod.common.duck;
 
-import net.minecraft.world.item.crafting.RecipeAccess;
+import net.minecraft.world.item.crafting.RecipeManager;
 
 public interface RecipeAwareSlot {
-	void setRecipeManager(RecipeAccess recipeManager);
+	void setRecipeManager(RecipeManager recipeManager);
 }

common/src/main/java/com/cobblemon/mod/common/duck/ServerLevelDuck.java

@@ -0,0 +1,21 @@
+/*
+ * 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.duck;
+
+import net.minecraft.resources.ResourceLocation;
+
+/**
+ * Duck that facilitates getting a level key that we store on the level.
+ *
+ * @author dualspiral
+ * @since August 30th, 2026
+ */
+public interface ServerLevelDuck {
+    ResourceLocation cobblemon$getLevelResourceLocation();
+}

common/src/main/java/com/cobblemon/mod/common/duck/SoundEngineDuck.java

@@ -10,12 +10,12 @@ package com.cobblemon.mod.common.duck;
 
 import org.jetbrains.annotations.Nullable;
 
-import net.minecraft.resources.Identifier;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraft.sounds.SoundSource;
 
 public interface SoundEngineDuck {
 
-    void pauseSounds(@Nullable Identifier id, @Nullable SoundSource category);
+    void pauseSounds(@Nullable ResourceLocation id, @Nullable SoundSource category);
 
-    void resumeSounds(@Nullable Identifier id, @Nullable SoundSource category);
+    void resumeSounds(@Nullable ResourceLocation id, @Nullable SoundSource category);
 }

common/src/main/java/com/cobblemon/mod/common/duck/SoundManagerDuck.java

@@ -8,13 +8,13 @@
 
 package com.cobblemon.mod.common.duck;
 
-import net.minecraft.resources.Identifier;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraft.sounds.SoundSource;
 import org.jetbrains.annotations.Nullable;
 
 public interface SoundManagerDuck {
 
-    void pauseSounds(@Nullable Identifier id, @Nullable SoundSource category);
+    void pauseSounds(@Nullable ResourceLocation id, @Nullable SoundSource category);
 
-    void resumeSounds(@Nullable Identifier id, @Nullable SoundSource category);
+    void resumeSounds(@Nullable ResourceLocation id, @Nullable SoundSource category);
 }

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

@@ -13,7 +13,7 @@ import com.cobblemon.mod.common.duck.RidePassenger;
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.entity.projectile.arrow.AbstractArrow;
+import net.minecraft.world.entity.projectile.AbstractArrow;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.Level;
 import org.jetbrains.annotations.Nullable;

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

@@ -11,7 +11,7 @@ package com.cobblemon.mod.common.mixin;
 import com.llamalad7.mixinextras.sugar.Local;
 import net.minecraft.core.BlockPos;
 import net.minecraft.server.level.ServerLevel;
-import net.minecraft.world.entity.animal.bee.Bee;
+import net.minecraft.world.entity.animal.Bee;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.BonemealableBlock;
 import net.minecraft.world.level.block.state.BlockState;
@@ -22,14 +22,14 @@ import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.ModifyVariable;
 
 
-@Mixin(targets = "net.minecraft.world.entity.animal.bee.Bee$BeeGrowCropGoal")
+@Mixin(targets = "net.minecraft.world.entity.animal.Bee$BeeGrowCropGoal")
 public abstract class BeeEntityMixin {
 
     @Shadow(aliases = {"this$0", "field_20373"}) @Final private Bee bee;
 
     // Grows bonemealable blocks vanilla's hardcoded checks miss, returning the state so it handles the rest.
-    @ModifyVariable(method = "tick", at = @At(value = "LOAD", ordinal = 0), name = "growState")
-    private BlockState cobblemon$growBonemealableBlocks(BlockState grownState, @Local(name = "belowState") BlockState blockState, @Local(name = "belowPos") BlockPos pos) {
+    @ModifyVariable(method = "tick", at = @At(value = "LOAD", ordinal = 0), index = 5)
+    private BlockState cobblemon$growBonemealableBlocks(BlockState grownState, @Local(ordinal = 0) BlockState blockState, @Local BlockPos pos) {
         if (grownState != null || blockState.is(Blocks.CAVE_VINES) || blockState.is(Blocks.CAVE_VINES_PLANT)) {
             return grownState;
         }

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

@@ -14,26 +14,19 @@ import com.cobblemon.mod.common.api.ai.config.task.PathToBeeHiveTaskConfig;
 import com.cobblemon.mod.common.api.pokemon.PokemonProperties;
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
 import com.cobblemon.mod.common.world.feature.SaccharineTreeFeature;
-import com.mojang.logging.LogUtils;
 import net.minecraft.core.BlockPos;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.tags.BlockTags;
-import net.minecraft.util.ProblemReporter;
 import net.minecraft.world.entity.Entity;
-import net.minecraft.world.entity.EntitySpawnReason;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.ai.memory.MemoryStatus;
 import net.minecraft.world.item.component.CustomData;
-import net.minecraft.world.item.component.TypedEntityData;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.BeehiveBlock;
 import net.minecraft.world.level.block.HorizontalDirectionalBlock;
 import net.minecraft.world.level.block.entity.BeehiveBlockEntity;
-import net.minecraft.world.level.storage.TagValueOutput;
 import net.minecraft.world.phys.Vec3;
-import org.slf4j.Logger;
 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;
@@ -45,28 +38,25 @@ import java.util.Objects;
 @Mixin(BeehiveBlockEntity.Occupant.class)
 public abstract class BeeOccupantMixin {
 
-    @Unique
-    private static final Logger LOGGER = LogUtils.getLogger();
-
     @Inject(method = "createEntity", at = @At("RETURN"), cancellable = true)
     private void cobblemon$createEntity(Level level, BlockPos pos, CallbackInfoReturnable<Entity> cir) {
         // Needing to replicate all the post op stuff on the hive isn't great
         if (cir.getReturnValue() == null) {
             final BeehiveBlockEntity.Occupant occupant = (BeehiveBlockEntity.Occupant) (Object) this;
-            CompoundTag compoundTag = occupant.entityData().copyTagWithoutId();
-            String id = compoundTag.getStringOr("id", "");
+            CompoundTag compoundTag = occupant.entityData().copyTag();
+            String id = compoundTag.getString("id");
             Entity entity = null;
             if (id.equals(SaccharineTreeFeature.Companion.getPOKEMON_PLACEHOLD_ID())) {
                 // Special case for Pokemon stuffed into a beenest upon world gen.
                 // For technical reasons we cannot create them as full entities during world gen.
                 // So we look for this special id tag and complete the entity when it attempts to exit a hive.
                 if (compoundTag.contains("pokemonProperties")) {
-                    String properties = compoundTag.getString("pokemonProperties").get();
+                    String properties = compoundTag.getString("pokemonProperties");
                     PokemonProperties pokemon = PokemonProperties.Companion.parse(properties);
                     entity = pokemon.createEntity(level);
                 }
             } else {
-                entity = EntityType.loadEntityRecursive(compoundTag, level, EntitySpawnReason.LOAD, (entityx) -> entityx);
+                entity = EntityType.loadEntityRecursive(compoundTag, level, (entityx) -> entityx);
             }
 
             if (entity instanceof PokemonEntity pokemonEntity) {
@@ -86,11 +76,11 @@ public abstract class BeeOccupantMixin {
                     // Block has likely been destroyed
                     var center = pos.getCenter();
                     newPos = new Vec3(
-                            center.x + level.getRandom().nextFloat() * 0.6 - 0.3,
-                            center.y + level.getRandom().nextFloat() * 0.6 - 0.3,
-                            center.z + level.getRandom().nextFloat() * 0.6 - 0.3
+                            center.x + level.random.nextFloat() * 0.6 - 0.3,
+                            center.y + level.random.nextFloat() * 0.6 - 0.3,
+                            center.z + level.random.nextFloat() * 0.6 - 0.3
                     );
-                    newYaw = level.getRandom().nextFloat() * 360F;
+                    newYaw = level.random.nextFloat() * 360F;
                     if (brain.checkMemory(CobblemonMemories.HIVE_LOCATION, MemoryStatus.REGISTERED)) {
                         brain.eraseMemory(CobblemonMemories.HIVE_LOCATION);
                     }
@@ -110,7 +100,7 @@ public abstract class BeeOccupantMixin {
                         if (state.is(BlockTags.BEEHIVES, (blockStateBase) -> blockStateBase.hasProperty(BeehiveBlock.HONEY_LEVEL))) {
                             int i = state.getValue(BeehiveBlock.HONEY_LEVEL);
                             if (i < 5) {
-                                int j = level.getRandom().nextInt(100) == 0 ? 2 : 1;
+                                int j = level.random.nextInt(100) == 0 ? 2 : 1;
                                 if (i + j > 5) {
                                     --j;
                                 }
@@ -127,19 +117,16 @@ public abstract class BeeOccupantMixin {
     @Inject(method = "of", at = @At("HEAD"), cancellable = true)
     private static void cobblemon$of(Entity entity, CallbackInfoReturnable<BeehiveBlockEntity.Occupant> cir) {
         if (entity instanceof PokemonEntity pokemonEntity) {
-            try (ProblemReporter.ScopedCollector reporter = new ProblemReporter.ScopedCollector(pokemonEntity.problemPath(), LOGGER)) {
-                List<String> IGNORED_BEE_TAGS = BeehiveBlockEntity.IGNORED_BEE_TAGS;
-                TagValueOutput output = TagValueOutput.createWithContext(reporter, pokemonEntity.registryAccess());
-                pokemonEntity.save(output);
-                Objects.requireNonNull(output);
-                IGNORED_BEE_TAGS.forEach(output::discard);
-                CompoundTag entityTag = output.buildResult();
-                boolean hasNectar = pokemonEntity.getBrain().checkMemory(CobblemonMemories.HAS_NECTAR, MemoryStatus.REGISTERED)
-                        && pokemonEntity.getBrain().getMemory(CobblemonMemories.HAS_NECTAR).orElse(false);
-                cir.setReturnValue(new BeehiveBlockEntity.Occupant(TypedEntityData.of(pokemonEntity.getType(), entityTag), 0, hasNectar ? 2400 : 600));
-                cir.cancel();
-            }
+            List<String> IGNORED_BEE_TAGS = Arrays.asList("Air", "ArmorDropChances", "ArmorItems", "CanPickUpLoot", "DeathTime", "FallDistance", "FallFlying", "Fire", "HandDropChances", "HandItems", "HurtByTimestamp", "HurtTime", "LeftHanded", "Motion", "NoGravity", "OnGround", "PortalCooldown", "Pos", "Rotation", "Passengers", "leash", "UUID");
+            CompoundTag compoundTag = new CompoundTag();
+            entity.save(compoundTag);
+            Objects.requireNonNull(compoundTag);
+            IGNORED_BEE_TAGS.forEach(compoundTag::remove);
+            boolean hasNectar = pokemonEntity.getBrain().checkMemory(CobblemonMemories.HAS_NECTAR, MemoryStatus.REGISTERED)
+                    && pokemonEntity.getBrain().getMemory(CobblemonMemories.HAS_NECTAR).orElse(false);
+            cir.setReturnValue(new BeehiveBlockEntity.Occupant(CustomData.of(compoundTag), 0, hasNectar ? 2400 : 600));
+            cir.cancel();
         }
 
     }
-}
+}

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

@@ -12,6 +12,7 @@ package com.cobblemon.mod.common.mixin;
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
 import com.cobblemon.mod.common.mixin.accessor.BeeDataAccessor;
 import com.cobblemon.mod.common.mixin.accessor.BeehiveBlockEntityAccessor;
+import com.cobblemon.mod.common.mixin.accessor.BlockEntityAccessor;
 import com.google.common.collect.Lists;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.entity.Entity;
@@ -58,8 +59,8 @@ public abstract class BeehiveBlockEntityMixin {
                         }
                         if (isPokemon) {
                             return BeehiveBlockEntityAccessor.releaseOccupant(
-                                    blockEntity.getLevel(),
-                                    blockEntity.getBlockPos(),
+                                    ((BlockEntityAccessor) blockEntityAccessor).getLevel(),
+                                    ((BlockEntityAccessor) blockEntityAccessor).getWorldPosition(),
                                     state,
                                     occupant,
                                     list,

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

@@ -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.mixin;
+
+import com.cobblemon.mod.common.client.render.item.CobblemonBuiltinItemRenderer;
+import com.cobblemon.mod.common.client.render.item.CobblemonBuiltinItemRendererRegistry;
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer;
+import net.minecraft.client.renderer.MultiBufferSource;
+import net.minecraft.world.item.ItemDisplayContext;
+import net.minecraft.world.item.ItemStack;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(BlockEntityWithoutLevelRenderer.class)
+public class BuiltinModelItemRendererMixin {
+
+    @Inject(method = "renderByItem", at = @At("HEAD"), cancellable = true)
+    private void cobblemon$useDynamicItemRenderer(ItemStack stack, ItemDisplayContext mode, PoseStack matrices, MultiBufferSource vertexConsumers, int light, int overlay, CallbackInfo ci) {
+        CobblemonBuiltinItemRenderer renderer = CobblemonBuiltinItemRendererRegistry.INSTANCE.rendererOf(stack.getItem());
+        if (renderer != null) {
+            renderer.render(stack, mode, matrices, vertexConsumers, light, overlay);
+            ci.cancel();
+        }
+    }
+
+}

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

@@ -0,0 +1,69 @@
+/*
+ * 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 static com.cobblemon.mod.common.datafixer.CobblemonSchemas.VERSION_KEY;
+
+import com.cobblemon.mod.common.datafixer.CobblemonSchemas;
+import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
+import com.mojang.serialization.MapCodec;
+import java.util.Optional;
+import java.util.function.Supplier;
+import net.minecraft.SharedConstants;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.nbt.IntTag;
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.util.datafix.DataFixTypes;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.chunk.ChunkGenerator;
+import net.minecraft.world.level.chunk.storage.ChunkStorage;
+import net.minecraft.world.level.storage.DimensionDataStorage;
+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.ModifyVariable;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+@Mixin(ChunkStorage.class)
+public class ChunkStorageMixin {
+    //Modifies the NBT returned by the vanilla upgradeChunkTag to also incorporate cobblemon fixup stuff
+    @ModifyExpressionValue(
+        method = "upgradeChunkTag(Lnet/minecraft/resources/ResourceKey;Ljava/util/function/Supplier;Lnet/minecraft/nbt/CompoundTag;Ljava/util/Optional;)Lnet/minecraft/nbt/CompoundTag;",
+        at = @At(
+            value = "INVOKE",
+            target = "Lnet/minecraft/util/datafix/DataFixTypes;updateToCurrentVersion(Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/nbt/CompoundTag;I)Lnet/minecraft/nbt/CompoundTag;"
+        )
+    )
+    public CompoundTag cobblemon$doChunkFix(
+        CompoundTag vanillaFixed
+    ) {
+        int curVersion = vanillaFixed.contains(VERSION_KEY) ? vanillaFixed.getInt(VERSION_KEY) : 0;
+        return DataFixTypes.CHUNK.update(CobblemonSchemas.getDATA_FIXER(), vanillaFixed, curVersion, CobblemonSchemas.DATA_VERSION);
+    }
+
+    // Our update on the same MC version still needs its own fixes so run them here in that case.
+    @Inject(
+        method = "upgradeChunkTag(Lnet/minecraft/resources/ResourceKey;Ljava/util/function/Supplier;Lnet/minecraft/nbt/CompoundTag;Ljava/util/Optional;)Lnet/minecraft/nbt/CompoundTag;",
+        at = @At("HEAD"),
+        cancellable = true
+    )
+    private void cobblemon$doChunkFixOnCurrentVersion(
+        ResourceKey<Level> levelKey,
+        Supplier<DimensionDataStorage> storage,
+        CompoundTag chunkData,
+        Optional<ResourceKey<MapCodec<? extends ChunkGenerator>>> chunkGeneratorKey,
+        CallbackInfoReturnable<CompoundTag> cir
+    ) {
+        if (ChunkStorage.getVersion(chunkData) != SharedConstants.getCurrentVersion().getDataVersion().getVersion()) {
+            return;
+        }
+        int curVersion = chunkData.contains(VERSION_KEY) ? chunkData.getInt(VERSION_KEY) : 0;
+        cir.setReturnValue(DataFixTypes.CHUNK.update(CobblemonSchemas.getDATA_FIXER(), chunkData, curVersion, CobblemonSchemas.DATA_VERSION));
+    }
+}

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

@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.mixin;
-
-import com.cobblemon.mod.common.block.dispenser.DispenserBehaviorRegistry;
-import net.minecraft.core.dispenser.DispenseItemBehavior;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-@Mixin(DispenseItemBehavior.class)
-public interface DispenseItemBehaviourMixin {
-    @Inject(method = "bootStrap", at = @At("TAIL"))
-    private static void addCobblemonDispenserBehaviors(CallbackInfo ci) {
-        DispenserBehaviorRegistry.INSTANCE.registerDispenserBehaviors();
-    }
-}

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

@@ -10,7 +10,7 @@ package com.cobblemon.mod.common.mixin;
 
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
 import net.minecraft.world.InteractionHand;
-import net.minecraft.world.InteractionResult;
+import net.minecraft.world.InteractionResultHolder;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.EnderpearlItem;
@@ -28,7 +28,7 @@ import java.util.Comparator;
 @Mixin(EnderpearlItem.class)
 public abstract class EnderPearlItemMixin {
     @Inject(method = "use", at = @At(value = "HEAD"), cancellable = true)
-    private void cobblemon$use(Level level, Player player, InteractionHand usedHand, CallbackInfoReturnable<InteractionResult> cir) {
+    private void cobblemon$use(Level level, Player player, InteractionHand usedHand, CallbackInfoReturnable<InteractionResultHolder<ItemStack>> cir) {
         double range = player.entityInteractionRange();
         Entity closestEntity = level.getEntities(player, AABB.ofSize(player.position(), range, range, range)).stream()
             .filter(entity -> isLookingAt(player, entity))
@@ -36,7 +36,7 @@ public abstract class EnderPearlItemMixin {
             .orElse(null);
 
         if (closestEntity instanceof PokemonEntity pokemonEntity) {
-            if (player.isCrouching() && pokemonEntity.isOwnedBy(player)) {
+            if (player.isCrouching() && pokemonEntity.getOwnerUUID() == player.getUUID()) {
                 cir.cancel();
             }
         }

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

@@ -13,7 +13,7 @@ import com.cobblemon.mod.common.pokemon.ai.EntityBehaviour;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.entity.Mob;
 import net.minecraft.world.entity.ai.goal.AvoidEntityGoal;
-import net.minecraft.world.entity.animal.fox.Fox;
+import net.minecraft.world.entity.animal.Fox;
 import net.minecraft.world.entity.monster.Creeper;
 import net.minecraft.world.level.Level;
 import org.spongepowered.asm.mixin.Mixin;

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

@@ -9,11 +9,19 @@
 package com.cobblemon.mod.common.mixin;
 
 import com.cobblemon.mod.common.client.CobblemonClient;
-import net.minecraft.client.player.AbstractClientPlayer;
+import com.cobblemon.mod.common.client.render.models.blockbench.PosableState;
+import com.cobblemon.mod.common.entity.PosableEntity;
+import com.mojang.blaze3d.vertex.PoseStack;
+import com.mojang.blaze3d.vertex.VertexConsumer;
+import net.minecraft.client.renderer.LevelRenderer;
 import net.minecraft.client.renderer.entity.EntityRenderDispatcher;
-import net.minecraft.client.renderer.entity.player.AvatarRenderer;
+import net.minecraft.client.renderer.entity.EntityRenderer;
+import net.minecraft.client.resources.PlayerSkin;
 import net.minecraft.server.packs.resources.ResourceManager;
-import net.minecraft.world.entity.player.PlayerModelType;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.phys.AABB;
+import net.minecraft.world.phys.Vec3;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
@@ -25,7 +33,7 @@ import java.util.Map;
 @Mixin(EntityRenderDispatcher.class)
 public class EntityRenderDispatcherMixin {
 
-    @Shadow private Map<PlayerModelType, AvatarRenderer<AbstractClientPlayer>> playerRenderers;
+    @Shadow private Map<PlayerSkin.Model, EntityRenderer<? extends Player>> playerRenderers;
 
     @Inject(
         method = "onResourceManagerReload",
@@ -35,4 +43,55 @@ public class EntityRenderDispatcherMixin {
         CobblemonClient.INSTANCE.onAddLayer(this.playerRenderers);
     }
 
-}
+    @Inject(
+        method = "renderHitbox(Lcom/mojang/blaze3d/vertex/PoseStack;Lcom/mojang/blaze3d/vertex/VertexConsumer;Lnet/minecraft/world/entity/Entity;FFFF)V",
+        at = @At(value = "TAIL")
+    )
+    private static void renderLocators(
+        PoseStack poseStack,
+        VertexConsumer buffer,
+        Entity entity,
+        float red,
+        float green,
+        float blue,
+        float alpha,
+        CallbackInfo ci
+    ) {
+        if (entity instanceof PosableEntity posableEntity) {
+            if (posableEntity.getDelegate() instanceof PosableState state) {
+                state.getLocatorStates().forEach((locator, matrix) -> {
+                    poseStack.pushPose();
+                    Vec3 pos = matrix.getOrigin().subtract(entity.position());
+                    LevelRenderer.renderLineBox(
+                        poseStack,
+                        buffer,
+                        AABB.ofSize(pos, 0.25, 0.25, 0.25),
+                        0F,
+                        1F,
+                        0F,
+                        1F
+                    );
+
+                    /*if (locator.contains("middle")){
+                        PoseStack.Pose pose = poseStack.last();
+                        Vector3f vec = matrix.getMatrix().getRotation(new AxisAngle4f()).transform(new Vector3f(0, 0, -1));
+                        buffer.addVertex(pose, pos.toVector3f()).setColor(0xffff00ff).setNormal(pose, vec.x, vec.y, vec.z); //Forward, pink
+                        buffer.addVertex(pose, (float)(pos.x() + vec.x), (float)(pos.y() + vec.y), (float)(pos.z() + vec.z)).setColor(0xffff00ff).setNormal(pose, vec.x, vec.y, vec.z);
+
+                        vec = matrix.getMatrix().getRotation(new AxisAngle4f()).transform(new Vector3f(0, 1, 0));
+                        buffer.addVertex(pose, pos.toVector3f()).setColor(0xffffff00).setNormal(pose, vec.x, vec.y, vec.z); //Up, yellow
+                        buffer.addVertex(pose, (float)(pos.x() + vec.x), (float)(pos.y() + vec.y), (float)(pos.z() + vec.z)).setColor(0xffffff00).setNormal(pose, vec.x, vec.y, vec.z);
+
+                        vec = matrix.getMatrix().getRotation(new AxisAngle4f()).transform(new Vector3f(-1, 0, 0));
+                        buffer.addVertex(pose, pos.toVector3f()).setColor(0xff00ffff).setNormal(pose, vec.x, vec.y, vec.z); //Left, cyan
+                        buffer.addVertex(pose, (float)(pos.x() + vec.x), (float)(pos.y() + vec.y), (float)(pos.z() + vec.z)).setColor(0xff00ffff).setNormal(pose, vec.x, vec.y, vec.z);
+                    }*/
+
+
+                    poseStack.popPose();
+                });
+
+            }
+        }
+    }
+}

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

@@ -14,7 +14,7 @@ import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.Mob;
 import net.minecraft.world.entity.ai.goal.AvoidEntityGoal;
-import net.minecraft.world.entity.monster.skeleton.AbstractSkeleton;
+import net.minecraft.world.entity.monster.AbstractSkeleton;
 import net.minecraft.world.level.Level;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;

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

@@ -23,7 +23,7 @@ import org.spongepowered.asm.mixin.injection.At;
 public class EntityStorageMixin {
     //Modifies the NBT returned by the vanilla upgradeChunkTag to also incorporate cobblemon fixup stuff
     @ModifyExpressionValue(
-        method = "lambda$loadEntities$0",
+        method = "method_31731(Lnet/minecraft/world/level/ChunkPos;Ljava/util/Optional;)Lnet/minecraft/world/level/entity/ChunkEntities;",
         at = @At(
             value = "INVOKE",
             target = "Lnet/minecraft/world/level/chunk/storage/SimpleRegionStorage;upgradeChunkTag(Lnet/minecraft/nbt/CompoundTag;I)Lnet/minecraft/nbt/CompoundTag;"
@@ -32,7 +32,7 @@ public class EntityStorageMixin {
     public CompoundTag cobblemon$doEntityFix(
         CompoundTag vanillaFixed
     ) {
-        int curVersion = vanillaFixed.getIntOr(VERSION_KEY, 0);
+        int curVersion = vanillaFixed.contains(VERSION_KEY) ? vanillaFixed.getInt(VERSION_KEY) : 0;
         CompoundTag newTag =  DataFixTypes.ENTITY_CHUNK.update(CobblemonSchemas.getDATA_FIXER(), vanillaFixed, curVersion, CobblemonSchemas.DATA_VERSION);
         newTag.put(VERSION_KEY, IntTag.valueOf(CobblemonSchemas.DATA_VERSION));
         return newTag;

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

@@ -15,18 +15,17 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 import com.cobblemon.mod.common.villager.VillagerGatherableItems;
 
 import java.util.Objects;
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.world.entity.npc.villager.Villager;
-import net.minecraft.world.entity.npc.villager.VillagerProfession;
+import net.minecraft.world.entity.npc.Villager;
+import net.minecraft.world.entity.npc.VillagerProfession;
 import net.minecraft.world.item.ItemStack;
 
 @Mixin(Villager.class)
 public abstract class EntityVillagerMixin {
 
     @Inject(method = "wantsToPickUp", at = @At(value = "RETURN"), cancellable = true)
-    private void cobblemon$canGather(ServerLevel serverLevel, ItemStack stack, CallbackInfoReturnable<Boolean> ci) {
+    private void cobblemon$canGather(ItemStack stack, CallbackInfoReturnable<Boolean> ci) {
         final Villager villager = (Villager) (Object) this;
-        if (!ci.getReturnValue() && Objects.equals(villager.getVillagerData().profession().value(), VillagerProfession.FARMER) && villager.getInventory().canAddItem(stack)) {
+        if (ci.getReturnValue() == false && Objects.equals(villager.getVillagerData().getProfession(), VillagerProfession.FARMER) && villager.getInventory().canAddItem(stack)) {
             if(VillagerGatherableItems.INSTANCE.getVillagerGatherableItems().contains(stack.getItem()))
                 ci.setReturnValue(true);
         }

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

@@ -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.mixin;
-
-import com.cobblemon.mod.common.Cobblemon;
-import com.cobblemon.mod.common.CobblemonItems;
-import com.cobblemon.mod.common.api.events.CobblemonEvents;
-import com.cobblemon.mod.common.api.events.item.LeftoversCreatedEvent;
-import com.cobblemon.mod.common.api.tags.CobblemonItemTags;
-import kotlin.Unit;
-import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.food.FoodProperties;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.component.Consumable;
-import net.minecraft.world.level.Level;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-@Mixin(FoodProperties.class)
-public class FoodPropertiesMixin {
-    @Inject(method = "onConsume", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/food/FoodData;eat(Lnet/minecraft/world/food/FoodProperties;)V"))
-    public void dropLeftOvers(Level level, LivingEntity user, ItemStack stack, Consumable consumable, CallbackInfo ci) {
-        if (!level.isClientSide()) {
-            if (stack.is(CobblemonItemTags.LEAVES_LEFTOVERS) && level.getRandom().nextDouble() < Cobblemon.config.getAppleLeftoversChance()) {
-                ItemStack leftovers = new ItemStack(CobblemonItems.LEFTOVERS);
-                CobblemonEvents.LEFTOVERS_CREATED.postThen(
-                        new LeftoversCreatedEvent(user, leftovers),
-                        _ -> Unit.INSTANCE,
-                        leftoversCreatedEvent -> {
-                            user.handleExtraItemsCreatedOnUse(leftoversCreatedEvent.getLeftovers());
-                            return Unit.INSTANCE;
-                        }
-                );
-            }
-        }
-    }
-}

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

@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.mixin;
+
+import com.cobblemon.mod.common.entity.fishing.PokeRodFishingBobberEntity;
+import net.minecraft.client.multiplayer.ClientLevel;
+import net.minecraft.client.renderer.item.ItemProperties;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.item.ItemStack;
+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;
+
+@Mixin(ItemProperties.class)
+public class ItemPropertiesMixin {
+
+    // Mixins into the fishing rod's register() lambda expression
+    // Without this, the fishing rod item model appears cast when using a PokeRod in the other hand
+    @Inject(method = "method_27883", at = @At(value = "RETURN", ordinal = 1), cancellable = true)
+    private static void cobblemon$preventRodMixup(ItemStack itemStack, ClientLevel clientLevel, LivingEntity livingEntity, int i, CallbackInfoReturnable<Float> cir) {
+        if (!(livingEntity instanceof Player) || ((Player) livingEntity).fishing instanceof PokeRodFishingBobberEntity) {
+            cir.setReturnValue(0.0f);
+        }
+    }
+}

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

@@ -16,7 +16,7 @@ import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.sounds.SoundSource;
 import net.minecraft.world.InteractionHand;
-import net.minecraft.world.InteractionResult;
+import net.minecraft.world.ItemInteractionResult;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.Level;
@@ -35,8 +35,8 @@ import static net.minecraft.world.level.block.LecternBlock.HAS_BOOK;
 @Mixin(LecternBlock.class)
 public abstract class LecternBlockMixin {
     @Inject(method = "useItemOn", at = @At(value = "HEAD"), cancellable = true)
-    private void cobblemon$useItemOn(ItemStack itemStack, BlockState blockState, Level world, BlockPos blockPos, Player player, InteractionHand interactionHand, BlockHitResult blockHitResult, CallbackInfoReturnable<InteractionResult> cir) {
-        if (!world.isClientSide() && itemStack.getItem() instanceof PokedexItem) {
+    private void cobblemon$useItemOn(ItemStack itemStack, BlockState blockState, Level world, BlockPos blockPos, Player player, InteractionHand interactionHand, BlockHitResult blockHitResult, CallbackInfoReturnable<ItemInteractionResult> cir) {
+        if (!world.isClientSide && itemStack.getItem() instanceof PokedexItem) {
             BlockEntity blockEntity = world.getBlockEntity(blockPos);
             if (!blockState.getValue(HAS_BOOK)
                 && blockEntity instanceof net.minecraft.world.level.block.entity.LecternBlockEntity
@@ -53,9 +53,9 @@ public abstract class LecternBlockMixin {
                 if (lecternEntity instanceof LecternBlockEntity) {
                     ((LecternBlockEntity) lecternEntity).setItemStack((pokedexItemStack));
                     world.playSound(null, blockPos, CobblemonSounds.POKEDEX_CLOSE, SoundSource.BLOCKS, 0.5F, 1.25F);
-                    cir.setReturnValue(InteractionResult.SUCCESS);
+                    cir.setReturnValue(ItemInteractionResult.SUCCESS);
                 } else {
-                    cir.setReturnValue(itemStack.isEmpty() && interactionHand == InteractionHand.MAIN_HAND ? InteractionResult.PASS : InteractionResult.TRY_WITH_EMPTY_HAND);
+                    cir.setReturnValue(itemStack.isEmpty() && interactionHand == InteractionHand.MAIN_HAND ? ItemInteractionResult.SKIP_DEFAULT_BLOCK_INTERACTION : ItemInteractionResult.PASS_TO_DEFAULT_BLOCK_INTERACTION);
                 }
             }
         }

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

@@ -23,7 +23,7 @@ import java.util.List;
 @Mixin(LightningBolt.class)
 public abstract class LightningBoltMixin {
 
-    @Inject(method = "spawnFire", at = @At(value = "HEAD"), cancellable = true)
+    @Inject(method = "spawnFire", at = @At(value = "Head"), cancellable = true)
     private void cobblemon$spawnFire(int extraIgnitions, CallbackInfo ci) {
         // This prevents fire from spawning around Pokemon who otherwise should be immune to lightning and effectively absorb the hit
         final LightningBolt lightningBolt = (LightningBolt) (Object) this;
@@ -41,4 +41,4 @@ public abstract class LightningBoltMixin {
             ci.cancel();
         }
     }
-}
+}

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

@@ -15,23 +15,18 @@ import com.cobblemon.mod.common.api.pokemon.effect.ShoulderEffectRegistry;
 import com.cobblemon.mod.common.api.riding.RidingStyle;
 import com.cobblemon.mod.common.api.riding.Seat;
 import com.cobblemon.mod.common.api.riding.behaviour.types.liquid.SubmarineBehaviour;
-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.duck.RidePassenger;
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
 import com.cobblemon.mod.common.net.messages.server.orientation.ServerboundUpdateOrientationPacket;
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
-import net.minecraft.core.Holder;
 import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.world.effect.MobEffect;
 import net.minecraft.world.effect.MobEffectInstance;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.ClipContext;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.phys.HitResult;
@@ -60,8 +55,8 @@ public abstract class LivingEntityMixin extends Entity implements OrientationCon
         return cobblemon$orientationController;
     }
 
-    @Inject(method = "removeEffect", at = @At(value = "TAIL"))
-    private void cobblemon$onEffectRemoved(Holder<MobEffect> effect, CallbackInfoReturnable<Boolean> cir) {
+    @Inject(method = "onEffectRemoved", at = @At(value = "TAIL"))
+    private void cobblemon$onEffectRemoved(MobEffectInstance effect, CallbackInfo ci) {
         final LivingEntity entity = (LivingEntity) (Object) this;
         if (entity instanceof ServerPlayer) {
             ShoulderEffectRegistry.INSTANCE.onEffectEnd((ServerPlayer) entity);
@@ -81,40 +76,27 @@ public abstract class LivingEntityMixin extends Entity implements OrientationCon
         Entity vehicle = this.getVehicle();
         if (vehicle instanceof PokemonEntity pokemonEntity && pokemonEntity.getDelegate() instanceof PokemonClientDelegate delegate) {
             int seatIndex = pokemonEntity.getPassengers().indexOf(this);
-            if (seatIndex >= 0 && seatIndex < pokemonEntity.getSeats().size()) {
-                Seat seat = pokemonEntity.getSeats().get(seatIndex);
-                MatrixWrapper locator = delegate.getLocatorStates().get(seat.getLocator());
-                if (locator != null) {
-                    Vec3 locatorOffset = new Vec3(locator.getMatrix().getTranslation(new Vector3f()));
-                    Vec3 eyePosition = cobblemon$getEyePosition(partialTicks, pokemonEntity, locatorOffset);
-                    return cobblemon$pickFromEyePosition(hitDistance, partialTicks, hitFluids, eyePosition);
-                }
-            }
+            Seat seat = pokemonEntity.getSeats().get(seatIndex);
+            MatrixWrapper locator = delegate.getLocatorStates().get(seat.getLocator());
 
-            if ((Object) this instanceof RidePassenger ridePassenger) {
-                Vec3 rideEyePosition = ridePassenger.cobblemon$getRideEyePos();
-                if (!rideEyePosition.equals(Vec3.ZERO)) {
-                    return cobblemon$pickFromEyePosition(hitDistance, partialTicks, hitFluids, rideEyePosition);
-                }
-            }
+            Vec3 locatorOffset = new Vec3(locator.getMatrix().getTranslation(new Vector3f()));
+
+            Vec3 eyePosition = cobblemon$getEyePosition(partialTicks, pokemonEntity, locatorOffset);
+
+            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 @NotNull HitResult cobblemon$pickFromEyePosition(double hitDistance, float partialTicks, boolean hitFluids, Vec3 eyePosition) {
-        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
-                        )
-                );
-    }
-
     @Unique
     private Vec3 cobblemon$getEyePosition(float partialTicks, PokemonEntity pokemonEntity, Vec3 locatorOffset) {
         OrientationController controller = this.getOrientationController();
@@ -136,6 +118,20 @@ public abstract class LivingEntityMixin extends Entity implements OrientationCon
         this.cobblemon$orientationController.tick();
     }
 
+    @Override
+    public void absMoveTo(double x, double y, double z, float yaw, float pitch) {
+        if (cobblemon$orientationController.getActive()) {
+            this.absMoveTo(x, y, z);
+            this.setYRot(yaw % 360.0f);
+            this.setXRot(pitch % 360.0f);
+            this.yRotO = this.getYRot();
+            this.xRotO = this.getXRot();
+        } else {
+            this.absMoveTo(x, y, z);
+            this.absRotateTo(yaw, pitch);
+        }
+    }
+
     @Inject(method = "decreaseAirSupply", at = @At("HEAD"), cancellable = true)
     private void cobblemon$conditionalWaterBreathing(
             int currentAir,
@@ -163,10 +159,4 @@ public abstract class LivingEntityMixin extends Entity implements OrientationCon
         }
     }
 
-    @Inject(method = "stopRiding", at = @At("HEAD"))
-    public void cobblemon$resetOrientationOnDismount(CallbackInfo ci) {
-        LivingEntity player = (LivingEntity)(Object)this;
-        if (!(player.getVehicle() instanceof OrientationControllable controllableVehicle)) return;
-        controllableVehicle.getOrientationController().setActive(false);
-    }
 }

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

@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.mixin;
+
+import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
+import net.minecraft.server.ServerInterface;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.entity.Entity;
+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;
+
+@Mixin(ServerLevel.class)
+public abstract class MinecraftDedicatedServerMixin implements ServerInterface {
+
+    @Inject(method = "shouldDiscardEntity", at = @At(value = "HEAD"), cancellable = true)
+    public void cobblemon$allowPokemonSpawns(Entity entity, CallbackInfoReturnable<Boolean> callback) {
+        if (entity instanceof PokemonEntity) {
+            callback.setReturnValue(false);
+        }
+    }
+
+}

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

@@ -33,7 +33,7 @@ public abstract class NoteBlockMixin {
             return;
         }
 
-        if (!level.isClientSide()) {
+        if (!level.isClientSide) {
             final BlockPos instrumentPos = shelfPos.below();
             final SoundEvent soundEvent;
             if (level.getBlockState(instrumentPos).isAir()) {

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

@@ -9,8 +9,7 @@
 package com.cobblemon.mod.common.mixin;
 
 import com.cobblemon.mod.common.api.snowstorm.ParticleMaterials;
-import com.cobblemon.mod.common.client.particle.SnowstormParticleGroup;
-import java.util.ArrayList;
+import com.google.common.collect.ImmutableList;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Mutable;
@@ -18,10 +17,8 @@ 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 net.minecraft.client.particle.ParticleGroup;
 import net.minecraft.client.particle.ParticleEngine;
 import net.minecraft.client.particle.ParticleRenderType;
 
@@ -34,21 +31,7 @@ final class ParticleManagerMixin {
 
     @Inject(at = @At("RETURN"), method = "<clinit>")
     private static void lodestone$addTypes(CallbackInfo ci) {
-        ArrayList<ParticleRenderType> types = new ArrayList<>(RENDER_ORDER);
-        types.add(ParticleMaterials.INSTANCE.getADD());
-        types.add(ParticleMaterials.INSTANCE.getALPHA());
-        types.add(ParticleMaterials.INSTANCE.getBLEND());
-        types.add(ParticleMaterials.INSTANCE.getOPAQUE());
-        RENDER_ORDER = types;
+        RENDER_ORDER = ImmutableList.<ParticleRenderType>builder().addAll(RENDER_ORDER)
+                .add(ParticleMaterials.INSTANCE.getADD(), ParticleMaterials.INSTANCE.getALPHA(), ParticleMaterials.INSTANCE.getBLEND(), ParticleMaterials.INSTANCE.getOPAQUE()).build();
     }
-
-    @Inject(method = "createParticleGroup", at = @At("HEAD"), cancellable = true)
-    private void cobblemon$createSnowstormParticleGroup(ParticleRenderType renderType, CallbackInfoReturnable<ParticleGroup<?>> cir) {
-        if (renderType == ParticleMaterials.INSTANCE.getADD()
-            || renderType == ParticleMaterials.INSTANCE.getALPHA()
-            || renderType == ParticleMaterials.INSTANCE.getBLEND()
-            || renderType == ParticleMaterials.INSTANCE.getOPAQUE()) {
-            cir.setReturnValue(new SnowstormParticleGroup((ParticleEngine) (Object) this, renderType));
-        }
-    }
-}
+}

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

@@ -9,12 +9,17 @@
 package com.cobblemon.mod.common.mixin;
 
 import com.cobblemon.mod.common.Cobblemon;
+import com.cobblemon.mod.common.CobblemonItems;
 import com.cobblemon.mod.common.OrientationControllable;
-import com.cobblemon.mod.common.api.pokemon.PokemonSpecies;
+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.RidingStyle;
 import com.cobblemon.mod.common.api.riding.behaviour.types.air.HoverBehaviour;
 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.duck.PlayerDuck;
 import com.cobblemon.mod.common.duck.RidePassenger;
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
@@ -27,13 +32,14 @@ import com.cobblemon.mod.common.pokemon.Species;
 import com.cobblemon.mod.common.util.CompoundTagExtensionsKt;
 import com.cobblemon.mod.common.util.CompoundTagUtilities;
 import com.cobblemon.mod.common.util.DataKeys;
-import com.cobblemon.mod.common.util.ShoulderEntitySynchronizer;
 import com.cobblemon.mod.common.world.gamerules.CobblemonGameRules;
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import com.llamalad7.mixinextras.sugar.Local;
 import net.minecraft.nbt.CompoundTag;
-import net.minecraft.nbt.ListTag;
+import net.minecraft.nbt.Tag;
+import net.minecraft.network.chat.Component;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.util.Mth;
@@ -43,15 +49,17 @@ import net.minecraft.world.entity.EntityDimensions;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.Pose;
+import net.minecraft.world.entity.item.ItemEntity;
 import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.food.FoodProperties;
 import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.enchantment.EnchantmentHelper;
 import net.minecraft.world.level.Level;
-import net.minecraft.world.level.storage.ValueInput;
-import net.minecraft.world.level.storage.ValueOutput;
-import net.minecraft.resources.Identifier;
 import net.minecraft.world.phys.Vec3;
 import org.jetbrains.annotations.Nullable;
 import org.joml.Vector3f;
+import org.objectweb.asm.Opcodes;
+import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.Unique;
@@ -62,23 +70,34 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 @Mixin(Player.class)
 public abstract class PlayerMixin extends LivingEntity implements ScannableEntity, OrientationControllable, PlayerDuck, RidePassenger {
-    @Unique
-    private CompoundTag cobblemon$shoulderEntityLeft = new CompoundTag();
-    @Unique
-    private CompoundTag cobblemon$shoulderEntityRight = new CompoundTag();
 
     @Unique
     private Vector3f cobblemon$driverInput;
     @Unique
     private Vector3f cobblemon$lastSentDriverInput;
 
+    @Shadow public abstract CompoundTag getShoulderEntityLeft();
+
+    @Shadow public abstract CompoundTag getShoulderEntityRight();
+
+    @Shadow public abstract void respawnEntityOnShoulder(CompoundTag entityNbt);
+
+    @Shadow public abstract void setShoulderEntityRight(CompoundTag entityNbt);
+
+    @Shadow public abstract void setShoulderEntityLeft(CompoundTag entityNbt);
+
     @Shadow public abstract boolean isSpectator();
 
     @Shadow public abstract boolean addItem(ItemStack stack);
 
+    @Shadow public abstract void displayClientMessage(Component message, boolean overlay);
+
+    @Shadow @Final private static Map<Pose, EntityDimensions> POSES;
+    @Shadow @Final public static EntityDimensions STANDING_DIMENSIONS;
     @Shadow protected int jumpTriggerTime;
     @Unique private final OrientationController cobblemon$orientationController = new OrientationController(this);
 
@@ -92,70 +111,71 @@ public abstract class PlayerMixin extends LivingEntity implements ScannableEntit
         super(p_20966_, p_20967_);
     }
 
-    @Inject(method = "readAdditionalSaveData", at = @At("TAIL"))
-    private void cobblemon$readShoulderData(ValueInput input, CallbackInfo ci) {
-        input.read("ShoulderEntityLeft", CompoundTag.CODEC)
-            .ifPresent(entityNbt -> this.cobblemon$setShoulderEntity(true, entityNbt, false));
-        input.read("ShoulderEntityRight", CompoundTag.CODEC)
-            .ifPresent(entityNbt -> this.cobblemon$setShoulderEntity(false, entityNbt, false));
-    }
-
-    @Inject(method = "addAdditionalSaveData", at = @At("TAIL"))
-    private void cobblemon$writeShoulderData(ValueOutput output, CallbackInfo ci) {
-        CompoundTag leftShoulder = this.getShoulderEntityLeft();
-        if (!leftShoulder.isEmpty()) {
-            output.store("ShoulderEntityLeft", CompoundTag.CODEC, leftShoulder);
-        }
-
-        CompoundTag rightShoulder = this.getShoulderEntityRight();
-        if (!rightShoulder.isEmpty()) {
-            output.store("ShoulderEntityRight", CompoundTag.CODEC, rightShoulder);
+    @Inject(method = "respawnEntityOnShoulder", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/EntityType;create(Lnet/minecraft/nbt/CompoundTag;Lnet/minecraft/world/level/Level;)Ljava/util/Optional;"), cancellable = true)
+    private void cobblemon$removePokemon(CompoundTag nbt, CallbackInfo ci) {
+        if (CompoundTagExtensionsKt.isPokemonEntity(nbt)) {
+            final UUID uuid = CompoundTagUtilities.getPokemonID(nbt);
+            if (CompoundTagUtilities.isShoulderPokemon(this.getShoulderEntityRight())) {
+                final UUID uuidRight = CompoundTagUtilities.getPokemonID(this.getShoulderEntityRight());
+                if (uuid.equals(uuidRight)) {
+                    this.recallPokemon(uuidRight);
+                    this.setShoulderEntityRight(new CompoundTag());
+                }
+            }
+            if (CompoundTagUtilities.isShoulderPokemon(this.getShoulderEntityLeft())) {
+                final UUID uuidLeft = CompoundTagUtilities.getPokemonID(this.getShoulderEntityLeft());
+                if (uuid.equals(uuidLeft)) {
+                    this.recallPokemon(uuidLeft);
+                    this.setShoulderEntityLeft(new CompoundTag());
+                }
+            }
+            ci.cancel();
         }
     }
 
     @Override
     public EntityDimensions getDefaultDimensions(Pose pose) {
         if (this.getVehicle() instanceof PokemonEntity) {
-            return super.getDefaultDimensions(Pose.STANDING);
+            return STANDING_DIMENSIONS;
         }
-        return super.getDefaultDimensions(pose);
+        return POSES.getOrDefault(pose, STANDING_DIMENSIONS);
     }
 
-    @Override
-    public CompoundTag getShoulderEntityLeft() {
-        return this.cobblemon$shoulderEntityLeft;
-    }
-
-    @Override
-    public CompoundTag getShoulderEntityRight() {
-        return this.cobblemon$shoulderEntityRight;
-    }
-
-    @Override
-    public void setShoulderEntityLeft(CompoundTag entityNbt) {
-        this.cobblemon$setShoulderEntity(true, entityNbt, true);
-    }
-
-    @Override
-    public void setShoulderEntityRight(CompoundTag entityNbt) {
-        this.cobblemon$setShoulderEntity(false, entityNbt, true);
-    }
-
-    @Unique
-    private void cobblemon$setShoulderEntity(boolean isLeftShoulder, CompoundTag entityNbt, boolean shouldSync) {
-        CompoundTag copied = entityNbt == null ? new CompoundTag() : entityNbt.copy();
-        if (isLeftShoulder) {
-            this.cobblemon$shoulderEntityLeft = copied;
-        } else {
-            this.cobblemon$shoulderEntityRight = copied;
+    @Inject(
+        method = "removeEntitiesOnShoulder",
+        at = @At(
+            value = "JUMP",
+            opcode = Opcodes.IFGE,
+            ordinal = 0,
+            shift = At.Shift.AFTER
+        ),
+        cancellable = true
+    )
+    private void cobblemon$preventPokemonDropping(CallbackInfo ci) {
+        // We want to allow both of these to forcefully remove the entities
+        if (this.isSpectator() || this.isDeadOrDying())
+            return;
+        if (!CompoundTagUtilities.isShoulderPokemon(this.getShoulderEntityLeft())) {
+            this.respawnEntityOnShoulder(this.getShoulderEntityLeft());
+            this.setShoulderEntityLeft(new CompoundTag());
         }
+        if (!CompoundTagUtilities.isShoulderPokemon(this.getShoulderEntityRight())) {
+            this.respawnEntityOnShoulder(this.getShoulderEntityRight());
+            this.setShoulderEntityRight(new CompoundTag());
+        }
+        ci.cancel();
+    }
 
-        if (shouldSync && !this.level().isClientSide() && (Object)this instanceof ServerPlayer player) {
-            ShoulderEntitySynchronizer.sync(player);
+    private void recallPokemon(UUID uuid) {
+        // We need to do this cause the Entity doesn't store a reference to its storage
+        final PartyStore party = Cobblemon.INSTANCE.getStorage().getParty(this.getUUID(), this.registryAccess());
+        for (Pokemon pokemon : party) {
+            if (pokemon.getUuid().equals(uuid)) {
+                pokemon.recall();
+            }
         }
     }
 
-
     @Redirect(
             method = "getDestroySpeed",
             at = @At(
@@ -182,11 +202,39 @@ public abstract class PlayerMixin extends LivingEntity implements ScannableEntit
         return player.onGround();
     }
 
+    @Inject(
+        method = "eat",
+        at = @At(
+            value = "INVOKE",
+            target = "Lnet/minecraft/world/entity/player/Player;getFoodData()Lnet/minecraft/world/food/FoodData;",
+            shift = At.Shift.AFTER
+        )
+    )
+    public void onEatFood(Level world, ItemStack stack, FoodProperties foodComponent, CallbackInfoReturnable<ItemStack> cir) {
+        if (!level().isClientSide) {
+            if (stack.is(CobblemonItemTags.LEAVES_LEFTOVERS) && level().random.nextDouble() < Cobblemon.config.getAppleLeftoversChance()) {
+                ItemStack leftovers = new ItemStack(CobblemonItems.LEFTOVERS);
+                ServerPlayer player = Objects.requireNonNull(getServer()).getPlayerList().getPlayer(uuid);
+                assert player != null;
+                CobblemonEvents.LEFTOVERS_CREATED.postThen(
+                    new LeftoversCreatedEvent(player, leftovers),
+                    leftoversCreatedEvent -> null,
+                    leftoversCreatedEvent -> {
+                        if(!player.addItem(leftoversCreatedEvent.getLeftovers())) {
+                            var itemPos = player.getLookAngle().scale(0.5f).add(position());
+                            level().addFreshEntity(new ItemEntity(level(), itemPos.x(), itemPos.y(), itemPos.z(), leftoversCreatedEvent.getLeftovers()));
+                        }
+                        return null;
+                    }
+                );
+            }
+        }
+    }
 
     @Inject(method = "isInvulnerableTo", at = @At("HEAD"), cancellable = true)
-    public void isInvulnerableTo(net.minecraft.server.level.ServerLevel serverLevel, DamageSource source, CallbackInfoReturnable<Boolean> ci) {
-        if ((Object) this instanceof ServerPlayer player) {
-            boolean invulnerableInBattle = serverLevel.getGameRules().get(CobblemonGameRules.BATTLE_INVULNERABILITY);
+    public void isInvulnerableTo(DamageSource source, CallbackInfoReturnable<Boolean> ci) {
+        if (!level().isClientSide && (Object) this instanceof ServerPlayer player) {
+            boolean invulnerableInBattle = this.level().getGameRules().getBoolean(CobblemonGameRules.BATTLE_INVULNERABILITY);
             boolean inBattle = Cobblemon.INSTANCE.getBattleRegistry().getBattleByParticipatingPlayer(player) != null;
             if (invulnerableInBattle && inBattle) {
                 ci.setReturnValue(true);
@@ -196,40 +244,34 @@ public abstract class PlayerMixin extends LivingEntity implements ScannableEntit
 
     @Override @Nullable
     public PokedexEntityData resolvePokemonScan() {
-        if (CompoundTagUtilities.isShoulderPokemon(this.getShoulderEntityRight())) {
+        if (CompoundTagUtilities.isShoulderPokemon(this.getShoulderEntityRight())){
             return getDataFromShoulderPokemon(this.getShoulderEntityRight());
         }
-        if (CompoundTagUtilities.isShoulderPokemon(this.getShoulderEntityLeft())) {
+        if (CompoundTagUtilities.isShoulderPokemon(this.getShoulderEntityLeft())){
             return getDataFromShoulderPokemon(this.getShoulderEntityLeft());
         }
         return null;
     }
 
-    @Nullable
-    @Unique
+    @Nullable @Unique
     private PokedexEntityData getDataFromShoulderPokemon(CompoundTag shoulderTag) {
         Pokemon pokemon;
-        if (level().isClientSide()) {
-            CompoundTag pokemonTag = shoulderTag.getCompound(DataKeys.POKEMON).orElse(new CompoundTag());
+        if (level().isClientSide) {
+            CompoundTag pokemonTag = shoulderTag.getCompound(DataKeys.POKEMON);
             if (pokemonTag.isEmpty()) return null;
-            String speciesId = pokemonTag.getString(DataKeys.POKEMON_SPECIES_IDENTIFIER).orElse("");
-            if (speciesId.isEmpty()) return null;
-            Species species = PokemonSpecies.getByIdentifier(Identifier.parse(speciesId));
+            Species species = PokemonSpecies.getByIdentifier(ResourceLocation.parse(pokemonTag.getString(DataKeys.POKEMON_SPECIES_IDENTIFIER)));
             if (species == null) return null;
-            String formId = pokemonTag.getString(DataKeys.POKEMON_FORM_ID).orElse("");
+            String formId = pokemonTag.getString(DataKeys.POKEMON_FORM_ID);
             FormData form = species.getStandardForm();
             List<FormData> formList = species.getForms().stream().filter(it -> it.formOnlyShowdownId().equals(formId)).toList();
             if (!formList.isEmpty()) form = formList.getFirst();
             if (form == null) return null;
-            String genderString = pokemonTag.getString(DataKeys.POKEMON_GENDER).orElse("");
+            String genderString = pokemonTag.getString(DataKeys.POKEMON_GENDER);
             if (genderString.isEmpty()) return null;
             Gender gender = Gender.valueOf(genderString);
-            boolean shiny = pokemonTag.getBoolean(DataKeys.POKEMON_SHINY).orElse(false);
-            int level = pokemonTag.getInt(DataKeys.POKEMON_LEVEL).orElse(0);
-            Set<String> aspects = new HashSet<>();
-            for (var tag : shoulderTag.getList(DataKeys.SHOULDER_ASPECTS).orElse(new ListTag())) {
-                tag.asString().ifPresent(aspects::add);
-            }
+            boolean shiny = pokemonTag.getBoolean(DataKeys.POKEMON_SHINY);
+            int level = pokemonTag.getInt(DataKeys.POKEMON_LEVEL);
+            Set<String> aspects = shoulderTag.getList(DataKeys.SHOULDER_ASPECTS, Tag.TAG_STRING).stream().map(Tag::getAsString).collect(Collectors.toSet());
 
             pokemon = new Pokemon();
             pokemon.setSpecies(species);
@@ -239,8 +281,8 @@ public abstract class PlayerMixin extends LivingEntity implements ScannableEntit
             pokemon.setLevel(level);
             pokemon.setForcedAspects(aspects);
         } else {
-            PartyStore party = Cobblemon.INSTANCE.getStorage().getParty(this.getUUID(), this.registryAccess());
-            pokemon = party.get(CompoundTagExtensionsKt.getUUID(shoulderTag, DataKeys.SHOULDER_UUID));
+            PlayerPartyStore party = Cobblemon.INSTANCE.getStorage().getParty(this.getUUID(), this.registryAccess());
+            pokemon = party.get(shoulderTag.getUUID(DataKeys.SHOULDER_UUID));
         }
         return (pokemon == null) ? null : new PokedexEntityData(pokemon, null);
     }
@@ -250,6 +292,21 @@ public abstract class PlayerMixin extends LivingEntity implements ScannableEntit
         return this;
     }
 
+    @Override
+    public void absMoveTo(double x, double y, double z, float yaw, float pitch) {
+        if (cobblemon$orientationController.getActive()) {
+            this.absMoveTo(x, y, z);
+            this.setYRot(yaw % 360.0f);
+            this.setXRot(pitch % 360.0f);
+            this.yRotO = this.getYRot();
+            this.xRotO = this.getXRot();
+        }
+        else {
+            this.absMoveTo(x, y, z);
+            this.absRotateTo(yaw, pitch);
+        }
+    }
+
     @WrapOperation(
             method = "rideTick()V",
             at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/player/Player;wantsToStopRiding()Z")
@@ -324,15 +381,13 @@ public abstract class PlayerMixin extends LivingEntity implements ScannableEntit
      */
     @WrapOperation(
             method = "attack",
-            at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/player/Player;itemAttackInteraction(Lnet/minecraft/world/entity/Entity;Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/damagesource/DamageSource;Z)V")
+            at = @At(value = "INVOKE", target = "Lnet/minecraft/world/item/enchantment/EnchantmentHelper;doPostAttackEffects(Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/Entity;Lnet/minecraft/world/damagesource/DamageSource;)V")
     )
-    private void cobblemon$skipPostAttackEffectsOnImmunePokemon(Player instance, Entity target, ItemStack attackingItemStack, DamageSource damageSource, boolean applyToTarget, Operation<Void> original, @Local DamageSource source) {
-        if (this.level() instanceof ServerLevel serverLevel) {
-            if (target instanceof PokemonEntity pokemonEntity && pokemonEntity.isInvulnerableTo(serverLevel, source)) {
-                return;
-            }
-            original.call(instance, target, attackingItemStack, damageSource, applyToTarget);
+    private void cobblemon$skipPostAttackEffectsOnImmunePokemon(ServerLevel level, Entity target, DamageSource source, Operation<Void> original) {
+        if (target instanceof PokemonEntity pokemonEntity && pokemonEntity.isInvulnerableTo(source)) {
+            return;
         }
+        original.call(level, target, source);
     }
 
     /**
@@ -340,15 +395,13 @@ public abstract class PlayerMixin extends LivingEntity implements ScannableEntit
      */
     @WrapOperation(
             method = "attack",
-            at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/player/Player;causeExtraKnockback(Lnet/minecraft/world/entity/Entity;FLnet/minecraft/world/phys/Vec3;)V")
+            at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/LivingEntity;knockback(DDD)V")
     )
-    private void cobblemon$skipKnockbackOnImmunePokemon(Player instance, Entity target, float knockbackAmount, Vec3 oldMovement, Operation<Void> original, @Local DamageSource source) {
-        if (this.level() instanceof ServerLevel serverLevel) {
-            if (target instanceof PokemonEntity pokemonEntity && pokemonEntity.isInvulnerableTo(serverLevel, source)) {
-                return;
-            }
-            original.call(instance, target, knockbackAmount, oldMovement);
+    private void cobblemon$skipKnockbackOnImmunePokemon(LivingEntity target, double strength, double x, double z, Operation<Void> original, @Local DamageSource source) {
+        if (target instanceof PokemonEntity pokemonEntity && pokemonEntity.isInvulnerableTo(source)) {
+            return;
         }
+        original.call(target, strength, x, z);
     }
 
 }

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

@@ -1,42 +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.CobblemonRecipeBookTypes;
-import net.minecraft.stats.RecipeBookSettings;
-import net.minecraft.world.inventory.RecipeBookType;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Unique;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-
-import java.util.function.UnaryOperator;
-
-@Mixin(RecipeBookSettings.class)
-public class RecipeBookSettingsMixin {
-    @Unique
-    private RecipeBookSettings.TypeSettings cobblemon$cookingPot = new RecipeBookSettings.TypeSettings(false, false);
-
-    @Inject(method = "getSettings", at = @At("HEAD"), cancellable = true)
-    public void getSettings(RecipeBookType type, CallbackInfoReturnable<RecipeBookSettings.TypeSettings> cir) {
-        if (type == CobblemonRecipeBookTypes.INSTANCE.getCOOKING_POT()) {
-            cir.setReturnValue(cobblemon$cookingPot);
-        }
-    }
-
-    @Inject(method = "updateSettings", at = @At("HEAD"), cancellable = true)
-    private void updateSetting(RecipeBookType recipeBookType, UnaryOperator<RecipeBookSettings.TypeSettings> operator, CallbackInfo ci) {
-        if (recipeBookType == CobblemonRecipeBookTypes.INSTANCE.getCOOKING_POT()) {
-            cobblemon$cookingPot = operator.apply(cobblemon$cookingPot);
-            ci.cancel();
-        }
-    }
-}

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

@@ -1,94 +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.CobblemonRecipePropertySets;
-import com.cobblemon.mod.common.item.crafting.CookingPotRecipeBase;
-import com.cobblemon.mod.common.item.crafting.brewingstand.BrewingStandRecipe;
-import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
-import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
-import net.minecraft.resources.ResourceKey;
-import net.minecraft.world.item.crafting.Ingredient;
-import net.minecraft.world.item.crafting.RecipeManager;
-import net.minecraft.world.item.crafting.RecipePropertySet;
-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.HashMap;
-import java.util.Map;
-import java.util.Optional;
-
-@Mixin(RecipeManager.class)
-public abstract class RecipeManagerMixin {
-
-    @Shadow
-    @Final
-    private static Map<ResourceKey<RecipePropertySet>, RecipeManager.IngredientExtractor> RECIPE_PROPERTY_SETS;
-    
-    @WrapOperation(method = "<clinit>", at = @At(value = "INVOKE", target = "Ljava/util/Map;of(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/util/Map;"))
-    private static Map poggers(Object k1, Object v1,
-                               Object k2, Object v2,
-                               Object k3, Object v3,
-                               Object k4, Object v4,
-                               Object k5, Object v5,
-                               Object k6, Object v6,
-                               Object k7, Object v7,
-                               Operation<Map> original) {
-        return new HashMap(original.call(k1,v1,k2,v2,k3,v3,k4,v4,k5,v5,k6,v6,k7,v7));
-    }
-
-    @Inject(method = "<clinit>", at = @At("TAIL"))
-    private static void cobblemon$addPropertySets(CallbackInfo ci) {
-        RECIPE_PROPERTY_SETS.put(CobblemonRecipePropertySets.INSTANCE.getBREWING_BOTTLE(), recipe -> {
-            if (recipe instanceof BrewingStandRecipe brew) {
-                return Optional.of(brew.getBottle());
-            }
-            return Optional.empty();
-        });
-
-        RECIPE_PROPERTY_SETS.put(CobblemonRecipePropertySets.INSTANCE.getBREWING_INPUT(), recipe -> {
-            if (recipe instanceof BrewingStandRecipe brew) {
-                return Optional.of(brew.getInput());
-            }
-            return Optional.empty();
-        });
-
-        RECIPE_PROPERTY_SETS.put(CobblemonRecipePropertySets.INSTANCE.getCOOKING_POT_FLAVOUR_PROCESSOR(), recipe -> {
-            if (recipe instanceof CookingPotRecipeBase cooking && cooking.getSeasoningProcessors().stream().anyMatch(x -> x.getType().equals("flavour"))) {
-                return Optional.of(Ingredient.of(cooking.getResult().item().value()));
-            }
-            return Optional.empty();
-        });
-
-        RECIPE_PROPERTY_SETS.put(CobblemonRecipePropertySets.INSTANCE.getCOOKING_POT_FOOD_PROCESSOR(), recipe -> {
-            if (recipe instanceof CookingPotRecipeBase cooking && cooking.getSeasoningProcessors().stream().anyMatch(x -> x.getType().equals("food"))) {
-                return Optional.of(Ingredient.of(cooking.getResult().item().value()));
-            }
-            return Optional.empty();
-        });
-
-        RECIPE_PROPERTY_SETS.put(CobblemonRecipePropertySets.INSTANCE.getCOOKING_POT_MOB_EFFECTS_PROCESSOR(), recipe -> {
-            if (recipe instanceof CookingPotRecipeBase cooking && cooking.getSeasoningProcessors().stream().anyMatch(x -> x.getType().equals("mob_effects"))) {
-                return Optional.of(Ingredient.of(cooking.getResult().item().value()));
-            }
-            return Optional.empty();
-        });
-
-        RECIPE_PROPERTY_SETS.put(CobblemonRecipePropertySets.INSTANCE.getCOOKING_POT_SPAWN_BAIT_PROCESSOR(), recipe -> {
-            if (recipe instanceof CookingPotRecipeBase cooking && cooking.getSeasoningProcessors().stream().anyMatch(x -> x.getType().equals("spawn_bait"))) {
-                return Optional.of(Ingredient.of(cooking.getResult().item().value()));
-            }
-            return Optional.empty();
-        });
-    }
-}

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

@@ -19,7 +19,6 @@ import com.cobblemon.mod.common.mixin.accessor.TrackedEntityAccessor;
 import com.cobblemon.mod.common.net.messages.client.orientation.ClientboundUpdateDriverInputPacket;
 import com.cobblemon.mod.common.net.messages.client.orientation.ClientboundUpdateOrientationPacket;
 import com.cobblemon.mod.common.net.messages.client.pokemon.update.ClientboundUpdateRidingStatePacket;
-import com.mojang.authlib.GameProfile;
 import com.cobblemon.mod.common.net.messages.client.pokemon.update.evolution.ClientboundSeatAssignmentPacket;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import net.minecraft.network.protocol.Packet;
@@ -30,8 +29,6 @@ import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.server.network.ServerPlayerConnection;
 import net.minecraft.world.entity.Entity;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.level.Level;
 import org.joml.Matrix3f;
 import org.joml.Vector3f;
 import org.spongepowered.asm.mixin.Final;
@@ -50,6 +47,9 @@ import java.util.function.Consumer;
 @Mixin(ServerEntity.class)
 public abstract class ServerEntityMixin {
 
+    @Shadow
+    @Final
+    private Consumer<Packet<?>> broadcast;
     @Shadow
     @Final
     private Entity entity;

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

@@ -8,28 +8,35 @@
 
 package com.cobblemon.mod.common.mixin;
 
+import com.cobblemon.mod.common.duck.MinecraftServerDuck;
+import com.cobblemon.mod.common.duck.ServerLevelDuck;
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Holder;
 import net.minecraft.core.RegistryAccess;
 import net.minecraft.resources.ResourceKey;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.level.ServerLevel;
+import net.minecraft.util.profiling.ProfilerFiller;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.dimension.DimensionType;
 import net.minecraft.world.level.storage.WritableLevelData;
 import net.minecraft.world.phys.AABB;
 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;
 
 import java.util.List;
 import java.util.Optional;
+import java.util.function.Supplier;
 
 
 @Mixin(ServerLevel.class)
-public abstract class ServerLevelMixin extends Level {
+public abstract class ServerLevelMixin extends Level implements ServerLevelDuck {
 
     // Ignored by Mixin, fulfils Java contract
     protected ServerLevelMixin(
@@ -37,12 +44,32 @@ public abstract class ServerLevelMixin extends Level {
             ResourceKey<Level> dimension,
             RegistryAccess registryAccess,
             Holder<DimensionType> dimensionTypeRegistration,
+            Supplier<ProfilerFiller> profiler,
             boolean isClientSide,
             boolean isDebug,
             long biomeZoomSeed,
             int maxChainedNeighborUpdates
     ) {
-        super(levelData, dimension, registryAccess, dimensionTypeRegistration, isClientSide, isDebug, biomeZoomSeed, maxChainedNeighborUpdates);
+        super(levelData, dimension, registryAccess, dimensionTypeRegistration, profiler, isClientSide, isDebug, biomeZoomSeed, maxChainedNeighborUpdates);
+    }
+
+    @Shadow
+    public abstract MinecraftServer shadow$getServer();
+
+    /**
+     * Cached to speed up level world key checks every tick.
+     */
+    private ResourceLocation cobblemon$levelResourceLocation;
+
+    @Override
+    public ResourceLocation cobblemon$getLevelResourceLocation() {
+        if (this.cobblemon$levelResourceLocation == null) {
+            this.cobblemon$levelResourceLocation = ((MinecraftServerDuck) this.shadow$getServer())
+                    .cobblemon$getLevelKey(this)
+                    .map(ResourceKey::location)
+                    .orElse(null);
+        }
+        return this.cobblemon$levelResourceLocation;
     }
 
     @Inject(method = "findLightningRod", at = @At(value = "RETURN"), cancellable = true)
@@ -50,14 +77,14 @@ public abstract class ServerLevelMixin extends Level {
         final ServerLevel serverLevel = (ServerLevel) (Object) this;
         if (ci.getReturnValue().isEmpty()) {
             // Search for Pokemon with the ability Lightning Rod and redirect to them
-            AABB aABB = AABB.encapsulatingFullBlocks(blockPos, new BlockPos(blockPos.atY(serverLevel.getMaxY() + 1))).inflate(64.0);
+            AABB aABB = AABB.encapsulatingFullBlocks(blockPos, new BlockPos(blockPos.atY(serverLevel.getMaxBuildHeight()))).inflate(64.0);
             List<LivingEntity> list = serverLevel.getEntitiesOfClass(LivingEntity.class, aABB, (livingEntity) -> livingEntity != null
                     && livingEntity.isAlive()
                     && livingEntity instanceof PokemonEntity
                     && ((PokemonEntity) livingEntity).getBeamMode() == 0
                     && ((PokemonEntity) livingEntity).getPokemon().getAbility().getName().equals("lightningrod"));
             if (!list.isEmpty()) {
-                ci.setReturnValue(Optional.of((list.get(serverLevel.getRandom().nextInt(list.size()))).blockPosition()));
+                ci.setReturnValue(Optional.of((list.get(serverLevel.random.nextInt(list.size()))).blockPosition()));
             }
         }
     }

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

@@ -15,23 +15,21 @@ import com.cobblemon.mod.common.api.riding.RidingStyle;
 import com.cobblemon.mod.common.api.spawning.spawner.PlayerSpawner;
 import com.cobblemon.mod.common.api.spawning.spawner.PlayerSpawnerFactory;
 import com.cobblemon.mod.common.api.stats.CobblemonStats;
+import com.cobblemon.mod.common.duck.ServerLevelDuck;
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
-import com.cobblemon.mod.common.util.CompoundTagUtilities;
-import com.cobblemon.mod.common.util.ShoulderEntitySynchronizer;
 import com.cobblemon.mod.common.world.gamerules.CobblemonGameRules;
 import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import com.llamalad7.mixinextras.sugar.Local;
 import net.minecraft.server.MinecraftServer;
-import net.minecraft.nbt.CompoundTag;
+import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.entity.Entity;
-import net.minecraft.world.level.Level;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Unique;
 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;
@@ -39,29 +37,15 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 @Mixin(ServerPlayer.class)
 public abstract class ServerPlayerMixin implements PlayerSpawnerAccessor {
 
-    @Shadow public abstract CompoundTag getShoulderEntityLeft();
-
-    @Shadow public abstract CompoundTag getShoulderEntityRight();
-
-    @Shadow public abstract void respawnEntityOnShoulder(CompoundTag entityNbt);
-
-    @Shadow public abstract void setShoulderEntityRight(CompoundTag entityNbt);
-
-    @Shadow public abstract void setShoulderEntityLeft(CompoundTag entityNbt);
+    @Shadow
+    public abstract ServerLevel serverLevel();
 
     @Shadow
     @Final
     public MinecraftServer server;
-
     @Unique
     public PlayerSpawner cobblemon$spawner;
 
-    @Shadow
-    private long timeEntitySatOnShoulder;
-
-    @Shadow
-    public abstract Level level();
-
     @Override
     public PlayerSpawner getPlayerSpawner() {
         ServerPlayer player = (ServerPlayer)(Object)this;
@@ -83,51 +67,13 @@ public abstract class ServerPlayerMixin implements PlayerSpawnerAccessor {
         }
     }
 
-    @Inject(method = "removeEntitiesOnShoulder", at = @At("HEAD"), cancellable = true)
-    private void cobblemon$preventPokemonDropping(CallbackInfo ci) {
-        ServerPlayer player = (ServerPlayer)(Object)this;
-        if (player.isSpectator() || player.isDeadOrDying()) {
-            return;
-        }
-
-        long gameTime = player.level().getGameTime();
-        if (this.timeEntitySatOnShoulder + 20L >= gameTime) {
-            return;
-        }
-
-        boolean changed = false;
-        CompoundTag leftShoulder = player.getShoulderEntityLeft();
-        if (!leftShoulder.isEmpty() && !CompoundTagUtilities.isShoulderPokemon(leftShoulder)) {
-            respawnEntityOnShoulder(leftShoulder);
-            setShoulderEntityLeft(new CompoundTag());
-            changed = true;
-        }
-
-        CompoundTag rightShoulder = player.getShoulderEntityRight();
-        if (!rightShoulder.isEmpty() && !CompoundTagUtilities.isShoulderPokemon(rightShoulder)) {
-            respawnEntityOnShoulder(rightShoulder);
-            setShoulderEntityRight(new CompoundTag());
-            changed = true;
-        }
-
-        this.timeEntitySatOnShoulder = gameTime;
-        if (changed) {
-            ShoulderEntitySynchronizer.sync(player);
-        }
-        ci.cancel();
-    }
-
     @Inject(method = "rideTick", at = @At("HEAD"))
     private void cobblemon$updateOrientationControllerRideTick(CallbackInfo ci) {
         ServerPlayer player = (ServerPlayer)(Object)this;
         Entity vehicle = player.getVehicle();
         if (!(vehicle instanceof OrientationControllable controllableVehicle)) return;
         var shouldUseCustomOrientation = cobblemon$shouldUseCustomOrientation(vehicle);
-        var controller = controllableVehicle.getOrientationController();
-        controller.setActive(shouldUseCustomOrientation);
-        if (shouldUseCustomOrientation && controller.getOrientation() == null) {
-            controller.updateOrientation(matrix -> matrix);
-        }
+        controllableVehicle.getOrientationController().setActive(shouldUseCustomOrientation);
     }
 
     @Unique
@@ -139,9 +85,16 @@ public abstract class ServerPlayerMixin implements PlayerSpawnerAccessor {
         });
     }
 
+    @Inject(method = "stopRiding", at = @At("HEAD"))
+    public void cobblemon$resetOrientationOnDismount(CallbackInfo ci) {
+        ServerPlayer player = (ServerPlayer)(Object)this;
+        if (!(player.getVehicle() instanceof OrientationControllable controllableVehicle)) return;
+        controllableVehicle.getOrientationController().setActive(false);
+    }
+
     //TODO: Switch to sending out on load instead of preventing saving
-    @ModifyExpressionValue(method = "saveParentVehicle", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/Entity;hasExactlyOnePlayerPassenger()Z"))
-    private boolean cobblemon$cancelSavingPokemonMounts(boolean original, @Local(name = "rootVehicle") Entity entity) {
+    @ModifyExpressionValue(method = "addAdditionalSaveData", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/Entity;hasExactlyOnePlayerPassenger()Z"))
+    private boolean cobblemon$cancelSavingPokemonMounts(boolean original, @Local(ordinal=0) Entity entity) {
         return original && !(entity instanceof PokemonEntity);
     }
 
@@ -183,8 +136,10 @@ public abstract class ServerPlayerMixin implements PlayerSpawnerAccessor {
     @Unique
     private boolean cobblemon$canSpawn() {
         return Cobblemon.config.getEnableSpawning() &&
-                this.server.getGameRules().get(CobblemonGameRules.DO_POKEMON_SPAWNING) &&
+                this.serverLevel().getGameRules().getBoolean(CobblemonGameRules.DO_POKEMON_SPAWNING) &&
                 // intentionally last as this is a more expensive check, even with all the caching
-                !Cobblemon.config.getWorldSpawningBlocklist().contains(this.level().dimension().identifier());
+                !Cobblemon.config.getWorldSpawningBlocklist().contains(
+                        ((ServerLevelDuck) this.serverLevel()).cobblemon$getLevelResourceLocation()
+                );
     }
 }

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

@@ -13,7 +13,6 @@ import kotlin.Unit;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.dispenser.ShearsDispenseItemBehavior;
 import net.minecraft.server.level.ServerLevel;
-import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.state.BlockState;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
@@ -25,10 +24,10 @@ public abstract class ShearsDispenserBehaviorMixin {
 
     // This exists, so we can execute our custom interaction only if no one redirected shears interactions to overwrite the vanilla ones.
     @Inject(method = "tryShearBeehive", at = @At("HEAD"), cancellable = true)
-    private static void cobblemon$tryApricornHarvest(ServerLevel serverLevel, ItemStack itemStack, BlockPos blockPos, CallbackInfoReturnable<Boolean> cir) {
-        final BlockState state = serverLevel.getBlockState(blockPos);
+    private static void cobblemon$tryApricornHarvest(ServerLevel world, BlockPos pos, CallbackInfoReturnable<Boolean> cir) {
+        final BlockState state = world.getBlockState(pos);
         if (state.getBlock() instanceof ShearableBlock shearableBlock) {
-            cir.setReturnValue(shearableBlock.attemptShear(serverLevel, state, blockPos, () -> Unit.INSTANCE));
+            cir.setReturnValue(shearableBlock.attemptShear(world, state, pos, () -> Unit.INSTANCE));
         }
     }
 

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

@@ -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.mixin;
-
-import static com.cobblemon.mod.common.datafixer.CobblemonSchemas.VERSION_KEY;
-
-import com.cobblemon.mod.common.datafixer.CobblemonSchemas;
-import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.util.datafix.DataFixTypes;
-import net.minecraft.world.level.chunk.storage.SimpleRegionStorage;
-import org.spongepowered.asm.mixin.Debug;
-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;
-
-@Mixin(SimpleRegionStorage.class)
-public class SimpleRegionStorageMixin {
-
-    @Final
-    @Shadow
-    private DataFixTypes dataFixType;
-    //Modifies the NBT returned by the vanilla upgradeChunkTag to also incorporate cobblemon fixup stuff
-    @ModifyExpressionValue(
-            method = "upgradeChunkTag(Lnet/minecraft/nbt/CompoundTag;ILnet/minecraft/nbt/CompoundTag;I)Lnet/minecraft/nbt/CompoundTag;",
-            at = @At(
-                    value = "INVOKE",
-                    target = "Lnet/minecraft/util/datafix/DataFixTypes;update(Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/nbt/CompoundTag;II)Lnet/minecraft/nbt/CompoundTag;"
-            )
-    )
-    public CompoundTag cobblemon$doChunkFix(
-            CompoundTag vanillaFixed
-    ) {
-        int curVersion = vanillaFixed.getIntOr(VERSION_KEY, 0);
-        return vanillaFixed; //TODO FIGURE OUT WHAT THE HECK IS GOING ON HERE
-        //return this.dataFixType.update(CobblemonSchemas.getDATA_FIXER(), vanillaFixed, curVersion, CobblemonSchemas.DATA_VERSION);
-    }
-}

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

@@ -21,7 +21,7 @@ import net.minecraft.client.resources.sounds.SoundInstance;
 import net.minecraft.client.resources.sounds.TickableSoundInstance;
 import net.minecraft.client.sounds.ChannelAccess;
 import net.minecraft.client.sounds.SoundEngine;
-import net.minecraft.resources.Identifier;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraft.sounds.SoundSource;
 import net.minecraft.util.Mth;
 import net.minecraft.world.phys.Vec3;
@@ -71,39 +71,39 @@ public abstract class SoundEngineMixin implements SoundEngineDuck {
 
     /** Resumes the SoundInstance(s) queried by id and/or category. */
     @Override
-    public void resumeSounds(@Nullable Identifier id, @Nullable SoundSource category) {
+    public void resumeSounds(@Nullable ResourceLocation id, @Nullable SoundSource category) {
         if (category != null) {
             this.instanceBySource.get(category).forEach((sound) -> {
-                if (id == null || sound.getIdentifier().equals(id)) resume(sound);
+                if (id == null || sound.getLocation().equals(id)) resume(sound);
             });
         } else if (id == null) {
             this.instanceToChannel.keySet().forEach(this::resume);
         } else {
             this.instanceToChannel.keySet().forEach(sound -> {
-                if (sound.getIdentifier().equals(id)) resume(sound);
+                if (sound.getLocation().equals(id)) resume(sound);
             });
         }
     }
 
     /** Pauses the SoundInstances queried by id and/or category. */
     @Override
-    public void pauseSounds(@Nullable Identifier id, @Nullable SoundSource category) {
+    public void pauseSounds(@Nullable ResourceLocation id, @Nullable SoundSource category) {
         if (category != null) {
             this.instanceBySource.get(category).forEach((sound) -> {
-                if (id == null || sound.getIdentifier().equals(id)) pause(sound);
+                if (id == null || sound.getLocation().equals(id)) pause(sound);
             });
         } else if (id == null) {
             this.instanceToChannel.keySet().forEach(this::pause);
         } else {
             this.instanceToChannel.keySet().forEach(sound -> {
-                if (sound.getIdentifier().equals(id)) pause(sound);
+                if (sound.getLocation().equals(id)) pause(sound);
             });
         }
     }
 
     /** Allows stopping all SoundInstances that belong to a queried category. */
-    @Inject(method = "stop(Lnet/minecraft/resources/Identifier;Lnet/minecraft/sounds/SoundSource;)V", at = @At("HEAD"), cancellable = true)
-    public void stopSounds(@Nullable Identifier id, @Nullable SoundSource category, CallbackInfo cb) {
+    @Inject(method = "stop(Lnet/minecraft/resources/ResourceLocation;Lnet/minecraft/sounds/SoundSource;)V", at = @At("HEAD"), cancellable = true)
+    public void stopSounds(@Nullable ResourceLocation id, @Nullable SoundSource category, CallbackInfo cb) {
         if (id == null && category != null) {
             this.instanceBySource.get(category).forEach(this::stop);
             cb.cancel();
@@ -116,7 +116,7 @@ public abstract class SoundEngineMixin implements SoundEngineDuck {
      */
     @Inject(method = "calculatePitch", at = @At("HEAD"), cancellable = true)
     private void cobblemon$allowExtendedNoteblockPitch(SoundInstance sound, CallbackInfoReturnable<Float> cir) {
-        if (sound.getIdentifier().getPath().startsWith("block.note_block.")) {
+        if (sound.getLocation().getPath().startsWith("block.note_block.")) {
             cir.setReturnValue(Mth.clamp(sound.getPitch(), 0.5F, 4.0F));
         }
     }

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

@@ -17,7 +17,7 @@ import net.minecraft.client.resources.sounds.SoundInstance;
 import net.minecraft.client.resources.sounds.UnderwaterAmbientSoundInstances;
 import net.minecraft.client.sounds.SoundEngine;
 import net.minecraft.client.sounds.SoundManager;
-import net.minecraft.resources.Identifier;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraft.sounds.SoundSource;
 import org.jetbrains.annotations.Nullable;
 import org.spongepowered.asm.mixin.Final;
@@ -26,7 +26,6 @@ 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;
 
 @Mixin(SoundManager.class)
 public abstract class SoundManagerMixin implements SoundManagerDuck {
@@ -56,20 +55,20 @@ public abstract class SoundManagerMixin implements SoundManagerDuck {
 
     /** Pauses the queried SoundInstance(s). If id is null, will pause all sounds belonging to the SoundCategory. */
     @Override
-    public void pauseSounds(@Nullable Identifier id, @Nullable SoundSource category) {
+    public void pauseSounds(@Nullable ResourceLocation id, @Nullable SoundSource category) {
         ((SoundEngineDuck)soundEngine).pauseSounds(id, category);
     }
 
     /** Resumes the queried SoundInstance(s). If id is null, will resume all sounds belonging to the SoundCategory. */
     @Override
-    public void resumeSounds(@Nullable Identifier id, @Nullable SoundSource category) {
+    public void resumeSounds(@Nullable ResourceLocation id, @Nullable SoundSource category) {
         ((SoundEngineDuck)soundEngine).resumeSounds(id, category);
     }
 
     /** Blocks filtered sounds from being played while a BattleMusicInstance is in progress. */
-    @Inject(method = "play", at = @At("HEAD"), cancellable = true)
-    public void playStart(SoundInstance soundInstance, CallbackInfoReturnable<SoundEngine.PlayResult> cir) {
-        if (filterCondition(soundInstance)) cir.cancel();
+    @Inject(method = "play(Lnet/minecraft/client/resources/sounds/SoundInstance;)V", at = @At("HEAD"), cancellable = true)
+    public void playStart(SoundInstance sound, CallbackInfo cb) {
+        if (filterCondition(sound)) cb.cancel();
     }
 
     @Inject(method = "playDelayed(Lnet/minecraft/client/resources/sounds/SoundInstance;I)V", at = @At("HEAD"), cancellable = true)
@@ -78,14 +77,14 @@ public abstract class SoundManagerMixin implements SoundManagerDuck {
     }
 
     /** Pauses ambient loops while a BattleMusicInstance is in progress. */
-    @Inject(method = "play", at = @At("TAIL"))
-    public void playEnd(SoundInstance soundInstance, CallbackInfoReturnable<SoundEngine.PlayResult> cir) {
-        if (ambientLoopCondition(soundInstance)) this.pauseSounds(soundInstance.getIdentifier(), SoundSource.AMBIENT);
+    @Inject(method = "play(Lnet/minecraft/client/resources/sounds/SoundInstance;)V", at = @At("TAIL"))
+    public void playEnd(SoundInstance sound, CallbackInfo cb) {
+        if (ambientLoopCondition(sound)) this.pauseSounds(sound.getLocation(), SoundSource.AMBIENT);
     }
 
     @Inject(method = "playDelayed(Lnet/minecraft/client/resources/sounds/SoundInstance;I)V", at = @At("TAIL"))
     public void playEnd(SoundInstance sound, int delay, CallbackInfo cb) {
-        if (ambientLoopCondition(sound)) this.pauseSounds(sound.getIdentifier(), SoundSource.AMBIENT);
+        if (ambientLoopCondition(sound)) this.pauseSounds(sound.getLocation(), SoundSource.AMBIENT);
     }
 
     /** Clears tracked sounds on the client when disconnected. */

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

@@ -13,10 +13,8 @@ import com.cobblemon.mod.common.world.structureprocessors.HeightRangeStructurePr
 import com.llamalad7.mixinextras.sugar.Local;
 import net.minecraft.core.Holder;
 import net.minecraft.core.RegistryAccess;
-import net.minecraft.resources.ResourceKey;
 import net.minecraft.world.level.ChunkPos;
 import net.minecraft.world.level.LevelHeightAccessor;
-import net.minecraft.world.level.Level;
 import net.minecraft.world.level.biome.Biome;
 import net.minecraft.world.level.biome.BiomeSource;
 import net.minecraft.world.level.chunk.ChunkGenerator;
@@ -56,11 +54,9 @@ public abstract class StructureMixin {
 			cancellable = true
 	)
 	private void cobblemon$rejectStartsOutsideHeightRange(
-			Holder<Structure> selected,
-			ResourceKey<Level> dimension,
 			RegistryAccess registryAccess, ChunkGenerator chunkGenerator, BiomeSource biomeSource,
 			RandomState randomState, StructureTemplateManager structureTemplateManager, long seed,
-			ChunkPos sourceChunkPos, int references, LevelHeightAccessor heightAccessor,
+			ChunkPos chunkPos, int references, LevelHeightAccessor heightAccessor,
 			Predicate<Holder<Biome>> validBiome,
 			CallbackInfoReturnable<StructureStart> cir,
 			@Local StructureStart structureStart
@@ -104,4 +100,4 @@ public abstract class StructureMixin {
 
 		return Optional.empty();
 	}
-}
+}

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

@@ -29,4 +29,4 @@ public interface StructurePoolAccessor {
 
     @Accessor("templates")
     ObjectArrayList<StructurePoolElement> getElements();
-}
+}

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

@@ -11,7 +11,7 @@ package com.cobblemon.mod.common.mixin;
 import com.cobblemon.mod.common.world.CobblemonStructureIDs;
 import com.llamalad7.mixinextras.sugar.Local;
 import net.minecraft.core.Registry;
-import net.minecraft.resources.Identifier;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraft.util.RandomSource;
 import net.minecraft.world.level.LevelHeightAccessor;
 import net.minecraft.world.level.chunk.ChunkGenerator;
@@ -38,7 +38,7 @@ public abstract class StructurePoolGeneratorMixin {
     Map<String, Integer> generatedStructureGroupCounts;
 
     private static final Map<String, Integer> structureMaxes;
-    private static final Map<Identifier, Set<String>> structureGroups = new HashMap<>();
+    private static final Map<ResourceLocation, Set<String>> structureGroups = new HashMap<>();
     static {
         String pokecenter = "pokecenter";
         String berry = "berry_farm";
@@ -73,11 +73,11 @@ public abstract class StructurePoolGeneratorMixin {
         structureMaxes = Collections.unmodifiableMap(aMap);
     }
 
-    public Set<String> getGroups(Identifier structureIdentifier) {
+    public Set<String> getGroups(ResourceLocation structureIdentifier) {
         return structureGroups.getOrDefault(structureIdentifier, Set.of());
     }
 
-    public boolean hasReachedMaximum(Identifier structureIdentifier) {
+    public boolean hasReachedMaximum(ResourceLocation structureIdentifier) {
         Set<String> groups = getGroups(structureIdentifier);
         for (String group : groups) {
             int count = generatedStructureGroupCounts.getOrDefault(group, 0);
@@ -89,7 +89,7 @@ public abstract class StructurePoolGeneratorMixin {
         return false;
     }
 
-    public void incrementStructureCount(Identifier structureIdentifier) {
+    public void incrementStructureCount(ResourceLocation structureIdentifier) {
         Set<String> groups = getGroups(structureIdentifier);
         for (String group : groups) {
             generatedStructureGroupCounts.put(group, generatedStructureGroupCounts.getOrDefault(group, 0) + 1);
@@ -107,7 +107,7 @@ public abstract class StructurePoolGeneratorMixin {
 
         while (iterator.hasNext()) {
             StructurePoolElement structure = iterator.next();
-            Identifier structurePieceLocationKey = getCobblemonOnlyLocation(structure);
+            ResourceLocation structurePieceLocationKey = getCobblemonOnlyLocation(structure);
             if (structurePieceLocationKey == null) {
                 reducedList.add(structure);
                 continue;
@@ -134,14 +134,14 @@ public abstract class StructurePoolGeneratorMixin {
         CallbackInfo ci,
         @Local(ordinal = 1) StructurePoolElement structurePoolElement
     ) {
-        Identifier structureLocationKey = getCobblemonOnlyLocation(structurePoolElement);
+        ResourceLocation structureLocationKey = getCobblemonOnlyLocation(structurePoolElement);
         if (structureLocationKey != null) {
             incrementStructureCount(structureLocationKey);
         }
     }
 
-    private static Identifier getCobblemonOnlyLocation(StructurePoolElement structurePoolElement) {
-        Identifier location = getLocationIfAvailable(structurePoolElement);
+    private static ResourceLocation getCobblemonOnlyLocation(StructurePoolElement structurePoolElement) {
+        ResourceLocation location = getLocationIfAvailable(structurePoolElement);
         if (location == null) return null;
 
         if (!location.getNamespace().equals("cobblemon")) return null;
@@ -149,7 +149,7 @@ public abstract class StructurePoolGeneratorMixin {
         return location;
     }
 
-    private static Identifier getLocationIfAvailable(StructurePoolElement structurePoolElement) {
+    private static ResourceLocation getLocationIfAvailable(StructurePoolElement structurePoolElement) {
         if (structurePoolElement instanceof LegacySinglePoolElement legacySinglePoolElement) {
             if (legacySinglePoolElement.template.left().isEmpty()) return null;
 
@@ -162,4 +162,4 @@ public abstract class StructurePoolGeneratorMixin {
             return null;
         }
     }
-}
+}

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

@@ -12,7 +12,6 @@ import com.bedrockk.molang.runtime.value.DoubleValue;
 import com.cobblemon.mod.common.entity.MoLangScriptingEntity;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.entity.Entity;
-import net.minecraft.world.entity.InsideBlockEffectApplier;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.SweetBerryBushBlock;
 import net.minecraft.world.level.block.state.BlockState;
@@ -26,15 +25,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 public abstract class SweetBerryBushBlockMixin {
 
     @Inject(method = "entityInside", at = @At(value = "HEAD"), cancellable = true)
-    private void cobblemon$entityInside(
-        BlockState state,
-        Level level,
-        BlockPos pos,
-        Entity entity,
-        InsideBlockEffectApplier effectApplier,
-        boolean moved,
-        CallbackInfo callbackInfo
-    ) {
+    private void cobblemon$entityInside(BlockState state, Level level, BlockPos pos, Entity entity, CallbackInfo callbackInfo) {
         if (entity instanceof MoLangScriptingEntity) {
             if (((MoLangScriptingEntity) entity).getConfig().getMap().getOrDefault("immune_to_sweet_berry_bush_block", DoubleValue.ZERO).asDouble() == 1.0) {
                 callbackInfo.cancel();

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

@@ -10,7 +10,6 @@ package com.cobblemon.mod.common.mixin;
 
 import com.cobblemon.mod.common.Cobblemon;
 import com.cobblemon.mod.common.world.gamerules.CobblemonGameRules;
-import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.ai.targeting.TargetingConditions;
@@ -24,11 +23,11 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 public class TargetingConditionsMixin {
 
     @Inject(method = "test", at = @At("HEAD"), cancellable = true)
-    public void test(ServerLevel serverLevel, LivingEntity baseEntity, LivingEntity targetEntity, CallbackInfoReturnable<Boolean> cir) {
+    public void test(@Nullable LivingEntity baseEntity, LivingEntity targetEntity, CallbackInfoReturnable<Boolean> ci) {
         if (targetEntity instanceof ServerPlayer player) {
-            if (serverLevel.getGameRules().get(CobblemonGameRules.MOB_TARGET_IN_BATTLE)) return;
+            if (player.level().getGameRules().getBoolean(CobblemonGameRules.MOB_TARGET_IN_BATTLE)) return;
             boolean targetInBattle = Cobblemon.INSTANCE.getBattleRegistry().getBattleByParticipatingPlayer(player) != null;
-            if (targetInBattle) cir.setReturnValue(false);
+            if (targetInBattle) ci.setReturnValue(false);
         }
     }
 }

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

@@ -0,0 +1,68 @@
+/*
+ * 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.Cobblemon;
+import com.cobblemon.mod.common.CobblemonVillagerProfessions;
+import com.mojang.blaze3d.vertex.PoseStack;
+import com.mojang.blaze3d.vertex.VertexConsumer;
+import kotlin.Pair;
+import net.minecraft.ChatFormatting;
+import net.minecraft.client.model.EntityModel;
+import net.minecraft.client.renderer.MultiBufferSource;
+import net.minecraft.client.renderer.RenderType;
+import net.minecraft.client.renderer.entity.LivingEntityRenderer;
+import net.minecraft.client.renderer.entity.layers.RenderLayer;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.entity.monster.ZombieVillager;
+import net.minecraft.world.entity.npc.Villager;
+import net.minecraft.world.entity.npc.VillagerProfession;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(RenderLayer.class)
+public abstract class VillagerProfessionLayerMixin {
+    @Inject(method = "renderColoredCutoutModel", at = @At(value = "HEAD"), cancellable = true)
+    private static <T extends LivingEntity> void cobblemon$renderVillagerProfessionLayer(EntityModel<T> entityModel, ResourceLocation resourceLocation, PoseStack poseStack, MultiBufferSource multiBufferSource, int i, T livingEntity, int j, CallbackInfo ci) {
+        if (resourceLocation.getNamespace().equals(Cobblemon.MODID)) {
+            VillagerProfession profession = null;
+            boolean isZombie = false;
+
+            if (livingEntity instanceof Villager) profession = ((Villager) livingEntity).getVillagerData().getProfession();
+            if (livingEntity instanceof ZombieVillager) {
+                profession = ((ZombieVillager) livingEntity).getVillagerData().getProfession();
+                isZombie = true;
+            }
+
+            Pair<String, String[]> override = CobblemonVillagerProfessions.INSTANCE.getNameTagOverride(profession);
+            if (profession != null && override != null) {
+                String entityName = ChatFormatting.stripFormatting(livingEntity.getName().getString());
+                boolean nameMatches = false;
+                for (String name: override.getSecond())
+                    if (entityName.endsWith(name)) {
+                        nameMatches = true;
+                        break;
+                    }
+                if (nameMatches && resourceLocation.equals(getProfessionResourceLocation(resourceLocation.getNamespace(), ResourceLocation.parse(profession.name()).getPath(), isZombie))) {
+                    ResourceLocation textureLocation = getProfessionResourceLocation(resourceLocation.getNamespace(), override.getFirst(), isZombie);
+                    VertexConsumer vertexConsumer = multiBufferSource.getBuffer(RenderType.entityCutoutNoCull(textureLocation));
+                    entityModel.renderToBuffer(poseStack, vertexConsumer, i, LivingEntityRenderer.getOverlayCoords(livingEntity, 0.0F), j);
+                    ci.cancel();
+                }
+            }
+        }
+    }
+
+    private static ResourceLocation getProfessionResourceLocation(String namespace, String profession, Boolean isZombie) {
+        return ResourceLocation.fromNamespaceAndPath(namespace, "textures/entity/" + (isZombie ? "zombie_villager" : "villager") + "/profession/" + profession + ".png");
+    }
+}

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

@@ -0,0 +1,21 @@
+/*
+ * 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.core.BlockPos;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.entity.BlockEntity;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+@Mixin(BlockEntity.class)
+public interface BlockEntityAccessor {
+    @Accessor("level") Level getLevel();
+    @Accessor("worldPosition") BlockPos getWorldPosition();
+}

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

@@ -6,15 +6,18 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-package com.cobblemon.mod.common.mixin.client.accessor;
+package com.cobblemon.mod.common.mixin.accessor;
 
-import com.mojang.blaze3d.systems.ScissorState;
-import net.minecraft.client.gui.GuiGraphicsExtractor;
+import net.minecraft.world.entity.vehicle.Boat;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 
-@Mixin(GuiGraphicsExtractor.class)
-public interface GuiGraphicsExtractorAccessor {
-    @Accessor
-    public GuiGraphicsExtractor.ScissorStack getScissorStack();
+@Mixin(Boat.class)
+public interface BoatEntityAccessor {
+
+    @Accessor("lastYd")
+    void setFallVelocity(double fallVelocity);
+
+    @Accessor("status")
+    Boat.Status getLocation();
 }

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

@@ -17,4 +17,4 @@ import org.spongepowered.asm.mixin.gen.Accessor;
 public interface ChunkMapAccessor {
     @Accessor("entityMap")
     Int2ObjectMap<?> getEntityMap();
-}
+}

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

@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.mixin.accessor;
+
+import net.minecraft.world.item.Item;
+import net.minecraft.core.dispenser.DispenseItemBehavior;
+import net.minecraft.world.level.block.DispenserBlock;
+
+import java.util.Map;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+@Mixin(DispenserBlock.class)
+public interface DispenserBlockAccessor {
+	@Accessor("DISPENSER_REGISTRY")
+	static Map<Item, DispenseItemBehavior> getItemBehaviors() {
+		throw new AssertionError();
+	}
+}

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

@@ -0,0 +1,19 @@
+/*
+ * 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.AbstractSelectionList;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+@Mixin(AbstractSelectionList.class)
+public interface EntryListWidgetAccessor {
+    @Accessor("renderHeader")
+    boolean getRenderHeader();
+}

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

@@ -8,7 +8,7 @@
 
 package com.cobblemon.mod.common.mixin.accessor;
 
-import net.minecraft.client.gui.components.CycleButton;
+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;
@@ -18,5 +18,5 @@ import org.spongepowered.asm.mixin.gen.Accessor;
 @Mixin(RecipeBookComponent.class)
 public interface RecipeBookComponentAccessor {
     @Accessor("filterButton")
-    CycleButton<Boolean> getFilterButton();
+    StateSwitchingButton getFilterButton();
 }

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

@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.mixin.accessor;
-
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.server.level.ServerPlayer;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Invoker;
-
-@Mixin(ServerPlayer.class)
-public interface ServerPlayerAccessor {
-    @Invoker("setShoulderEntityLeft")
-    public void cobblemon$setShoulderEntityLeft(CompoundTag nbt);
-    @Invoker("setShoulderEntityRight")
-    public void cobblemon$setShoulderEntityRight(CompoundTag nbt);
-    @Invoker("respawnEntityOnShoulder")
-    public void cobblemon$respawnEntityOnShoulder(CompoundTag nbt);
-}

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

@@ -19,4 +19,7 @@ import java.util.Set;
 public interface TrackedEntityAccessor {
     @Accessor("seenBy")
     Set<ServerPlayerConnection> getSeenBy();
-}
+
+    @Accessor("serverEntity")
+    ServerEntity getServerEntity();
+}

common/src/main/java/com/cobblemon/mod/common/mixin/brewing/BrewingStandBlockEntityMixin.java

@@ -20,7 +20,6 @@ import net.minecraft.core.NonNullList;
 import net.minecraft.world.Containers;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Items;
-import net.minecraft.world.item.ItemStackTemplate;
 import net.minecraft.world.item.alchemy.PotionBrewing;
 import net.minecraft.world.item.crafting.RecipeHolder;
 import net.minecraft.world.item.crafting.RecipeManager;
@@ -49,17 +48,17 @@ public class BrewingStandBlockEntityMixin {
 		ItemStack itemStack = slots.get(3);
 		for(int i = 0; i < 3; ++i) {
 			if (!slots.get(i).isEmpty()){
-				slots.set(i, recipe.getResult().create());
+				slots.set(i, recipe.getResult().copy());
 			}
 		}
 
 		itemStack.shrink(1);
-		ItemStackTemplate itemStack2 = itemStack.getItem().getCraftingRemainder();
-		if (itemStack2 != null) {
+		if (itemStack.getItem().hasCraftingRemainingItem()) {
+			ItemStack itemStack2 = new ItemStack(itemStack.getItem().getCraftingRemainingItem());
 			if (itemStack.isEmpty()) {
-				itemStack = itemStack2.create();
+				itemStack = itemStack2;
 			} else {
-				Containers.dropItemStack(level, pos.getX(), pos.getY(), pos.getZ(), itemStack2.create());
+				Containers.dropItemStack(level, pos.getX(), pos.getY(), pos.getZ(), itemStack2);
 			}
 		}
 
@@ -91,10 +90,7 @@ public class BrewingStandBlockEntityMixin {
 		}
 
 		BrewingStandInput input = new BrewingStandInput(ingredient, bottles);
-		if (level.getServer() == null) {
-			return null;
-		}
-		RecipeManager recipeManager = level.getServer().getRecipeManager();
+		RecipeManager recipeManager = level.getRecipeManager();
 
 		Optional<RecipeHolder<BrewingStandRecipe>> recipeHolder =
 				recipeManager.getRecipeFor(CobblemonRecipeTypes.INSTANCE.getBREWING_STAND(), input, level);
@@ -111,7 +107,7 @@ public class BrewingStandBlockEntityMixin {
 
 		if (level != null) {
 
-			var rm = level.recipeAccess();
+			var rm = level.getRecipeManager();
 
 			//Input slot
 			if (slot == 3) {
@@ -132,4 +128,4 @@ public class BrewingStandBlockEntityMixin {
 			}
 		}
 	}
-}
+}

common/src/main/java/com/cobblemon/mod/common/mixin/brewing/BrewingStandMenuMixin.java

@@ -29,7 +29,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 public abstract class BrewingStandMenuMixin {
 	@Inject(method = "<init>(ILnet/minecraft/world/entity/player/Inventory;Lnet/minecraft/world/Container;Lnet/minecraft/world/inventory/ContainerData;)V", at = @At("TAIL"))
 	private void captureLevel(int containerId, Inventory playerInventory, Container brewingStandContainer, ContainerData brewingStandData, CallbackInfo ci) {
-		var recipeManager = playerInventory.player.level().recipeAccess();
+		var recipeManager = playerInventory.player.level().getRecipeManager();
 		for (Slot slot : ((BrewingStandMenu) (Object) this).slots) {
 			if (slot instanceof RecipeAwareSlot awareSlot) {
 				awareSlot.setRecipeManager(recipeManager);

common/src/main/java/com/cobblemon/mod/common/mixin/brewing/IngredientSlotMixin.java

@@ -12,7 +12,8 @@ import com.cobblemon.mod.common.duck.RecipeAwareSlot;
 import com.cobblemon.mod.common.item.crafting.brewingstand.BrewingStandRecipe;
 import net.minecraft.world.inventory.BrewingStandMenu;
 import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.crafting.RecipeAccess;
+import net.minecraft.world.item.crafting.RecipeManager;
+import net.minecraft.world.level.Level;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
@@ -23,10 +24,10 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 public class IngredientSlotMixin implements RecipeAwareSlot {
 
 	@Unique
-	private RecipeAccess cobblemon$recipeManager;
+	private RecipeManager cobblemon$recipeManager;
 
 	@Override
-	public void setRecipeManager(RecipeAccess recipeManager) {
+	public void setRecipeManager(RecipeManager recipeManager) {
 		this.cobblemon$recipeManager = recipeManager;
 	}
 

common/src/main/java/com/cobblemon/mod/common/mixin/brewing/PotionSlotMixin.java

@@ -12,7 +12,8 @@ import com.cobblemon.mod.common.duck.RecipeAwareSlot;
 import com.cobblemon.mod.common.item.crafting.brewingstand.BrewingStandRecipe;
 import net.minecraft.world.inventory.BrewingStandMenu;
 import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.crafting.RecipeAccess;
+import net.minecraft.world.item.crafting.RecipeManager;
+import net.minecraft.world.level.Level;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
@@ -23,10 +24,10 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 public class PotionSlotMixin implements RecipeAwareSlot {
 
 	@Unique
-	private RecipeAccess cobblemon$recipeManager;
+	private RecipeManager cobblemon$recipeManager;
 
 	@Override
-	public void setRecipeManager(RecipeAccess recipeManager) {
+	public void setRecipeManager(RecipeManager recipeManager) {
 		this.cobblemon$recipeManager = recipeManager;
 	}
 

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

@@ -21,7 +21,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 @Mixin(AbstractClientPlayer.class)
 public class AbstractClientPlayerMixin {
     @Inject(
-        method = "getFieldOfViewModifier",
+        method = "getFieldOfViewModifier()F",
         at = @At(
             value = "HEAD"
         ),
@@ -35,7 +35,8 @@ public class AbstractClientPlayerMixin {
             // Only modify fov through riding if the pokedex is not open
             AbstractClientPlayer player = (AbstractClientPlayer) (Object) this;
             // Only modify fov for the driver and not the passengers
-            if (player != null && player.isPassenger() && player.getVehicle() instanceof PokemonEntity ride && player.getVehicle().getControllingPassenger() == player) {
+            if (player != null && player.isPassenger() && player.getVehicle() instanceof PokemonEntity && player.getVehicle().getControllingPassenger() == player) {
+                PokemonEntity ride = (PokemonEntity) player.getVehicle();
 
                 // Return custom fov mult for riding
                 cir.setReturnValue(ride.rideFovMult());

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

@@ -11,6 +11,7 @@ package com.cobblemon.mod.common.mixin.client;
 import com.cobblemon.mod.common.client.render.player.MountedPlayerRenderer;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
+import net.minecraft.client.model.AgeableListModel;
 import net.minecraft.client.model.HumanoidModel;
 import net.minecraft.client.model.Model;
 import org.spongepowered.asm.mixin.Mixin;
@@ -18,13 +19,18 @@ import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-@Mixin(Model.class)
-public abstract class ModelMixin {
-    @Inject(
-        method = "renderToBuffer(Lcom/mojang/blaze3d/vertex/PoseStack;Lcom/mojang/blaze3d/vertex/VertexConsumer;III)V",
-        at = @At("HEAD")
-    )
-    private void cobblemon$applyMountedRootAnimation(
+/**
+ * This mixin adds to the head of the renderToBuffer function and allows us to detect if it is a HumanoidModel and
+ * is being rendered as part of a player in the world who is riding a PokemonEntity. If so we need to obey any
+ * root animations that have been applied earlier.
+ *
+ * @author Hiroku
+ * @since May 16, 2025
+ */
+@Mixin(AgeableListModel.class)
+public class AgeableListModelMixin {
+    @Inject(method = "renderToBuffer", at = @At("HEAD"))
+    private void cobblemon$renderToBuffer(
         PoseStack poseStack,
         VertexConsumer vertexConsumer,
         int packedLight,
@@ -32,7 +38,8 @@ public abstract class ModelMixin {
         int colour,
         CallbackInfo ci
     ) {
-        if ((Object) this instanceof HumanoidModel<?> && MountedPlayerRenderer.shouldApplyRootAnimation) {
+        Model model = (Model) (Object) this;
+        if (model instanceof HumanoidModel<?> && MountedPlayerRenderer.shouldApplyRootAnimation) {
             MountedPlayerRenderer.INSTANCE.animateRoot(poseStack);
         }
     }

common/src/main/java/com/cobblemon/mod/common/mixin/client/AvatarRenderStateMixin.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.duck.AvatarRenderStateDuck;
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
-import net.minecraft.client.player.AbstractClientPlayer;
-import net.minecraft.client.renderer.entity.state.AvatarRenderState;
-import org.jetbrains.annotations.Nullable;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Unique;
-
-@Mixin(AvatarRenderState.class)
-public class AvatarRenderStateMixin implements AvatarRenderStateDuck {
-    @Unique
-    private @Nullable AbstractClientPlayer cobblemon$mountedPlayer;
-
-    @Unique
-    private @Nullable PokemonEntity cobblemon$mountedPokemon;
-
-    @Override
-    public @Nullable AbstractClientPlayer cobblemon$getMountedPlayer() {
-        return this.cobblemon$mountedPlayer;
-    }
-
-    @Override
-    public void cobblemon$setMountedPlayer(@Nullable AbstractClientPlayer player) {
-        this.cobblemon$mountedPlayer = player;
-    }
-
-    @Override
-    public @Nullable PokemonEntity cobblemon$getMountedPokemon() {
-        return this.cobblemon$mountedPokemon;
-    }
-
-    @Override
-    public void cobblemon$setMountedPokemon(@Nullable PokemonEntity pokemonEntity) {
-        this.cobblemon$mountedPokemon = pokemonEntity;
-    }
-}

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

@@ -1,55 +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.duck.AvatarRenderStateDuck;
-import com.cobblemon.mod.common.duck.LivingEntityRenderStateDuck;
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
-import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
-import net.minecraft.client.player.AbstractClientPlayer;
-import net.minecraft.client.renderer.entity.player.AvatarRenderer;
-import net.minecraft.client.renderer.entity.state.AvatarRenderState;
-import net.minecraft.world.entity.Avatar;
-import net.minecraft.world.phys.Vec3;
-import org.objectweb.asm.Opcodes;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-
-@Mixin(AvatarRenderer.class)
-public abstract class AvatarRendererMixin {
-    @Inject(method = "extractRenderState", at = @At("TAIL"))
-    private void cobblemon$captureMountedPlayer(Avatar avatar, AvatarRenderState state, float partialTick, CallbackInfo ci) {
-        AvatarRenderStateDuck duck = (AvatarRenderStateDuck) state;
-        LivingEntityRenderStateDuck livingDuck = (LivingEntityRenderStateDuck) state;
-        if (avatar instanceof AbstractClientPlayer player && player.getVehicle() instanceof PokemonEntity pokemonEntity) {
-            duck.cobblemon$setMountedPlayer(player);
-            duck.cobblemon$setMountedPokemon(pokemonEntity);
-            state.isCrouching = false;
-        } else {
-            duck.cobblemon$setMountedPlayer(null);
-            duck.cobblemon$setMountedPokemon(null);
-        }
-    }
-
-    @ModifyExpressionValue(
-        method = "getRenderOffset(Lnet/minecraft/client/renderer/entity/state/AvatarRenderState;)Lnet/minecraft/world/phys/Vec3;",
-        at = @At(value = "FIELD", target = "Lnet/minecraft/client/renderer/entity/state/HumanoidRenderState;isCrouching:Z", opcode = Opcodes.GETFIELD)
-    )
-    private boolean cobblemon$disableMountedCrouchOffset(boolean isCrouching, AvatarRenderState state) {
-        AvatarRenderStateDuck duck = (AvatarRenderStateDuck) state;
-        if (duck.cobblemon$getMountedPlayer() != null && duck.cobblemon$getMountedPokemon() != null) {
-            return false;
-        }
-        return isCrouching;
-    }
-
-}

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

@@ -12,36 +12,33 @@ import com.cobblemon.mod.common.api.riding.Rideable;
 import com.cobblemon.mod.common.client.MountedPokemonAnimationRenderController;
 import com.cobblemon.mod.common.client.render.camera.MountedCameraRenderer;
 import com.cobblemon.mod.common.duck.CameraDuck;
+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.core.BlockPos;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.level.BlockGetter;
-import net.minecraft.world.level.Level;
 import net.minecraft.world.phys.Vec3;
+import org.joml.Quaternionf;
 import org.joml.Vector3f;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(Camera.class)
 public abstract class CameraMixin implements CameraDuck {
     @Shadow private float eyeHeight;
     @Shadow private float eyeHeightOld;
-    @Shadow private Level level;
+    @Shadow private BlockGetter level;
     @Shadow private Entity entity;
     @Final @Shadow private Vector3f forwards;
     @Final @Shadow private Vector3f up;
     @Final @Shadow private Vector3f left;
     @Shadow private float yRot;
     @Shadow private float xRot;
-    @Shadow private Vec3 position;
-    @Shadow @Final private BlockPos.MutableBlockPos blockPosition;
-    @Shadow private int matrixPropertiesDirty;
+
+    @Shadow protected abstract void setPosition(Vec3 pos);
 
     @Override public BlockGetter cobblemon$getLevel() {
        return level;
@@ -63,19 +60,15 @@ public abstract class CameraMixin implements CameraDuck {
     @Override public float cobblemon$getYRot() { return yRot; }
     @Override public void cobblemon$setYRot(float yRot) { this.yRot = yRot; }
 
-    @Override public void cobblemon$markDirty() { this.matrixPropertiesDirty |= 3; }
-
-    @Inject(method = "setPosition(DDD)V", at = @At("HEAD"), cancellable = true)
-    private void cobblemon$positionCamera(double x, double y, double z, CallbackInfo ci) {
-        if (this.entity == null) return;
-        Entity entity = this.entity;
+    @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();
         Entity vehicle = entity.getVehicle();
-        boolean thirdPersonReverse = Minecraft.getInstance().options.getCameraType().isMirrored();
         MountedPokemonAnimationRenderController.INSTANCE.reset();
 
-        if (vehicle instanceof Rideable) {
-            Vec3 ridePos = MountedCameraRenderer.INSTANCE.getCameraPosition(
-                (Camera) (Object) this,
+        if(vehicle instanceof Rideable){
+            Vec3 position = MountedCameraRenderer.INSTANCE.getCameraPosition(
+                instance,
                 entity,
                 vehicle,
                 thirdPersonReverse,
@@ -83,17 +76,14 @@ public abstract class CameraMixin implements CameraDuck {
                 eyeHeightOld
             );
 
-            if (ridePos != null) {
-                // Directly set the position field instead of calling setPosition(Vec3)
-                this.position = ridePos;
-                this.blockPosition.set(ridePos.x, ridePos.y, ridePos.z);
-
-                ci.cancel();
+            if(position != null) {
+                setPosition(position);
                 return;
             }
         }
 
         // reset the rotation values if it is now not being ridden.
         MountedCameraRenderer.INSTANCE.setSmoothRotation(null);
+        original.call(instance, x, y, z);
     }
 }

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

@@ -13,14 +13,12 @@ import com.mojang.blaze3d.audio.Channel;
 import org.lwjgl.openal.AL10;
 import org.lwjgl.openal.AL11;
 import org.lwjgl.openal.EXTEfx;
-import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 
 @Mixin(Channel.class)
 public abstract class ChannelMixin implements ChannelDuck {
 
-    @Final
     @Shadow
     private int source;
 

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

@@ -0,0 +1,75 @@
+/*
+ * 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.CookingPotRecipeBase;
+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 com.llamalad7.mixinextras.sugar.Local;
+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 CookingPotRecipeBase) {
+            CookingPotBookCategory category = ((CookingPotRecipeBase) recipe2).getCategory();
+            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(
+                    value = "INVOKE",
+                    target = "Lcom/google/common/collect/ImmutableMap;copyOf(Ljava/util/Map;)Lcom/google/common/collect/ImmutableMap;"
+            ))
+    private void addCustomAggregateCategories(Iterable<RecipeHolder<?>> recipes, RegistryAccess registryAccess, CallbackInfo ci, @Local(name = "map2") Map<RecipeBookCategories, List<RecipeCollection>> map2) {
+        CobblemonRecipeCategories.Companion.getCustomAggregateCategories().forEach((recipeBookCategories, list) -> map2.put(recipeBookCategories, (List) list.stream().flatMap((recipeBookCategoriesx) -> ((List) map2.getOrDefault(recipeBookCategoriesx, ImmutableList.of())).stream()).collect(ImmutableList.toImmutableList())));
+    }
+}

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

@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.mixin.client;
-
-import com.mojang.blaze3d.platform.cursor.CursorType;
-import net.minecraft.client.gui.GuiGraphicsExtractor;
-import net.minecraft.client.gui.screens.inventory.CreativeModeInventoryScreen;
-import net.minecraft.world.item.CreativeModeTab;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Redirect;
-
-@Mixin(CreativeModeInventoryScreen.class)
-public abstract class CreativeModeInventoryScreenMixin {
-
-    @Redirect(
-        method = "renderTabButton",
-        at = @At(
-            value = "INVOKE",
-            target = "Lnet/minecraft/client/gui/GuiGraphicsExtractor;requestCursor(Lcom/mojang/blaze3d/platform/cursor/CursorType;)V"
-        )
-    )
-    private void cobblemon$skipCreativeTabCursor(GuiGraphicsExtractor guiGraphics, CursorType cursorType, GuiGraphicsExtractor context, int mouseX, int mouseY, CreativeModeTab tab) {
-        // 1.21.1 had no special cursor on creative tab hover; keep the arrow cursor for tab icons.
-    }
-}

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

@@ -0,0 +1,29 @@
+/*
+ * 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.gui.ScrollingWidget;
+import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
+import net.minecraft.client.gui.components.AbstractSelectionList;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+
+@Mixin(AbstractSelectionList.class)
+public abstract class EntryListWidgetMixin {
+
+    @SuppressWarnings("ConstantValue")
+    @ModifyExpressionValue(method = "getEntryAtPosition", at = @At(value = "CONSTANT", args = {"intValue=4"}))
+    public int cobblemon$adjustOnlyIfNecessary(int original) {
+        if(ScrollingWidget.class.isInstance(this)) {
+            return 0;
+        }
+
+        return original;
+    }
+}

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

@@ -49,14 +49,14 @@ public class GameRendererMixin {
     }
 
     @ModifyArg(
-        method = "pick",
+        method = "pick(Lnet/minecraft/world/entity/Entity;DDF)Lnet/minecraft/world/phys/HitResult;",
         at = @At(
             value = "INVOKE",
-            target = "Lnet/minecraft/world/phys/EntityHitResult;getEntity()Lnet/minecraft/world/entity/Entity;"
+            target = "Lnet/minecraft/world/entity/projectile/ProjectileUtil;getEntityHitResult(Lnet/minecraft/world/entity/Entity;Lnet/minecraft/world/phys/Vec3;Lnet/minecraft/world/phys/Vec3;Lnet/minecraft/world/phys/AABB;Ljava/util/function/Predicate;D)Lnet/minecraft/world/phys/EntityHitResult;"
         ),
         index = 4
     )
-    private Predicate<Entity> filterPokemonVehicle(Predicate<Entity> original, @Local Entity entity) {
+    private Predicate<Entity> filterPokemonVehicle(Predicate<Entity> original, @Local(ordinal = 0, argsOnly = true) Entity entity) {
         return (entityX) -> !(entity.getVehicle() == entityX && entityX instanceof PokemonEntity) && original.test(entityX);
     }
 

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

@@ -8,23 +8,21 @@
 
 package com.cobblemon.mod.common.mixin.client;
 
+import com.cobblemon.mod.common.OrientationControllable;
 import com.cobblemon.mod.common.client.render.player.MountedPlayerRenderer;
-import com.cobblemon.mod.common.duck.AvatarRenderStateDuck;
-import com.cobblemon.mod.common.duck.LivingEntityRenderStateDuck;
-import com.cobblemon.mod.common.entity.PoseType;
 import com.cobblemon.mod.common.client.render.player.RecallArmAnimationTracker;
+import com.cobblemon.mod.common.duck.RidePassenger;
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
 import net.minecraft.client.model.HumanoidModel;
 import net.minecraft.client.model.geom.ModelPart;
 import net.minecraft.client.player.AbstractClientPlayer;
-import net.minecraft.client.renderer.entity.state.AvatarRenderState;
-import net.minecraft.client.renderer.entity.state.HumanoidRenderState;
+import net.minecraft.util.Mth;
 import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.LivingEntity;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Coerce;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
@@ -45,85 +43,69 @@ public class HumanoidModelMixin {
     @Shadow @Final
     public ModelPart body;
 
-    @Inject(
-        method = "setupAnim(Lnet/minecraft/client/renderer/entity/state/HumanoidRenderState;)V",
-        at = @At("TAIL")
-    )
-    public void cobblemon$animateRiders(HumanoidRenderState renderState, CallbackInfo ci) {
+    @Inject(method = "setupAnim*", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/model/geom/ModelPart;copyFrom(Lnet/minecraft/client/model/geom/ModelPart;)V", shift = At.Shift.BEFORE))
+    public void cobblemon$animateRiders(
+        LivingEntity entity,
+        float limbSwing,
+        float limbSwingAmount,
+        float ageInTicks,
+        float netHeadYaw,
+        float headPitch,
+        CallbackInfo ci
+    ) {
         MountedPlayerRenderer.shouldApplyRootAnimation = false;
 
-        if (!(renderState instanceof AvatarRenderState avatarRenderState)) {
-            return;
+        if (MountedPlayerRenderer.relevantPartsByName.size() <= 1) {
+            MountedPlayerRenderer.relevantPartsByName.put("arm_left", leftArm);
+            MountedPlayerRenderer.relevantPartsByName.put("arm_right", rightArm);
+            MountedPlayerRenderer.relevantPartsByName.put("leg_left", leftLeg);
+            MountedPlayerRenderer.relevantPartsByName.put("leg_right", rightLeg);
+            MountedPlayerRenderer.relevantPartsByName.put("head", head);
+            MountedPlayerRenderer.relevantPartsByName.put("hat", hat);
+            MountedPlayerRenderer.relevantPartsByName.put("torso", body);
         }
 
-        AvatarRenderStateDuck duck = (AvatarRenderStateDuck) avatarRenderState;
-        LivingEntityRenderStateDuck livingDuck = (LivingEntityRenderStateDuck) avatarRenderState;
-        AbstractClientPlayer player = duck.cobblemon$getMountedPlayer();
-        PokemonEntity pokemonEntity = duck.cobblemon$getMountedPokemon();
-        if (player == null || pokemonEntity == null) {
-            return;
+        Entity vehicle = entity.getVehicle();
+        if (vehicle instanceof PokemonEntity pokemonEntity && entity instanceof OrientationControllable) {
+            var shouldRotatePlayerHead = pokemonEntity.ifRidingAvailableSupply(false, (behaviour, settings, state) ->
+                    behaviour.shouldRotateRiderHead(settings, state, pokemonEntity)
+            );
+
+            // If the player is on a rollable ride then use the ride local rotations to rotate the head
+            // This is to allow the player head to face the correct direction when "freelooking"
+            // TODO: find a way for this to work on built jars without borking head rotations.
+//            if (entity instanceof RidePassenger playerRotater &&
+//                vehicle instanceof OrientationControllable controller &&
+//                controller.getOrientationController().isActive()) {
+//                this.head.xRot = playerRotater.cobblemon$getRideXRot();
+//                headPitch = playerRotater.cobblemon$getRideXRot();
+//                this.head.yRot = playerRotater.cobblemon$getRideYRot();
+//                netHeadYaw = playerRotater.cobblemon$getRideYRot();
+//            }
+
+            if (!shouldRotatePlayerHead) {
+                netHeadYaw = 0f;
+                headPitch = 0f;
+                if (this.head != null) {
+                    this.head.yRot = 0f;
+                    this.head.xRot = 0f;
+                }
+            }
+
+            if (!(entity instanceof AbstractClientPlayer player)) return;
+
+            MountedPlayerRenderer.shouldApplyRootAnimation = true;
+            MountedPlayerRenderer.INSTANCE.animate((HumanoidModel<AbstractClientPlayer>)(Object)this, pokemonEntity, player, netHeadYaw, headPitch, ageInTicks, limbSwing, limbSwingAmount);
         }
-
-        int seatIndex = livingDuck.cobblemon$getMountedSeatIndex();
-        String seatLocator = livingDuck.cobblemon$getMountedSeatLocator();
-        PoseType poseType = livingDuck.cobblemon$getMountedPoseType();
-
-        if (seatIndex < 0 || poseType == null) {
-            return;
-        }
-
-        MountedPlayerRenderer.relevantPartsByName.put("arm_left", leftArm);
-        MountedPlayerRenderer.relevantPartsByName.put("arm_right", rightArm);
-        MountedPlayerRenderer.relevantPartsByName.put("leg_left", leftLeg);
-        MountedPlayerRenderer.relevantPartsByName.put("leg_right", rightLeg);
-        MountedPlayerRenderer.relevantPartsByName.put("head", head);
-        MountedPlayerRenderer.relevantPartsByName.put("hat", hat);
-        MountedPlayerRenderer.relevantPartsByName.put("torso", body);
-
-        Entity vehicle = player.getVehicle();
-        if (!(vehicle instanceof PokemonEntity)) {
-            return;
-        }
-
-        var shouldRotatePlayerHead = pokemonEntity.ifRidingAvailableSupply(false, (behaviour, settings, state) ->
-                behaviour.shouldRotateRiderHead(settings, state, pokemonEntity)
-        );
-
-        float netHeadYaw = avatarRenderState.yRot;
-        float headPitch = avatarRenderState.xRot;
-
-        if (!shouldRotatePlayerHead) {
-            netHeadYaw = 0f;
-            headPitch = 0f;
-            this.head.yRot = 0f;
-            this.head.xRot = 0f;
-        }
-
-        MountedPlayerRenderer.INSTANCE.animate(
-            (HumanoidModel<?>)(Object)this,
-            pokemonEntity,
-            player,
-            avatarRenderState,
-            seatIndex,
-            seatLocator,
-            poseType,
-            netHeadYaw,
-            headPitch,
-            avatarRenderState.ageInTicks,
-            avatarRenderState.walkAnimationPos,
-            avatarRenderState.walkAnimationSpeed
-        );
-        MountedPlayerRenderer.shouldApplyRootAnimation = true;
-
     }
 
-    //@Inject(method = "setupAnim*", at = @At("TAIL"))
-    //public void cobblemon$poseRecallArm(LivingEntity entity, float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch, CallbackInfo ci) {
-    //    if (!(entity instanceof AbstractClientPlayer) || entity.getVehicle() instanceof PokemonEntity) return;
-    //    float raise = RecallArmAnimationTracker.INSTANCE.raiseFactor(entity.getUUID());
-    //    if (raise <= 0f) return;
-    //    this.rightArm.xRot = Mth.lerp(raise, this.rightArm.xRot, (float) (-Math.PI / 2.0));
-    //    this.rightArm.yRot = Mth.lerp(raise, this.rightArm.yRot, 0f);
-    //    this.rightArm.zRot = Mth.lerp(raise, this.rightArm.zRot, 0f);
-    //}
-}
+    @Inject(method = "setupAnim*", at = @At("TAIL"))
+    public void cobblemon$poseRecallArm(LivingEntity entity, float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch, CallbackInfo ci) {
+        if (!(entity instanceof AbstractClientPlayer) || entity.getVehicle() instanceof PokemonEntity) return;
+        float raise = RecallArmAnimationTracker.INSTANCE.raiseFactor(entity.getUUID());
+        if (raise <= 0f) return;
+        this.rightArm.xRot = Mth.lerp(raise, this.rightArm.xRot, (float) (-Math.PI / 2.0));
+        this.rightArm.yRot = Mth.lerp(raise, this.rightArm.yRot, 0f);
+        this.rightArm.zRot = Mth.lerp(raise, this.rightArm.zRot, 0f);
+    }
+}

common/src/main/java/com/cobblemon/mod/common/mixin/client/ItemEntityRendererMixin.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.client;
-
-import com.cobblemon.mod.common.item.PokeBallItem;
-import com.cobblemon.mod.common.item.PokedexItem;
-import net.minecraft.client.renderer.entity.ItemEntityRenderer;
-import net.minecraft.client.renderer.entity.state.ItemEntityRenderState;
-import net.minecraft.client.renderer.item.ItemModelResolver;
-import net.minecraft.core.component.DataComponents;
-import net.minecraft.resources.Identifier;
-import net.minecraft.world.entity.item.ItemEntity;
-import net.minecraft.world.item.ItemDisplayContext;
-import net.minecraft.world.item.ItemStack;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.Unique;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-@Mixin(ItemEntityRenderer.class)
-public class ItemEntityRendererMixin {
-    @Shadow @Final private ItemModelResolver itemModelResolver;
-
-    @Inject(method = "extractRenderState", at = @At("TAIL"))
-    private void cobblemon$overrideDroppedItemModel(ItemEntity entity, ItemEntityRenderState state, float partialTick, CallbackInfo ci) {
-        Identifier modelId = cobblemon$getGroundModel(entity.getItem());
-        if (modelId == null) {
-            return;
-        }
-
-        ItemStack renderStack = entity.getItem().copy();
-        renderStack.set(DataComponents.ITEM_MODEL, modelId);
-        this.itemModelResolver.updateForNonLiving(state.item, renderStack, ItemDisplayContext.GROUND, entity);
-    }
-
-    @Unique
-    private static Identifier cobblemon$getGroundModel(ItemStack stack) {
-        if (stack.getItem() instanceof PokeBallItem pokeBallItem) {
-            return cobblemon$asStandaloneModel(pokeBallItem.getPokeBall().getModel3d());
-        }
-
-        if (stack.getItem() instanceof PokedexItem pokedexItem) {
-            return cobblemon$asStandaloneModel(pokedexItem.getType().getItemModelPath("off"));
-        }
-
-        return null;
-    }
-
-    @Unique
-    private static Identifier cobblemon$asStandaloneModel(Identifier modelId) {
-        return modelId.withPath(path -> path.startsWith("item/") ? path.substring("item/".length()) : path);
-    }
-}

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

@@ -10,11 +10,11 @@ package com.cobblemon.mod.common.mixin.client;
 
 import com.cobblemon.mod.common.client.render.player.RecallArmAnimationTracker;
 import com.mojang.blaze3d.vertex.PoseStack;
-import net.minecraft.client.renderer.SubmitNodeCollector;
+import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.entity.layers.ItemInHandLayer;
-import net.minecraft.client.renderer.entity.state.ArmedEntityRenderState;
-import net.minecraft.client.renderer.item.ItemStackRenderState;
 import net.minecraft.world.entity.HumanoidArm;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.item.ItemDisplayContext;
 import net.minecraft.world.item.ItemStack;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
@@ -23,11 +23,10 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(ItemInHandLayer.class)
 public class ItemInHandLayerMixin {
-    //@Inject(method = "submitArmWithItem", at = @At("HEAD"), cancellable = true)
-    //private void cobblemon$hideRecallHandItem(ArmedEntityRenderState state, ItemStackRenderState item, ItemStack itemStack,
-    //                                          HumanoidArm arm, PoseStack poseStack, SubmitNodeCollector submitNodeCollector, int lightCoords, CallbackInfo ci) {
-    //    if (arm == HumanoidArm.RIGHT && RecallArmAnimationTracker.INSTANCE.isRecalling(state..getId())) {
-    //        ci.cancel();
-    //    }
-    //}
+    @Inject(method = "renderArmWithItem", at = @At("HEAD"), cancellable = true)
+    private void cobblemon$hideRecallHandItem(LivingEntity entity, ItemStack itemStack, ItemDisplayContext itemDisplayContext, HumanoidArm humanoidArm, PoseStack poseStack, MultiBufferSource multiBufferSource, int light, CallbackInfo ci) {
+        if (humanoidArm == HumanoidArm.RIGHT && RecallArmAnimationTracker.INSTANCE.isRecalling(entity.getUUID())) {
+            ci.cancel();
+        }
+    }
 }

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

@@ -9,28 +9,17 @@
 package com.cobblemon.mod.common.mixin.client;
 
 import com.cobblemon.mod.common.OrientationControllable;
-import com.cobblemon.mod.common.item.PokeBallItem;
 import com.cobblemon.mod.common.client.render.player.FirstPersonRecallBallRenderer;
 import com.cobblemon.mod.common.item.PokedexItem;
 import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.player.AbstractClientPlayer;
 import net.minecraft.client.renderer.ItemInHandRenderer;
-import net.minecraft.client.renderer.SubmitNodeCollector;
-import net.minecraft.client.renderer.item.ItemModelResolver;
-import net.minecraft.client.renderer.item.ItemStackRenderState;
-import net.minecraft.core.component.DataComponents;
-import net.minecraft.resources.Identifier;
+import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.world.InteractionHand;
-import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.item.ItemDisplayContext;
 import net.minecraft.world.item.ItemStack;
-import net.minecraft.client.renderer.texture.OverlayTexture;
-import org.spongepowered.asm.mixin.Final;
 import org.joml.Quaternionf;
 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.Redirect;
@@ -38,14 +27,12 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(ItemInHandRenderer.class)
 public class ItemInHandRendererMixin {
-    @Shadow @Final private ItemModelResolver itemModelResolver;
-
     @Inject(method = "renderArmWithItem", at = @At(value = "HEAD"), cancellable = true)
-    private void cobblemon$renderArmWithItem(AbstractClientPlayer abstractClientPlayer, float f, float g, InteractionHand interactionHand, float h, ItemStack itemStack, float i, PoseStack poseStack, SubmitNodeCollector submitNodeCollector, int j, CallbackInfo ci) {
+    private void cobblemon$renderArmWithItem(AbstractClientPlayer abstractClientPlayer, float f, float g, InteractionHand interactionHand, float h, ItemStack itemStack, float i, PoseStack poseStack, MultiBufferSource multiBufferSource, int j, CallbackInfo ci) {
         if (abstractClientPlayer.isUsingItem() && abstractClientPlayer.getUseItem().getItem() instanceof PokedexItem) {
             ci.cancel();
         }
-        else if (interactionHand == InteractionHand.MAIN_HAND && FirstPersonRecallBallRenderer.INSTANCE.render(poseStack, submitNodeCollector, j, f)) {
+        else if (interactionHand == InteractionHand.MAIN_HAND && FirstPersonRecallBallRenderer.INSTANCE.render(poseStack, multiBufferSource, j, f)) {
             ci.cancel();
         }
         else if (abstractClientPlayer instanceof OrientationControllable controllable && controllable.getOrientationController().isActive()) {
@@ -53,58 +40,10 @@ public class ItemInHandRendererMixin {
         }
     }
 
-    @Inject(method = "renderItem", at = @At("HEAD"), cancellable = true)
-    private void cobblemon$renderItem(LivingEntity entity, ItemStack stack, ItemDisplayContext displayContext, PoseStack poseStack, SubmitNodeCollector submitNodeCollector, int light, CallbackInfo ci) {
-        Identifier modelId = cobblemon$getHeldModel(stack, entity, displayContext);
-        if (modelId == null) {
-            return;
-        }
-
-        ItemStack renderStack = stack.copy();
-        renderStack.set(DataComponents.ITEM_MODEL, modelId);
-
-        ItemStackRenderState renderState = new ItemStackRenderState();
-        this.itemModelResolver.updateForTopItem(renderState, renderStack, displayContext, entity.level(), entity, entity.getId() + displayContext.ordinal());
-        renderState.submit(poseStack, submitNodeCollector, light, OverlayTexture.NO_OVERLAY, 0);
-        ci.cancel();
-    }
-
     @Redirect(method = "renderHandsWithItems", at = @At(value = "INVOKE", target = "Lcom/mojang/blaze3d/vertex/PoseStack;mulPose(Lorg/joml/Quaternionf;)V"))
     private void cobblemon$renderHandswithItems(PoseStack instance, Quaternionf quaternion) {
         if (!(Minecraft.getInstance().player != null && Minecraft.getInstance().player.getVehicle() instanceof OrientationControllable controllable && controllable.getOrientationController().isActive())) {
             instance.mulPose(quaternion);
         }
     }
-
-    @Unique
-    private static Identifier cobblemon$getHeldModel(ItemStack stack, LivingEntity entity, ItemDisplayContext displayContext) {
-        if (!cobblemon$isHandContext(displayContext)) {
-            return null;
-        }
-
-        if (stack.getItem() instanceof PokeBallItem pokeBallItem) {
-            return cobblemon$asStandaloneModel(pokeBallItem.getPokeBall().getModel3d());
-        }
-
-        if (stack.getItem() instanceof PokedexItem pokedexItem) {
-            boolean isScanModel = entity instanceof AbstractClientPlayer && entity.getUseItem() == stack && entity.isUsingItem();
-            boolean canOpenScreen = (entity.getOffhandItem() == stack && !(entity.getMainHandItem().getItem() instanceof PokedexItem)) || entity.getMainHandItem() == stack;
-            return cobblemon$asStandaloneModel(pokedexItem.getType().getItemModelPath(isScanModel ? "scanning" : (canOpenScreen ? null : "off")));
-        }
-
-        return null;
-    }
-
-    @Unique
-    private static boolean cobblemon$isHandContext(ItemDisplayContext displayContext) {
-        return displayContext == ItemDisplayContext.FIRST_PERSON_LEFT_HAND
-            || displayContext == ItemDisplayContext.FIRST_PERSON_RIGHT_HAND
-            || displayContext == ItemDisplayContext.THIRD_PERSON_LEFT_HAND
-            || displayContext == ItemDisplayContext.THIRD_PERSON_RIGHT_HAND;
-    }
-
-    @Unique
-    private static Identifier cobblemon$asStandaloneModel(Identifier modelId) {
-        return modelId.withPath(path -> path.startsWith("item/") ? path.substring("item/".length()) : path);
-    }
 }

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

@@ -0,0 +1,112 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.mixin.client;
+
+import com.cobblemon.mod.common.Cobblemon;
+import com.cobblemon.mod.common.CobblemonItemComponents;
+import com.cobblemon.mod.common.CobblemonItems;
+import com.cobblemon.mod.common.ModAPI;
+import com.cobblemon.mod.common.item.PokeBallItem;
+import com.cobblemon.mod.common.item.PokedexItem;
+import com.cobblemon.mod.common.item.WearableItem;
+import com.cobblemon.mod.common.item.components.TMMoveComponent;
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.client.multiplayer.ClientLevel;
+import net.minecraft.client.renderer.ItemModelShaper;
+import net.minecraft.client.renderer.MultiBufferSource;
+import net.minecraft.client.renderer.entity.ItemRenderer;
+import net.minecraft.client.resources.model.BakedModel;
+import net.minecraft.client.resources.model.ModelResourceLocation;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.item.ItemDisplayContext;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.level.Level;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.Unique;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+/*
+    I think it would be nice to maybe use the existing mixin we have for custom item rendering [BuiltinModelItemRendererMixin]
+    Obviously that would require changes. Potentially each item renderer defines what modes it overrides for?
+ */
+@Mixin(ItemRenderer.class)
+public abstract class ItemRendererMixin {
+    // ignore the hint saying implmentation is never null, if something crashes then it is null and causes red herrings
+    @Unique private final String MODEL_PATH = (Cobblemon.implementation != null && Cobblemon.implementation.getModAPI() == ModAPI.FABRIC) ? "fabric_resource" : "standalone";
+
+    @Shadow @Final private ItemModelShaper itemModelShaper;
+
+    @Shadow public abstract void render(ItemStack stack, ItemDisplayContext renderMode, boolean leftHanded, PoseStack matrices, MultiBufferSource vertexConsumers, int light, int overlay, BakedModel model);
+
+    @Inject(
+        method = "render(Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/item/ItemDisplayContext;ZLcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;IILnet/minecraft/client/resources/model/BakedModel;)V",
+        at = @At("HEAD"),
+        cancellable = true
+    )
+    private void cobblemon$overrideItemModel(ItemStack stack, ItemDisplayContext renderMode, boolean leftHanded, PoseStack matrices, MultiBufferSource multiBufferSource, int light, int overlay, BakedModel model, CallbackInfo ci) {
+        boolean shouldBe2d = renderMode == ItemDisplayContext.GUI || renderMode == ItemDisplayContext.FIXED || stack.getItem() == CobblemonItems.TECHNICAL_MACHINE;
+        ResourceLocation resourceLocation = null;
+        if (shouldBe2d) {
+            if (stack.getItem() instanceof PokeBallItem pokeBallItem) resourceLocation = pokeBallItem.getPokeBall().getModel2d();
+            else if (stack.getItem() instanceof PokedexItem pokedexItem) resourceLocation = pokedexItem.getType().getItemSpritePath();
+            else if (stack.getItem() == CobblemonItems.TECHNICAL_MACHINE) {
+                TMMoveComponent component = stack.get(CobblemonItemComponents.TM_MOVE);
+                if (component != null) {
+                    resourceLocation = new ResourceLocation(Cobblemon.MODID, "tm/" + component.getMove().getElementalType().showdownId() + "_tm");
+                }
+            }
+        }
+        if (renderMode != ItemDisplayContext.HEAD && stack.getItem() instanceof WearableItem wearableItem) resourceLocation = wearableItem.getModel2d();
+
+        if (resourceLocation != null) {
+            BakedModel replacementModel = this.itemModelShaper.getModelManager().getModel(new ModelResourceLocation(resourceLocation, "inventory"));
+            if (!cobblemon$isSameModel(model, replacementModel)) {
+                ci.cancel();
+                render(stack, renderMode, leftHanded, matrices, multiBufferSource, light, overlay, replacementModel);
+            }
+        }
+    }
+
+    @Inject(method = "getModel", at = @At("HEAD"), cancellable = true)
+    private void cobblemon$getItemModel(ItemStack stack, Level world, LivingEntity entity, int seed, CallbackInfoReturnable<BakedModel> cir) {
+        ResourceLocation resourceLocation = null;
+        if (stack.getItem() instanceof PokeBallItem pokeBallItem) resourceLocation = pokeBallItem.getPokeBall().getModel3d();
+        else if (stack.getItem() instanceof PokedexItem pokedexItem) {
+            boolean isScanModel = entity instanceof Player && entity.getUseItem() == stack && entity.isUsingItem();
+            boolean canOpenScreen = entity != null && ((entity.getOffhandItem() == stack && !(entity.getMainHandItem().getItem() instanceof PokedexItem)) || entity.getMainHandItem() == stack);
+            resourceLocation = pokedexItem.getType().getItemModelPath(isScanModel ? "scanning" : (canOpenScreen ? null : "off"));
+        }
+        else if (stack.getItem() instanceof WearableItem wearableItem) resourceLocation = wearableItem.getModel3d();
+
+        if (resourceLocation != null) {
+            BakedModel model = this.itemModelShaper.getModelManager().getModel(new ModelResourceLocation(resourceLocation, MODEL_PATH));
+            ClientLevel clientWorld = world instanceof ClientLevel ? (ClientLevel) world : null;
+            BakedModel overriddenModel = model.getOverrides().resolve(model, stack, clientWorld, entity, seed);
+            cir.setReturnValue(overriddenModel == null ? this.itemModelShaper.getModelManager().getMissingModel() : overriddenModel);
+        }
+    }
+
+    // this method aims to cover an issue with modernfixes and it's "dynamic resource" causing the usual .equals check to always fail, resulting in a StackOverflow
+    // this falls back to comparing the model contents (e.g. location of the texture, width and height)
+    @Unique
+    private static boolean cobblemon$isSameModel(BakedModel original, BakedModel replacement) {
+        return original.equals(replacement) ||
+                       (original.getParticleIcon().contents().name().equals(replacement.getParticleIcon().contents().name()) &&
+                                original.getParticleIcon().contents().width() == replacement.getParticleIcon().contents().width() &&
+                                original.getParticleIcon().contents().height() == replacement.getParticleIcon().contents().height());
+    }
+
+}

common/src/main/java/com/cobblemon/mod/common/mixin/client/LivingEntityRenderStateMixin.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.duck.LivingEntityRenderStateDuck;
-import com.cobblemon.mod.common.entity.PoseType;
-import net.minecraft.client.renderer.entity.state.LivingEntityRenderState;
-import net.minecraft.world.entity.LivingEntity;
-import org.jetbrains.annotations.Nullable;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Unique;
-
-@Mixin(LivingEntityRenderState.class)
-public class LivingEntityRenderStateMixin implements LivingEntityRenderStateDuck {
-    @Unique
-    private @Nullable LivingEntity cobblemon$mountedEntity;
-
-    @Unique
-    private float cobblemon$mountedPartialTick;
-
-    @Unique
-    private int cobblemon$mountedSeatIndex = -1;
-
-    @Unique
-    private @Nullable String cobblemon$mountedSeatLocator;
-
-    @Unique
-    private @Nullable PoseType cobblemon$mountedPoseType;
-
-    @Override
-    public @Nullable LivingEntity cobblemon$getMountedEntity() {
-        return this.cobblemon$mountedEntity;
-    }
-
-    @Override
-    public void cobblemon$setMountedEntity(@Nullable LivingEntity entity) {
-        this.cobblemon$mountedEntity = entity;
-    }
-
-    @Override
-    public float cobblemon$getMountedPartialTick() {
-        return this.cobblemon$mountedPartialTick;
-    }
-
-    @Override
-    public void cobblemon$setMountedPartialTick(float partialTick) {
-        this.cobblemon$mountedPartialTick = partialTick;
-    }
-
-    @Override
-    public int cobblemon$getMountedSeatIndex() {
-        return this.cobblemon$mountedSeatIndex;
-    }
-
-    @Override
-    public void cobblemon$setMountedSeatIndex(int seatIndex) {
-        this.cobblemon$mountedSeatIndex = seatIndex;
-    }
-
-    @Override
-    public @Nullable String cobblemon$getMountedSeatLocator() {
-        return this.cobblemon$mountedSeatLocator;
-    }
-
-    @Override
-    public void cobblemon$setMountedSeatLocator(@Nullable String seatLocator) {
-        this.cobblemon$mountedSeatLocator = seatLocator;
-    }
-
-    @Override
-    public @Nullable PoseType cobblemon$getMountedPoseType() {
-        return this.cobblemon$mountedPoseType;
-    }
-
-    @Override
-    public void cobblemon$setMountedPoseType(@Nullable PoseType poseType) {
-        this.cobblemon$mountedPoseType = poseType;
-    }
-}

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

@@ -8,122 +8,30 @@
 
 package com.cobblemon.mod.common.mixin.client;
 
-import com.cobblemon.mod.common.client.render.ClientPlayerIcon;
 import com.cobblemon.mod.common.client.render.entity.MountedLivingEntityRenderer;
-import com.cobblemon.mod.common.duck.LivingEntityRenderStateDuck;
-import com.cobblemon.mod.common.entity.PoseType;
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
 import com.mojang.blaze3d.vertex.PoseStack;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.SubmitNodeCollector;
+import net.minecraft.client.model.EntityModel;
 import net.minecraft.client.renderer.entity.LivingEntityRenderer;
-import net.minecraft.client.renderer.entity.state.AvatarRenderState;
-import net.minecraft.client.renderer.entity.state.LivingEntityRenderState;
-import net.minecraft.client.renderer.item.ItemModelResolver;
-import net.minecraft.client.renderer.state.level.CameraRenderState;
-import net.minecraft.core.component.DataComponents;
-import net.minecraft.world.entity.EquipmentSlot;
 import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.item.ItemDisplayContext;
-import net.minecraft.world.item.ItemStack;
-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(LivingEntityRenderer.class)
-public class LivingEntityRendererMixin {
-    @Shadow @Final protected ItemModelResolver itemModelResolver;
-
-    @Inject(
-            method = "extractRenderState",
-            at = @At("TAIL")
-    )
-    private void cobblemon$captureMountedEntity(LivingEntity entity, LivingEntityRenderState state, float partialTick, CallbackInfo ci) {
-        LivingEntityRenderStateDuck duck = (LivingEntityRenderStateDuck) state;
-        if (entity.isPassenger() && entity.getVehicle() instanceof PokemonEntity) {
-            PokemonEntity pokemonEntity = (PokemonEntity) entity.getVehicle();
-            int seatIndex = pokemonEntity.getPassengers().indexOf(entity);
-            String seatLocator = null;
-            PoseType poseType = pokemonEntity.getCurrentPoseType();
-            if (seatIndex >= 0 && seatIndex < pokemonEntity.getSeats().size()) {
-                seatLocator = pokemonEntity.getSeats().get(seatIndex).getLocator();
-                if (seatLocator == null) {
-                    seatLocator = "seat_" + (seatIndex + 1);
-                }
-            } else {
-                seatIndex = -1;
-            }
-
-            duck.cobblemon$setMountedEntity(entity);
-            duck.cobblemon$setMountedPartialTick(partialTick);
-            duck.cobblemon$setMountedSeatIndex(seatIndex);
-            duck.cobblemon$setMountedSeatLocator(seatLocator);
-            duck.cobblemon$setMountedPoseType(poseType);
-        } else {
-            duck.cobblemon$setMountedEntity(null);
-            duck.cobblemon$setMountedPartialTick(0.0F);
-            duck.cobblemon$setMountedSeatIndex(-1);
-            duck.cobblemon$setMountedSeatLocator(null);
-            duck.cobblemon$setMountedPoseType(null);
-        }
-
-        //ItemStack headItem = entity.getItemBySlot(EquipmentSlot.HEAD);
-        //if (headItem.getItem() instanceof WearableItem wearableItem) {
-        //    ItemStack renderHeadItem = headItem.copy();
-        //    renderHeadItem.set(DataComponents.ITEM_MODEL, wearableItem.getModel3d().withPath(path -> path.startsWith("item/") ? path.substring("item/".length()) : path));
-        //    this.itemModelResolver.updateForLiving(state.headItem, renderHeadItem, ItemDisplayContext.HEAD, entity);
-        //}
-    }
+public class LivingEntityRendererMixin<T extends LivingEntity, M extends EntityModel<T>> {
 
     @Inject(
             method = "setupRotations",
             at = @At("HEAD")
     )
-    private void cobblemon$modifyRoll(LivingEntityRenderState state, PoseStack poseStack, float bodyRot, float scale, CallbackInfo ci) {
-        LivingEntityRenderStateDuck duck = (LivingEntityRenderStateDuck) state;
-        LivingEntity entity = duck.cobblemon$getMountedEntity();
-        if (entity == null || !(entity.getVehicle() instanceof PokemonEntity pokemonEntity)) {
-            return;
-        }
-
-        MountedLivingEntityRenderer.INSTANCE.render(
-            entity,
-            pokemonEntity,
-            poseStack,
-            state.walkAnimationPos,
-            bodyRot,
-            duck.cobblemon$getMountedPartialTick(),
-            scale
-        );
-    }
-
-    @Inject(
-        method = "submit",
-        at = @At("TAIL")
-    )
-    private void cobblemon$renderPlayerIcon(
-        LivingEntityRenderState state,
-        PoseStack poseStack,
-        SubmitNodeCollector submitNodeCollector,
-        CameraRenderState cameraRenderState,
-        CallbackInfo ci
-    ) {
-        if (!(state instanceof AvatarRenderState avatarState)) {
-            return;
-        }
-
-        var level = Minecraft.getInstance().level;
-        if (level == null) {
-            return;
-        }
-
-        var entity = level.getEntity(avatarState.id);
-        if (entity instanceof Player player) {
-            ClientPlayerIcon.Companion.onRenderPlayer(player);
+    private void cobblemon$modifyRoll(LivingEntity entity, PoseStack poseStack, float bob, float yBodyRot, float partialTick, float scale, CallbackInfo ci) {
+        if (entity.isPassenger()) {
+            var vehicle = entity.getVehicle();
+            if (vehicle instanceof PokemonEntity pokemonEntity) {
+                MountedLivingEntityRenderer.INSTANCE.render(entity, pokemonEntity, poseStack, bob, yBodyRot, partialTick, scale);
+            }
         }
     }
 }

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

@@ -30,7 +30,7 @@ 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.ClientInput;
+import net.minecraft.client.player.Input;
 import net.minecraft.client.player.LocalPlayer;
 import net.minecraft.util.Mth;
 import net.minecraft.world.entity.Entity;
@@ -65,7 +65,7 @@ public abstract class LocalPlayerMixin extends AbstractClientPlayer implements O
     @Shadow
     private float jumpRidingScale;
 
-    @Shadow public ClientInput input;
+    @Shadow public Input input;
 
     @Shadow private int autoJumpTime;
 
@@ -89,7 +89,6 @@ public abstract class LocalPlayerMixin extends AbstractClientPlayer implements O
     @Inject(method = "rideTick", at = @At("HEAD"))
     private void cobblemon$updateOrientationControllerRideTick(CallbackInfo ci) {
         if (Minecraft.getInstance().player != (Object)this) return;
-
         var driver = (LocalPlayer)(Object)this;
         var vehicle = driver.getVehicle();
         if (!(this.getVehicle() instanceof OrientationControllable controllableVehicle)) return;
@@ -122,6 +121,7 @@ public abstract class LocalPlayerMixin extends AbstractClientPlayer implements O
         Vector3f lastSentDriverInput = ((PlayerDuck)this).getLastSentDriverInput();
         if (driverInput.equals(lastSentDriverInput)) return;
         ((PlayerDuck)this).setLastSentDriverInput(driverInput);
+
         CobblemonNetwork.INSTANCE.sendToServer(new ServerboundUpdateDriverInputPacket(driverInput));
     }
 
@@ -143,6 +143,7 @@ public abstract class LocalPlayerMixin extends AbstractClientPlayer implements O
             cobblemon$lastRideYRot != rideYRot ||
             cobblemon$lastRideEyePos != rideEyePos
             ) {
+
             // Update 'last' values
             cobblemon$lastRideXRot = rideXRot;
             cobblemon$lastRideYRot = rideYRot;
@@ -200,26 +201,22 @@ public abstract class LocalPlayerMixin extends AbstractClientPlayer implements O
 
     @Inject(method = "aiStep", at = @At("HEAD"))
     private void cobblemon$aiStep(CallbackInfo ci) {
-        boolean jumpPressed = this.input.keyPresses.jump();
         this.cobblemon$isDoubleJumping = false;
-        this.cobblemon$isJumping = jumpPressed;
+        this.cobblemon$isJumping = this.input.jumping;
     }
 
     @Inject(method = "aiStep", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/player/LocalPlayer;isSprinting()Z", shift = At.Shift.BEFORE))
     private void cobblemon$updateDoubleJumping(CallbackInfo ci) {
-        if (!this.cobblemon$isJumping && this.input.keyPresses.jump() && this.autoJumpTime <= 0 && !this.isSwimming()) {
-            PokemonEntity pokemonEntity = this.getVehicle() instanceof PokemonEntity vehiclePokemon ? vehiclePokemon : null;
+        if (!this.cobblemon$isJumping && this.input.jumping && this.autoJumpTime <= 0 && !this.isSwimming()) {
             if (this.cobblemon$survivalJumpTriggerTime != 0) {
                 this.cobblemon$isDoubleJumping = true;
                 this.cobblemon$survivalJumpTriggerTime = 0;
-            } else {
-                this.cobblemon$survivalJumpTriggerTime = 12;
-                if (pokemonEntity != null) {
-                    this.cobblemon$isDoubleJumping = true;
-                    this.cobblemon$survivalJumpTriggerTime = 0;
-                }
             }
-        } else if (this.cobblemon$survivalJumpTriggerTime > 0) {
+            else {
+                this.cobblemon$survivalJumpTriggerTime = 12;
+            }
+        }
+        else if (this.cobblemon$survivalJumpTriggerTime > 0) {
             this.cobblemon$survivalJumpTriggerTime--;
         }
     }

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

@@ -0,0 +1,95 @@
+/*
+ * 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.CobblemonBakingOverrides;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.color.block.BlockColors;
+import net.minecraft.client.renderer.block.model.BlockModel;
+import net.minecraft.client.resources.model.BlockStateModelLoader;
+import net.minecraft.client.resources.model.ModelBakery;
+import net.minecraft.client.resources.model.ModelResourceLocation;
+import net.minecraft.client.resources.model.UnbakedModel;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.server.packs.resources.Resource;
+import net.minecraft.util.profiling.ProfilerFiller;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.Unique;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+@Mixin(ModelBakery.class)
+public abstract class ModelLoaderMixin {
+    @Shadow abstract UnbakedModel getModel(ResourceLocation resourceLocation);
+
+    @Shadow protected abstract void registerModel(ModelResourceLocation modelId, UnbakedModel unbakedModel);
+
+    @Shadow protected abstract void loadItemModelAndDependencies(ResourceLocation resourceLocation);
+
+    @Unique
+    List<String> dynamicFolders = Arrays.asList("egg", "tm");
+
+    @Inject(
+            method = "<init>",
+            at = @At(
+                    value = "INVOKE",
+                    target = "Lnet/minecraft/util/profiling/ProfilerFiller;popPush(Ljava/lang/String;)V",
+                    ordinal = 1
+            )
+    )
+    public void loadCustomItemModels(BlockColors blockColors,
+                                     ProfilerFiller profiler,
+                                     Map<ResourceLocation, BlockModel> jsonUnbakedModels,
+                                     Map<ResourceLocation, List<BlockStateModelLoader.LoadedJson>> blockStates,
+                                     CallbackInfo ci
+    ) {
+        /*
+         * The models/item/*.json's only get loaded if there's an item in the registry that actually asks for it. It
+         * naively looks for things in the root with an item ID and calls upon it, and some of those JSONs reference
+         * other model JSONs and so it cascades a little bit. Used for block models but more importantly here, sprites.
+         *
+         * The thing about the eggs (and TMs) is, we really want the eggs to be addon-compatible in a way that doesn't restrict
+         * the species that can have eggs, so we can't pre-plan all of them. This mixin looks for the things inside the
+         * egg subfolder (which won't get loaded automagically) and manually inserts them into the unbaked model list so
+         * Minecraft loads them for us. We'll then dynamically call these models from the ItemRendererMixin; so it's
+         * hacky at the init stage and hacky at the render stage. Pretty cool in the gameplay stage though.
+         *
+         * - Hiro
+         */
+
+        dynamicFolders.forEach(folder -> {
+            Map<ResourceLocation, Resource> map = Minecraft.getInstance().getResourceManager().listResources("models/item/" + folder, (t) -> true);
+            map.forEach((key, value) -> {
+                ResourceLocation resourceLocation = new ResourceLocation(key.getNamespace(), key.getPath().replace("models/item/", "").replace(".json", ""));
+                this.loadItemModelAndDependencies(resourceLocation);
+            });
+        });
+    }
+
+    @Inject(
+            method = "<init>",
+            at = @At("TAIL")
+    )
+    public void init(BlockColors blockColors,
+                     ProfilerFiller profiler,
+                     Map<ResourceLocation, BlockModel> jsonUnbakedModels,
+                     Map<ResourceLocation, List<BlockStateModelLoader.LoadedJson>> blockStates,
+                     CallbackInfo ci) {
+        CobblemonBakingOverrides.INSTANCE.getModels().forEach(bakingOverride -> {
+            var unbakedModel = this.getModel(bakingOverride.getModelLocation());
+            this.registerModel(bakingOverride.getModelIdentifier(), unbakedModel);
+        });
+    }
+}

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

@@ -11,9 +11,12 @@ package com.cobblemon.mod.common.mixin.client;
 import com.cobblemon.mod.common.Cobblemon;
 import com.cobblemon.mod.common.OrientationControllable;
 import com.cobblemon.mod.common.api.orientation.OrientationController;
+import com.cobblemon.mod.common.client.CobblemonClient;
+import com.cobblemon.mod.common.client.keybind.keybinds.PartySendBinding;
 import com.cobblemon.mod.common.client.keybind.keybinds.RidingFreelookBinding;
 import com.cobblemon.mod.common.duck.RidePassenger;
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
+import com.cobblemon.mod.common.pokedex.scanner.PokedexUsageContext;
 import com.llamalad7.mixinextras.injector.v2.WrapWithCondition;
 import com.llamalad7.mixinextras.sugar.Local;
 import com.mojang.blaze3d.Blaze3D;
@@ -24,6 +27,7 @@ import net.minecraft.client.player.LocalPlayer;
 import net.minecraft.util.Mth;
 import net.minecraft.util.SmoothDouble;
 import net.minecraft.world.phys.Vec3;
+import org.objectweb.asm.Opcodes;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -31,12 +35,14 @@ 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 com.cobblemon.mod.common.client.gui.party.PartyTutorialToasts;
 
 import static com.google.common.primitives.Floats.min;
 import static net.minecraft.util.Mth.lerp;
 
 @Mixin(MouseHandler.class)
 public abstract class MouseHandlerMixin {
+    @Shadow private double accumulatedScrollY;
     @Shadow @Final private Minecraft minecraft;
 
     @Unique SmoothDouble xMouseSmoother = new SmoothDouble();
@@ -61,6 +67,52 @@ public abstract class MouseHandlerMixin {
 
     @Unique private double cobblemon$timeDelta;
 
+    @Inject(
+            method = "onScroll",
+            at = @At(
+                    value = "FIELD",
+                    target="Lnet/minecraft/client/MouseHandler;accumulatedScrollY:D",
+                    opcode = Opcodes.PUTFIELD,
+                    ordinal = 2,
+                    shift = At.Shift.BEFORE
+            ),
+            cancellable = true
+    )
+    public void cobblemon$scrollParty(long window, double horizontal, double vertical, CallbackInfo ci) {
+        if (PartySendBinding.INSTANCE.getWasDown()) {
+            int i = (int) accumulatedScrollY;
+            if (i > 0) {
+                accumulatedScrollY -= i;
+                CobblemonClient.INSTANCE.getStorage().shiftSelected(false);
+                ci.cancel();
+                PartySendBinding.INSTANCE.actioned();
+                PartyTutorialToasts.INSTANCE.onHoldKeyScrollSwitchedSlot();
+            } else if (i < 0) {
+                accumulatedScrollY -= i;
+                CobblemonClient.INSTANCE.getStorage().shiftSelected(true);
+                ci.cancel();
+                PartySendBinding.INSTANCE.actioned();
+                PartyTutorialToasts.INSTANCE.onHoldKeyScrollSwitchedSlot();
+            }
+        }
+    }
+
+    @Inject(
+        method = "onScroll",
+        at = @At(
+            value = "INVOKE",
+            target = "Lnet/minecraft/world/entity/player/Inventory;swapPaint(D)V"
+        ),
+        cancellable = true
+    )
+    public void cobblemon$doPokedexZoom(long window, double horizontal, double vertical, CallbackInfo ci) {
+        PokedexUsageContext usageContext = CobblemonClient.INSTANCE.getPokedexUsageContext();
+        if (usageContext.getScanningGuiOpen()) {
+            usageContext.adjustZoom(vertical);
+            ci.cancel();
+        }
+    }
+
     @WrapWithCondition(
             method = "turnPlayer",
             at = @At(
@@ -75,10 +127,28 @@ public abstract class MouseHandlerMixin {
         @Local(argsOnly = true) double d,
         @Local(argsOnly = true) double movementTime
     ) {
+        PokedexUsageContext usageContext = CobblemonClient.INSTANCE.getPokedexUsageContext();
         boolean returnValue = true;
+        if (usageContext.getScanningGuiOpen()) {
+            this.smoothTurnY.reset();
+            this.smoothTurnX.reset();
+            var defaultSensitivity = this.minecraft.options.sensitivity().get() * 0.6 + 0.2;
+            var spyglassSensitivity = Math.pow(defaultSensitivity, 3);
+            var lookSensitivity = spyglassSensitivity * 8.0;
+            var sensitivity = lerp(usageContext.getFovMultiplier(), spyglassSensitivity, lookSensitivity);
+            var yRotationFlip = this.minecraft.options.invertYMouse().get() ? -1 : 1;
+            player.turn(this.accumulatedDX * sensitivity, (this.accumulatedDY * sensitivity * yRotationFlip));
+            returnValue = false;
+        }
+
         var vehicle = player.getVehicle();
         if (!(vehicle instanceof PokemonEntity)) return returnValue;
 
+        // Clamp player rotation if riding and the vehicle demands it
+        if (player.isPassenger() && vehicle instanceof PokemonEntity pokeVehicle) {
+            pokeVehicle.clampPassengerRotation(player);
+        }
+
         // If the ride is not orientation controllable then return and perform the normal turnPlayer logic
         if (!(vehicle instanceof OrientationControllable controllableVehicle) || !controllableVehicle.getOrientationController().isActive()) {
             xMouseSmoother.reset();

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

@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.mixin.client;
+
+import com.cobblemon.mod.common.client.render.ClientPlayerIcon;
+import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.client.model.PlayerModel;
+import net.minecraft.client.player.AbstractClientPlayer;
+import net.minecraft.client.renderer.MultiBufferSource;
+import net.minecraft.client.renderer.entity.EntityRendererProvider;
+import net.minecraft.client.renderer.entity.LivingEntityRenderer;
+import net.minecraft.client.renderer.entity.player.PlayerRenderer;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(PlayerRenderer.class)
+public abstract class PlayerRendererMixin extends LivingEntityRenderer<AbstractClientPlayer, PlayerModel<AbstractClientPlayer>> {
+
+    public PlayerRendererMixin(EntityRendererProvider.Context context, PlayerModel<AbstractClientPlayer> model, float shadowRadius) {
+        super(context, model, shadowRadius);
+    }
+
+    @Inject(method = "render", at = @At(value = "TAIL"))
+    public void renderPlayer(AbstractClientPlayer player, float f, float g, PoseStack poseStack, MultiBufferSource multiBufferSource, int i, CallbackInfo ci) {
+        ClientPlayerIcon.Companion.onRenderPlayer(player);
+    }
+
+    @WrapOperation(method = "getRenderOffset(Lnet/minecraft/client/player/AbstractClientPlayer;F)Lnet/minecraft/world/phys/Vec3;", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/player/AbstractClientPlayer;isCrouching()Z"))
+    private boolean cobblemon$disableCrouchOffset(AbstractClientPlayer instance, Operation<Boolean> original) {
+        if (instance.isPassenger() && instance.getVehicle() instanceof PokemonEntity) {
+            return false;
+        }
+        return original.call(instance);
+    }
+
+    @Inject(method = "setModelProperties", at = @At("TAIL"))
+    private void cobblemon$setModelProperties(AbstractClientPlayer player, CallbackInfo ci) {
+        if (player.isPassenger() && player.getVehicle() instanceof PokemonEntity) {
+            PlayerModel<AbstractClientPlayer> playerModel = this.getModel();
+            playerModel.crouching = false;
+        }
+    }
+}

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

@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.mixin.client;
+
+import com.cobblemon.mod.common.CobblemonRecipeCategories;
+import com.llamalad7.mixinextras.expression.Definition;
+import com.llamalad7.mixinextras.expression.Expression;
+import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
+import com.llamalad7.mixinextras.sugar.Local;
+import net.minecraft.client.RecipeBookCategories;
+import net.minecraft.client.gui.screens.recipebook.RecipeBookComponent;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+
+@Mixin(RecipeBookComponent.class)
+public class RecipeBookComponentMixin {
+    @Definition(id = "recipeBookCategories", local = @Local(name = "recipeBookCategories"))
+    @Definition(id = "FURNACE_SEARCH", field = "Lnet/minecraft/client/RecipeBookCategories;FURNACE_SEARCH:Lnet/minecraft/client/RecipeBookCategories;")
+    @Expression("recipeBookCategories != FURNACE_SEARCH")
+    @ModifyExpressionValue(
+            method = "updateTabs",
+            at = @At(value = "MIXINEXTRAS:EXPRESSION")
+    )
+    private boolean notCookingPotSearch(boolean original, @Local(name = "recipeBookCategories") RecipeBookCategories recipeBookCategories) {
+        return original && recipeBookCategories != CobblemonRecipeCategories.COOKING_POT_SEARCH.toVanillaCategory();
+    }
+}

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

@@ -0,0 +1,40 @@
+/*
+ * 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

@@ -0,0 +1,53 @@
+/*
+ * 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/StringRenderOutputMixin.java

@@ -9,6 +9,7 @@
 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;
@@ -34,13 +35,12 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
  * @author Hiroku
  * @since April 18th, 2025
  */
-
-@Mixin(targets = "net.minecraft.client.gui.Font$PreparedTextBuilder")
+@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(false);
+            cir.setReturnValue(true);
         }
     }
 }

common/src/main/java/com/cobblemon/mod/common/mixin/client/accessor/HumanoidModelAccessor.java

@@ -1,26 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.mixin.client.accessor;
-
-import net.minecraft.client.model.HumanoidModel;
-import net.minecraft.client.renderer.entity.state.HumanoidRenderState;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Invoker;
-
-@Mixin(HumanoidModel.class)
-public interface HumanoidModelAccessor {
-    @Invoker("poseRightArm")
-    void cobblemon$invokePoseRightArm(HumanoidRenderState renderState);
-
-    @Invoker("poseLeftArm")
-    void cobblemon$invokePoseLeftArm(HumanoidRenderState renderState);
-
-    @Invoker("setupAttackAnimation")
-    void cobblemon$invokeSetupAttackAnimation(HumanoidRenderState renderState);
-}

common/src/main/java/com/cobblemon/mod/common/mixin/client/accessor/LivingEntityRendererAccessor.java

@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.mixin.client.accessor;
-
-import net.minecraft.client.model.EntityModel;
-import net.minecraft.client.renderer.entity.layers.RenderLayer;
-import net.minecraft.client.renderer.entity.LivingEntityRenderer;
-import net.minecraft.client.renderer.entity.state.EntityRenderState;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Accessor;
-
-import java.util.List;
-
-@Mixin(LivingEntityRenderer.class)
-public interface LivingEntityRendererAccessor<S extends EntityRenderState, M extends EntityModel<? super S>> {
-    @Accessor("layers")
-    List<RenderLayer<S, M>> cobblemon$getLayers();
-}

common/src/main/java/com/cobblemon/mod/common/mixin/client/snapshots/SnapshotWarningMixin.java

@@ -19,7 +19,7 @@ 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 org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 import java.util.List;
 import java.util.function.Function;
@@ -33,7 +33,7 @@ public final class SnapshotWarningMixin {
     private final Pattern VERSION = Pattern.compile("^(?<major>\\d+)\\.(?<minor>\\d+)\\.(?<patch>\\d+)$");
 
     @Inject(method = "addInitialScreens", at = @At("TAIL"))
-    public void cobblemon$addSnapshotWarningScreen(List<Function<Runnable, Screen>> output, CallbackInfoReturnable<Boolean> callback) {
+    public void cobblemon$addSnapshotWarningScreen(List<Function<Runnable, Screen>> output, CallbackInfo callback) {
         if (CobblemonBuildDetails.SNAPSHOT && !this.cobblemon$isAcknowledged() && !SharedConstants.IS_RUNNING_IN_IDE) {
             output.add((runnable) -> new SnapshotWarningScreen((acknowledgement, dsa) -> {
                 if (acknowledgement == SnapshotWarningScreen.Acknowledgement.NO) {

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

@@ -82,7 +82,7 @@ public abstract class EntityMixin {
     @Unique
     private void cobblemon$getCustomEyePos(CallbackInfoReturnable<Vec3> cir) {
         var entity = (Entity)(Object)this;
-        if (entity.level().isClientSide()) return;
+        if (entity.level().isClientSide) return;
         if (!(entity instanceof Player player)) return;
         if (!(player instanceof RidePassenger ridePassenger)) return;
         if (!(player.getVehicle() instanceof OrientationControllable vehicle)) return;

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

@@ -9,24 +9,18 @@
 package com.cobblemon.mod.common.mixin.entity;
 
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
-import com.llamalad7.mixinextras.sugar.Local;
-import net.minecraft.world.damagesource.DamageSource;
-import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.TamableAnimal;
-import net.minecraft.world.level.gamerules.GameRule;
+import net.minecraft.world.level.Level;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.Redirect;
 
 @Mixin(TamableAnimal.class)
 public class TameableEntityMixin {
 
-    @Inject(method = "die", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/TamableAnimal;getOwner()Lnet/minecraft/world/entity/LivingEntity;"), cancellable = true)
-    public void cobblemon$checkIfPokemonBeforeSendingMessage(DamageSource damageSource, CallbackInfo ci, @Local(name = "var4") LivingEntity owner) {
-        if(((TamableAnimal)(Object)this).level().isClientSide() || (this.getClass().isAssignableFrom(PokemonEntity.class))) {
-            ci.cancel();
-        }
+    @Redirect(method = "die", at = @At(value = "FIELD", target = "Lnet/minecraft/world/level/Level;isClientSide:Z"))
+    public boolean cobblemon$checkIfPokemonBeforeSendingMessage(Level world) {
+        return world.isClientSide || (this.getClass().isAssignableFrom(PokemonEntity.class));
     }
 
 }

common/src/main/java/com/cobblemon/mod/common/mixin/invoker/BlocksInvoker.java

@@ -11,33 +11,33 @@ package com.cobblemon.mod.common.mixin.invoker;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.SoundType;
-import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.block.state.properties.BlockSetType;
 import net.minecraft.world.level.material.MapColor;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Invoker;
 
+@SuppressWarnings("unused")
 @Mixin(Blocks.class)
 public interface BlocksInvoker {
 
-    @Invoker
-    static BlockBehaviour.Properties callLogProperties(MapColor mapColor, MapColor mapColor2, SoundType soundType) {
+    @Invoker("log")
+    static Block createLogBlock(MapColor topMapColor, MapColor sideMapColor) {
         throw new UnsupportedOperationException();
     }
 
-    @Invoker
-    static BlockBehaviour.Properties callLeavesProperties(SoundType soundType) {
+    @Invoker("leaves")
+    static Block createLeavesBlock(SoundType soundGroup) {
         throw new UnsupportedOperationException();
     }
 
-    @Invoker
-    static BlockBehaviour.Properties callButtonProperties() {
+    @Invoker("woodenButton")
+    static Block createWoodenButtonBlock(BlockSetType blockSetType) {
         throw new UnsupportedOperationException();
     }
 
-    @Invoker
-    static BlockBehaviour.Properties callFlowerPotProperties() {
+    @Invoker("flowerPot")
+    static Block createFlowerPotBlock(Block flower) {
         throw new UnsupportedOperationException();
     }
 
-}
+}

common/src/main/java/com/cobblemon/mod/common/mixin/invoker/BooleanRuleInvoker.java

@@ -0,0 +1,21 @@
+/*
+ * 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.invoker;
+
+import net.minecraft.world.level.GameRules;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Invoker;
+
+@Mixin(GameRules.BooleanValue.class)
+public interface BooleanRuleInvoker {
+    @Invoker("create")
+    static GameRules.Type<GameRules.BooleanValue> cobblemon$create(boolean initialValue) {
+        throw new UnsupportedOperationException();
+    }
+}

common/src/main/java/com/cobblemon/mod/common/mixin/invoker/DoorBlockInvoker.java

@@ -20,4 +20,4 @@ public interface DoorBlockInvoker {
     static DoorBlock cobblemon$create(BlockSetType blockSetType, BlockBehaviour.Properties settings) {
         throw new UnsupportedOperationException();
     }
-}
+}

common/src/main/java/com/cobblemon/mod/common/mixin/invoker/PressurePlateBlockInvoker.java

@@ -20,4 +20,4 @@ public interface PressurePlateBlockInvoker {
     static PressurePlateBlock cobblemon$create(BlockSetType type, BlockBehaviour.Properties settings) {
         throw new UnsupportedOperationException();
     }
-}
+}

common/src/main/java/com/cobblemon/mod/common/mixin/invoker/TrapdoorBlockInvoker.java

@@ -20,4 +20,4 @@ public interface TrapdoorBlockInvoker {
     static TrapDoorBlock cobblemon$create(BlockSetType blockSetType, BlockBehaviour.Properties settings) {
         throw new UnsupportedOperationException();
     }
-}
+}