Changelog [skip-ci]

Wobbuffix (and charcadet)

See merge request cable-mc/cobblemon!1500

CHANGELOG.md

@@ -1,52 +1,136 @@
 # Changelog
-## [1.6.1 (Release TBD)](#1-6-1)
+## [1.6.1 (January 26th, 2025)](#1-6-1)
 
 ### Additions
+- Added crossover paintings from Close Combat: Premonition, Altar, Slumber, and Nomad.
+- Added Galarica Nuts, used for crafting Galarica Cuffs and Wreaths. Dropped from certain Pokémon. Take a wild guess which.
+- Added compatibility with Repurposed Structures. (Thank you, TelepathicGrunt!)
+- Added an evolution method for Karrablast to evolve into Escavalier in singleplayer.
+- Pokédexes can now be placed in Chiseled Bookshelves.
+- Added optional box argument to the /pc command.
+- Pokédex and Dialogue screens now close when the inventory keybind is pressed.
 - Added config setting `maxPokedexScanningDetectionRange` to control from what distance the player can scan Pokémon using the Pokédex.
-- Added the `is_standing_on_blocks(depth, blocks...)` MoLang function, which returns whether the specified entity is standing on a specific block or set of blocks. Example usage: `q.is_standing_on_blocks(2, minecraft:sand)` 
 - Added config setting `hideUnimplementedPokemonInThePokedex` which hides unimplemented Pokémon from the Pokédex when set to true. 
-- Added molang particle queries for getting distance to targeted entities.
-- Added debug renderer for poseable entity locators.
-- Added `baseScale` property to NPCs.
-- Added the player to `PokerodReelEvent`.
-- Pokédex and Dialogue API screens now close when the inventory keybind is pressed.
-- Added Galarica Nuts, used for crafting Galarica Cuffs and Wreaths. Dropped from certain Pokémon.
-- Added specific compatibility with Repurposed Structures. (Thank you, TelepathicGrunt!)
+- Added debug renderer for posable entity locators.
+
+### Pokémon Added
+
+#### Gen 5
+- Ducklett
+- Swanna
+- Shelmet
+- Accelgor
+- Karrablast
+- Escavalier
+- Rufflet
+- Braviary
+- Foongus
+- Amoonguss
+
+#### Gen 6
+- Binacle
+- Barbaracle
+
+#### Gen 7
+- Dewpider
+- Araquanid
+- Alolan Geodude
+- Alolan Graveler
+- Alolan Golem
+
+#### Gen 8
+- Galarian Slowpoke
+- Galarian Slowbro
+- Galarian Slowking
+
+#### Gen 9
+- Paldean Tauros
+
+### Added cries to the following Pokémon
+- All Nidorans
+- Shellder, Cloyster
+- Pinsir
+- Tyrogue, Hitmontop
+- Spinda
+
+### Animation updates for the following Pokémon
+- Primeape
+- Munchlax
+- Snorlax
+- Poliwrath
+- Goldeen
+- Seaking
+- Dondozo
+- Wobbuffet
+- Charcadet
+- Armarouge
+- Ceruledge
+- Geodude
+- Graveler
+- Golem
+- Sandile
+- Krokorok
+- Krookodile
+
+### Model updates for the following Pokémon
+- Slowpoke
+- Slowbro
+- Slowking
+- Eiscue
+- Tauros
+- Goldeen
+- Seaking
+- Charcadet
+- Armarouge
+- Ceruledge
+- Pinsir
+- Geodude
+- Graveler
+- Golem
+
+### Cry updates for the following Pokémon
+- Sceptile
 
 ### Changes
-- Pokémon will now be dynamically revealed to the Pokédex as they're seen instead of revealing entire parties at the end of battle regardless.
-- Unseen wild Pokémon will update their name from '???' to their real name as soon as a battle starts to reflect the battle UI showing the actual species name.
+- Completely re-synced Pokémon move and stat data based on later games. Learnsets have changed considerably to maximise available moves.
+- Pokémon will now be dynamically revealed to the Pokédex as they're seen in battle instead of revealing entire parties at the end of battle.
+- Unseen wild Pokémon will update their name from '???' to their real name as soon as a battle starts to match how the battle UI shows the actual species name.
 - Pokémon under the illusion effect will reveal their disguise to the Pokédex first and then the base Pokémon once the disguise is broken.
+- Berries will now drop from berry trees if broken at age 0 so you aren't punished for mistaken planting.
+- Increased Fortune drops on Mint Seeds.
+- Updated Slowpoke's shiny texture.
+- Updated drops for many Pokémon.
+- Adjusted the evolution sound to match the timing of the particle effect.
+- Made berry trees shear-able by dispenser blocks. I'm sure nobody will make unholy contraptions with this.
+- Edited some recipes to utilize tags instead of direct item IDs, for better mod compatibility.
+- Added more support for a variety of Fabric/NeoForge conventional tags.
+- Reformatted some tags to be more consistent.
 
 ### Fixes
 - Fixed Pokédex sometimes crashing when switching forms.
 - Fixed Pokédex interface not transitioning out when closed.
-- Fixed texture dimensions for the interact interface.
-- Fixed crash related to Tom's Simple Storage mod and Fossil Machine.
+- Fixed texture dimensions for the player and Pokémon interact interface.
+- Fixed crash related to Tom's Simple Storage mod and the Fossil Machine.
 - Fixed not being able to retrieve a fossil from the Fossil Machine with an empty hand.
-- Fixed Pokémon being collidable while being captured by a Poké Ball.
+- Fixed Pokémon being collidable (collidible? collissionable? kaleidoscopable?) while being captured by a Poké Ball.
 - Fixed `full_party`, `own_zangoose_seviper`, `use_revive` and `use_candy` Advancement triggers.
 - Fixed `healing_machine` Advancement by using the correct 1.21 trigger.
 - Fix Display Cases not dropping items if destroyed through explosions.
 - Fixed an issue where the first Pokémon in the pastured Pokémon list clipped into the interface.
 - Fixed all Pokémon facing South on spawn.
-- Parametric particle motion now works.
-- Event spawned particles now work.
-- Particles can now have independent coordinate spaces.
-- Fixed bait being consumed when not reeling in any Pokémon.
+- Fixed bait being consumed even when not reeling in any Pokémon.
 - Fixed Miltank milk magically disappearing out of your bucket.
 - Fixed Pokémon nicknames migrating from 1.5.2 not being displayed properly.
-- Fixed capitalization in one of our config fields, but allowing typo'd version to still be valid.
-- Fixed Poké Rods not working if lure or luck of the sea enchantments get removed by other mods.
-- Fixed crashes related to Pokémon when they are ready to evolve while holding an enchanted item.
-- Fixed crashes that sometimes occur when evolving Nincada.
-- Fixed plants not being compostible on NeoForge.
+- Fixed capitalization in one of our config options. It was a very important fix. Very important. Old configs are fine.
+- Fixed Poké Rods not working if Lure or Luck of the Sea enchantments get removed by other mods.
+- Fixed crashes related to Pokémon when they are ready to evolve while holding an enchanted item. Very specific.
+- Fixed a crash that sometimes occurred when evolving Nincada.
+- Fixed Cobblemon plants not being compostable on NeoForge.
 - Fixed hide UI (F1 key) not hiding the party overlay.
 - Fixed NPC MoLang command `player_lose_command` not working.
-- Corrected misaligned tooltips with editboxes in the NPC editor screen.
+- Fixed misaligned tooltips with edit boxes in the NPC editor screen.
 - Fixed Pokémon riding two boats when attempting to deploy a platform on water.
-- Made berry trees be shearable by dispenser blocks.
-- Fixed the summary screen showing there's experience to reach the next level when at level cap.
+- Fixed the summary screen showing there's experience to reach the next level when they are at the level cap.
 - Fixed Pokémon forgetting moves when evolving on specific cases.
 - Fixed Adorn compatibility, including improvements when using JEI/REI (Apricorn items now show up under the collapsed entries rather than standalone).
 - Fixed error message appearing on battle log when using Solar Beam with Sunny Day.
@@ -54,35 +138,68 @@
 - Fixed `/pokedex grant all` command not giving male/female/shininess completion for some Pokémon.
 - Fixed `/pokedex grant only` and `/pokedex remove only` not respecting the form parameter passed.
 - Fixed variant forms appearing incorrectly in the Pokédex when the normal form had not been unlocked.
-- Fixed Pokémon occasionally being shot into the sky during battle.
+- Fixed Pokémon occasionally being shot into the sky during battle. No Pokémon were harmed by this bug, probably.
 - Fixed NPC editing GUI not updating aspects until a game restart.
-- Fix some users being unable to open their PC if a Pokémon in said PC had a lot of pp raises beyond normal bounds
-- Fix some color variants (dubwool, conkeldurr and undyed wooloo) missing in the Pokédex
-- Fix invalid species or held_items causing Players to not be able to load into their world anymore (commonly happening after removing addons/mods)
+- Fixed some users being unable to open their PC if a Pokémon in it had a lot of PP raises beyond normal bounds. How did you get those, anyway? Tell me or the Bellossom gets it.
+- Fixed some color variants (Dubwool, Conkeldurr and Undyed wooloo) being missing in the Pokédex.
+- Fixed invalid species or held items causing Players to not be able to load into their world anymore (commonly happening after removing addons/mods).
 - Fixed Wooloo variants not being automatically registered in the owner's Pokédex when dyed.
-- Fixed Vivichoke Dip and Leek and Potato Stew not returning a bowl upon consumption.
-- Fixed Fossil Restoration Machine not accepting Hay Bales.
-- Fixed Potion items so that they no longer apply over double their intended healing value.
+- Fixed Vivichoke Dip and Leek & Potato Stew not returning a bowl upon consumption.
+- Fixed Fossil Restoration Tank not accepting Hay Bales as organic material.
+- Fixed Potion items applying double their intended healing value.
+- Fixed Fast Ball capture bonuses applying to all Pokémon, making it the Best Ball instead of the Mediocre Edge-Case Ball. 
+- Fixed "learned new move" messages appearing for already-known moves on Pokémon evolutions.
+- Fixed Pokémon Item Models breaking shadows nearby when being placed in Display Cases or Item Frames.
+- Fixed berries not giving bonus yields when planted in their preferred biomes. I'm sure we've fixed that 5 times now.
+- Fixed the NeoForge version not supporting "SodiumDynamicLights".
+- Fixed players disconnecting from servers if they made changes to certain config options.
+- Fixed players with shouldered Pokémon not being able to rejoin their 1.5.2 worlds using 1.6.
+- Fixed `PokemonProperties` utilizing `ability=<some ability>` being treated as a forced ability even when it is a legal ability for the Pokémon.
+- Fixed type formatting in Pokédex scanner mode when dual types require two lines.
+- Fixed trading sometimes crashing the game or server. 
+- Fixed Wild shiny sounds not respecting the `shinyNoticeParticlesDistance` config setting.
+- Fixed Pokémon being able to evolve mid-battle.
+- Fixed NPC held items being able to be stolen by players. Don't be a thief!
+- Fixed evolutions that require a held item consuming it as soon as meeting requirements when it should only be consumed upon evolution.
+- Fixed Pokémon showing only the default form when selecting them as a target in battle.
+- Fixed a possible error coming out of reeling fishing rods in specific situations.
+- Fixed incorrect weights being used when Poké Fishing with Luck of the Sea.
+- Parametric particle motion now works.
+- Event-spawned particles now work.
+- Particles can now have independent coordinate spaces.
 
-### Molang & Datapacks  
+### Developer
+- Updated the Pokédex data updated events to always include a `Pokemon` instance, and optionally a `DisguiseData` instance.
+- Updated fields in `SpawnNPCPacket` and `SpawnPokemonPacket` to be visible and mutable.
+- Updated `UnvalidatedPlaySoundS2CPacket` to be public instead of internal and made its fields mutable.
+- Added `hideNameTag` field and `HideNPCNameTag` nbt tag to `NPCEntity` to allow hiding the name tag of the NPC.
+- Added the player to `PokerodReelEvent` so you know who is doing the reeling.
+
+### MoLang & Datapacks  
 - Added flows for:
   - `forme_change`: Triggered when a Pokémon changes form in battle.
-  - `mega_evolution`: Triggered when a Pokémon mega evolves in battle. (Note: Third party mods are required for this feature currently)
-  - `zpower_used`: Triggered when a Pokémon uses a Z-Power move in battle. (Note: Third party mods are required for this feature currently)
-  - `terastallization`: Triggered when a Pokémon terastallizes in battle. (Note: Third party mods are required for this feature currently)
+  - `mega_evolution`: Triggered when a Pokémon mega evolves in battle. (Note: Third-party mods are required for this feature currently)
+  - `zpower_used`: Triggered when a Pokémon uses a Z-Power move in battle. (Note: Third-party mods are required for this feature currently)
+  - `terastallization`: Triggered when a Pokémon terastallizes in battle. (Note: Third-party mods are required for this feature currently)
   - `battle_fainted`: Triggered when a Pokémon faints in battle.
-  - `battle_fled`: Triggered when a Player flees from battle.
+  - `battle_fled`: Triggered when a player flees from battle.
   - `battle_started_pre`: Triggered when a battle starts. Cancelable!
   - `battle_started_post`: Triggered when a battle starts.
-  - `apricorn_harvested`: Triggered when an apricorn is harvested.
+  - `apricorn_harvested`: Triggered when an Apricorn is harvested.
   - `thrown_pokeball_hit`: Triggered when a thrown Pokéball hits a Pokémon.
   - `level_up`: Triggered when a Pokémon levels up.
   - `pokemon_fainted`: Triggered when a Pokémon faints.
-  - `pokemon_gained`: Triggered when a Player gains a Pokémon.
-- Added molang functions:
+  - `pokemon_gained`: Triggered when a player gains a Pokémon.
+- Added MoLang functions:
   - For Pokémon:
     - `pokemon.apply(PokemonProperties)`: Applies the given properties to the Pokémon.
     - `pokemon.owner`: Returns the owner of the Pokémon or 0.0 if there is no owner or they are not online.
+  - For all entities:
+    - `entity.is_standing_on_blocks(depth, blocks...)`: Returns whether the specified entity is standing on a specific block or set of blocks. Example usage: `q.is_standing_on_blocks(2, minecraft:sand)`
+- Added NPC field:
+  - `hideNameTag`: Hides the name tag of the NPC.
+  - Added `baseScale` property to NPCs.
+- Added MoLang particle queries for getting distance to targeted entities.
 
 ## [1.6.0 - The Record Catch Update (December 25th, 2024)](#1-6-0)
 #### "Now that there's a fishing mechanic, the mod is actually good!"
@@ -1985,5 +2102,4 @@ Thank you so much to all of our community translators that bring the mod to the
 - Added species, ability, and move translations for `ko_ko`, `jp_jp`, `fr_fr`, `es_es`, `it_it`, and `zh_cn`.
 
 ## [1.0.0 (November 12th, 2022)](#1-0-0)
-- Initial release.
-
+- Initial release.

build-logic/build.gradle.kts

@@ -1,27 +0,0 @@
-plugins {
-    id("java-gradle-plugin")
-    kotlin("jvm") version "2.1.0"
-}
-
-repositories {
-    mavenCentral()
-    gradlePluginPortal()
-    maven("https://maven.architectury.dev/")
-    maven("https://maven.fabricmc.net/")
-}
-
-dependencies {
-    implementation("net.neoforged:moddev-gradle:2.0.75")
-    implementation("dev.architectury:at:1.0.1")
-    implementation("net.fabricmc:access-widener:2.1.0")
-}
-
-gradlePlugin {
-    plugins {
-        create("cobblemongradle") {
-            id = "com.cobblemon.gradle"
-            implementationClass = "com.cobblemon.gradle.CobblemonGradle"
-            version = "1.0.0"
-        }
-    }
-}

build-logic/settings.gradle.kts

@@ -1,7 +0,0 @@
-dependencyResolutionManagement {
-    versionCatalogs {
-        create("libs") {
-            from(files("../gradle/libs.versions.toml"))
-        }
-    }
-}

build-logic/src/main/kotlin/com/cobblemon/gradle/CobblemonGradle.kt

@@ -1,85 +0,0 @@
-package com.cobblemon.gradle
-
-import com.cobblemon.gradle.extension.CobblemonGradleExtension
-import com.cobblemon.gradle.extension.tasks.ConvertAccessWidenersTask
-import com.cobblemon.gradle.extension.tasks.UnzipAccessWidenersTask
-import net.neoforged.nfrtgradle.CreateMinecraftArtifacts
-import org.gradle.api.Plugin
-import org.gradle.api.Project
-import org.gradle.api.attributes.LibraryElements
-import org.gradle.language.jvm.tasks.ProcessResources
-
-class CobblemonGradle : Plugin<Project> {
-    override fun apply(project: Project) {
-        val cobblemonExtension = project.extensions.create(
-            CobblemonGradleExtension.EXTENSION_NAME,
-            CobblemonGradleExtension::class.java
-        )
-
-        //This exists because all of
-        //  - com.cobblemon:mod
-        //  - com.cobblemon:mod-resources
-        //  - com.cobblemon:accesswidener
-        //technically point to the same dependency (the :common project). To pick the proper artifact from that project
-        //we set attributes in that project and check for them here.
-        val accessWideners = project.configurations.register("accessWidener") { configuration ->
-            configuration.isCanBeConsumed = false
-            configuration.isCanBeResolved = true
-            configuration.isCanBeDeclared = true
-            configuration.attributes {
-                it.attribute(
-                    LibraryElements.LIBRARY_ELEMENTS_ATTRIBUTE,
-                    project.objects.named(LibraryElements::class.java, LibraryElements.OBJECTS)
-                )
-            }
-        }
-        val includeRootResources = project.configurations.register("includeRootResources") { configuration ->
-            configuration.isCanBeConsumed = false
-            configuration.isCanBeResolved = true
-            configuration.isCanBeDeclared = true
-            configuration.attributes {
-                it.attribute(
-                    LibraryElements.LIBRARY_ELEMENTS_ATTRIBUTE,
-                    project.objects.named(LibraryElements::class.java, LibraryElements.RESOURCES)
-                )
-            }
-        }
-
-        val unzipAwTask = project.tasks.register("unzipAccessWideners", UnzipAccessWidenersTask::class.java) {
-            it.accessWidenerZips = accessWideners.get()
-        }
-
-
-        val convertAwTask = project.tasks.register(ConvertAccessWidenersTask.NAME, ConvertAccessWidenersTask::class.java) {
-            it.enabled = cobblemonExtension.convertAccessWideners
-            it.dependsOn(unzipAwTask)
-            it.accessWideners = project.files(unzipAwTask).plus(project.files(cobblemonExtension.additionalAccessWideners))
-        }
-
-        //Add root resources and access wideners to output jar
-        project.tasks.named("processResources", ProcessResources::class.java) { task ->
-            task.dependsOn(includeRootResources)
-            if (cobblemonExtension.convertAccessWideners) {
-                task.dependsOn(convertAwTask)
-                task.from(convertAwTask)
-            }
-            else {
-                task.dependsOn(unzipAwTask)
-                task.from(unzipAwTask)
-            }
-            task.doLast {
-                project.copy {
-                    it.from(project.provider {
-                        includeRootResources.get().resolve().map { project.zipTree(it) }
-                    })
-                    it.into(task.destinationDir)
-                }
-            }
-        }
-
-        project.tasks.withType(CreateMinecraftArtifacts::class.java) {
-            it.dependsOn(convertAwTask)
-            it.accessTransformers.from(convertAwTask)
-        }
-    }
-}

build-logic/src/main/kotlin/com/cobblemon/gradle/extension/CobblemonGradleExtension.kt

@@ -1,12 +0,0 @@
-package com.cobblemon.gradle.extension
-
-import org.gradle.api.file.FileCollection
-
-abstract class CobblemonGradleExtension {
-    var additionalAccessWideners: FileCollection? = null
-    var convertAccessWideners = true
-
-    companion object {
-        const val EXTENSION_NAME = "cobblemon"
-    }
-}

build-logic/src/main/kotlin/com/cobblemon/gradle/extension/tasks/ConvertAccessWidenersTask.kt

@@ -1,82 +0,0 @@
-package com.cobblemon.gradle.extension.tasks
-
-import dev.architectury.at.AccessChange
-import dev.architectury.at.AccessTransform
-import dev.architectury.at.AccessTransformSet
-import dev.architectury.at.ModifierChange
-import dev.architectury.at.io.AccessTransformFormats
-import net.fabricmc.accesswidener.AccessWidenerReader
-import net.fabricmc.accesswidener.AccessWidenerVisitor
-import org.cadixdev.bombe.type.signature.MethodSignature
-import org.gradle.api.DefaultTask
-import org.gradle.api.file.FileCollection
-import org.gradle.api.tasks.InputFiles
-import org.gradle.api.tasks.Internal
-import org.gradle.api.tasks.OutputFiles
-import org.gradle.api.tasks.TaskAction
-import java.io.Writer
-import java.nio.file.Files
-
-abstract class ConvertAccessWidenersTask : DefaultTask() {
-    abstract var accessWideners: FileCollection
-        @InputFiles get
-
-    @Internal
-    val accessTransformerDir = project.layout.buildDirectory.dir("access-transformers")
-
-    @OutputFiles
-    val accessTransformers = project.files ({
-        accessWideners.files.map {
-            accessTransformerDir.get().file(it.name.replace("accesswidener", "accesstransformer.cfg"))
-        }
-    })
-
-    @TaskAction
-    fun convertAccessWideners() {
-        accessWideners.files.forEach { file ->
-            val awFile = Files.newBufferedReader(file.toPath())
-            val result = AccessTransformSet.create();
-
-            AccessWidenerReader(object : AccessWidenerVisitor {
-                override fun visitClass(name: String, access: AccessWidenerReader.AccessType, transitive: Boolean) {
-                    result.getOrCreateClass(name).merge(toAt(access));
-                }
-
-                override fun visitMethod(owner: String, name: String, descriptor: String, access: AccessWidenerReader.AccessType, transitive: Boolean) {
-                    result.getOrCreateClass(owner).mergeMethod(MethodSignature.of(name, descriptor), toAt(access));
-                }
-
-                override fun visitField(owner: String, name: String, descriptor: String, access: AccessWidenerReader.AccessType, transitive: Boolean) {
-                    result.getOrCreateClass(owner).mergeField(name, toAt(access));
-                }
-            }).read(awFile)
-
-            val outputFile = accessTransformerDir.get().file(
-                file.name.replace("accesswidener", "accesstransformer.cfg")
-            )
-            var outputWriter: Writer? = null
-            try {
-                outputWriter = outputFile.asFile.writer()
-                AccessTransformFormats.FML.write(outputWriter, result)
-            }
-            finally {
-                outputWriter?.flush()
-                outputWriter?.close()
-            }
-        }
-
-    }
-
-    private fun toAt(access: AccessWidenerReader.AccessType): AccessTransform {
-        return when (access) {
-            AccessWidenerReader.AccessType.ACCESSIBLE -> AccessTransform.of(AccessChange.PUBLIC)
-            AccessWidenerReader.AccessType.EXTENDABLE, AccessWidenerReader.AccessType.MUTABLE -> AccessTransform.of(
-                AccessChange.PUBLIC,
-                ModifierChange.REMOVE
-            )
-        }
-    }
-    companion object {
-        const val NAME = "convertAccessWideners"
-    }
-}

build-logic/src/main/kotlin/com/cobblemon/gradle/extension/tasks/UnzipAccessWidenersTask.kt

@@ -1,33 +0,0 @@
-package com.cobblemon.gradle.extension.tasks
-
-import org.gradle.api.DefaultTask
-import org.gradle.api.Task
-import org.gradle.api.file.FileCollection
-import org.gradle.api.tasks.InputFiles
-import org.gradle.api.tasks.Internal
-import org.gradle.api.tasks.OutputFile
-import org.gradle.api.tasks.OutputFiles
-import org.gradle.api.tasks.TaskAction
-
-abstract class UnzipAccessWidenersTask : DefaultTask() {
-    abstract var accessWidenerZips: FileCollection
-        @InputFiles get
-
-    @OutputFiles
-    val outputFiles = project.provider {
-        project.files(accessWidenerZips.flatMap { zip ->
-            project.zipTree(zip).files.map { OUTPUT_DIR.get().file(it.name) }
-        })
-    }
-
-    @Internal
-    val OUTPUT_DIR = project.layout.buildDirectory.dir("cobblemon-working/access-wideners")
-
-    @TaskAction
-    fun run() {
-        project.copy {
-            it.from(accessWidenerZips.map(project::zipTree))
-            it.into(OUTPUT_DIR)
-        }
-    }
-}

build.gradle.kts

@@ -1,14 +1,12 @@
 plugins {
-    //id("cobblemon.root-conventions")
+    id("cobblemon.root-conventions")
     id ("net.nemerosa.versioning") version "3.1.0"
 }
 
 version = "${project.property("mod_version")}+${project.property("mc_version")}"
 
 val isSnapshot = project.property("snapshot")?.equals("true") ?: false
-/*
 if (isSnapshot) {
     val fixedBranchName = versioning.info.branch.substringAfter("/")
     version = "$version-${fixedBranchName}-${versioning.info.build}"
 }
-*/

common/build.gradle.kts

@@ -1,102 +1,68 @@
+import java.time.OffsetDateTime
+import java.time.ZoneOffset
+import java.time.format.DateTimeFormatter
+import utilities.isSnapshot
+import utilities.version
+
+/*
+ *
+ *  * 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/.
+ *
+ */
+
 plugins {
-    kotlin("jvm") version "2.1.0"
-    id ("net.neoforged.moddev") version "2.0.75"
-    id("net.kyori.blossom") version "2.1.0"
-    id("com.github.johnrengelman.shadow") version "8.1.1"
-    id("com.cobblemon.gradle")
+    id("cobblemon.base-conventions")
+    id("cobblemon.publish-conventions")
+
+    id("net.kyori.blossom")
+    id("org.jetbrains.gradle.plugin.idea-ext")
+    id("net.nemerosa.versioning") version "3.1.0"
 }
 
-cobblemon {
-    additionalAccessWideners = files(sourceSets.main.get().resources).filter { it.extension == "accesswidener" }
-}
-
-val rootResources = configurations.create("rootResources") {
-    isCanBeConsumed = true
-    isCanBeResolved = false
-    attributes {
-        attribute(LibraryElements.LIBRARY_ELEMENTS_ATTRIBUTE, objects.named(LibraryElements.RESOURCES))
-    }
-}
-
-val accessWidenerExport = configurations.create("accessWidenerExport") {
-    isCanBeConsumed = true
-    isCanBeResolved = false
-    attributes {
-        attribute(LibraryElements.LIBRARY_ELEMENTS_ATTRIBUTE, objects.named(LibraryElements.OBJECTS))
-    }
-}
-
-tasks.processResources {
-    exclude("*.accesswidener")
-}
-
-tasks.create<Zip>("zipResources") {
-    dependsOn("processResources")
-    from(tasks.processResources.get().destinationDir)
-    this.archiveBaseName = "mod-resources"
-}
-
-tasks.create<Zip>("zipAccessWideners") {
-    from(sourceSets.main.get().resources)
-    include("*.accesswidener")
-    this.archiveBaseName = "mod-accesswideners"
-}
-
-tasks.jar {
-    archiveBaseName = "mod"
-    manifest {
-        attributes(mapOf("FMLModType" to "GAMELIBRARY"))
-    }
-    exclude {
-        it.file in tasks.processResources.get().outputs.files
-    }
-}
-
-tasks.assemble {
-    dependsOn(tasks.named("zipResources"))
-    dependsOn(tasks.named("zipAccessWideners"))
-}
-
-artifacts {
-    add("rootResources", tasks.getByName<Zip>("zipResources"))
-    add("accessWidenerExport", tasks.getByName("zipAccessWideners"))
-}
-
-buildscript {
-    repositories {
-        mavenCentral()
-        gradlePluginPortal()
-        maven("https://maven.architectury.dev/")
-        maven("https://maven.fabricmc.net/")
-    }
+architectury {
+    common("neoforge", "fabric")
 }
 
 repositories {
-    mavenCentral()
-    maven("https://maven.fabricmc.net/")
-    maven("https://maven.blamejared.com/")
-    maven("https://api.modrinth.com/maven")
-    maven(url = "../deps")
+    maven(url = "${rootProject.projectDir}/deps")
+    maven(url = "https://api.modrinth.com/maven")
+    maven(url = "https://maven.neoforged.net/releases")
+    mavenLocal()
 }
 
 dependencies {
-    compileOnly(libs.bundles.mongo)
-    compileOnly(libs.bundles.kotlin)
-    compileOnly(libs.molang)
-    compileOnly(libs.graal)
-    compileOnly(libs.jei.api)
-    compileOnly(libs.bundles.fabric.integrations.compileOnly) {
+    implementation(libs.bundles.kotlin)
+    modImplementation(libs.fabric.loader)
+    modApi(libs.molang)
+
+    // Integrations
+    compileOnlyApi(libs.jei.api)
+    modCompileOnly(libs.bundles.fabric.integrations.compileOnly) {
         isTransitive = false
     }
-    compileOnly("net.fabricmc:sponge-mixin:0.15.5+mixin.0.8.7")
-    compileOnly("io.github.llamalad7:mixinextras-fabric:0.4.1")
+    // Flywheel has no common dep so just pick one and don't use any platform specific code in common
+    // modCompileOnly(libs.flywheelFabric)
+
+    // Showdown
+    modCompileOnly(libs.graal)
+
+    // Data Storage
+    modCompileOnly(libs.bundles.mongo)
+
+    // Unit Testing
     testImplementation(libs.bundles.unitTesting)
 }
 
-neoForge {
-    neoFormVersion = "1.21.1-20240808.144430"
-    interfaceInjectionData.from("src/main/resources/interfaces.json")
-    validateAccessTransformers = true
+tasks.withType<Test> {
+    useJUnitPlatform()
+    testLogging {
+        setEvents(listOf("failed"))
+        setExceptionFormat("full")
+    }
 }
 
 sourceSets {
@@ -106,7 +72,7 @@ sourceSets {
                 fun generateLicenseHeader() : String {
                     val builder = StringBuilder()
                     builder.append("/*\n")
-                    project.projectDir.parentFile.resolve("HEADER").forEachLine {
+                    rootProject.file("HEADER").forEachLine {
                         if(it.isEmpty()) {
                             builder.append(" *").append("\n")
                         } else {
@@ -119,14 +85,12 @@ sourceSets {
 
                 property("license", generateLicenseHeader())
                 property("modid", "cobblemon")
-                property("version", project.version as String)
-                property("isSnapshot", "true")
-                /*
+                property("version", project.version())
+                property("isSnapshot", if(rootProject.isSnapshot()) "true" else "false")
                 property("gitCommit", versioning.info.commit)
                 property("branch", versioning.info.branch)
                 System.getProperty("buildNumber")?.let { property("buildNumber", it) }
                 property("timestamp", OffsetDateTime.now(ZoneOffset.UTC).format(DateTimeFormatter.ofPattern("MM/dd/yyyy hh:mm:ss")) + " UTC")
-                 */
             }
         }
     }

common/build.gradle.kts.old

@@ -1,97 +0,0 @@
-import java.time.OffsetDateTime
-import java.time.ZoneOffset
-import java.time.format.DateTimeFormatter
-import utilities.isSnapshot
-import utilities.version
-
-/*
- *
- *  * 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/.
- *
- */
-
-plugins {
-    id("cobblemon.base-conventions")
-    id("cobblemon.publish-conventions")
-
-    id("net.kyori.blossom")
-    id("org.jetbrains.gradle.plugin.idea-ext")
-    id("net.nemerosa.versioning") version "3.1.0"
-}
-
-architectury {
-    common("neoforge", "fabric")
-}
-
-repositories {
-    maven(url = "${rootProject.projectDir}/deps")
-    maven(url = "https://api.modrinth.com/maven")
-    maven(url = "https://maven.neoforged.net/releases")
-    mavenLocal()
-}
-
-dependencies {
-    implementation(libs.bundles.kotlin)
-    modImplementation(libs.fabric.loader)
-    modApi(libs.molang)
-
-    // Integrations
-    compileOnlyApi(libs.jei.api)
-    modCompileOnly(libs.bundles.fabric.integrations.compileOnly) {
-        isTransitive = false
-    }
-    // Flywheel has no common dep so just pick one and don't use any platform specific code in common
-    // modCompileOnly(libs.flywheelFabric)
-
-    // Showdown
-    modCompileOnly(libs.graal)
-
-    // Data Storage
-    modCompileOnly(libs.bundles.mongo)
-
-    // Unit Testing
-    testImplementation(libs.bundles.unitTesting)
-}
-
-tasks.withType<Test> {
-    useJUnitPlatform()
-    testLogging {
-        setEvents(listOf("failed"))
-        setExceptionFormat("full")
-    }
-}
-
-sourceSets {
-    main {
-        blossom {
-            kotlinSources {
-                fun generateLicenseHeader() : String {
-                    val builder = StringBuilder()
-                    builder.append("/*\n")
-                    rootProject.file("HEADER").forEachLine {
-                        if(it.isEmpty()) {
-                            builder.append(" *").append("\n")
-                        } else {
-                            builder.append(" * ").append(it).append("\n")
-                        }
-                    }
-
-                    return builder.append(" */").append("\n").toString()
-                }
-
-                property("license", generateLicenseHeader())
-                property("modid", "cobblemon")
-                property("version", project.version())
-                property("isSnapshot", if(rootProject.isSnapshot()) "true" else "false")
-                property("gitCommit", versioning.info.commit)
-                property("branch", versioning.info.branch)
-                System.getProperty("buildNumber")?.let { property("buildNumber", it) }
-                property("timestamp", OffsetDateTime.now(ZoneOffset.UTC).format(DateTimeFormatter.ofPattern("MM/dd/yyyy hh:mm:ss")) + " UTC")
-            }
-        }
-    }
-}

common/gradle/libs.versions.toml

@@ -1,95 +0,0 @@
-[versions]
-# Kotlin
-kotlin = "2.0.0"
-
-# Plugins
-licenser = "0.6.1"
-shadow = "8.1.1"
-blossom = "2.1.0"
-idea-ext = "1.1.7"
-
-# Loom
-loom = "1.7-SNAPSHOT"
-architectury-plugin = "3.4-SNAPSHOT"
-
-# Common
-molang = "1.1.18"
-graal = "22.3.0"
-icu4j = "71.1"
-jei-api = "19.8.2.99"
-
-# Fabric
-fabric-loader = "0.16.5"
-fabric-api = "0.104.0+1.21.1"
-fabric-kotlin = "1.11.0+kotlin.2.0.0"
-fabric-permissions-api = "0.2-SNAPSHOT"
-lambDynamicLights = "3.0.1+1.21.1"
-debugutils-fabric = "1.21-1.0.6-fabric"
-
-# NeoForge
-neoforge = "21.1.66"
-neo-kotlin-for-forge = "5.5.0"
-debugutils-forge = "1.21-1.0.6-neoforge"
-
-# Data Storage
-mongo = "4.10.2"
-
-# Testing
-junit = "5.9.0"
-mockito = "5.2.0"
-mockk = "1.12.1"
-classgraph = "4.8.153"
-
-[libraries]
-# General Buildscript Plugins
-kotlin = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version.ref = "kotlin" }
-loom = { group = "dev.architectury", name = "architectury-loom", version.ref = "loom" }
-architectury = { group = "architectury-plugin", name = "architectury-plugin.gradle.plugin", version.ref = "architectury-plugin" }
-shadow = { group = "com.github.johnrengelman", name = "shadow", version.ref = "shadow" }
-blossom = { group = "net.kyori", name = "blossom", version.ref = "blossom" }
-ideaExt = { group = "org.jetbrains.gradle.plugin.idea-ext", name = "org.jetbrains.gradle.plugin.idea-ext.gradle.plugin", version.ref = "idea-ext"}
-licenser = { group = "gradle.plugin.org.cadixdev.gradle", name = "licenser", version.ref = "licenser" }
-
-# Kotlin
-kotlin-stdlib = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib-jdk8", version.ref = "kotlin" }
-kotlin-reflect = { group = "org.jetbrains.kotlin", name = "kotlin-reflect", version.ref = "kotlin" }
-
-# Common
-jei-api = { group = "mezz.jei", name = "jei-1.21-common-api", version.ref = "jei-api"}
-molang = { group = "local.com.bedrockk", name = "molang", version.ref = "molang" }
-graal = { group = "org.graalvm.js", name = "js", version.ref = "graal" }
-icu4j = { group = "com.ibm.icu", name = "icu4j", version.ref = "icu4j" }
-
-# Fabric
-fabric-loader = { group = "net.fabricmc", name = "fabric-loader", version.ref = "fabric-loader" }
-fabric-api = { group = "net.fabricmc.fabric-api", name = "fabric-api", version.ref = "fabric-api" }
-fabric-kotlin = { group = "net.fabricmc", name = "fabric-language-kotlin", version.ref = "fabric-kotlin" }
-fabric-permissions = { group = "me.lucko", name = "fabric-permissions-api", version.ref = "fabric-permissions-api" }
-adorn-fabric = { group = "maven.modrinth", name = "adorn", version = "6.0.0-neoforge"}
-lambDynamicLights = { group = "maven.modrinth", name = "lambdynamiclights", version.ref = "lambDynamicLights"}
-jei-api-fabric = { group = "mezz.jei", name = "jei-1.21-fabric-api", version.ref = "jei-api" }
-jei-fabric = { group = "mezz.jei", name = "jei-1.21-fabric", version.ref = "jei-api"}
-fabric-debugutils = { group = "maven.modrinth", name = "debugutils", version.ref = "debugutils-fabric"}
-
-# NeoForge
-neoforge = { group = "net.neoforged", name = "neoforge", version.ref = "neoforge" }
-neo-kotlin-forge = { group = "thedarkcolour", name = "kotlinforforge-neoforge", version.ref = "neo-kotlin-for-forge" }
-neoforge-debugutils = { group = "maven.modrinth", name = "debugutils", version.ref = "debugutils-forge"}
-
-# Data Storage
-mongo-driver-core = { group = "org.mongodb", name = "mongodb-driver-core", version.ref = "mongo" }
-mongo-driver-sync = { group = "org.mongodb", name = "mongodb-driver-sync", version.ref = "mongo" }
-
-# Testing
-junit = { group = "org.junit.jupiter", name = "junit-jupiter", version.ref = "junit" }
-mockito-core = { group = "org.mockito", name = "mockito-core", version.ref = "mockito" }
-mock-kotlin = { group = "io.mockk", name = "mockk", version.ref = "mockk" }
-classgraph = { group = "io.github.classgraph", name = "classgraph", version.ref = "classgraph" }
-
-[bundles]
-kotlin = [ "kotlin-stdlib", "kotlin-reflect" ]
-fabric = [ "fabric-kotlin", "fabric-permissions" ]
-fabric-integrations-compileOnly = [ "adorn-fabric", "lambDynamicLights", "jei-api-fabric" ]
-fabric-integrations-runtimeOnly = [ "jei-fabric" ]
-mongo = [ "mongo-driver-core", "mongo-driver-sync" ]
-unitTesting = [ "junit", "mockito-core", "mock-kotlin", "classgraph" ]

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

@@ -14,6 +14,7 @@ import com.cobblemon.mod.common.api.events.CobblemonEvents;
 import com.cobblemon.mod.common.api.events.item.LeftoversCreatedEvent;
 import com.cobblemon.mod.common.api.pokemon.PokemonSpecies;
 import com.cobblemon.mod.common.api.storage.party.PartyStore;
+import com.cobblemon.mod.common.api.storage.party.PlayerPartyStore;
 import com.cobblemon.mod.common.api.tags.CobblemonItemTags;
 import com.cobblemon.mod.common.pokedex.scanner.PokedexEntityData;
 import com.cobblemon.mod.common.pokedex.scanner.ScannableEntity;
@@ -178,10 +179,10 @@ 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;
@@ -190,30 +191,34 @@ public abstract class PlayerMixin extends LivingEntity implements ScannableEntit
     @Nullable @Unique
     private PokedexEntityData getDataFromShoulderPokemon(CompoundTag shoulderTag) {
         CompoundTag pokemonTag = shoulderTag.getCompound(DataKeys.POKEMON);
-        if(pokemonTag.isEmpty()) return null;
+        if (pokemonTag.isEmpty()) return null;
         Species species = PokemonSpecies.INSTANCE.getByIdentifier(ResourceLocation.parse(pokemonTag.getString(DataKeys.POKEMON_SPECIES_IDENTIFIER)));
-        if(species == null) return null;
+        if (species == null) return null;
         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;
+        if (!formList.isEmpty()) form = formList.getFirst();
+        if (form == null) return null;
         String genderString = pokemonTag.getString(DataKeys.POKEMON_GENDER);
-        if(genderString.isEmpty()) return null;
+        if (genderString.isEmpty()) return null;
         Gender gender = Gender.valueOf(genderString);
         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());
 
-        return new PokedexEntityData(
-                species,
-                form,
-                gender,
-                aspects,
-                shiny,
-                level,
-                this.getUUID()
-        );
+        Pokemon pokemon = new Pokemon();
+        if (level().isClientSide) {
+            pokemon.setSpecies(species);
+            pokemon.setForm(form);
+            pokemon.setGender(gender);
+            pokemon.setShiny(shiny);
+            pokemon.setLevel(level);
+            pokemon.setForcedAspects(aspects);
+        } else {
+            PlayerPartyStore party = Cobblemon.INSTANCE.getStorage().getParty(this.getUUID(), this.registryAccess());
+            pokemon = party.get(shoulderTag.getUUID(DataKeys.SHOULDER_UUID));
+        }
+        return new PokedexEntityData(pokemon, null);
     }
 
     @Override

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

@@ -14,6 +14,7 @@ import com.cobblemon.mod.common.api.SeasonResolver
 import com.cobblemon.mod.common.api.data.DataProvider
 import com.cobblemon.mod.common.api.drop.CommandDropEntry
 import com.cobblemon.mod.common.api.drop.DropEntry
+import com.cobblemon.mod.common.api.drop.EvolutionItemDropEntry
 import com.cobblemon.mod.common.api.drop.ItemDropEntry
 import com.cobblemon.mod.common.api.events.CobblemonEvents
 import com.cobblemon.mod.common.api.events.CobblemonEvents.DATA_SYNCHRONIZED
@@ -200,6 +201,7 @@ object Cobblemon {
 
         DropEntry.register("command", CommandDropEntry::class.java)
         DropEntry.register("item", ItemDropEntry::class.java, isDefault = true)
+        DropEntry.register("evolution", EvolutionItemDropEntry::class.java)
 
         ExperienceGroups.registerDefaults()
         CaptureCalculators.registerDefaults()
@@ -218,7 +220,7 @@ object Cobblemon {
             storage.onPlayerDataSync(it)
             playerDataManager.syncAllToPlayer(it)
             starterHandler.handleJoin(it)
-            ServerSettingsPacket(this.config.preventCompletePartyDeposit, this.config.displayEntityLevelLabel, this.config.displayEntityNameLabel, this.config.maxPokemonLevel).sendToPlayer(it)
+            ServerSettingsPacket(this.config.preventCompletePartyDeposit, this.config.displayEntityLevelLabel, this.config.displayEntityNameLabel, this.config.maxPokemonLevel, this.config.maxPokemonFriendship, this.config.maxDynamaxLevel).sendToPlayer(it)
         }
         PlatformEvents.SERVER_PLAYER_LOGOUT.subscribe {
             PCLinkManager.removeLink(it.player.uuid)
@@ -256,6 +258,8 @@ object Cobblemon {
         // Lowest priority because this applies after luxury ball bonus as of gen 4
         CobblemonEvents.FRIENDSHIP_UPDATED.subscribe(Priority.LOWEST) { event ->
             var increment = (event.newFriendship - event.pokemon.friendship).toFloat()
+            if (increment <= 0) //these affects are only meant to affect positive gains
+                return@subscribe
             // Our Luxury ball spec is diff from official, but we will still assume these stack
             if (event.pokemon.heldItemNoCopy().`is`(CobblemonItemTags.IS_FRIENDSHIP_BOOSTER)) {
                 increment += increment * 0.5F

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

@@ -317,6 +317,7 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
     @JvmField val RAZOR_FANG = noSettingsItem("razor_fang")
     @JvmField val AUSPICIOUS_ARMOR = heldItem("auspicious_armor")
     @JvmField val MALICIOUS_ARMOR = heldItem("malicious_armor")
+    @JvmField val SHELL_HELMET = heldItem("shell_helmet")
 
     private val berries = mutableMapOf<ResourceLocation, BerryItem>()
     // Plants

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

@@ -8,6 +8,7 @@
 
 package com.cobblemon.mod.common.api.drop
 
+import com.cobblemon.mod.common.pokemon.Pokemon
 import net.minecraft.server.level.ServerLevel
 import net.minecraft.server.level.ServerPlayer
 import net.minecraft.world.entity.LivingEntity
@@ -40,17 +41,23 @@ interface DropEntry {
      * to be dropped.
      */
     val percentage: Float
+
     /**
      * The drop's quantity when doing selection from the [DropTable]. See the drop table documentation for more on how
      * this works.
      */
     val quantity: Int
+
     /**
      * The maximum number of times the item can be selected drop the [DropTable]. In most cases this will just be 1,
      * meaning that the item, once picked, cannot be picked again. A larger value will allow the same [DropEntry] from
      * appearing multiple times in a drop action.
      */
     val maxSelectableTimes: Int
+
+    /** Whether this is considered a possible drop at the moment or not */
+    fun canDrop(pokemon: Pokemon?): Boolean = true
+
     /** The logic to use to actually drop the thing. */
     fun drop(entity: LivingEntity?, world: ServerLevel, pos: Vec3, player: ServerPlayer?)
 }

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

@@ -11,11 +11,13 @@ package com.cobblemon.mod.common.api.drop
 import com.cobblemon.mod.common.api.events.CobblemonEvents.LOOT_DROPPED
 import com.cobblemon.mod.common.api.events.drops.LootDroppedEvent
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
+import com.cobblemon.mod.common.pokemon.Pokemon
 import kotlin.random.Random
 import net.minecraft.network.RegistryFriendlyByteBuf
 import net.minecraft.server.level.ServerLevel
 import net.minecraft.server.level.ServerPlayer
 import net.minecraft.world.entity.LivingEntity
+import net.minecraft.world.item.ItemStack
 import net.minecraft.world.phys.Vec3
 
 /**
@@ -45,9 +47,11 @@ class DropTable {
      * Gets a drop list from this table as a list of [DropEntry]. You can specify the range of drop quantity totals
      * that will be possible, or if you leave it blank it will use [DropTable.amount].
      */
-    fun getDrops(amount: IntRange = this.amount): List<DropEntry> {
+    fun getDrops(amount: IntRange = this.amount, pokemon: Pokemon? = null): List<DropEntry> {
         val chosenAmount = amount.random()
-        val possibleDrops = entries.filter { it.quantity <= chosenAmount }.toMutableList()
+        val possibleDrops = entries.filter {
+            it.quantity <= chosenAmount && it.canDrop(pokemon)
+        }.toMutableList()
 
         if (possibleDrops.isEmpty()) {
             return emptyList()
@@ -87,11 +91,10 @@ class DropTable {
         world: ServerLevel,
         pos: Vec3,
         player: ServerPlayer?,
-        amount: IntRange = this.amount
+        amount: IntRange = this.amount,
+        pokemon: Pokemon? = null,
     ) {
-        val drops = getDrops(amount).toMutableList()
-        val heldItem = (entity as PokemonEntity).pokemon.heldItemNoCopy()
-        if (!heldItem.isEmpty) entity.spawnAtLocation(heldItem.item)
+        val drops = getDrops(amount, pokemon).toMutableList()
         LOOT_DROPPED.postThen(
             event = LootDroppedEvent(this, player, entity, drops),
             ifSucceeded = { it.drops.forEach { it.drop(entity, world, pos, player) } }

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

@@ -0,0 +1,18 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.drop
+
+import com.cobblemon.mod.common.api.pokemon.evolution.requirement.EvolutionRequirement
+import com.cobblemon.mod.common.pokemon.Pokemon
+
+class EvolutionItemDropEntry : ItemDropEntry() {
+    val requirements: MutableSet<EvolutionRequirement> = mutableSetOf()
+
+    override fun canDrop(pokemon: Pokemon?): Boolean = pokemon != null && requirements.all { it.check(pokemon) }
+}

common/src/main/kotlin/com/cobblemon/mod/common/api/events/pokedex/scanning/PokemonScannedEvent.kt

@@ -18,19 +18,17 @@ import net.minecraft.server.level.ServerPlayer
 import net.minecraft.world.entity.LivingEntity
 
 data class PokemonScannedEvent(val player: ServerPlayer, val scannedPokemonEntityData: PokedexEntityData, val scannedEntity: ScannableEntity) {
-    val pokedexEntityData: PokedexEntityData
-        get() = scannedPokemonEntityData
-
     val isOwned: Boolean
-        get() = scannedPokemonEntityData.ownerUUID == player.uuid
+        get() = scannedPokemonEntityData.pokemon.getOwnerUUID() == player.uuid
 
     val context = mutableMapOf(
         "player" to player.asMoLangValue(),
-        "pokemon" to scannedPokemonEntityData.struct,
+        "pokemon" to scannedPokemonEntityData.pokemon.struct,
+        "disguise" to (scannedPokemonEntityData.disguise?.struct ?: DoubleValue.ZERO),
         "entity" to {
             when (scannedEntity) {
                 is LivingEntity -> scannedEntity.asMostSpecificMoLangValue()
-                else -> DoubleValue(0.0)
+                else -> DoubleValue.ZERO
             }
         },
     )

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

@@ -8,6 +8,7 @@
 
 package com.cobblemon.mod.common.api.events.pokemon
 
+import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.pokemon.Pokemon
 
 /**
@@ -18,5 +19,11 @@ import com.cobblemon.mod.common.pokemon.Pokemon
  */
 data class FriendshipUpdatedEvent(
     val pokemon: Pokemon,
-    var newFriendship: Int
-)
+    val newFriendshipInitial: Int
+)
+{
+    var newFriendship: Int = newFriendshipInitial
+        set(value) {
+            field = value.coerceIn(0, Cobblemon.config.maxPokemonFriendship)
+        }
+}

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

@@ -17,16 +17,14 @@ import com.cobblemon.mod.common.api.pokedex.AbstractPokedexManager
 import com.cobblemon.mod.common.api.pokedex.FormDexRecord
 import com.cobblemon.mod.common.api.pokedex.PokedexEntryProgress
 import com.cobblemon.mod.common.pokedex.scanner.PokedexEntityData
-import com.cobblemon.mod.common.pokemon.Pokemon
 import com.cobblemon.mod.common.util.getPlayer
-import com.mojang.datafixers.util.Either
 import java.util.UUID
 
 /**
  * Event that fires when a Pokémon's information is gained or updated in the Pokédex.
  */
 sealed interface PokedexDataChangedEvent {
-    val dataSource: Either<PokedexEntityData, Pokemon>
+    val dataSource: PokedexEntityData
     val knowledge: PokedexEntryProgress
     val playerUUID: UUID
     val record: FormDexRecord
@@ -37,22 +35,22 @@ sealed interface PokedexDataChangedEvent {
     fun getContext(): MutableMap<String, MoValue> {
         return mutableMapOf(
             "player" to (playerUUID.getPlayer()?.asMoLangValue() ?: DoubleValue.ZERO),
-            "pokemon" to dataSource.map({ DoubleValue.ZERO }, { it.struct }),
-            "data" to dataSource.map({ it.struct }, { DoubleValue.ZERO }),
+            "pokemon" to dataSource.pokemon.struct,
+            "disguise" to (dataSource.disguise?.struct ?: DoubleValue.ZERO),
             "knowledge" to StringValue(knowledge.name.lowercase()),
             "pokedex" to pokedexManager.struct
         )
     }
 
     class Pre(
-        override val dataSource: Either<PokedexEntityData, Pokemon>,
+        override val dataSource: PokedexEntityData,
         override val knowledge: PokedexEntryProgress,
         override val playerUUID: UUID,
         override val record: FormDexRecord
     ) : PokedexDataChangedEvent, Cancelable()
 
     class Post(
-        override val dataSource: Either<PokedexEntityData, Pokemon>,
+        override val dataSource: PokedexEntityData,
         override val knowledge: PokedexEntryProgress,
         override val playerUUID: UUID,
         override val record: FormDexRecord

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

@@ -54,7 +54,15 @@ class BenchedMoves : Iterable<BenchedMove> {
         }
     }
 
-    fun add(benchedMove: BenchedMove) = doThenEmit { benchedMoves.add(benchedMove) }
+    fun add(benchedMove: BenchedMove): Boolean {
+        if (any { it.moveTemplate == benchedMove.moveTemplate }) {
+            return false
+        }
+
+        doThenEmit { benchedMoves.add(benchedMove) }
+        return true
+    }
+
     fun addAll(benchedMoves: Iterable<BenchedMove>) = doThenEmit { this.benchedMoves.addAll(benchedMoves) }
     fun clear() = doThenEmit { benchedMoves.clear() }
     fun remove(benchedMove: BenchedMove) = doThenEmit { benchedMoves.remove(benchedMove) }

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

@@ -134,18 +134,21 @@ class MoveSet : Iterable<Move> {
         return json
     }
 
-    fun add(move: Move) {
+    fun add(move: Move): Boolean {
         if (any { it.template == move.template }) {
-            return
+            return false
         }
+
         for (i in 0 until MOVE_COUNT) {
             if (moves[i] == null) {
                 moves[i] = move
                 move.observable.subscribe { this.update() }
                 update()
-                return
+                return true
             }
         }
+
+        return false
     }
 
     fun update() {

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

@@ -57,6 +57,7 @@ class NPCClass {
     var isInvulnerable = false
     var isLeashable = true
     var allowProjectileHits = true
+    var hideNameTag = false
 
     // If you're adding stuff here, add it to NPCPreset and NPCClassAdapter too
 
@@ -97,6 +98,7 @@ class NPCClass {
         buffer.writeBoolean(isInvulnerable)
         buffer.writeBoolean(isLeashable)
         buffer.writeBoolean(allowProjectileHits)
+        buffer.writeBoolean(hideNameTag)
     }
 
     fun decode(buffer: RegistryFriendlyByteBuf) {
@@ -148,5 +150,6 @@ class NPCClass {
         isInvulnerable = buffer.readBoolean()
         isLeashable = buffer.readBoolean()
         allowProjectileHits = buffer.readBoolean()
+        hideNameTag = buffer.readBoolean()
     }
 }

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

@@ -37,6 +37,7 @@ class NPCPreset {
     var isInvulnerable: Boolean? = null
     var isLeashable: Boolean? = null
     var allowProjectileHits: Boolean? = null
+    var hideNameTag: Boolean? = null
 
     fun applyTo(npcClass: NPCClass) {
         resourceIdentifier?.let { npcClass.resourceIdentifier = it }
@@ -63,5 +64,6 @@ class NPCPreset {
         isInvulnerable?.let { npcClass.isInvulnerable = it }
         isLeashable?.let { npcClass.isLeashable = it }
         allowProjectileHits?.let { npcClass.allowProjectileHits = it }
+        hideNameTag?.let { npcClass.hideNameTag = it }
     }
 }

common/src/main/kotlin/com/cobblemon/mod/common/api/npc/README.md

@@ -78,6 +78,7 @@ any number of presets and the properties of those presets will be merged into th
       "skill": 5,
       "autoHealParty": true,
       "randomizePartyOrder": true,
+      "hideNameTag": false,
       "party": {
         "type": "simple",
         "pokemon": [
@@ -411,4 +412,7 @@ Pokémon in the party.
 
 ### ai
 The AI property is an array of brain configurations. This is used to configure the behaviours of the NPC. See
-the documentation for brain configurations at [AI Configuration](../ai/config/README.md).
+the documentation for brain configurations at [AI Configuration](../ai/config/README.md).
+
+### hideNameTag
+Whether the NPC's nametag should be hidden or not. Defaults to false.

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

@@ -202,6 +202,8 @@ object PokeBalls : JsonDataRegistry<PokeBall> {
         // Luxury ball effect, low priority as it must be triggered before soothe bell as of gen 4
         CobblemonEvents.FRIENDSHIP_UPDATED.subscribe(priority = Priority.LOW) { event ->
             var increment = (event.newFriendship - event.pokemon.friendship).toFloat()
+            if (increment <= 0) //these affects are only meant to affect positive gains
+                return@subscribe
             if (increment <= 1F) {
                 event.pokemon.caughtBall.effects.filterIsInstance<FriendshipEarningBoostEffect>()
                     .forEach { increment *= it.multiplier }

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

@@ -42,7 +42,10 @@ class BaseStatModifier(
 
     override fun behavior(thrower: LivingEntity, pokemon: Pokemon): CatchRateModifier.Behavior = CatchRateModifier.Behavior.MULTIPLY
 
-    override fun isValid(thrower: LivingEntity, pokemon: Pokemon): Boolean = pokemon.form.baseStats[this.stat] != null
+    override fun isValid(thrower: LivingEntity, pokemon: Pokemon): Boolean {
+        val valStat = pokemon.form.baseStats[this.stat] ?: return false
+        return comparator(valStat)
+    }
 
     override fun modifyCatchRate(currentCatchRate: Float, thrower: LivingEntity, pokemon: Pokemon): Float = this.behavior(thrower, pokemon).mutator(currentCatchRate, this.value(thrower, pokemon))
 

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

@@ -96,15 +96,21 @@ abstract class AbstractPokedexManager {
     }
 
     fun getNewInformation(pokedexEntityData: PokedexEntityData): PokedexLearnedInformation {
-        val speciesRecord = getSpeciesRecord(pokedexEntityData.species.resourceIdentifier)
+        val speciesRecord = getSpeciesRecord(pokedexEntityData.getApparentSpecies().resourceIdentifier)
         if (speciesRecord == null || speciesRecord.getKnowledge() == PokedexEntryProgress.NONE) {
             return PokedexLearnedInformation.SPECIES
         }
-        val formRecord = speciesRecord.getFormRecord(pokedexEntityData.form.name)
+        val formRecord = speciesRecord.getFormRecord(pokedexEntityData.getApparentForm().name)
         if (formRecord == null || formRecord.knowledge == PokedexEntryProgress.NONE) {
             return PokedexLearnedInformation.FORM
         }
-        if (pokedexEntityData.aspects.any{ !speciesRecord.hasAspect(it) } || pokedexEntityData.gender !in formRecord.getGenders() || !formRecord.hasSeenShinyState(pokedexEntityData.shiny)) {
+
+        // Can't update aspects on a disguise
+        if (pokedexEntityData.disguise != null) {
+            return PokedexLearnedInformation.NONE
+        }
+
+        if (pokedexEntityData.pokemon.aspects.any { !speciesRecord.hasAspect(it) } || pokedexEntityData.pokemon.gender !in formRecord.getGenders() || !formRecord.hasSeenShinyState(pokedexEntityData.pokemon.shiny)) {
             return PokedexLearnedInformation.VARIATION
         }
         return PokedexLearnedInformation.NONE

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

@@ -89,21 +89,15 @@ class FormDexRecord {
         it.knowledge = knowledge
     }
 
-    fun encountered(pokemon: Pokemon) {
-        if (wouldBeDifferent(pokemon, PokedexEntryProgress.ENCOUNTERED)) {
-            addInformation(pokemon, PokedexEntryProgress.ENCOUNTERED)
-        }
-    }
-
     fun encountered(pokedexEntityData: PokedexEntityData) {
         if (wouldBeDifferent(pokedexEntityData, PokedexEntryProgress.ENCOUNTERED)) {
             addInformation(pokedexEntityData, PokedexEntryProgress.ENCOUNTERED)
         }
     }
 
-    fun caught(pokemon: Pokemon) {
-        if (wouldBeDifferent(pokemon, PokedexEntryProgress.CAUGHT)) {
-            addInformation(pokemon, PokedexEntryProgress.CAUGHT)
+    fun caught(pokedexEntityData: PokedexEntityData) {
+        if (wouldBeDifferent(pokedexEntityData, PokedexEntryProgress.CAUGHT)) {
+            addInformation(pokedexEntityData, PokedexEntryProgress.CAUGHT)
         }
     }
 
@@ -125,47 +119,18 @@ class FormDexRecord {
         speciesDexRecord.onFormRecordUpdated(this)
     }
 
-    private fun addInformation(pokemon: Pokemon, knowledge: PokedexEntryProgress) {
-        (speciesDexRecord.pokedexManager as? PokedexManager)?.let { pokedexManager ->
-            CobblemonEvents.POKEDEX_DATA_CHANGED_PRE.postThen(
-                PokedexDataChangedEvent.Pre(
-                        Either.right(pokemon),
-                        knowledge,
-                        pokedexManager.uuid,
-                        this
-                ),
-                ifSucceeded = {
-                    genders.add(pokemon.gender)
-                    seenShinyStates.add(if (pokemon.shiny) "shiny" else "normal")
-                    if (knowledge.ordinal > this.knowledge.ordinal) {
-                        this.knowledge = knowledge
-                    }
-                    speciesDexRecord.addInformation(pokemon, knowledge)
-                    speciesDexRecord.onFormRecordUpdated(this)
-                    CobblemonEvents.POKEDEX_DATA_CHANGED_POST.post(
-                        PokedexDataChangedEvent.Post(
-                                Either.right(pokemon),
-                                knowledge,
-                                pokedexManager.uuid,
-                                this
-                        )
-                    )
-                })
-        }
-    }
-
     private fun addInformation(pokedexEntityData: PokedexEntityData, knowledge: PokedexEntryProgress) {
         (speciesDexRecord.pokedexManager as? PokedexManager)?.let { pokedexManager ->
             CobblemonEvents.POKEDEX_DATA_CHANGED_PRE.postThen(
                 PokedexDataChangedEvent.Pre(
-                        Either.left(pokedexEntityData),
-                        knowledge,
-                        pokedexManager.uuid,
-                        this
+                    pokedexEntityData,
+                    knowledge,
+                    pokedexManager.uuid,
+                    this
                 ),
                 ifSucceeded = {
-                    genders.add(pokedexEntityData.gender)
-                    seenShinyStates.add(if (pokedexEntityData.shiny) "shiny" else "normal")
+                    genders.add(pokedexEntityData.pokemon.gender)
+                    seenShinyStates.add(if (pokedexEntityData.pokemon.shiny) "shiny" else "normal")
                     if (knowledge.ordinal > this.knowledge.ordinal) {
                         this.knowledge = knowledge
                     }
@@ -173,10 +138,10 @@ class FormDexRecord {
                     speciesDexRecord.onFormRecordUpdated(this)
                     CobblemonEvents.POKEDEX_DATA_CHANGED_POST.post(
                         PokedexDataChangedEvent.Post(
-                                Either.left(pokedexEntityData),
-                                knowledge,
-                                pokedexManager.uuid,
-                                this
+                            pokedexEntityData,
+                            knowledge,
+                            pokedexManager.uuid,
+                            this
                         )
                     )
                 }
@@ -184,19 +149,10 @@ class FormDexRecord {
         }
     }
 
-    /** Returns whether the given [Pokemon] and [knowledge] would add new information to the Pokédex.*/
-    fun wouldBeDifferent(pokemon: Pokemon, knowledge: PokedexEntryProgress): Boolean {
-        return pokemon.gender !in genders
-                || (pokemon.shiny && "shiny" !in seenShinyStates)
-                || (!pokemon.shiny && "normal" !in seenShinyStates)
-                || knowledge.ordinal > this.knowledge.ordinal
-                || speciesDexRecord.wouldBeDifferent(pokemon)
-    }
-
     fun wouldBeDifferent(pokedexEntityData: PokedexEntityData, knowledge: PokedexEntryProgress): Boolean {
-        return pokedexEntityData.gender !in genders
-                || (pokedexEntityData.shiny && "shiny" !in seenShinyStates)
-                || (!pokedexEntityData.shiny && "normal" !in seenShinyStates)
+        return pokedexEntityData.pokemon.gender !in genders
+                || (pokedexEntityData.pokemon.shiny && "shiny" !in seenShinyStates)
+                || (!pokedexEntityData.pokemon.shiny && "normal" !in seenShinyStates)
                 || knowledge.ordinal > this.knowledge.ordinal
                 || speciesDexRecord.wouldBeDifferent(pokedexEntityData)
     }

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

@@ -30,19 +30,19 @@ class PokedexManager(
     fun encounter(pokemon: Pokemon) {
         val speciesId = pokemon.species.resourceIdentifier
         val formName = pokemon.form.name
-        getOrCreateSpeciesRecord(speciesId).getOrCreateFormRecord(formName).encountered(pokemon)
+        getOrCreateSpeciesRecord(speciesId).getOrCreateFormRecord(formName).encountered(PokedexEntityData(pokemon = pokemon, disguise = null))
     }
 
     fun encounter(pokedexEntityData: PokedexEntityData) {
-        val speciesId = pokedexEntityData.species.resourceIdentifier
-        val formName = pokedexEntityData.form.name
+        val speciesId = pokedexEntityData.getApparentSpecies().resourceIdentifier
+        val formName = pokedexEntityData.getApparentForm().name
         getOrCreateSpeciesRecord(speciesId).getOrCreateFormRecord(formName).encountered(pokedexEntityData)
     }
 
     fun catch(pokemon: Pokemon) {
         val speciesId = pokemon.species.resourceIdentifier
         val formName = pokemon.form.name
-        getOrCreateSpeciesRecord(speciesId).getOrCreateFormRecord(formName).caught(pokemon)
+        getOrCreateSpeciesRecord(speciesId).getOrCreateFormRecord(formName).caught(PokedexEntityData(pokemon = pokemon, disguise = null))
     }
 
     override fun markDirty() {

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

@@ -97,7 +97,7 @@ class SpeciesDexRecord {
     }
 
     fun addInformation(pokedexEntityData: PokedexEntityData, knowledge: PokedexEntryProgress) {
-        aspects.addAll(pokedexEntityData.aspects)
+        aspects.addAll(pokedexEntityData.pokemon.aspects)
     }
 
     fun addAspects(addedAspects: Set<String>) {
@@ -107,7 +107,7 @@ class SpeciesDexRecord {
     /** Returns true if the given Pokémon contains new information. Internal because it's only to be called from [FormDexRecord.wouldBeDifferent]. */
     internal fun wouldBeDifferent(pokemon: Pokemon) = pokemon.aspects.any { it !in aspects }
 
-    internal fun wouldBeDifferent(pokedexEntityData: PokedexEntityData) = pokedexEntityData.aspects.any { it !in aspects }
+    internal fun wouldBeDifferent(pokedexEntityData: PokedexEntityData) = pokedexEntityData.pokemon.aspects.any { it !in aspects }
 
     fun getOrCreateFormRecord(formName: String): FormDexRecord {
         return formRecords.getOrPut(formName.lowercase()) {

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

@@ -468,6 +468,10 @@ open class PokemonProperties {
         return this.commonMatches(pokemonEntity.pokemon) && this.customProperties.none { !it.matches(pokemonEntity) }
     }
 
+    fun matches(properties: PokemonProperties): Boolean {
+        return properties.asString() == this.asString()
+    }
+
     private fun commonMatches(pokemon: Pokemon): Boolean {
         level?.takeIf { it != pokemon.level }?.let { return false }
         shiny?.takeIf { it != pokemon.shiny }?.let { return false }
@@ -805,7 +809,7 @@ open class PokemonProperties {
     private fun createAbility(id: String, form: FormData): Ability? {
         val ability = Abilities.get(id) ?: return null
         val potentialAbility = form.abilities.firstOrNull { potential -> potential.template == ability } ?: return ability.create(true)
-        return potentialAbility.template.create(false)
+        return potentialAbility.template.create(false, potentialAbility.priority)
     }
 
 }

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

@@ -13,6 +13,7 @@ import com.cobblemon.mod.common.CobblemonItems
 import com.cobblemon.mod.common.CobblemonSounds
 import com.cobblemon.mod.common.advancement.CobblemonCriteria
 import com.cobblemon.mod.common.advancement.criterion.EvolvePokemonContext
+import com.cobblemon.mod.common.api.drop.DropTable
 import com.cobblemon.mod.common.api.events.CobblemonEvents
 import com.cobblemon.mod.common.api.events.pokemon.PokemonGainedEvent
 import com.cobblemon.mod.common.api.events.pokemon.evolution.EvolutionCompleteEvent
@@ -32,9 +33,8 @@ import com.cobblemon.mod.common.pokemon.evolution.variants.LevelUpEvolution
 import com.cobblemon.mod.common.pokemon.evolution.variants.TradeEvolution
 import com.cobblemon.mod.common.util.lang
 import com.cobblemon.mod.common.util.party
-import net.minecraft.client.Minecraft
-import net.minecraft.core.registries.BuiltInRegistries
-import net.minecraft.network.protocol.game.ClientboundSoundPacket
+import com.cobblemon.mod.common.world.gamerules.CobblemonGameRules
+import net.minecraft.server.level.ServerLevel
 import net.minecraft.sounds.SoundSource
 import net.minecraft.world.entity.Entity
 import net.minecraft.world.item.ItemStack
@@ -80,6 +80,11 @@ interface Evolution : EvolutionLike {
      */
     val learnableMoves: MutableSet<MoveTemplate>
 
+    /**
+     * The items that will drop once the evolution finishes.
+     */
+    val drops: DropTable
+
     /**
      * Checks if the given [Pokemon] passes all the conditions and is ready to evolve.
      *
@@ -100,9 +105,6 @@ interface Evolution : EvolutionLike {
      * @param pokemon The [Pokemon] being evolved.
      */
     fun evolve(pokemon: Pokemon): Boolean {
-        if (this.consumeHeldItem) {
-            pokemon.swapHeldItem(ItemStack.EMPTY)
-        }
         if (this.optional) {
             // All the networking is handled under the hood, see EvolutionController.
             return pokemon.evolutionProxy.server().add(this)
@@ -198,19 +200,41 @@ interface Evolution : EvolutionLike {
 
         val movesToLearn = previousSpeciesLearnableMoves + this.learnableMoves
         movesToLearn.forEach { move ->
-            if (pokemon.moveSet.hasSpace()) {
-                pokemon.moveSet.add(move.create())
-            } else {
-                pokemon.benchedMoves.add(BenchedMove(move, 0))
-            }
+            val couldAddMove =
+                if (pokemon.moveSet.hasSpace()) {
+                    pokemon.moveSet.add(move.create())
+                } else {
+                    pokemon.benchedMoves.add(BenchedMove(move, 0))
+                }
 
-            pokemon.getOwnerPlayer()?.sendSystemMessage(lang("experience.learned_move", pokemon.getDisplayName(), move.displayName))
+            val previousSpeciesKnewMove = previousSpeciesLearnableMoves.any { move.name == it.name }
+
+            if (couldAddMove && !previousSpeciesKnewMove) {
+                pokemon.getOwnerPlayer()?.sendSystemMessage(lang("experience.learned_move", pokemon.getDisplayName(), move.displayName))
+            }
         }
 
         // we want to instantly tick for example you might only evolve your Bulbasaur at level 34 so Venusaur should be immediately available
         pokemon.evolutions.filterIsInstance<PassiveEvolution>().forEach { evolution -> evolution.attemptEvolution(pokemon) }
         pokemon.lockedEvolutions.filterIsInstance<PassiveEvolution>().forEach { evolution -> evolution.attemptEvolution(pokemon) }
+
         this.shed(pokemon)
+
+        if (this.consumeHeldItem) {
+            pokemon.swapHeldItem(ItemStack.EMPTY)
+        }
+
+        val ownerPlayer = pokemon.getOwnerPlayer()
+        if (ownerPlayer != null && ownerPlayer.level().gameRules.getBoolean(CobblemonGameRules.DO_POKEMON_LOOT)) {
+            drops.drop(
+                pokemon.entity,
+                ownerPlayer.level() as ServerLevel,
+                pokemon.entity?.position() ?: ownerPlayer.position(),
+                ownerPlayer,
+                pokemon = pokemon
+            )
+        }
+
         CobblemonEvents.EVOLUTION_COMPLETE.post(EvolutionCompleteEvent(pokemon, this))
         CobblemonEvents.POKEMON_GAINED.post(PokemonGainedEvent(pokemon.getOwnerUUID()!!, pokemon))
     }
@@ -218,4 +242,4 @@ interface Evolution : EvolutionLike {
     fun applyTo(pokemon: Pokemon) {
         result.apply(pokemon)
     }
-}
+}

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

@@ -21,6 +21,12 @@ object CobblemonPokemonLabels {
      */
     const val LEGENDARY = "legendary"
 
+    /**
+     * Represents a Pokémon who is typically banned or has restricted usage in competitive sanctions.
+     * For example usage see this [VGC](https://www.pokemon.com/us/pokemon-news/trainers-can-once-again-use-a-restricted-pokemon-in-ranked-battles-series-10-starting-august-1-2021) page.
+     */
+    const val RESTRICTED = "restricted"
+
     /**
      * Represents a mythical Pokémon.
      * In Cobblemon terms they do not exist since we do not share the concept of timed event only Pokémon but the official ones are still tagged.
@@ -28,14 +34,21 @@ object CobblemonPokemonLabels {
     const val MYTHICAL = "mythical"
 
     /**
-     * Represents Pokémon that originate from Ultra Space.
+     * Represents Pokémon that receive a boosted catch rate from the Beast Ball. (Due to Beast Boost)
+     * Does not include [thematically related](https://bulbapedia.bulbagarden.net/wiki/Ultra_Beast#Related_Pok%C3%A9mon) beasts.
      */
     const val ULTRA_BEAST = "ultra_beast"
 
     /**
-     * Represents the pseudo legendary Pokémon.
+     * Represents a Pokémon whose family could be derived from resurrecting a fossil.
      */
-    const val PSEUDO_LEGENDARY = "pseudo_legendary"
+    const val FOSSIL = "fossil"
+
+    /**
+     * Represents the "pseudo-legendary" Pokémon. (Slow-rate three-stage lines with a base stat total of 600)
+     * Term reference on this [Pokémon Center](https://www.pokemoncenter.com/search/powerhouse) page.
+     */
+    const val POWERHOUSE = "powerhouse"
 
     /**
      * Represents a baby Pokémon, this is not just a first stage Pokémon species, it is also unable to breed.
@@ -52,52 +65,55 @@ object CobblemonPokemonLabels {
     /**
      * See [REGIONAL], this has no official regionals but it consists of the "base" form that comes from the region.
      */
-    const val REGIONAL_OF_KANTO = "kanto_regional"
+    const val KANTONIAN_FORM = "kantonian_form"
+
+    /**
+     * See [REGIONAL], this has no official regionals but it consists of the "base" form that comes from the region.
+     * Source for adjectival form: [Bulbapedia](https://bulbapedia.bulbagarden.net/wiki/Johto#Trivia)
+     */
+    const val JOHTONIAN_FORM = "johtonian_form"
+
+    /**
+     * See [REGIONAL], this has no official regionals but it consists of the "base" form that comes from the region.
+     * Source for adjectival form:[Bulbapedia](https://bulbapedia.bulbagarden.net/wiki/Hoenn#Trivia)
+     */
+    const val HOENNIAN_FORM = "hoennian_form"
+
+    /**
+     * See [REGIONAL], this has no official regionals but it consists of the "base" form that comes from the region.
+     * Source for adjectival form:[Bulbapedia](https://bulbapedia.bulbagarden.net/wiki/Sinnoh#Trivia)
+     */
+    const val SINNOHAN_FORM = "sinnohan_form"
 
     /**
      * See [REGIONAL], this has no official regionals but it consists of the "base" form that comes from the region.
      */
-    const val REGIONAL_OF_JOHTO = "johto_regional"
+    const val UNOVAN_FORM = "unovan_form"
 
     /**
      * See [REGIONAL], this has no official regionals but it consists of the "base" form that comes from the region.
      */
-    const val REGIONAL_OF_HOENN = "hoenn_regional"
-
-    /**
-     * See [REGIONAL], this has no official regionals but it consists of the "base" form that comes from the region.
-     */
-    const val REGIONAL_OF_SINNOH = "sinnoh_regional"
-
-    /**
-     * See [REGIONAL], this has no official regionals but it consists of the "base" form that comes from the region.
-     */
-    const val REGIONAL_OF_UNOVA = "unova_regional"
-
-    /**
-     * See [REGIONAL], this has no official regionals but it consists of the "base" form that comes from the region.
-     */
-    const val REGIONAL_OF_KALOS = "kalos_regional"
+    const val KALOSIAN_FORM = "kalosian_form"
 
     /**
      * See [REGIONAL] and this [Bulbapedia](https://bulbapedia.bulbagarden.net/wiki/Regional_form#Alolan_Form) page.
      */
-    const val REGIONAL_OF_ALOLA = "alola_regional"
+    const val ALOLAN_FORM = "alolan_form"
 
     /**
      * See [REGIONAL] and this [Bulbapedia](https://bulbapedia.bulbagarden.net/wiki/Regional_form#Galarian_Form) page.
      */
-    const val REGIONAL_OF_GALAR = "galar_regional"
+    const val GALARIAN_FORM = "galarian_form"
 
     /**
      * See [REGIONAL] and this [Bulbapedia](https://bulbapedia.bulbagarden.net/wiki/Regional_form#Hisuian_Form) page.
      */
-    const val REGIONAL_OF_HISUI = "hisui_regional"
+    const val HISUIAN_FORM = "hisuian_form"
 
     /**
      * See [REGIONAL] and this [Bulbapedia](https://bulbapedia.bulbagarden.net/wiki/Regional_form#Paldean_Form) page.
      */
-    const val REGIONAL_OF_PALDEA = "paldea_regional"
+    const val PALDEAN_FORM = "paldean_form"
 
     /**
      * Represents a mega evolution.
@@ -124,7 +140,7 @@ object CobblemonPokemonLabels {
     const val TOTEM = "totem"
 
     /**
-     * Represents a Paradox species.
+     * Represents Pokémon that trigger the Booster Energy item (due to Protosynthesis/Quark Drive)
      * For more information see the [Bulbapedia](https://bulbapedia.bulbagarden.net/wiki/Paradox_Pok%C3%A9mon) page.
      */
     const val PARADOX = "paradox"
@@ -171,12 +187,24 @@ object CobblemonPokemonLabels {
      */
     const val GENERATION_7 = "gen7"
 
+    /**
+     * The "official" designation for Pokémon from Gen 7 (Unknown) and not the Alola region
+     * This may also include forms of Pokémon that had been previously introduced
+     */
+    const val GENERATION_7B = "gen7b"
+
     /**
      * Pokémon from the national Pokédex of 810 to 905
      * This may also include forms of Pokémon that had been previously introduced
      */
     const val GENERATION_8 = "gen8"
 
+    /**
+     * The "official" designation for Pokémon from Gen 8 (Hisui) and not the Galar region
+     * This may also include forms of Pokémon that had been previously introduced
+     */
+    const val GENERATION_8A = "gen8a"
+
     /**
      * Pokémon from the national Pokédex from 906 to 1008
      * This may also include forms of Pokémon that had been previously introduced

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

@@ -53,7 +53,7 @@ enum class Stats(override val identifier: ResourceLocation, override val display
         fun getStat(statKey: String) = when(statKey.lowercase()) {
             "hp" -> HP
             "atk", "attack" -> ATTACK // Hyper Cutter states the full stat name "Attack"
-            "def", "defense" -> DEFENCE // Big Pecks states the full stat name "Defense"
+            "def", "defense", "defence" -> DEFENCE // Big Pecks states the full stat name "Defense"
             "spa" -> SPECIAL_ATTACK
             "spd" -> SPECIAL_DEFENCE
             "spe", "speed" -> SPEED

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

@@ -10,15 +10,12 @@ package com.cobblemon.mod.common.api.spawning.fishing
 
 import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.Cobblemon.LOGGER
-import com.cobblemon.mod.common.api.Priority
-import com.cobblemon.mod.common.api.abilities.Abilities
 import com.cobblemon.mod.common.api.events.CobblemonEvents
 import com.cobblemon.mod.common.api.events.fishing.BobberSpawnPokemonEvent
 import com.cobblemon.mod.common.api.fishing.FishingBait
 import com.cobblemon.mod.common.api.pokemon.Natures
 import com.cobblemon.mod.common.api.pokemon.PokemonSpecies
 import com.cobblemon.mod.common.api.pokemon.egg.EggGroup
-import com.cobblemon.mod.common.api.pokemon.stats.Stat
 import com.cobblemon.mod.common.api.pokemon.stats.Stats
 import com.cobblemon.mod.common.api.spawning.SpawnBucket
 import com.cobblemon.mod.common.api.spawning.SpawnCause
@@ -27,7 +24,6 @@ import com.cobblemon.mod.common.api.spawning.detail.PokemonSpawnDetail
 import com.cobblemon.mod.common.api.spawning.detail.SpawnDetail
 import com.cobblemon.mod.common.api.spawning.spawner.Spawner
 import com.cobblemon.mod.common.api.types.ElementalTypes
-import com.cobblemon.mod.common.api.types.tera.TeraTypes
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.item.interactive.PokerodItem
 import com.cobblemon.mod.common.pokemon.Gender
@@ -129,8 +125,8 @@ class FishingSpawnCause(
         }
 
         fun alterFriendshipAttempt(pokemonEntity: PokemonEntity, effect: FishingBait.Effect) {
-            if (pokemonEntity.pokemon.friendship + effect.value > 255)
-                pokemonEntity.pokemon.setFriendship(255)
+            if (pokemonEntity.pokemon.friendship + effect.value > Cobblemon.config.maxPokemonFriendship)
+                pokemonEntity.pokemon.setFriendship(Cobblemon.config.maxPokemonFriendship)
             else
                 pokemonEntity.pokemon.setFriendship(pokemonEntity.pokemon.friendship + effect.value.toInt())
         }

common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/preset/BestSpawnerConfig.kt

@@ -53,7 +53,7 @@ class BestSpawnerConfig {
             .create()
 
         const val CONFIG_NAME = "best-spawner-config"
-        const val INTERNAL_PATH = "data/${Cobblemon.MODID}/spawning/$CONFIG_NAME.json"
+        const val INTERNAL_PATH = "/data/${Cobblemon.MODID}/spawning/$CONFIG_NAME.json"
         const val EXTERNAL_PATH = "config/${Cobblemon.MODID}/spawning/$CONFIG_NAME.json"
 
         fun load(): BestSpawnerConfig {
@@ -77,7 +77,7 @@ class BestSpawnerConfig {
         }
 
         private fun loadInternal(): BestSpawnerConfig {
-            val reader = InputStreamReader(Cobblemon.javaClass.classLoader.getResourceAsStream(INTERNAL_PATH)!!)
+            val reader = InputStreamReader(Cobblemon::class.java.getResourceAsStream(INTERNAL_PATH)!!)
             val config = GSON.fromJson(reader, BestSpawnerConfig::class.java)
             reader.close()
             return config

common/src/main/kotlin/com/cobblemon/mod/common/api/storage/player/PlayerInstancedDataStoreManager.kt

@@ -27,15 +27,15 @@ import net.minecraft.world.entity.player.Player
  * @since February 21, 2024
  */
 
-class PlayerInstancedDataStoreManager {
+open class PlayerInstancedDataStoreManager {
     val factories = mutableMapOf<PlayerInstancedDataStoreType, PlayerInstancedDataFactory<*>>()
     val saveTasks = mutableMapOf<PlayerInstancedDataStoreType, ScheduledTask>()
-    fun setFactory(factory: PlayerInstancedDataFactory<*>, dataType: PlayerInstancedDataStoreType) {
+    open fun setFactory(factory: PlayerInstancedDataFactory<*>, dataType: PlayerInstancedDataStoreType) {
         factories[dataType] = factory
     }
 
 
-    fun setup(server: MinecraftServer) {
+    open fun setup(server: MinecraftServer) {
         factories.values.forEach {
             it.setup(server)
         }
@@ -57,62 +57,62 @@ class PlayerInstancedDataStoreManager {
             .build()
     }
 
-    fun get(playerId: UUID, dataType: PlayerInstancedDataStoreType): InstancedPlayerData {
+    open fun get(playerId: UUID, dataType: PlayerInstancedDataStoreType): InstancedPlayerData {
         if (!factories.contains(dataType)) {
             throw UnsupportedOperationException("No factory registered for $dataType")
         }
         return factories[dataType]!!.getForPlayer(playerId)
     }
 
-    fun get(player: Player, dataType: PlayerInstancedDataStoreType): InstancedPlayerData {
+    open fun get(player: Player, dataType: PlayerInstancedDataStoreType): InstancedPlayerData {
         return get(player.uuid, dataType)
     }
 
-    fun saveAllOfOneType(dataType: PlayerInstancedDataStoreType) {
+    open fun saveAllOfOneType(dataType: PlayerInstancedDataStoreType) {
         if (!factories.contains(dataType)) {
             throw UnsupportedOperationException("No factory registered for $dataType")
         }
         return factories[dataType]!!.saveAll()
     }
 
-    fun saveSingle(playerData: InstancedPlayerData, dataType: PlayerInstancedDataStoreType) {
+    open fun saveSingle(playerData: InstancedPlayerData, dataType: PlayerInstancedDataStoreType) {
         if (!factories.contains(dataType)) {
             throw UnsupportedOperationException("No factory registered for $dataType")
         }
         return factories[dataType]!!.saveSingle(playerData.uuid)
     }
 
-    fun onPlayerDisconnect(player: ServerPlayer) {
+    open fun onPlayerDisconnect(player: ServerPlayer) {
         factories.values.forEach {
             it.onPlayerDisconnect(player)
         }
     }
 
-    fun syncAllToPlayer(player: ServerPlayer) {
+    open fun syncAllToPlayer(player: ServerPlayer) {
         factories.values.forEach {
             it.sendToPlayer(player)
         }
     }
 
-    fun saveAllStores() {
+    open fun saveAllStores() {
         factories.values.forEach {
             it.saveAll()
         }
     }
 
-    fun getGenericData(player: ServerPlayer): GeneralPlayerData {
+    open fun getGenericData(player: ServerPlayer): GeneralPlayerData {
         return getGenericData(player.uuid)
     }
 
-    fun getGenericData(playerId: UUID): GeneralPlayerData {
+    open fun getGenericData(playerId: UUID): GeneralPlayerData {
         return get(playerId, PlayerInstancedDataStoreTypes.GENERAL) as GeneralPlayerData
     }
 
-    fun getPokedexData(player: ServerPlayer): PokedexManager {
+    open fun getPokedexData(player: ServerPlayer): PokedexManager {
         return getPokedexData(player.uuid)
     }
 
-    fun getPokedexData(playerId: UUID): PokedexManager {
+    open fun getPokedexData(playerId: UUID): PokedexManager {
         return get(playerId, PlayerInstancedDataStoreTypes.POKEDEX) as PokedexManager
     }
 }

common/src/main/kotlin/com/cobblemon/mod/common/api/tags/CobblemonBlockTags.kt

@@ -23,30 +23,72 @@ object CobblemonBlockTags {
 
     @JvmField val ALL_HANGING_SIGNS = createTag("all_hanging_signs")
     @JvmField val ALL_SIGNS = createTag("all_signs")
+    @JvmField val ANCIENT_CITY_BLOCKS = createTag("ancient_city_blocks")
     @JvmField val APRICORN_LEAVES = createTag("apricorn_leaves")
     @JvmField val APRICORN_LOGS = createTag("apricorn_logs")
     @JvmField val APRICORN_SAPLINGS = createTag("apricorn_saplings")
     @JvmField val APRICORNS = createTag("apricorns")
-    @JvmField val BERRY_WILD_SOIL = createTag("berry_wild_soil")
-    @JvmField val BERRY_SOIL = createTag("berry_soil")
+    @JvmField val BERRIES = createTag("berries")
     @JvmField val BERRY_REPLACEABLE = createTag("berry_replaceable")
+    @JvmField val BERRY_SOIL = createTag("berry_soil")
+    @JvmField val BERRY_WILD_SOIL = createTag("berry_wild_soil")
+    @JvmField val BLACK_TUMBLESTONE_BRICKS = createTag("black_tumblestone_bricks")
+    @JvmField val BLACK_TUMBLESTONES = createTag("black_tumblestones")
+    @JvmField val BLUE_FLOWERS = createTag("blue_flowers")
     @JvmField val CEILING_HANGING_SIGNS = createTag("ceiling_hanging_signs")
     @JvmField val CROPS = createTag("crops")
+    @JvmField val DAWN_STONE_ORES = createTag("dawn_stone_ores")
+    @JvmField val DESERT_PYRAMID_BLOCKS = createTag("desert_pyramid_blocks")
     @JvmField val DRIPSTONE_GROWABLE = createTag("dripstone_growable")
     @JvmField val DRIPSTONE_REPLACEABLES = createTag("dripstone_replaceables")
+    @JvmField val DUSK_STONE_ORES = createTag("dusk_stone_ores")
+    @JvmField val END_CITY_BLOCKS = createTag("end_city_blocks")
+    @JvmField val EVOLUTION_STONE_BLOCKS = createTag("evolution_stone_blocks")
+    @JvmField val FIRE_STONE_ORES = createTag("fire_stone_ores")
     @JvmField val FLOWERS = createTag("flowers")
+    @JvmField val FOSSIL_MACHINE_PARTS = createTag("fossil_machine_parts")
+    @JvmField val GEMSTONES = createTag("gemstones")
+    @JvmField val GILDED_CHESTS = createTag("gilded_chests")
+    @JvmField val GLAZED_TERRACOTTA_BLOCKS = createTag("glazed_terracotta_blocks")
+    @JvmField val ICE_STONE_ORES = createTag("ice_stone_ores")
+    @JvmField val JUNGLE_PYRAMID_BLOCKS = createTag("jungle_pyramid_blocks")
+    @JvmField val LEAF_STONE_ORES = createTag("leaf_stone_ores")
+    @JvmField val MACHINES = createTag("machines")
+    @JvmField val MANSION_BLOCKS = createTag("mansion_blocks")
     @JvmField val MEDICINAL_LEEK_PLANTABLE = createTag("medicinal_leek_plantable")
     @JvmField val MINTS = createTag("mints")
-    @JvmField val ROOTS_SPREADABLE = createTag("roots_spreadable")
-    @JvmField val SIGNS = createTag("signs")
-    @JvmField val SMALL_FLOWERS = createTag("small_flowers")
-    @JvmField val SEES_SKY = createTag("sees_sky")
-    @JvmField val SNOW_BLOCK = createTag("snow_block")
+    @JvmField val MOON_STONE_ORES = createTag("moon_stone_ores")
+    @JvmField val NATURAL = createTag("natural")
+    @JvmField val NETHER_STRUCTURE_BLOCKS = createTag("nether_structure_blocks")
+    @JvmField val PINK_FLOWERS = createTag("pink_flowers")
+    @JvmField val RED_FLOWERS = createTag("red_flowers")
+    @JvmField val RED_TUMBLESTONE_BRICKS = createTag("red_tumblestone_bricks")
+    @JvmField val RED_TUMBLESTONES = createTag("red_tumblestones")
+    @JvmField val REDSTONE_BLOCKS = createTag("redstone_blocks")
     @JvmField val ROOTS = createTag("roots")
+    @JvmField val ROOTS_SPREADABLE = createTag("roots_spreadable")
+    @JvmField val RUINED_PORTAL_BLOCKS = createTag("ruined_portal_blocks")
+    @JvmField val SEES_SKY = createTag("sees_sky")
+    @JvmField val SHINY_STONE_ORES = createTag("shiny_stone_ores")
+    @JvmField val SIGNS = createTag("signs")
+    @JvmField val SKY_TUMBLESTONE_BRICKS = createTag("sky_tumblestone_bricks")
+    @JvmField val SKY_TUMBLESTONES = createTag("sky_tumblestones")
+    @JvmField val SMALL_FLOWERS = createTag("small_flowers")
+    @JvmField val SNOW_BLOCK = createTag("snow_block")
     @JvmField val STANDING_SIGNS = createTag("standing_signs")
+    @JvmField val SUN_STONE_ORES = createTag("sun_stone_ores")
+    @JvmField val THUNDER_STONE_ORES = createTag("thunder_stone_ores")
+    @JvmField val TRAIL_RUINS_BLOCKS = createTag("trail_ruins_blocks")
+    @JvmField val TRASH = createTag("trash")
+    @JvmField val TREES = createTag("trees")
+    @JvmField val TUMBLESTONE_BRICKS = createTag("tumblestone_bricks")
+    @JvmField val TUMBLESTONES = createTag("tumblestones")
     @JvmField val TUMBLESTONE_HEAT_SOURCE = createTag("tumblestone_heat_source")
     @JvmField val WALL_HANGING_SIGNS = createTag("wall_hanging_signs")
     @JvmField val WALL_SIGNS = createTag("wall_signs")
+    @JvmField val WATER_STONE_ORES = createTag("water_stone_ores")
+    @JvmField val WHITE_FLOWERS = createTag("white_flowers")
+    @JvmField val YELLOW_FLOWERS = createTag("yellow_flowers")
 
     private fun createTag(name: String) = TagKey.create(Registries.BLOCK, cobblemonResource(name))
 

common/src/main/kotlin/com/cobblemon/mod/common/api/tags/CobblemonItemTags.kt

@@ -21,137 +21,108 @@ import net.minecraft.tags.TagKey
  */
 @Suppress("unused", "HasPlatformType")
 object CobblemonItemTags {
-    @JvmField
-    val ANCIENT_POKE_BALLS = create("ancient_poke_balls")
-    @JvmField
-    val APRICORN_LOGS = create("apricorn_logs")
-    @JvmField
-    val APRICORN_SPROUTS = create("apricorn_sprouts")
-    @JvmField
-    val APRICORNS = create("apricorns")
-    @JvmField
-    val POKEDEX = create("pokedex")
-    /**
-     * This tag is only used for a Torterra aspect based easter egg evolution at the moment.
-     * It simply includes the 'minecraft:azalea' and 'minecraft:flowering_azalea' items by default.
-     */
-    @JvmField
-    val AZALEA_TREE = create("azalea_tree")
-    @JvmField
-    val BERRIES = create("berries")
-    @JvmField
-    val BOATS = create("boats")
-    @JvmField
-    val COBBLEMON_SEEDS = create("cobblemon_seeds")
-    /**
-     * This tag is used for Fossil Machine natural materials
-     */
-    @JvmField
-    val COOKED_MEAT = create("cooked_meat")
-    @JvmField
-    val DAWN_STONE_ORES = create("dawn_stone_ores")
-    @JvmField
-    val DUSK_STONE_ORES = create("dusk_stone_ores")
-    @JvmField
-    val EVOLUTION_ITEMS = create("evolution_items")
-    @JvmField
-    val EVOLUTION_STONES = create("evolution_stones")
-    @JvmField
-    val EXPERIENCE_CANDIES = create("experience_candies")
-    @JvmField
-    val FIRE_STONE_ORES = create("fire_stone_ores")
-    @JvmField
-    val FOSSILS = create("fossils")
-    @JvmField
-    val HANGING_SIGNS = create("hanging_signs")
-    @JvmField
-    val HERBS = create("herbs")
-    @JvmField
-    val ICE_STONE_ORES = create("ice_stone_ores")
-    @JvmField
-    val LEAF_STONE_ORES = create("leaf_stone_ores")
-    @JvmField
-    val MINT_LEAF = create("mint_leaf")
-    @JvmField
-    val MINT_SEEDS = create("mint_seeds")
-    @JvmField
-    val MINTS = create("mints")
-    @JvmField
-    val MOON_STONE_ORES = create("moon_stone_ores")
-    @JvmField
-    val MUTATED_BERRIES = create("mutated_berries")
-    @JvmField
-    val PLANTS = create("plants")
-    @JvmField
-    val POKE_BALLS = create("poke_balls")
-    @JvmField
-    val PROTEIN_INGREDIENTS = create("protein_ingredients")
+    @JvmField val ABILITY_CHANGERS = create("ability_changers")
+    @JvmField val ANCIENT_POKE_BALLS = create("ancient_poke_balls")
+    @JvmField val APPLES = create("apples")
+    @JvmField val APRICORN_LOGS = create("apricorn_logs")
+    @JvmField val APRICORN_POKE_BALLS = create("apricorn_poke_balls")
+    @JvmField val APRICORN_SPROUTS = create("apricorn_sprouts")
+    @JvmField val APRICORNS = create("apricorns")
+    /** This tag is only used for a Torterra aspect based easter egg evolution at the moment.
+     * It simply includes the 'minecraft:azalea' and 'minecraft:flowering_azalea' items by default. */
+    @JvmField val AZALEA_TREE = create("azalea_tree")
+    @JvmField val BATTLE_ITEMS = create("battle_items")
+    @JvmField val BERRIES = create("berries")
+    @JvmField val BLACK_TUMBLESTONE_BRICKS = create("black_tumblestone_bricks")
+    @JvmField val BLACK_TUMBLESTONES = create("black_tumblestones")
+    @JvmField val BOATS = create("boats")
+    /** This tag is used for Fossil Machine natural materials */
+    @JvmField val COOKED_MEAT = create("cooked_meat")
+    @JvmField val DAWN_STONE_ORES = create("dawn_stone_ores")
+    @JvmField val POTTERY_SHERDS = create("decorated_pot_sherds")
+    @JvmField val DEEP_SEAS = create("deep_seas")
+    @JvmField val DUSK_STONE_ORES = create("dusk_stone_ores")
+    @JvmField val ETHERS = create("ethers")
+    @JvmField val EVOLUTION_ITEMS = create("evolution_items")
+    @JvmField val EVOLUTION_STONE_BLOCKS = create("evolution_stone_blocks")
+    @JvmField val EVOLUTION_STONES = create("evolution_stones")
+    @JvmField val EXPERIENCE_CANDIES = create("experience_candies")
+    @JvmField val FEATHERS = create("feathers")
+    @JvmField val FIRE_STONE_ORES = create("fire_stone_ores")
+    @JvmField val FOSSIL_MACHINE_PARTS = create("fossil_machine_parts")
+    @JvmField val FOSSILS = create("fossils")
+    @JvmField val GILDED_CHESTS = create("gilded_chests")
+    @JvmField val HANGING_SIGNS = create("hanging_signs")
+    @JvmField val HERBS = create("herbs")
+    @JvmField val ICE_STONE_ORES = create("ice_stone_ores")
+    @JvmField val LEAF_STONE_ORES = create("leaf_stone_ores")
+    @JvmField val MACHINES = create("machines")
+    @JvmField val MINT_LEAF = create("mint_leaf")
+    @JvmField val MINT_SEEDS = create("mint_seeds")
+    @JvmField val MINTS = create("mints")
+    @JvmField val MOON_STONE_ORES = create("moon_stone_ores")
+    @JvmField val MUTATED_BERRIES = create("mutated_berries")
+    @JvmField val PLANTS = create("plants")
+    @JvmField val POKE_BALLS = create("poke_balls")
+    @JvmField val POKE_RODS = create("poke_rods")
+    @JvmField val POKEDEX = create("pokedex")
+    @JvmField val POKEDEX_SCREEN = create("pokedex_screen")
+    @JvmField val POTIONS = create("potions")
+    @JvmField val PROTEIN_INGREDIENTS = create("protein_ingredients")
     /** See [COOKED_MEAT] */
-    @JvmField
-    val RAW_MEAT = create("raw_meat")
-    @JvmField
-    val SEEDS = create("seeds")
-    @JvmField
-    val SHINY_STONE_ORES = create("shiny_stone_ores")
-    @JvmField
-    val SIGNS = create("signs")
-    @JvmField
-    val SUN_STONE_ORES = create("sun_stone_ores")
-    @JvmField
-    val THUNDER_STONE_ORES = create("thunder_stone_ores")
-    @JvmField
-    val TUMBLESTONES = create("tumblestones")
-    @JvmField
-    val WATER_STONE_ORES = create("water_stone_ores")
-    @JvmField
-    val ZINC_INGREDIENTS = create("zinc_ingredients")
+    @JvmField val RAW_MEAT = create("raw_meat")
+    @JvmField val RED_TUMBLESTONE_BRICKS = create("red_tumblestone_bricks")
+    @JvmField val RED_TUMBLESTONES = create("red_tumblestones")
+    @JvmField val REMEDIES = create("remedies")
+    @JvmField val RESTORES = create("restores")
+    @JvmField val REVIVES = create("revives")
+    @JvmField val SEEDS = create("seeds")
+    @JvmField val SHINY_STONE_ORES = create("shiny_stone_ores")
+    @JvmField val SIGNS = create("signs")
+    @JvmField val SKY_TUMBLESTONE_BRICKS = create("sky_tumblestone_bricks")
+    @JvmField val SKY_TUMBLESTONES = create("sky_tumblestones")
+    @JvmField val SUN_STONE_ORES = create("sun_stone_ores")
+    @JvmField val SWEETS = create("sweets")
+    @JvmField val TEACUPS = create("teacups")
+    @JvmField val TEAPOTS = create("teapots")
+    @JvmField val THUNDER_STONE_ORES = create("thunder_stone_ores")
+    @JvmField val TIER_1_POKE_BALL_MATERIALS = create("tier_1_poke_ball_materials")
+    @JvmField val TIER_1_POKE_BALLS = create("tier_1_poke_balls")
+    @JvmField val TIER_2_POKE_BALL_MATERIALS = create("tier_2_poke_ball_materials")
+    @JvmField val TIER_2_POKE_BALLS = create("tier_2_poke_balls")
+    @JvmField val TIER_3_POKE_BALL_MATERIALS = create("tier_3_poke_ball_materials")
+    @JvmField val TIER_3_POKE_BALLS = create("tier_3_poke_balls")
+    @JvmField val TIER_4_POKE_BALL_MATERIALS = create("tier_4_poke_ball_materials")
+    @JvmField val TIER_4_POKE_BALLS = create("tier_4_poke_balls")
+    @JvmField val TIER_5_POKE_BALLS = create("tier_5_poke_balls")
+    @JvmField val TUMBLESTONE_BRICKS = create("tumblestone_bricks")
+    @JvmField val TUMBLESTONES = create("tumblestones")
+    @JvmField val TYPE_GEMS = create("type_gems")
+    @JvmField val VITAMINS = create("vitamins")
+    @JvmField val WATER_STONE_ORES = create("water_stone_ores")
+    @JvmField val ZINC_INGREDIENTS = create("zinc_ingredients")
 
     // Held Item Tags
-    @JvmField
-    val ANY_HELD_ITEM = create("held/is_held_item")
-    @JvmField
-    val EXPERIENCE_SHARE = create("held/experience_share")
-    @JvmField
-    val LUCKY_EGG = create("held/lucky_egg")
-    @JvmField
-    val DESTINY_KNOT = create("held/destiny_knot")
-    @JvmField
-    val EVERSTONE = create("held/everstone")
-    @JvmField
-    val POWER_ANKLET = create("held/power_anklet")
-    @JvmField
-    val POWER_BAND = create("held/power_band")
-    @JvmField
-    val POWER_BELT = create("held/power_belt")
-    @JvmField
-    val POWER_BRACER = create("held/power_bracer")
-    @JvmField
-    val POWER_LENS = create("held/power_lens")
-    @JvmField
-    val POWER_WEIGHT = create("held/power_weight")
-    @JvmField
-    val CONSUMED_IN_NPC_BATTLE = create("held/consumed_in_npc_battle")
-    @JvmField
-    val CONSUMED_IN_PVP_BATTLE = create("held/consumed_in_pvp_battle")
-    @JvmField
-    val CONSUMED_IN_WILD_BATTLE = create("held/consumed_in_wild_battle")
-    @JvmField
-    val TERRAIN_SEEDS = create("held/terrain_seeds")
+    @JvmField val CONSUMED_IN_NPC_BATTLE = create("held/consumed_in_npc_battle")
+    @JvmField val CONSUMED_IN_PVP_BATTLE = create("held/consumed_in_pvp_battle")
+    @JvmField val CONSUMED_IN_WILD_BATTLE = create("held/consumed_in_wild_battle")
+    @JvmField val DESTINY_KNOT = create("held/destiny_knot")
+    @JvmField val EVERSTONE = create("held/everstone")
+    @JvmField val EXPERIENCE_SHARE = create("held/experience_share")
+    @JvmField val IS_FRIENDSHIP_BOOSTER = create("is_friendship_booster")
+    @JvmField val ANY_HELD_ITEM = create("held/is_held_item")
+    /** Tag that flags items as being able to "create" [CobblemonItems.LEFTOVERS]. */
+    @JvmField val LEAVES_LEFTOVERS = create("held/leaves_leftovers")
+    @JvmField val LUCKY_EGG = create("held/lucky_egg")
+    @JvmField val POWER_ANKLET = create("held/power_anklet")
+    @JvmField val POWER_BAND = create("held/power_band")
+    @JvmField val POWER_BELT = create("held/power_belt")
+    @JvmField val POWER_BRACER = create("held/power_bracer")
+    @JvmField val POWER_LENS = create("held/power_lens")
+    @JvmField val POWER_WEIGHT = create("held/power_weight")
+    @JvmField val TERRAIN_SEEDS = create("held/terrain_seeds")
 
-    /**
-     * Tag that flags items as being able to "create" [CobblemonItems.LEFTOVERS].
-     */
-    @JvmField
-    val LEAVES_LEFTOVERS = create("held/leaves_leftovers")
 
-    @JvmField
-    val POTTERY_SHERDS = create("decorated_pot_sherds")
-
-    @JvmField
-    val ABILITY_CHANGERS = create("ability_changers")
-
-    @JvmField
-    val IS_FRIENDSHIP_BOOSTER = create("is_friendship_booster")
 
     private fun create(path: String) = TagKey.create(Registries.ITEM, cobblemonResource(path))
 

common/src/main/kotlin/com/cobblemon/mod/common/battles/dispatch/InstructionSet.kt

@@ -9,6 +9,7 @@
 package com.cobblemon.mod.common.battles.dispatch
 
 import com.cobblemon.mod.common.api.battles.model.PokemonBattle
+import org.objectweb.asm.tree.analysis.Interpreter
 
 class InstructionSet {
     val instructions: MutableList<InterpreterInstruction> = mutableListOf()

common/src/main/kotlin/com/cobblemon/mod/common/battles/runner/graal/GraalShowdownUnbundler.kt

@@ -65,8 +65,8 @@ class GraalShowdownUnbundler {
             }
 
             if (extract) {
-                FileUtils.copyInternalToExternal("data/${Cobblemon.MODID}/showdown.zip", showdownZip.toPath())
-                FileUtils.copyInternalToExternal("data/${Cobblemon.MODID}/showdown.json", showdownMetadataFile.toPath())
+                FileUtils.copyInternalToExternal("/data/${Cobblemon.MODID}/showdown.zip", showdownZip.toPath())
+                FileUtils.copyInternalToExternal("/data/${Cobblemon.MODID}/showdown.json", showdownMetadataFile.toPath())
                 FileUtils.unzipFile(showdownZip.toPath(), showdownDir.toPath())
                 showdownZip.delete()
             }
@@ -75,7 +75,7 @@ class GraalShowdownUnbundler {
 
     private fun loadShowdownMetadata() : ShowdownMetadata? {
         try {
-            val inputStream = javaClass.classLoader.getResourceAsStream("data/${Cobblemon.MODID}/showdown.json")!!
+            val inputStream = javaClass.getResourceAsStream("/data/${Cobblemon.MODID}/showdown.json")!!
             return gson.fromJson<ShowdownMetadata>(InputStreamReader(inputStream))
         } catch (exception: Exception) {
             exception.printStackTrace()

common/src/main/kotlin/com/cobblemon/mod/common/client/entity/PokemonClientDelegate.kt

@@ -372,24 +372,24 @@ class PokemonClientDelegate : PosableState(), PokemonSideDelegate {
 
     override fun tick(entity: PokemonEntity) {
         incrementAge(entity)
-        if(currentEntity.ownerUUID == null && currentEntity.pokemon.shiny && secondsSinceLastShinyParticle > SHINY_PARTICLE_COOLDOWN && !currentEntity.isBattling) {
-            //wild shiny not looked at
-            playShinyEffect("cobblemon:shiny_sparkle_ambient_wild")
-            lastShinyParticle = System.currentTimeMillis()
-        }
-        getClientShinyPokemon()
+        playWildShinySounds()
     }
 
-    fun getClientShinyPokemon() {
+    fun playWildShinySounds() {
         val player = Minecraft.getInstance().player ?: return
         val isWithinRange = player.position().distanceTo(currentEntity.position()) <= Cobblemon.config.shinyNoticeParticlesDistance
 
-        if (currentEntity.pokemon.shiny && currentEntity.ownerUUID == null && !player.isSpectator ) {
-            if (isWithinRange && !shined) {
-                playShinyEffect("cobblemon:wild_shiny_ring")
-                shined = true
-                lastShinyParticle = System.currentTimeMillis()
-            } else if (!isWithinRange) {
+        if (currentEntity.pokemon.shiny && currentEntity.ownerUUID == null) {
+            if (isWithinRange) {
+                if (secondsSinceLastShinyParticle > SHINY_PARTICLE_COOLDOWN && !currentEntity.isBattling) {
+                    playShinyEffect("cobblemon:shiny_sparkle_ambient_wild")
+                    lastShinyParticle = System.currentTimeMillis()
+                }
+                if (!shined && !player.isSpectator) {
+                    playShinyEffect("cobblemon:wild_shiny_ring")
+                    shined = true
+                }
+            } else {
                 shined = false
             }
         }

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/battle/subscreen/BattleTargetSelection.kt

@@ -191,6 +191,8 @@ class BattleTargetSelection(
                 matrices.pushPose()
                 matrices.translate(x + TARGET_WIDTH - (25 / 2.0) - 2, y + 5.0, 0.0)
                 matrices.scale(2.5F, 2.5F, 1F)
+                // Grab aspects for right variant
+                state.currentAspects = battlePokemon.state.currentAspects
                 drawProfilePokemon(
                     species = battlePokemon.species.resourceIdentifier,
                     matrixStack = matrices,

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/pc/GrabbedStorageSlot.kt

@@ -17,6 +17,10 @@ class GrabbedStorageSlot(
     private val pokemon: Pokemon
 ) : StorageSlot(x, y, parent, {}) {
 
+    init {
+        isSelected = true
+    }
+
     override fun renderWidget(context: GuiGraphics, mouseX: Int, mouseY: Int, delta: Float) {
         renderSlot(context = context, posX = mouseX - (width / 2), posY = mouseY - (height / 2), partialTicks = delta)
     }

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/pc/PCGUI.kt

@@ -40,7 +40,8 @@ import net.minecraft.sounds.SoundEvent
 class PCGUI(
     val pc: ClientPC,
     val party: ClientParty,
-    val configuration: PCGUIConfiguration
+    val configuration: PCGUIConfiguration,
+    val openOnBox: Int = 0
 ) : Screen(Component.translatable("cobblemon.ui.pc.title")), CobblemonRenderable {
 
     companion object {
@@ -110,6 +111,7 @@ class PCGUI(
             pc = pc,
             party = party
         )
+        this.storageWidget.box = openOnBox
 
         this.setPreviewPokemon(null)
         this.addRenderableWidget(storageWidget)

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/pc/StorageSlot.kt

@@ -46,6 +46,8 @@ open class StorageSlot(
         private val slotOverlayMoveIconResource = cobblemonResource("textures/gui/pasture/pc_slot_icon_move.png")
     }
 
+    protected var isSelected = false;
+
     override fun playDownSound(soundManager: SoundManager) {
     }
 
@@ -82,50 +84,52 @@ open class StorageSlot(
 
         context.disableScissor()
 
-        // Ensure elements are not hidden behind Pokémon render
-        matrices.pushPose()
-        matrices.translate(0.0, 0.0, 100.0)
-        // Level
-        drawScaledText(
-            context = context,
-            text = lang("ui.lv.number", pokemon.level),
-            x = posX + 1,
-            y = posY + 1,
-            shadow = true,
-            scale = PCGUI.SCALE
-        )
-
-        if (pokemon.gender != Gender.GENDERLESS) {
-            blitk(
-                matrixStack = matrices,
-                texture = if (pokemon.gender == Gender.MALE) genderIconMale else genderIconFemale,
-                x = (posX + 21) / PCGUI.SCALE,
-                y = (posY + 1) / PCGUI.SCALE,
-                width = 6,
-                height = 8,
+        if (!isSelected) {
+            // Ensure elements are not hidden behind Pokémon render
+            matrices.pushPose()
+            matrices.translate(0.0, 0.0, 100.0)
+            // Level
+            drawScaledText(
+                context = context,
+                text = lang("ui.lv.number", pokemon.level),
+                x = posX + 1,
+                y = posY + 1,
+                shadow = true,
                 scale = PCGUI.SCALE
             )
-        }
 
-        // Held Item
-        val heldItem = pokemon.heldItemNoCopy()
-        if (!heldItem.isEmpty) {
-            renderScaledGuiItemIcon(
-                itemStack = heldItem,
-                x = posX + 16.0,
-                y = posY + 16.0,
-                scale = 0.5,
-                matrixStack = matrices
-            )
+            if (pokemon.gender != Gender.GENDERLESS) {
+                blitk(
+                    matrixStack = matrices,
+                    texture = if (pokemon.gender == Gender.MALE) genderIconMale else genderIconFemale,
+                    x = (posX + 21) / PCGUI.SCALE,
+                    y = (posY + 1) / PCGUI.SCALE,
+                    width = 6,
+                    height = 8,
+                    scale = PCGUI.SCALE
+                )
+            }
+
+            // Held Item
+            val heldItem = pokemon.heldItemNoCopy()
+            if (!heldItem.isEmpty) {
+                renderScaledGuiItemIcon(
+                    itemStack = heldItem,
+                    x = posX + 16.0,
+                    y = posY + 16.0,
+                    scale = 0.5,
+                    matrixStack = matrices
+                )
+            }
+            matrices.popPose()
         }
-        matrices.popPose()
 
         // Ensure overlay elements are on top
         matrices.pushPose()
         matrices.translate(0.0, 0.0, 500.0)
 
         val config = parent.pcGui.configuration
-        if (pokemon.tetheringId != null) {
+        if (pokemon.tetheringId != null && !isSelected) {
             if (isStationary()) {
                 blitk(
                     matrixStack = matrices,

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/pc/StorageWidget.kt

@@ -286,7 +286,10 @@ class StorageWidget(
         }
 
         pastureWidget?.render(context, mouseX, mouseY, delta)
+        matrices.pushPose()
+        matrices.translate(0.0, 0.0, 1000.0)
         grabbedSlot?.render(context, mouseX, mouseY, delta)
+        matrices.popPose()
     }
 
     override fun mouseClicked(pMouseX: Double, pMouseY: Double, pButton: Int): Boolean {

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/summary/Summary.kt

@@ -163,8 +163,8 @@ class Summary private constructor(party: Collection<Pokemon?>, private val edita
                 },
                 text = lang("ui.evolve"),
                 resource = evolveButtonResource,
-                renderRequirement = { selectedPokemon.evolutionProxy.client().isNotEmpty() },
-                clickRequirement = { selectedPokemon.evolutionProxy.client().isNotEmpty() }
+                renderRequirement = { selectedPokemon.evolutionProxy.client().isNotEmpty() && CobblemonClient.battle == null },
+                clickRequirement = { selectedPokemon.evolutionProxy.client().isNotEmpty() && CobblemonClient.battle == null }
             )
         )
 

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/toast/CobblemonToast.kt

@@ -9,6 +9,8 @@
 package com.cobblemon.mod.common.client.gui.toast
 
 import com.cobblemon.mod.common.net.messages.client.toast.ToastPacket
+import net.fabricmc.api.EnvType
+import net.fabricmc.api.Environment
 import net.minecraft.client.gui.GuiGraphics
 import net.minecraft.client.gui.components.toasts.Toast
 import net.minecraft.client.gui.components.toasts.ToastComponent
@@ -19,6 +21,7 @@ import net.minecraft.util.Mth
 import java.util.*
 import kotlin.math.min
 
+@Environment(EnvType.CLIENT)
 class CobblemonToast(
     val id: UUID,
     var icon: ItemStack,

common/src/main/kotlin/com/cobblemon/mod/common/client/net/settings/ServerSettingsPacketHandler.kt

@@ -19,6 +19,8 @@ object ServerSettingsPacketHandler : ClientNetworkPacketHandler<ServerSettingsPa
         ServerSettings.displayEntityLevelLabel = packet.displayEntityLevelLabel
         ServerSettings.displayEntityNameLabel = packet.displayEntityNameLabel
         ServerSettings.maxPokemonLevel = packet.maxPokemonLevel
+        ServerSettings.maxPokemonFriendship = packet.maxPokemonFriendship
+        ServerSettings.maxDynamaxLevel = packet.maxDynamaxLevel
     }
 
 }

common/src/main/kotlin/com/cobblemon/mod/common/client/net/storage/pc/OpenPCHandler.kt

@@ -18,6 +18,6 @@ import net.minecraft.client.Minecraft
 object OpenPCHandler : ClientNetworkPacketHandler<OpenPCPacket> {
     override fun handle(packet: OpenPCPacket, client: Minecraft) {
         val pc = CobblemonClient.storage.pcStores[packet.storeID] ?: return
-        Minecraft.getInstance().setScreen(PCGUI(pc, CobblemonClient.storage.myParty, PCGUIConfiguration()))
+        Minecraft.getInstance().setScreen(PCGUI(pc, CobblemonClient.storage.myParty, PCGUIConfiguration(), packet.box))
     }
 }

common/src/main/kotlin/com/cobblemon/mod/common/client/pokedex/PokedexScannerRenderer.kt

@@ -116,7 +116,7 @@ class PokedexScannerRenderer {
                             drawScaledText(
                                 context = graphics,
                                 font = CobblemonResources.DEFAULT_LARGE,
-                                text = lang("ui.lv.number", pokedexEntityData.level).bold(),
+                                text = lang("ui.lv.number", pokedexEntityData.pokemon.level).bold(),
                                 x = centerX + xOffset + xOffsetText,
                                 y = centerY + yOffset + yOffsetText,
                                 shadow = true,
@@ -126,7 +126,7 @@ class PokedexScannerRenderer {
 
                         if (infoDisplayedCounter == 2) {
                             val hasTrainer = (usageContext.scannableEntityInFocus?.resolveEntityScan() as? PokemonEntity)?.ownerUUID !== null
-                            val speciesName = pokedexEntityData.species.translatedName.bold()
+                            val speciesName = pokedexEntityData.getApparentSpecies().translatedName.bold()
                             var yOffsetName = if (hasTrainer) 2 else 0
                             if (hasTrainer) {
                                 drawScaledText(
@@ -149,7 +149,7 @@ class PokedexScannerRenderer {
                                 centered = true
                             )
 
-                            val gender = pokedexEntityData.gender
+                            val gender = pokedexEntityData.pokemon.gender
                             val speciesNameWidth = Minecraft.getInstance().font.width(speciesName.font(CobblemonResources.DEFAULT_LARGE))
                             if (gender != Gender.GENDERLESS) {
                                 val isMale = gender == Gender.MALE
@@ -179,14 +179,15 @@ class PokedexScannerRenderer {
                         }
 
                         if (infoDisplayedCounter == 3) {
-                            val typeText = lang("type.suffix", pokedexEntityData.form.types.map { it.displayName.copy() }.reduce { acc, next -> acc.plus("/").plus(next) }).bold()
+                            val typeText = lang("type.suffix", pokedexEntityData.getApparentForm().types.map { it.displayName.copy() }.reduce { acc, next -> acc.plus("/").plus(next) }).bold()
                             val typeWidth = Minecraft.getInstance().font.width(typeText.font(CobblemonResources.DEFAULT_LARGE))
                             // Split into 2 lines if text width is too long
-                            if (typeWidth > (OUTER_INFO_FRAME_WIDTH - 8) && pokedexEntityData.form.secondaryType !== null) {
+                            if (typeWidth > (OUTER_INFO_FRAME_WIDTH - 8) && pokedexEntityData.getApparentForm().secondaryType !== null) {
+                                val splitLines = typeText.string.split("/")
                                 drawScaledText(
                                     context = graphics,
                                     font = CobblemonResources.DEFAULT_LARGE,
-                                    text = lang("type.suffix", pokedexEntityData.form.primaryType.displayName).bold(),
+                                    text = text(splitLines[0], "/").bold(),
                                     x = centerX + xOffset + xOffsetText,
                                     y = centerY + yOffset + yOffsetText - 4,
                                     shadow = true,
@@ -196,7 +197,7 @@ class PokedexScannerRenderer {
                                 drawScaledText(
                                     context = graphics,
                                     font = CobblemonResources.DEFAULT_LARGE,
-                                    text = lang("type.suffix", pokedexEntityData.form.secondaryType!!.displayName).bold(),
+                                    text = text(splitLines[1]).bold(),
                                     x = centerX + xOffset + xOffsetText,
                                     y = centerY + yOffset + yOffsetText + 3,
                                     shadow = true,

common/src/main/kotlin/com/cobblemon/mod/common/client/render/MatrixWrapper.kt

@@ -10,6 +10,7 @@ package com.cobblemon.mod.common.client.render
 
 import com.cobblemon.mod.common.util.math.geometry.getOrigin
 import com.cobblemon.mod.common.util.math.geometry.transformPosition
+import net.fabricmc.loader.impl.lib.sat4j.core.Vec
 import org.joml.Matrix4f
 import net.minecraft.world.phys.Vec3
 

common/src/main/kotlin/com/cobblemon/mod/common/client/render/SnowstormParticle.kt

@@ -204,8 +204,8 @@ class SnowstormParticle(
         val spriteURange = sprite.u1 - sprite.u0
         val spriteVRange = sprite.v1 - sprite.v0
 
-        val minU = uvs.startU * spriteURange + sprite.u0
-        val maxU = uvs.endU * spriteURange + sprite.u0
+        val maxU = uvs.startU * spriteURange + sprite.u0
+        val minU = uvs.endU * spriteURange + sprite.u0
         val minV = uvs.startV * spriteVRange + sprite.v0
         val maxV = uvs.endV * spriteVRange + sprite.v0
 

common/src/main/kotlin/com/cobblemon/mod/common/client/render/entity/PokeBobberEntityRenderer.kt

@@ -14,6 +14,8 @@ import com.cobblemon.mod.common.entity.fishing.PokeRodFishingBobberEntity
 import com.cobblemon.mod.common.item.interactive.PokerodItem
 import com.cobblemon.mod.common.util.cobblemonResource
 import java.awt.Color
+import net.fabricmc.api.EnvType
+import net.fabricmc.api.Environment
 import net.minecraft.client.Minecraft
 import net.minecraft.client.renderer.texture.OverlayTexture
 import net.minecraft.client.renderer.RenderType
@@ -31,6 +33,7 @@ import net.minecraft.world.entity.HumanoidArm
 import net.minecraft.world.item.ItemDisplayContext
 import org.joml.Quaternionf
 
+@Environment(value = EnvType.CLIENT)
 class PokeBobberEntityRenderer(context: EntityRendererProvider.Context?) : EntityRenderer<PokeRodFishingBobberEntity>(context) {
 
     override fun render(fishingBobberEntity: PokeRodFishingBobberEntity, elapsedPartialTicks: Float, tickDelta: Float, matrixStack: PoseStack, vertexConsumerProvider: MultiBufferSource, light: Int) {

common/src/main/kotlin/com/cobblemon/mod/common/client/render/item/PokemonItemRenderer.kt

@@ -15,12 +15,12 @@ import com.cobblemon.mod.common.entity.PoseType
 import com.cobblemon.mod.common.item.PokemonItem
 import com.cobblemon.mod.common.util.math.fromEulerXYZDegrees
 import com.mojang.blaze3d.platform.Lighting
-import net.minecraft.client.renderer.texture.OverlayTexture
-import net.minecraft.client.renderer.RenderType
-import com.mojang.blaze3d.vertex.VertexConsumer
-import net.minecraft.client.renderer.MultiBufferSource
 import com.mojang.blaze3d.vertex.PoseStack
+import com.mojang.blaze3d.vertex.VertexConsumer
 import net.minecraft.client.renderer.LightTexture
+import net.minecraft.client.renderer.MultiBufferSource
+import net.minecraft.client.renderer.RenderType
+import net.minecraft.client.renderer.texture.OverlayTexture
 import net.minecraft.world.item.ItemDisplayContext
 import net.minecraft.world.item.ItemStack
 import org.joml.Quaternionf
@@ -50,7 +50,10 @@ class PokemonItemRenderer : CobblemonBuiltinItemRenderer {
 
         val transformations = positions[mode]!!
 
-        Lighting.setupForFlatItems()
+        if (mode == ItemDisplayContext.GUI) {
+            Lighting.setupForFlatItems()
+        }
+
         matrices.scale(transformations.scale.x, transformations.scale.y, transformations.scale.z)
         matrices.translate(transformations.translation.x, transformations.translation.y, transformations.translation.z)
         state.setPoseToFirstSuitable(PoseType.PORTRAIT)
@@ -84,7 +87,10 @@ class PokemonItemRenderer : CobblemonBuiltinItemRenderer {
         model.setDefault()
         matrices.popPose()
         matrices.popPose()
-        Lighting.setupFor3DItems()
+
+        if (mode == ItemDisplayContext.GUI) {
+            Lighting.setupFor3DItems()
+        }
     }
 
     companion object {

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ExeggutorAlolanModel.kt

@@ -1,106 +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.client.render.models.blockbench.pokemon.gen1
-
-import com.cobblemon.mod.common.client.render.models.blockbench.animation.SingleBoneLookAnimation
-import com.cobblemon.mod.common.client.render.models.blockbench.frame.BipedFrame
-import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
-import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
-import com.cobblemon.mod.common.client.render.models.blockbench.pose.Pose
-import com.cobblemon.mod.common.entity.PoseType
-import com.cobblemon.mod.common.entity.PoseType.Companion.MOVING_POSES
-import com.cobblemon.mod.common.entity.PoseType.Companion.STATIONARY_POSES
-import com.cobblemon.mod.common.entity.PoseType.Companion.UI_POSES
-import com.cobblemon.mod.common.util.isBattling
-import net.minecraft.client.model.geom.ModelPart
-import net.minecraft.world.phys.Vec3
-
-class ExeggutorAlolanModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame, BipedFrame {
-    override val rootPart = root.registerChildWithAllChildren("exeggutor")
-    override val head = getPart("head")
-
-    override val leftLeg = getPart("leg_left")
-    override val rightLeg = getPart("leg_right")
-
-    val head2 = object : HeadedFrame {
-        override val rootPart = this@ExeggutorAlolanModel.rootPart
-        override val head: ModelPart = getPart("head2")
-    }
-    val head3 = object : HeadedFrame {
-        override val rootPart = this@ExeggutorAlolanModel.rootPart
-        override val head: ModelPart = getPart("head3")
-    }
-
-    override var portraitScale = 1.0F
-    override var portraitTranslation = Vec3(-1.4, 16.55, 0.0)
-
-    override var profileScale = 0.45F
-    override var profileTranslation = Vec3(0.0, 1.0, -30.0)
-
-    lateinit var standing: Pose
-    lateinit var walk: Pose
-    lateinit var sleep: Pose
-    lateinit var battleidle: Pose
-
-    override fun registerPoses() {
-        val blink1 = quirk { bedrockStateful("exeggutor_alolan", "blink") }
-        val blink2 = quirk { bedrockStateful("exeggutor_alolan", "blink2") }
-        val blink3 = quirk { bedrockStateful("exeggutor_alolan", "blink3") }
-        val blink4 = quirk { bedrockStateful("exeggutor_alolan", "blink4") }
-        sleep = registerPose(
-            poseType = PoseType.SLEEP,
-            animations = arrayOf(bedrock("exeggutor_alolan", "sleep"))
-        )
-
-        standing = registerPose(
-            poseName = "standing",
-            poseTypes = STATIONARY_POSES + UI_POSES,
-            quirks = arrayOf(blink1, blink2, blink3, blink4),
-            condition = { !it.isBattling },
-            animations = arrayOf(
-                singleBoneLook(),
-                SingleBoneLookAnimation(head2, false, false, disableX = false, disableY = false),
-                SingleBoneLookAnimation(head3, false, false, disableX = false, disableY = false),
-                bedrock("exeggutor_alolan", "ground_idle")
-            )
-        )
-
-        walk = registerPose(
-            poseName = "walk",
-            poseTypes = MOVING_POSES,
-            quirks = arrayOf(blink1, blink2, blink3, blink4),
-            animations = arrayOf(
-                singleBoneLook(),
-                SingleBoneLookAnimation(head2, false, false, disableX = false, disableY = false),
-                SingleBoneLookAnimation(head3, false, false, disableX = false, disableY = false),
-                bedrock("exeggutor_alolan", "ground_walk")
-            )
-        )
-
-        battleidle = registerPose(
-            poseName = "battle_idle",
-            poseTypes = PoseType.STATIONARY_POSES,
-            transformTicks = 10,
-            quirks = arrayOf(blink1, blink2, blink3, blink4),
-            condition = { it.isBattling },
-            animations = arrayOf(
-                singleBoneLook(),
-                SingleBoneLookAnimation(head2, false, false, disableX = false, disableY = false),
-                SingleBoneLookAnimation(head3, false, false, disableX = false, disableY = false),
-                bedrock("exeggutor_alolan", "battle_idle")
-            )
-
-        )
-    }
-
-//    override fun getFaintAnimation(
-//        pokemonEntity: PokemonEntity,
-//        state: PosableState<PokemonEntity>
-//    ) = if (state.isPosedIn(standing, walk)) bedrockStateful("exeggutor_alolan", "faint") else null
-}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/NidokingModel.kt

@@ -13,6 +13,7 @@ import com.cobblemon.mod.common.client.render.models.blockbench.animation.BipedW
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.BimanualFrame
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.BipedFrame
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
 import com.cobblemon.mod.common.client.render.models.blockbench.pose.Pose
 import com.cobblemon.mod.common.entity.PoseType
@@ -40,6 +41,8 @@ class NidokingModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame, B
     lateinit var standing: Pose
     lateinit var walk: Pose
 
+    override val cryAnimation = CryProvider { bedrockStateful("nidoking", "cry") }
+
     override fun registerPoses() {
         val blink = quirk { bedrockStateful("nidoking", "blink")}
         standing = registerPose(

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/NidoqueenModel.kt

@@ -14,6 +14,7 @@ import com.cobblemon.mod.common.client.render.models.blockbench.animation.BipedW
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.BimanualFrame
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.BipedFrame
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
 import com.cobblemon.mod.common.client.render.models.blockbench.pose.Pose
 import com.cobblemon.mod.common.entity.PoseType
 import com.cobblemon.mod.common.entity.PoseType.Companion.MOVING_POSES
@@ -40,6 +41,8 @@ class NidoqueenModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame,
     lateinit var standing: Pose
     lateinit var walk: Pose
 
+    override val cryAnimation = CryProvider { bedrockStateful("nidoqueen", "cry") }
+
     override fun registerPoses() {
         val blink = quirk { bedrockStateful("nidoqueen", "blink")}
         val spg = quirk(secondsBetweenOccurrences = 600F to 900F) { bedrockStateful("nidoqueen", "spgs_happy_place") }

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/NidoranfModel.kt

@@ -11,6 +11,7 @@ package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen1
 import com.cobblemon.mod.common.client.render.models.blockbench.animation.QuadrupedWalkAnimation
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.QuadrupedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
 import com.cobblemon.mod.common.client.render.models.blockbench.pose.CobblemonPose
 import com.cobblemon.mod.common.entity.PoseType.Companion.MOVING_POSES
@@ -37,6 +38,8 @@ class NidoranfModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame, Q
     lateinit var standing: CobblemonPose
     lateinit var walk: CobblemonPose
 
+    override val cryAnimation = CryProvider { bedrockStateful("nidoranf", "cry") }
+
     override fun registerPoses() {
         val blink = quirk { bedrockStateful("nidoranf", "blink") }
         standing = registerPose(

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/NidoranmModel.kt

@@ -11,6 +11,7 @@ package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen1
 import com.cobblemon.mod.common.client.render.models.blockbench.animation.QuadrupedWalkAnimation
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.QuadrupedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
 import com.cobblemon.mod.common.client.render.models.blockbench.pose.Pose
 import com.cobblemon.mod.common.entity.PoseType.Companion.MOVING_POSES
@@ -37,6 +38,8 @@ class NidoranmModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame, Q
     lateinit var standing: Pose
     lateinit var walk: Pose
 
+    override val cryAnimation = CryProvider { bedrockStateful("nidoranm", "cry") }
+
     override fun registerPoses() {
         val blink = quirk { bedrockStateful("nidoranm", "blink") }
         standing = registerPose(

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/NidorinaModel.kt

@@ -11,6 +11,7 @@ package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen1
 import com.cobblemon.mod.common.client.render.models.blockbench.animation.QuadrupedWalkAnimation
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.QuadrupedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
 import com.cobblemon.mod.common.client.render.models.blockbench.pose.Pose
 import com.cobblemon.mod.common.entity.PoseType
@@ -40,6 +41,8 @@ class NidorinaModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame, Q
     lateinit var walk: Pose
     lateinit var battleidle: Pose
 
+    override val cryAnimation = CryProvider { bedrockStateful("nidorina", "cry") }
+
     override fun registerPoses() {
         val blink = quirk { bedrockStateful("nidorina", "blink")}
         standing = registerPose(

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/NidorinoModel.kt

@@ -12,6 +12,7 @@ import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonP
 import com.cobblemon.mod.common.client.render.models.blockbench.animation.QuadrupedWalkAnimation
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.QuadrupedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
 import com.cobblemon.mod.common.client.render.models.blockbench.pose.Pose
 import com.cobblemon.mod.common.entity.PoseType.Companion.MOVING_POSES
 import com.cobblemon.mod.common.entity.PoseType.Companion.STATIONARY_POSES
@@ -36,6 +37,8 @@ class NidorinoModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame, Q
     lateinit var standing: Pose
     lateinit var walk: Pose
 
+    override val cryAnimation = CryProvider { bedrockStateful("nidorino", "cry") }
+
     override fun registerPoses() {
         val blink = quirk { bedrockStateful("nidorino", "blink")}
         standing = registerPose(

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PinsirModel.kt

@@ -8,6 +8,7 @@
 
 package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen1
 
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
 import com.cobblemon.mod.common.client.render.models.blockbench.pose.CobblemonPose
 import com.cobblemon.mod.common.entity.PoseType
@@ -32,6 +33,8 @@ class PinsirModel(root: ModelPart) : PokemonPosableModel(root) {
     lateinit var battleidle: CobblemonPose
     lateinit var sleep: CobblemonPose
 
+    override val cryAnimation = CryProvider { bedrockStateful("pinsir", "cry") }
+
     override fun registerPoses() {
         val blink = quirk { bedrockStateful("pinsir", "blink")}
         sleep = registerPose(

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/SlowbroModel.kt

@@ -1,100 +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.client.render.models.blockbench.pokemon.gen1
-
-import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
-import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
-import com.cobblemon.mod.common.client.render.models.blockbench.pose.Pose
-import com.cobblemon.mod.common.entity.PoseType
-import com.cobblemon.mod.common.entity.PoseType.Companion.UI_POSES
-import com.cobblemon.mod.common.util.isBattling
-import com.cobblemon.mod.common.util.isUnderWater
-import net.minecraft.client.model.geom.ModelPart
-import net.minecraft.world.phys.Vec3
-
-class SlowbroModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame {
-    override val rootPart = root.registerChildWithAllChildren("slowbro")
-    override val head = getPart("head")
-
-    override var portraitScale = 2.0F
-    override var portraitTranslation = Vec3(-0.23, -0.1, 0.0)
-
-    override var profileScale = 0.95F
-    override var profileTranslation = Vec3(0.0, 0.3, 0.0)
-
-    lateinit var standing: Pose
-    lateinit var walk: Pose
-    lateinit var float: Pose
-    lateinit var swim: Pose
-    lateinit var battleidle: Pose
-
-    override fun registerPoses() {
-        val blink = quirk { bedrockStateful("slowbro", "blink1") }
-        val blink2 = quirk { bedrockStateful("slowbro", "blink2") }
-        val bite = quirk(secondsBetweenOccurrences = 60F to 120F) { bedrockStateful("slowbro", "bite_quirk") }
-
-        standing = registerPose(
-            poseName = "standing",
-            poseTypes = UI_POSES + PoseType.STAND,
-            quirks = arrayOf(blink, blink2, bite),
-            condition = { !it.isBattling },
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("slowbro", "ground_idle")
-            )
-        )
-
-        walk = registerPose(
-            poseName = "walk",
-            poseType = PoseType.WALK,
-            quirks = arrayOf(blink, blink2, bite),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("slowbro", "ground_walk")
-            )
-        )
-
-        float = registerPose(
-            poseName = "float",
-            poseType = PoseType.FLOAT,
-            quirks = arrayOf(blink, blink2, bite),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("slowbro", "water_idle")
-            )
-        )
-
-        swim = registerPose(
-            poseName = "swim",
-            poseType = PoseType.SWIM,
-            quirks = arrayOf(blink, blink2, bite),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("slowbro", "water_swim")
-            )
-        )
-
-        battleidle = registerPose(
-            poseName = "battle_idle",
-            poseTypes = PoseType.STATIONARY_POSES,
-            transformTicks = 10,
-            quirks = arrayOf(blink, blink2, bite),
-            condition = { it.isBattling && !it.isUnderWater },
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("slowbro", "battle_idle")
-            )
-        )
-    }
-
-//    override fun getFaintAnimation(
-//        pokemonEntity: PokemonEntity,
-//        state: PosableState<PokemonEntity>
-//    ) = if (state.isPosedIn(standing, walk)) bedrockStateful("slowbro", "faint") else null
-}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/SlowpokeModel.kt

@@ -1,96 +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.client.render.models.blockbench.pokemon.gen1
-
-import com.cobblemon.mod.common.client.render.models.blockbench.animation.QuadrupedWalkAnimation
-import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
-import com.cobblemon.mod.common.client.render.models.blockbench.frame.QuadrupedFrame
-import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
-import com.cobblemon.mod.common.client.render.models.blockbench.pose.Pose
-import com.cobblemon.mod.common.entity.PoseType
-import com.cobblemon.mod.common.entity.PoseType.Companion.UI_POSES
-import net.minecraft.client.model.geom.ModelPart
-import net.minecraft.world.phys.Vec3
-
-class SlowpokeModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame, QuadrupedFrame {
-    override val rootPart = root.registerChildWithAllChildren("slowpoke")
-    override val head = getPart("head")
-
-    override val foreLeftLeg= getPart("leftfrontleg")
-    override val foreRightLeg = getPart("rightfrontleg")
-    override val hindLeftLeg = getPart("leftbackleg")
-    override val hindRightLeg = getPart("rightbackleg")
-
-    override var portraitScale = 2.2F
-    override var portraitTranslation = Vec3(-0.6, -1.6, 0.0)
-
-    override var profileScale = 0.8F
-    override var profileTranslation = Vec3(0.0, 0.52, 0.0)
-
-    lateinit var standing: Pose
-    lateinit var walk: Pose
-    lateinit var float: Pose
-    lateinit var swim: Pose
-    lateinit var sleep: Pose
-
-    override fun registerPoses() {
-        val blink = quirk { bedrockStateful("slowpoke", "blink") }
-
-        sleep = registerPose(
-            poseType = PoseType.SLEEP,
-            animations = arrayOf(bedrock("slowpoke", "sleep"))
-        )
-
-        standing = registerPose(
-            poseName = "standing",
-            poseTypes = UI_POSES + PoseType.STAND,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("slowpoke", "ground_idle")
-            )
-        )
-
-        walk = registerPose(
-            poseName = "walk",
-            poseType = PoseType.WALK,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                QuadrupedWalkAnimation(this, periodMultiplier = 3.6F, amplitudeMultiplier = 2.2F),
-                singleBoneLook(),
-                bedrock("slowpoke", "ground_walk")
-            )
-        )
-
-        float = registerPose(
-            poseName = "float",
-            poseType = PoseType.FLOAT,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("slowpoke", "water_idle")
-            )
-        )
-
-        swim = registerPose(
-            poseName = "swim",
-            poseType = PoseType.SWIM,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("slowpoke", "water_swim")
-            )
-        )
-    }
-
-//    override fun getFaintAnimation(
-//        pokemonEntity: PokemonEntity,
-//        state: PosableState<PokemonEntity>
-//    ) = if (state.isPosedIn(standing, walk)) bedrockStateful("slowpoke", "faint") else null
-}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/SnorlaxModel.kt

@@ -1,60 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen1
-
-import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
-import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
-import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
-import com.cobblemon.mod.common.client.render.models.blockbench.pose.CobblemonPose
-import com.cobblemon.mod.common.entity.PoseType.Companion.MOVING_POSES
-import com.cobblemon.mod.common.entity.PoseType.Companion.STATIONARY_POSES
-import com.cobblemon.mod.common.entity.PoseType.Companion.UI_POSES
-import net.minecraft.client.model.geom.ModelPart
-import net.minecraft.world.phys.Vec3
-
-class SnorlaxModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame {
-    override val rootPart = root.registerChildWithAllChildren("snorlax")
-    override val head = getPart("head")
-
-    override var portraitScale = 2.3F
-    override var portraitTranslation = Vec3(-0.45, 0.75, 0.0)
-
-    override var profileScale = 0.75F
-    override var profileTranslation = Vec3(0.0, 0.55, 0.0)
-
-    lateinit var standing: CobblemonPose
-    lateinit var walk: CobblemonPose
-
-    override val cryAnimation = CryProvider { bedrockStateful("snorlax", "cry") }
-
-    override fun registerPoses() {
-        standing = registerPose(
-            poseName = "standing",
-            poseTypes = STATIONARY_POSES + UI_POSES,
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("snorlax", "ground_idle")
-            )
-        )
-
-        walk = registerPose(
-            poseName = "walk",
-            poseTypes = MOVING_POSES,
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("snorlax", "ground_walk")
-            )
-        )
-    }
-
-//    override fun getFaintAnimation(
-//        pokemonEntity: PokemonEntity,
-//        state: PosableState<PokemonEntity>
-//    ) = if (state.isPosedIn(standing, walk)) bedrockStateful("snorlax", "faint") else null
-}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/TaurosModel.kt

@@ -1,65 +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.client.render.models.blockbench.pokemon.gen1
-
-import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
-import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
-import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
-import com.cobblemon.mod.common.client.render.models.blockbench.pose.Pose
-import com.cobblemon.mod.common.entity.PoseType.Companion.MOVING_POSES
-import com.cobblemon.mod.common.entity.PoseType.Companion.STATIONARY_POSES
-import com.cobblemon.mod.common.entity.PoseType.Companion.UI_POSES
-import net.minecraft.client.model.geom.ModelPart
-import net.minecraft.world.phys.Vec3
-
-class TaurosModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame {
-    override val rootPart = root.registerChildWithAllChildren("tauros")
-    override val head = getPart("head")
-
-    override var portraitScale = 1.9F
-    override var portraitTranslation = Vec3(-0.7, -0.25, 0.0)
-
-    override var profileScale = 0.75F
-    override var profileTranslation = Vec3(0.0, 0.6, 0.0)
-
-    lateinit var standing: Pose
-    lateinit var walk: Pose
-
-    override val cryAnimation = CryProvider { bedrockStateful("tauros", "cry") }
-
-    override fun registerPoses() {
-        val blink = quirk { bedrockStateful("tauros", "blink")}
-        standing = registerPose(
-            poseName = "standing",
-            poseTypes = STATIONARY_POSES + UI_POSES,
-            transformTicks = 10,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("tauros", "ground_idle")
-            )
-        )
-
-        walk = registerPose(
-            poseName = "walk",
-            poseTypes = MOVING_POSES,
-            transformTicks = 10,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("tauros", "ground_walk")
-            )
-        )
-    }
-
-//    override fun getFaintAnimation(
-//        pokemonEntity: PokemonEntity,
-//        state: PosableState<PokemonEntity>
-//    ) = if (state.isPosedIn(standing, walk)) bedrockStateful("tauros", "faint") else null
-}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/FeraligatrModel.kt

@@ -25,7 +25,7 @@ import net.minecraft.world.phys.Vec3
 
 class FeraligatrModel (root: ModelPart) : PokemonPosableModel(root), HeadedFrame, BipedFrame {
     override val rootPart = root.registerChildWithAllChildren("feraligatr")
-    override val head = getPart("head")
+    override val head = getPart("head_ai")
 
     override val leftLeg = getPart("leg_left")
     override val rightLeg = getPart("leg_right")

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/HitmontopModel.kt

@@ -9,6 +9,7 @@
 package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen2
 
 import com.cobblemon.mod.common.client.render.models.blockbench.PosableState
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
 import com.cobblemon.mod.common.client.render.models.blockbench.pose.Pose
@@ -32,7 +33,7 @@ class HitmontopModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame {
     lateinit var walk: Pose
     lateinit var battleidle: Pose
 
-//    override val cryAnimation = CryProvider { bedrockStateful("hitmontop", "cry") }
+    override val cryAnimation = CryProvider { bedrockStateful("hitmontop", "cry") }
 
     override fun registerPoses() {
         val blink = quirk { bedrockStateful("hitmontop", "blink") }

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/SlowkingModel.kt

@@ -1,99 +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.client.render.models.blockbench.pokemon.gen2
-
-import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
-import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
-import com.cobblemon.mod.common.client.render.models.blockbench.pose.Pose
-import com.cobblemon.mod.common.entity.PoseType
-import com.cobblemon.mod.common.entity.PoseType.Companion.UI_POSES
-import com.cobblemon.mod.common.util.isBattling
-import com.cobblemon.mod.common.util.isInWater
-import net.minecraft.client.model.geom.ModelPart
-import net.minecraft.world.phys.Vec3
-
-class SlowkingModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame {
-    override val rootPart = root.registerChildWithAllChildren("slowking")
-    override val head = getPart("head")
-
-    override var portraitScale = 2.0F
-    override var portraitTranslation = Vec3(-0.1, 0.1, 0.0)
-
-    override var profileScale = 0.8F
-    override var profileTranslation = Vec3(0.0, 0.55, 0.0)
-
-    lateinit var standing: Pose
-    lateinit var walk: Pose
-    lateinit var float: Pose
-    lateinit var swim: Pose
-    lateinit var battleidle: Pose
-
-    override fun registerPoses() {
-        val blink = quirk { bedrockStateful("slowking", "blink") }
-        val blink2 = quirk { bedrockStateful("slowking", "blink2") }
-
-        standing = registerPose(
-            poseName = "standing",
-            poseTypes = UI_POSES + PoseType.STAND,
-            quirks = arrayOf(blink, blink2),
-            condition = { !it.isBattling },
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("slowking", "ground_idle")
-            )
-        )
-
-        walk = registerPose(
-            poseName = "walk",
-            poseType = PoseType.WALK,
-            quirks = arrayOf(blink, blink2),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("slowking", "ground_walk")
-            )
-        )
-
-        float = registerPose(
-            poseName = "float",
-            poseType = PoseType.FLOAT,
-            quirks = arrayOf(blink, blink2),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("slowking", "water_idle")
-            )
-        )
-
-        swim = registerPose(
-            poseName = "swim",
-            poseType = PoseType.SWIM,
-            quirks = arrayOf(blink, blink2),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("slowking", "water_swim")
-            )
-        )
-
-        battleidle = registerPose(
-            poseName = "battle_idle",
-            poseTypes = PoseType.STATIONARY_POSES,
-            transformTicks = 10,
-            quirks = arrayOf(blink, blink2),
-            condition = { it.isBattling },
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("slowking", "battle_idle")
-            )
-        )
-    }
-
-//    override fun getFaintAnimation(
-//        pokemonEntity: PokemonEntity,
-//        state: PosableState<PokemonEntity>
-//    ) = if (state.isPosedIn(standing, walk)) bedrockStateful("slowking", "faint") else null
-}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/KrokorokModel.kt

@@ -1,83 +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.client.render.models.blockbench.pokemon.gen5
-
-import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
-import com.cobblemon.mod.common.client.render.models.blockbench.pose.CobblemonPose
-import com.cobblemon.mod.common.entity.PoseType
-import com.cobblemon.mod.common.util.asExpressionLike
-import com.cobblemon.mod.common.util.isBattling
-import net.minecraft.client.model.geom.ModelPart
-import net.minecraft.world.phys.Vec3
-
-class KrokorokModel (root: ModelPart) : PokemonPosableModel(root) {
-    override val rootPart = root.registerChildWithAllChildren("krokorok")
-
-    override var portraitScale = 1.86F
-    override var portraitTranslation = Vec3(-0.43, 0.98, 0.0)
-
-    override var profileScale = 0.55F
-    override var profileTranslation = Vec3(0.05, 0.93, 0.0)
-
-    lateinit var sleep: CobblemonPose
-    lateinit var standing: CobblemonPose
-    lateinit var walk: CobblemonPose
-    lateinit var battleidle: CobblemonPose
-
-    override fun registerPoses() {
-//        animations["physical"] = "q.bedrock_primary('krokorok', 'physical', 'look', q.curve('symmetrical_wide'))".asExpressionLike()
-//        animations["special"] = "q.bedrock_primary('krokorok', 'special', 'look', q.curve('symmetrical_wide'))".asExpressionLike()
-//        animations["status"] = "q.bedrock_primary('krokorok', 'status', q.curve('symmetrical_wide'))".asExpressionLike()
-//        animations["recoil"] = "q.bedrock_stateful('krokorok', 'recoil')".asExpressionLike()
-        animations["cry"] = "q.bedrock_stateful('krokorok', 'cry')".asExpressionLike()
-
-        val faint = "q.bedrock_primary('krokorok', 'faint', q.curve('one'))".asExpressionLike()
-
-        val blink = quirk { bedrockStateful("krokorok", "blink") }
-        val look = quirk { bedrockStateful("krokorok", "look_quirk") }
-
-        sleep = registerPose(
-            poseType = PoseType.SLEEP,
-            namedAnimations = mutableMapOf("faint" to faint),
-            animations = arrayOf(bedrock("krokorok", "sleep"))
-        )
-
-        standing = registerPose(
-            poseName = "standing",
-            poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES,
-            quirks = arrayOf(blink, look),
-            condition = { !it.isBattling },
-            namedAnimations = mutableMapOf("faint" to faint),
-            animations = arrayOf(
-                bedrock("krokorok", "ground_idle")
-            )
-        )
-
-        walk = registerPose(
-            poseName = "walk",
-            poseTypes = PoseType.MOVING_POSES,
-            quirks = arrayOf(blink),
-            namedAnimations = mutableMapOf("faint" to faint),
-            animations = arrayOf(
-                bedrock("krokorok", "ground_walk")
-            )
-        )
-
-        battleidle = registerPose(
-            poseName = "battle_idle",
-            poseTypes = PoseType.STATIONARY_POSES,
-            quirks = arrayOf(blink, look),
-            condition = { it.isBattling },
-            namedAnimations = mutableMapOf("faint" to faint),
-            animations = arrayOf(
-                bedrock("krokorok", "battle_idle")
-            )
-        )
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/SandileModel.kt

@@ -1,84 +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.client.render.models.blockbench.pokemon.gen5
-
-import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
-import com.cobblemon.mod.common.client.render.models.blockbench.pose.CobblemonPose
-import com.cobblemon.mod.common.entity.PoseType
-import com.cobblemon.mod.common.util.asExpressionLike
-import com.cobblemon.mod.common.util.isBattling
-import net.minecraft.client.model.geom.ModelPart
-import net.minecraft.world.phys.Vec3
-
-class SandileModel (root: ModelPart) : PokemonPosableModel(root) {
-    override val rootPart = root.registerChildWithAllChildren("sandile")
-
-    override var portraitScale = 2.54F
-    override var portraitTranslation = Vec3(-0.5, -1.9, 0.0)
-
-    override var profileScale = 0.84F
-    override var profileTranslation = Vec3(0.05, 0.48, 0.0)
-
-    lateinit var sleep: CobblemonPose
-    lateinit var standing: CobblemonPose
-    lateinit var walk: CobblemonPose
-    lateinit var battle_idle: CobblemonPose
-
-    override fun registerPoses() {
-//        animations["physical"] = "q.bedrock_primary('sandile', 'physical', 'look', q.curve('symmetrical_wide'))".asExpressionLike()
-//        animations["special"] = "q.bedrock_primary('sandile', 'special', 'look', q.curve('symmetrical_wide'))".asExpressionLike()
-//        animations["status"] = "q.bedrock_primary('sandile', 'status', q.curve('symmetrical_wide'))".asExpressionLike()
-//        animations["recoil"] = "q.bedrock_stateful('sandile', 'recoil')".asExpressionLike()
-        animations["cry"] = "q.bedrock_stateful('sandile', 'cry')".asExpressionLike()
-
-        val faint = "q.bedrock_primary('sandile', 'faint', q.curve('one'))".asExpressionLike()
-
-        val blink = quirk { bedrockStateful("sandile", "blink") }
-        val bite = quirk { bedrockStateful("sandile", "bite_quirk") }
-
-        sleep = registerPose(
-            poseType = PoseType.SLEEP,
-            quirks = arrayOf(bite),
-            namedAnimations = mutableMapOf("faint" to faint),
-            animations = arrayOf(bedrock("sandile", "sleep"))
-        )
-
-        standing = registerPose(
-            poseName = "standing",
-            poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES,
-            quirks = arrayOf(blink, bite),
-            condition = { !it.isBattling },
-            namedAnimations = mutableMapOf("faint" to faint),
-            animations = arrayOf(
-                bedrock("sandile", "ground_idle")
-            )
-        )
-
-        walk = registerPose(
-            poseName = "walk",
-            poseTypes = PoseType.MOVING_POSES,
-            quirks = arrayOf(blink),
-            namedAnimations = mutableMapOf("faint" to faint),
-            animations = arrayOf(
-                bedrock("sandile", "ground_walk")
-            )
-        )
-
-        battle_idle = registerPose(
-            poseName = "battle_idle",
-            poseTypes = PoseType.STATIONARY_POSES,
-            quirks = arrayOf(blink, bite),
-            condition = { it.isBattling },
-            namedAnimations = mutableMapOf("faint" to faint),
-            animations = arrayOf(
-                bedrock("sandile", "battle_idle")
-            )
-        )
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/ArctozoltModel.kt

@@ -28,7 +28,7 @@ class ArctozoltModel (root: ModelPart) : PokemonPosableModel(root), HeadedFrame
     override var portraitTranslation = Vec3(-0.45, 2.15, 0.0)
     override var portraitScale = 0.85F
 
-    override var profileTranslation = Vec3(0.02, 0.95, 0.0)
+    override var profileTranslation = Vec3(0.02, 1.14, 0.0)
     override var profileScale = 0.33F
 
     lateinit var sleep: CobblemonPose

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/EiscueModel.kt

@@ -8,6 +8,7 @@
 
 package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen8
 
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
 import com.cobblemon.mod.common.client.render.models.blockbench.PosableState
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
@@ -21,15 +22,17 @@ class EiscueModel (root: ModelPart) : PokemonPosableModel(root), HeadedFrame {
     override val head = getPart("head")
 
     override var portraitScale = 2.0F
-    override var portraitTranslation = Vec3(-0.1, -0.2, 0.0)
+    override var portraitTranslation = Vec3(-0.1, 0.31, 0.0)
 
-    override var profileScale = 1.0F
-    override var profileTranslation = Vec3(0.0, 0.3, 0.0)
+    override var profileScale = 0.8F
+    override var profileTranslation = Vec3(0.0, 0.55, 0.0)
 
     lateinit var standing: Pose
     lateinit var walk: Pose
     lateinit var sleep: Pose
 
+    override val cryAnimation = CryProvider { bedrockStateful("eiscue_ice", "cry") }
+
     override fun registerPoses() {
         val blink = quirk { bedrockStateful("eiscue_ice", "blink")}
         sleep = registerPose(

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/RabootModel.kt

@@ -71,7 +71,7 @@ class RabootModel (root: ModelPart) : PokemonPosableModel(root), HeadedFrame {
             poseName = "battle_idle",
             poseTypes = PoseType.STATIONARY_POSES,
             condition = { it.isBattling },
-            quirks = arrayOf(blink, hipQuirk),
+            quirks = arrayOf(blink),
             animations = arrayOf(
                 singleBoneLook(),
                 bedrock("raboot", "battle_idle")

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/ArmarougeModel.kt

@@ -1,91 +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.client.render.models.blockbench.pokemon.gen9
-
-// import com.cobblemon.mod.common.client.render.models.blockbench.PosableState
-import com.cobblemon.mod.common.client.render.models.blockbench.PosableState
-import com.cobblemon.mod.common.client.render.models.blockbench.frame.BimanualFrame
-import com.cobblemon.mod.common.client.render.models.blockbench.frame.BipedFrame
-import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
-import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
-import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
-import com.cobblemon.mod.common.client.render.models.blockbench.pose.Pose
-import com.cobblemon.mod.common.entity.PoseType
-import com.cobblemon.mod.common.entity.PoseType.Companion.MOVING_POSES
-import com.cobblemon.mod.common.entity.PoseType.Companion.STATIONARY_POSES
-import com.cobblemon.mod.common.entity.PoseType.Companion.UI_POSES
-import com.cobblemon.mod.common.util.isBattling
-import net.minecraft.client.model.geom.ModelPart
-import net.minecraft.world.phys.Vec3
-
-class ArmarougeModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame, BipedFrame, BimanualFrame {
-    override val rootPart = root.registerChildWithAllChildren("armarouge")
-    override val head = getPart("head")
-    override val rightArm = getPart("arm_right")
-    override val leftArm = getPart("arm_left")
-    override val rightLeg = getPart("leg_right")
-    override val leftLeg = getPart("leg_left")
-
-    override var portraitScale = 1.8F
-    override var portraitTranslation = Vec3(-0.2, 1.8, 0.0)
-
-    override var profileScale = 0.5F
-    override var profileTranslation = Vec3(0.0, 1.0, 0.0)
-
-    lateinit var standing: Pose
-    lateinit var walking: Pose
-    lateinit var sleep: Pose
-    lateinit var battleidle: Pose
-
-    override val cryAnimation = CryProvider { bedrockStateful("armarouge", "cry") }
-
-    override fun registerPoses() {
-        val blink = quirk { bedrockStateful("armarouge", "blink") }
-        sleep = registerPose(
-            poseType = PoseType.SLEEP,
-            animations = arrayOf(bedrock("armarouge", "sleep"))
-        )
-
-        standing = registerPose(
-            poseName = "standing",
-            poseTypes = STATIONARY_POSES + UI_POSES,
-            transformTicks = 10,
-            condition = { !it.isBattling },
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("armarouge", "ground_idle")
-            )
-        )
-
-        walking = registerPose(
-            poseName = "walking",
-            poseTypes = MOVING_POSES,
-            transformTicks = 10,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("armarouge", "ground_walk")
-            )
-        )
-
-        battleidle = registerPose(
-            poseName = "battle_idle",
-            poseTypes = PoseType.STATIONARY_POSES,
-            transformTicks = 10,
-            quirks = arrayOf(blink),
-            condition = { it.isBattling },
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("armarouge", "battle_idle")
-            )
-        )
-    }
-    override fun getFaintAnimation(state: PosableState) = if (state.isPosedIn(standing, walking, battleidle, sleep)) bedrockStateful("armarouge", "faint") else null
-}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/CeruledgeModel.kt

@@ -1,120 +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.client.render.models.blockbench.pokemon.gen9
-
-// import com.cobblemon.mod.common.client.render.models.blockbench.PosableState
-import com.cobblemon.mod.common.client.render.models.blockbench.PosableState
-import com.cobblemon.mod.common.client.render.models.blockbench.createTransformation
-import com.cobblemon.mod.common.client.render.models.blockbench.frame.BimanualFrame
-import com.cobblemon.mod.common.client.render.models.blockbench.frame.BipedFrame
-import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
-import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
-import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
-import com.cobblemon.mod.common.client.render.models.blockbench.pose.Pose
-import com.cobblemon.mod.common.entity.PoseType
-import com.cobblemon.mod.common.entity.PoseType.Companion.MOVING_POSES
-import com.cobblemon.mod.common.entity.PoseType.Companion.STATIONARY_POSES
-import com.cobblemon.mod.common.entity.PoseType.Companion.UI_POSES
-import com.cobblemon.mod.common.util.isBattling
-import net.minecraft.client.model.geom.ModelPart
-import net.minecraft.world.phys.Vec3
-
-class CeruledgeModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame, BipedFrame, BimanualFrame {
-    override val rootPart = root.registerChildWithAllChildren("ceruledge")
-    override val head = getPart("head")
-    override val rightArm = getPart("arm_right")
-    override val leftArm = getPart("arm_left")
-    override val rightLeg = getPart("leg_right")
-    override val leftLeg = getPart("leg_left")
-    val bladeright = getPart("blade_right")
-    val bladeleft = getPart("blade_left")
-    val passivebladeright = getPart("passive_blade_right")
-    val passivebladeleft = getPart("passive_blade_left")
-
-    override var portraitScale = 1.8F
-    override var portraitTranslation = Vec3(-0.2, 1.9, 0.0)
-
-    override var profileScale = 0.5F
-    override var profileTranslation = Vec3(0.0, 1.0, 0.0)
-
-    lateinit var standing: Pose
-    lateinit var walking: Pose
-    lateinit var sleep: Pose
-    lateinit var battleidle: Pose
-
-    override val cryAnimation = CryProvider { bedrockStateful("ceruledge", "cry") }
-
-    override fun registerPoses() {
-        val blink = quirk { bedrockStateful("ceruledge", "blink") }
-        sleep = registerPose(
-            poseType = PoseType.SLEEP,
-            transformedParts = arrayOf(
-                bladeright.createTransformation().withVisibility(visibility = false),
-                bladeleft.createTransformation().withVisibility(visibility = false),
-                passivebladeright.createTransformation().withVisibility(visibility = true),
-                passivebladeleft.createTransformation().withVisibility(visibility = true)
-            ),
-            animations = arrayOf(bedrock("ceruledge", "sleep"))
-        )
-
-        standing = registerPose(
-            poseName = "standing",
-            poseTypes = STATIONARY_POSES + UI_POSES,
-            transformTicks = 10,
-            quirks = arrayOf(blink),
-            condition = { !it.isBattling },
-            transformedParts = arrayOf(
-                bladeright.createTransformation().withVisibility(visibility = false),
-                bladeleft.createTransformation().withVisibility(visibility = false),
-                passivebladeright.createTransformation().withVisibility(visibility = true),
-                passivebladeleft.createTransformation().withVisibility(visibility = true)
-            ),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("ceruledge", "ground_idle")
-            )
-        )
-
-        walking = registerPose(
-            poseName = "walking",
-            poseTypes = MOVING_POSES,
-            transformTicks = 10,
-            quirks = arrayOf(blink),
-            transformedParts = arrayOf(
-                bladeright.createTransformation().withVisibility(visibility = false),
-                bladeleft.createTransformation().withVisibility(visibility = false),
-                passivebladeright.createTransformation().withVisibility(visibility = true),
-                passivebladeleft.createTransformation().withVisibility(visibility = true)
-            ),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("ceruledge", "ground_walk")
-            )
-        )
-
-        battleidle = registerPose(
-            poseName = "battle_idle",
-            poseTypes = PoseType.STATIONARY_POSES,
-            transformTicks = 10,
-            quirks = arrayOf(blink),
-            condition = { it.isBattling },
-            transformedParts = arrayOf(
-                bladeright.createTransformation().withVisibility(visibility = true),
-                bladeleft.createTransformation().withVisibility(visibility = true),
-                passivebladeright.createTransformation().withVisibility(visibility = false),
-                passivebladeleft.createTransformation().withVisibility(visibility = false)
-            ),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("ceruledge", "battle_idle")
-            )
-        )
-    }
-    override fun getFaintAnimation(state: PosableState) = if (state.isPosedIn(standing, walking, battleidle, sleep)) bedrockStateful("ceruledge", "faint2") else null
-}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/CharcadetModel.kt

@@ -33,8 +33,8 @@ class CharcadetModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame,
     override val rightLeg = getPart("leg_right")
     override val leftLeg = getPart("leg_left")
 
-    override var portraitScale = 2.5F
-    override var portraitTranslation = Vec3(-0.15, -0.45, 0.0)
+    override var portraitScale = 1.7F
+    override var portraitTranslation = Vec3(-0.15, 0.08, 0.0)
 
     override var profileScale = 0.8F
     override var profileTranslation = Vec3(0.0, 0.6, 0.0)
@@ -51,7 +51,9 @@ class CharcadetModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame,
         val blink = quirk { bedrockStateful("charcadet", "blink") }
         sleep = registerPose(
             poseType = PoseType.SLEEP,
-            animations = arrayOf(bedrock("charcadet", "sleep"))
+            animations = arrayOf(bedrock("charcadet", "sleep"),
+                bedrock("charcadet", "eye_flame_overlay"),
+                bedrock("charcadet", "head_flame_overlay"))
         )
 
         standing = registerPose(
@@ -61,7 +63,9 @@ class CharcadetModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame,
             quirks = arrayOf(blink),
             animations = arrayOf(
                 singleBoneLook(),
-                bedrock("charcadet", "ground_idle")
+                bedrock("charcadet", "ground_idle"),
+                bedrock("charcadet", "eye_flame_overlay"),
+                bedrock("charcadet", "head_flame_overlay")
             )
         )
 
@@ -72,7 +76,9 @@ class CharcadetModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame,
             quirks = arrayOf(blink),
             animations = arrayOf(
                 singleBoneLook(),
-                bedrock("charcadet", "ground_walk")
+                bedrock("charcadet", "ground_walk"),
+                bedrock("charcadet", "eye_flame_overlay"),
+                bedrock("charcadet", "head_flame_overlay")
             )
         )
 
@@ -81,7 +87,9 @@ class CharcadetModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame,
                 quirks = arrayOf(blink),
                 animations = arrayOf(
                         singleBoneLook(),
-                        bedrock("charcadet", "shoulder_left")
+                        bedrock("charcadet", "shoulder_left"),
+                    bedrock("charcadet", "eye_flame_overlay"),
+                    bedrock("charcadet", "head_flame_overlay")
                 ),
                 transformedParts = arrayOf(
                         rootPart.createTransformation().addPosition(ModelPartTransformation.Y_AXIS, -0.1),
@@ -94,7 +102,9 @@ class CharcadetModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame,
                 quirks = arrayOf(blink),
                 animations = arrayOf(
                         singleBoneLook(),
-                        bedrock("charcadet", "shoulder_right")
+                        bedrock("charcadet", "shoulder_right"),
+                    bedrock("charcadet", "eye_flame_overlay"),
+                    bedrock("charcadet", "head_flame_overlay")
                 ),
                 transformedParts = arrayOf(
                         rootPart.createTransformation().addPosition(ModelPartTransformation.Y_AXIS, -0.1),

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/repository/PokemonModelRepository.kt

@@ -90,17 +90,13 @@ object PokemonModelRepository : VaryingModelRepository<PokemonPosableModel>() {
         inbuilt("electabuzz", ::ElectabuzzModel)
         inbuilt("exeggcute", ::ExeggcuteModel)
         inbuilt("exeggutor", ::ExeggutorModel)
-        inbuilt("exeggutor_alolan", ::ExeggutorAlolanModel)
         inbuilt("farfetchd", ::FarfetchdModel)
         inbuilt("farfetchd_galarian", ::FarfetchdGalarianModel)
         inbuilt("fearow", ::FearowModel)
         inbuilt("flareon", ::FlareonModel)
         inbuilt("gengar", ::GengarModel)
-        inbuilt("geodude", ::GeodudeModel)
         inbuilt("golbat", ::GolbatModel)
         inbuilt("golduck", ::GolduckModel)
-        inbuilt("golem", ::GolemModel)
-        inbuilt("graveler", ::GravelerModel)
         inbuilt("grimer", ::GrimerModel)
         inbuilt("growlithe", ::GrowlitheModel)
         inbuilt("hitmonchan", ::HitmonchanModel)
@@ -146,14 +142,11 @@ object PokemonModelRepository : VaryingModelRepository<PokemonPosableModel>() {
         inbuilt("sandslash", ::SandslashModel)
         inbuilt("scyther", ::ScytherModel)
         inbuilt("seel", ::SeelModel)
-        inbuilt("slowbro", ::SlowbroModel)
-        inbuilt("slowpoke", ::SlowpokeModel)
         inbuilt("spearow", ::SpearowModel)
         inbuilt("starmie", ::StarmieModel)
         inbuilt("staryu", ::StaryuModel)
         inbuilt("steelix", ::SteelixModel)
         inbuilt("tangela", ::TangelaModel)
-        inbuilt("tauros", ::TaurosModel)
         inbuilt("tentacool", ::TentacoolModel)
         inbuilt("tentacruel", ::TentacruelModel)
         inbuilt("vaporeon", ::VaporeonModel)
@@ -179,7 +172,6 @@ object PokemonModelRepository : VaryingModelRepository<PokemonPosableModel>() {
         inbuilt("blissey", ::BlisseyModel)
         inbuilt("piloswine", ::PiloswineModel)
         inbuilt("quagsire", ::QuagsireModel)
-        inbuilt("slowking", ::SlowkingModel)
         inbuilt("swinub", ::SwinubModel)
         inbuilt("wooper", ::WooperModel)
         inbuilt("wooper_paldean", ::WooperPaldeanModel)
@@ -343,8 +335,6 @@ object PokemonModelRepository : VaryingModelRepository<PokemonPosableModel>() {
         inbuilt("shroomish", ::ShroomishModel)
         inbuilt("breloom", ::BreloomModel)
         inbuilt("charcadet", ::CharcadetModel)
-        inbuilt("armarouge", ::ArmarougeModel)
-        inbuilt("ceruledge", ::CeruledgeModel)
         inbuilt("flittle", ::FlittleModel)
         inbuilt("espathra", ::EspathraModel)
         inbuilt("surskit", ::SurskitModel)
@@ -559,8 +549,6 @@ object PokemonModelRepository : VaryingModelRepository<PokemonPosableModel>() {
         inbuilt("roserade", ::RoseradeModel)
         inbuilt("woobat", ::WoobatModel)
         inbuilt("swoobat", ::SwoobatModel)
-        inbuilt("sandile", ::SandileModel)
-        inbuilt("krokorok", ::KrokorokModel)
         inbuilt("frillish", ::FrillishModel)
         inbuilt("jellicent", ::JellicentModel)
         inbuilt("cubchoo", ::CubchooModel)

common/src/main/kotlin/com/cobblemon/mod/common/client/render/npc/NPCRenderer.kt

@@ -60,4 +60,11 @@ class NPCRenderer(context: Context) : LivingEntityRenderer<NPCEntity, PosableEnt
 //            this.renderLabelIfPresent(entity, entity.displayName, poseMatrix, buffer, packedLight)
 //        }
     }
+
+    override fun shouldShowName(entity: NPCEntity): Boolean {
+        if (entity.hideNameTag) {
+            return false
+        }
+        return super.shouldShowName(entity)
+    }
 }

common/src/main/kotlin/com/cobblemon/mod/common/client/settings/ServerSettings.kt

@@ -25,5 +25,7 @@ object ServerSettings {
     var displayEntityLevelLabel = Cobblemon.config.displayEntityLevelLabel
     var displayEntityNameLabel = Cobblemon.config.displayEntityNameLabel
     var maxPokemonLevel = Cobblemon.config.maxPokemonLevel
+    var maxPokemonFriendship = Cobblemon.config.maxPokemonFriendship
+    var maxDynamaxLevel = Cobblemon.config.maxDynamaxLevel
 
 }

common/src/main/kotlin/com/cobblemon/mod/common/command/PcCommand.kt

@@ -17,10 +17,12 @@ import com.cobblemon.mod.common.net.messages.client.storage.pc.OpenPCPacket
 import com.cobblemon.mod.common.util.*
 import com.mojang.brigadier.Command
 import com.mojang.brigadier.CommandDispatcher
+import com.mojang.brigadier.arguments.IntegerArgumentType
 import com.mojang.brigadier.context.CommandContext
 import com.mojang.brigadier.exceptions.SimpleCommandExceptionType
 import net.minecraft.commands.CommandSourceStack
 import net.minecraft.commands.Commands.literal
+import net.minecraft.commands.Commands.argument
 
 object PcCommand {
 
@@ -30,25 +32,36 @@ object PcCommand {
     fun register(dispatcher : CommandDispatcher<CommandSourceStack>) {
         dispatcher.register(literal(NAME)
             .permission(CobblemonPermissions.PC)
+            .then(argument("box", IntegerArgumentType.integer(1))
+                .executes(this::execute)
+            )
             .executes(this::execute)
         )
     }
 
     private fun execute(context: CommandContext<CommandSourceStack>): Int {
         val player = context.source.playerOrException
+        val box = try {
+            IntegerArgumentType.getInteger(context, "box")
+        } catch (e: IllegalArgumentException) {
+            1
+        }
         val pc = player.pc()
         if (player.isInBattle()) {
             throw IN_BATTLE_EXCEPTION.create()
         }
+        if (pc.boxes.size < box) {
+            throw SimpleCommandExceptionType(lang("command.pc.invalid-box", box, pc.boxes.size).red()).create()
+        }
         PCLinkManager.addLink(PermissiblePcLink(pc, player, CobblemonPermissions.PC))
-        OpenPCPacket(pc.uuid).sendToPlayer(player)
+        OpenPCPacket(pc.uuid, box - 1).sendToPlayer(player)
         context.source.level.playSoundServer(
-                position = context.source.player!!.position(),
-                sound = CobblemonSounds.PC_ON,
-                volume = 0.5F,
-                pitch = 1F
+            position = context.source.player!!.position(),
+            sound = CobblemonSounds.PC_ON,
+            volume = 0.5F,
+            pitch = 1F
         )
         return Command.SINGLE_SUCCESS
     }
 
-}
+}

common/src/main/kotlin/com/cobblemon/mod/common/datafixer/fix/FeatureFix.kt

@@ -29,14 +29,14 @@ class FeatureFix(output: Schema) : PokemonFix(output) {
         if (features.result().isPresent) {
             return dynamic //already has Features nbt format... no work needed
         }
-        var featureTag = emptyList<CompoundTag>()
+        var featureTag = mutableListOf<CompoundTag>()
         if (dynamic.value is CompoundTag) {
             var rootTag = dynamic.value as CompoundTag
             var species = PokemonSpecies.getByIdentifier(rootTag.getString(DataKeys.POKEMON_SPECIES_IDENTIFIER).asResource())
             if (species == null) {
                 return dynamic
             }
-            SpeciesFeatures.getFeaturesFor(species!!).forEach {
+            SpeciesFeatures.getFeaturesFor(species).forEach {
                 val feature = it(rootTag) ?: return@forEach
                 var tag = CompoundTag()
                 tag.putString(FEATURE_ID, feature.name)
@@ -51,7 +51,10 @@ class FeatureFix(output: Schema) : PokemonFix(output) {
         } else if (dynamic.value is JsonElement) {
             var rootTag = (dynamic.value as JsonElement).asJsonObject
             var species = PokemonSpecies.getByIdentifier(rootTag.get(DataKeys.POKEMON_SPECIES_IDENTIFIER).asString.asResource())
-            SpeciesFeatures.getFeaturesFor(species!!).forEach {
+            if (species == null) {
+                return dynamic
+            }
+            SpeciesFeatures.getFeaturesFor(species).forEach {
                 val feature = it(rootTag) ?: return@forEach
                 var tag = CompoundTag()
                 tag.putString(FEATURE_ID, feature.name)

common/src/main/kotlin/com/cobblemon/mod/common/datafixer/fix/ShoulderStateJsonFix.kt

@@ -8,18 +8,20 @@
 
 package com.cobblemon.mod.common.datafixer.fix
 
+import com.cobblemon.mod.common.util.DataKeys
 import com.mojang.datafixers.schemas.Schema
 import com.mojang.serialization.Dynamic
 
 class ShoulderStateJsonFix(output: Schema) : PokemonFix(output) {
     override fun fixPokemonData(dynamic: Dynamic<*>): Dynamic<*> {
-        val moveSetJson = dynamic.get("State").result()
+        val stateJson = dynamic.get("State").result()
         //State not here
-        if (moveSetJson.isEmpty) {
+        if (stateJson.isEmpty) {
             return dynamic
         }
 
-        if (moveSetJson.get().mapValues.getOrThrow().size == 0) {
+        if (stateJson.get().mapValues.getOrThrow().isEmpty() ||
+            !stateJson.get().mapValues.getOrThrow().containsKey(dynamic.createString(DataKeys.POKEMON_STATE_TYPE))) {
             return dynamic.remove("State")
         }
 

common/src/main/kotlin/com/cobblemon/mod/common/entity/fishing/PokeRodFishingBobberEntity.kt

@@ -35,6 +35,7 @@ import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
 import com.cobblemon.mod.common.util.cobblemonResource
 import com.cobblemon.mod.common.util.lang
 import com.cobblemon.mod.common.util.toBlockPos
+import com.cobblemon.mod.common.util.weightedSelection
 import net.minecraft.advancements.CriteriaTriggers
 import net.minecraft.client.resources.sounds.EntityBoundSoundInstance
 import net.minecraft.core.BlockPos
@@ -183,33 +184,19 @@ class PokeRodFishingBobberEntity(type: EntityType<out PokeRodFishingBobberEntity
     }
 
     fun chooseAdjustedSpawnBucket(buckets: List<SpawnBucket>, luckOfTheSeaLevel: Int): SpawnBucket {
-        val baseIncreases = listOf(2.5F, 0.5F, 0.2F)  // Base increases for the first three buckets beyond the first
+        val baseValues = listOf(94.3F, 5.0F, 0.5F, 0.2F)
+        val adjustments = listOf(-4.1F, 2.5F, 1.0F, 0.6F)
+
         val adjustedWeights = buckets.mapIndexed { index, bucket ->
-            if (index == 0) {
-                // Placeholder, will be recalculated
-                0.0F
-            } else {
-                val increase = if (index < baseIncreases.size) baseIncreases[index] else baseIncreases.last() + (index - baseIncreases.size + 1) * 0.15F
-                bucket.weight + increase * luckOfTheSeaLevel
+            if (index >= baseValues.size) {
+                return@mapIndexed bucket to bucket.weight
             }
-        }.toMutableList()
+            val base = baseValues[index]
+            val adjustment = adjustments[index]
+            bucket to (base + adjustment * luckOfTheSeaLevel)
+        }.toMap()
 
-        // Recalculate the first bucket's weight to ensure the total is 100%
-        val totalAdjustedWeight = adjustedWeights.sum() - adjustedWeights[0]  // Corrected to ensure the list contains Floats
-        adjustedWeights[0] = 100.0F - totalAdjustedWeight + buckets[0].weight
-
-        // Random selection based on adjusted weights
-        val weightSum = adjustedWeights.sum()
-        val chosenSum = kotlin.random.Random.nextDouble(weightSum.toDouble()).toFloat()  // Ensure usage of Random from kotlin.random package
-        var sum = 0.0F
-        adjustedWeights.forEachIndexed { index, weight ->
-            sum += weight
-            if (sum >= chosenSum) {
-                return buckets[index]
-            }
-        }
-
-        return buckets.first()  // Fallback
+        return buckets.weightedSelection { adjustedWeights[it]!! }!!
     }
 
     fun isOpenOrWaterAround(pos: BlockPos): Boolean {
@@ -335,7 +322,7 @@ class PokeRodFishingBobberEntity(type: EntityType<out PokeRodFishingBobberEntity
 
                     val buckets = Cobblemon.bestSpawner.config.buckets
 
-                    // choose a spawn bucket according to weights no matter how many there are
+                    // choose a spawn bucket according to weights and luck of the sea
                     chosenBucket = chooseAdjustedSpawnBucket(buckets, luckOfTheSeaLevel)
                     CobblemonEvents.BOBBER_BUCKET_CHOSEN.post(BobberBucketChosenEvent(chosenBucket, buckets, luckOfTheSeaLevel)) { event ->
                         chosenBucket = event.chosenBucket
@@ -698,10 +685,9 @@ class PokeRodFishingBobberEntity(type: EntityType<out PokeRodFishingBobberEntity
         )
 
         // This has a chance to fail, if the position has no suitability for a fishing context
-        // it could also just be a miss which
-        // means two attempts to spawn in the same location can have differing results (which is expected for
-        // randomness).
-        if (result == null) {
+        // it could also just be a miss which means two attempts to spawn in the same location
+        // can have differing results (which is expected for randomness).
+        if (result == null || result.isCompletedExceptionally) {
             player.sendSystemMessage(lang("fishing.no_bite").red())
             return false
         }

common/src/main/kotlin/com/cobblemon/mod/common/entity/npc/NPCEntity.kt

@@ -109,6 +109,12 @@ class NPCEntity(world: Level) : AgeableMob(CobblemonEntities.NPC, world), Npc, P
     val level: Int
         get() = entityData.get(LEVEL)
 
+    var hideNameTag: Boolean
+        get() = entityData.get(HIDE_NAME_TAG)
+        set(value) {
+            entityData.set(HIDE_NAME_TAG, value)
+        }
+
     var skill: Int? = null // range from 0 - 5
 
     var baseScale: Float? = null
@@ -204,7 +210,7 @@ class NPCEntity(world: Level) : AgeableMob(CobblemonEntities.NPC, world), Npc, P
         val BATTLE_IDS = SynchedEntityData.defineId(NPCEntity::class.java, UUIDSetDataSerializer)
         val NPC_PLAYER_TEXTURE = SynchedEntityData.defineId(NPCEntity::class.java, NPCPlayerTextureSerializer)
         val LEVEL = SynchedEntityData.defineId(NPCEntity::class.java, EntityDataSerializers.INT)
-
+        val HIDE_NAME_TAG = SynchedEntityData.defineId(NPCEntity::class.java, EntityDataSerializers.BOOLEAN)
 
 //        val BATTLING = Activity.register("npc_battling")
 
@@ -255,6 +261,7 @@ class NPCEntity(world: Level) : AgeableMob(CobblemonEntities.NPC, world), Npc, P
         builder.define(BATTLE_IDS, setOf())
         builder.define(NPC_PLAYER_TEXTURE, NPCPlayerTexture(ByteArray(1), NPCPlayerModelType.NONE))
         builder.define(LEVEL, 1)
+        builder.define(HIDE_NAME_TAG, false)
     }
 
     override fun getAddEntityPacket(serverEntity: ServerEntity) = ClientboundCustomPayloadPacket(
@@ -318,6 +325,7 @@ class NPCEntity(world: Level) : AgeableMob(CobblemonEntities.NPC, world), Npc, P
         nbt.put(DataKeys.NPC_DATA, MoLangFunctions.writeMoValueToNBT(data))
         nbt.put(DataKeys.NPC_CONFIG, MoLangFunctions.writeMoValueToNBT(config))
         nbt.put(DataKeys.NPC_LEVEL, IntTag.valueOf(level))
+        nbt.putBoolean(DataKeys.NPC_HIDE_NAME_TAG, hideNameTag)
         nbt.putString(DataKeys.NPC_CLASS, npc.id.toString())
         nbt.put(DataKeys.NPC_ASPECTS, ListTag().also { list -> appliedAspects.forEach { list.add(StringTag.valueOf(it)) } })
         nbt.put(DataKeys.NPC_VARIATION_ASPECTS, ListTag().also { list -> variationAspects.forEach { list.add(StringTag.valueOf(it)) } })
@@ -383,6 +391,7 @@ class NPCEntity(world: Level) : AgeableMob(CobblemonEntities.NPC, world), Npc, P
     override fun load(nbt: CompoundTag) {
         npc = NPCClasses.getByIdentifier(ResourceLocation.parse(nbt.getString(DataKeys.NPC_CLASS))) ?: NPCClasses.classes.first()
         entityData.set(LEVEL, nbt.getInt(DataKeys.NPC_LEVEL).takeIf { it != 0 } ?: 1)
+        entityData.set(HIDE_NAME_TAG, nbt.getBoolean(DataKeys.NPC_HIDE_NAME_TAG))
         super.load(nbt)
         data = MoLangFunctions.readMoValueFromNBT(nbt.getCompound(DataKeys.NPC_DATA)) as VariableStruct
         config = if (nbt.contains(DataKeys.NPC_CONFIG)) MoLangFunctions.readMoValueFromNBT(nbt.getCompound(DataKeys.NPC_CONFIG)) as VariableStruct else VariableStruct()
@@ -490,6 +499,7 @@ class NPCEntity(world: Level) : AgeableMob(CobblemonEntities.NPC, world), Npc, P
 
     fun initialize(level: Int) {
         variationAspects.clear()
+        entityData.set(HIDE_NAME_TAG, npc.hideNameTag)
         entityData.set(LEVEL, level)
         npc.config.forEach { it.applyDefault(this) }
         npc.variations.values.forEach { this.variationAspects.addAll(it.provideAspects(this)) }

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

@@ -1583,17 +1583,15 @@ open class PokemonEntity(
     private fun sidedCodec(): Codec<Pokemon> = if (this.level().isClientSide) Pokemon.CLIENT_CODEC else Pokemon.CODEC
 
     override fun resolvePokemonScan(): PokedexEntityData? {
-        return PokemonSpecies.getByIdentifier(this.exposedSpecies.resourceIdentifier)?.let { species ->
-            PokedexEntityData(
-                species = species,
-                form = this.form,
-                gender = this.pokemon.gender,
-                aspects = this.aspects,
-                shiny = this.pokemon.shiny,
-                level = this.labelLevel(),
-                ownerUUID = this.ownerUUID
-            )
-        }
+        return PokedexEntityData(
+            pokemon = pokemon,
+            disguise = this.effects.mockEffect?.let {
+                PokedexEntityData.DisguiseData(
+                    species = it.exposedSpecies ?: pokemon.species,
+                    form = it.exposedForm ?: pokemon.form,
+                )
+            }
+        )
     }
 
     override fun resolveEntityScan(): LivingEntity {

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

@@ -34,6 +34,7 @@ import net.minecraft.network.chat.Component
 import net.minecraft.network.syncher.EntityDataAccessor
 import net.minecraft.world.damagesource.DamageSource
 import net.minecraft.world.entity.ai.attributes.Attributes
+import net.minecraft.world.item.ItemStack
 import net.minecraft.world.level.pathfinder.PathType
 
 /** Handles purely server logic for a Pokémon */
@@ -258,6 +259,8 @@ class PokemonServerDelegate : PokemonSideDelegate {
             if (entity.ownerUUID == null && entity.owner == null) {
                 entity.level().broadcastEntityEvent(entity, 60.toByte()) // Sends smoke effect
                 if(entity.level().gameRules.getBoolean(CobblemonGameRules.DO_POKEMON_LOOT)) {
+                    val heldItem = (entity as PokemonEntity?)?.pokemon?.heldItemNoCopy() ?: ItemStack.EMPTY
+                    if (!heldItem.isEmpty) entity.spawnAtLocation(heldItem.item)
                     (entity.drops ?: entity.pokemon.form.drops).drop(entity, entity.level() as ServerLevel, entity.position(), entity.killer)
                 }
             }

common/src/main/kotlin/com/cobblemon/mod/common/item/group/CobblemonItemGroups.kt

@@ -488,6 +488,7 @@ object CobblemonItemGroups {
         entries.accept(CobblemonItems.RIBBON_SWEET)
         entries.accept(CobblemonItems.AUSPICIOUS_ARMOR)
         entries.accept(CobblemonItems.MALICIOUS_ARMOR)
+        entries.accept(CobblemonItems.SHELL_HELMET)
     }
 
     private fun heldItemEntries(displayContext: ItemDisplayParameters, entries: Output) {

common/src/main/kotlin/com/cobblemon/mod/common/item/interactive/LinkCableItem.kt

@@ -20,6 +20,13 @@ class LinkCableItem : CobblemonItem(Properties()), PokemonEntityInteraction {
     override fun processInteraction(player: ServerPlayer, entity: PokemonEntity, stack: ItemStack): Boolean {
         val pokemon = entity.pokemon
         pokemon.lockedEvolutions.filterIsInstance<TradeEvolution>().forEach { evolution ->
+            // Prevent Pokémon that require a specific trading partner for evolution (e.g., Shelmet and Karrablast)
+            // from evolving via link cable. These Pokémon must either be traded with another player or use an
+            // alternative single-player evolution method.
+            if (!evolution.requiredContext.originalString.isEmpty()) {
+                return@forEach
+            }
+
             // If an evolution is possible non-optional or has been successfully queued we will consume the item and stop
             // validate requirements to respect required held items and such.
             if (evolution.requirements.all { it.check(pokemon) } && evolution.evolve(pokemon)) {

common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/settings/ServerSettingsPacket.kt

@@ -23,7 +23,9 @@ class ServerSettingsPacket internal constructor(
     val preventCompletePartyDeposit: Boolean,
     val displayEntityLevelLabel: Boolean,
     val displayEntityNameLabel: Boolean,
-    val maxPokemonLevel: Int
+    val maxPokemonLevel: Int,
+    val maxPokemonFriendship: Int,
+    val maxDynamaxLevel: Int
 ) : NetworkPacket<ServerSettingsPacket> {
     override val id = ID
     override fun encode(buffer: RegistryFriendlyByteBuf) {
@@ -31,9 +33,11 @@ class ServerSettingsPacket internal constructor(
         buffer.writeBoolean(Cobblemon.config.displayEntityLevelLabel)
         buffer.writeBoolean(Cobblemon.config.displayEntityNameLabel)
         buffer.writeInt(Cobblemon.config.maxPokemonLevel)
+        buffer.writeInt(Cobblemon.config.maxPokemonFriendship)
+        buffer.writeInt(Cobblemon.config.maxDynamaxLevel)
     }
     companion object {
         val ID = cobblemonResource("server_settings")
-        fun decode(buffer: RegistryFriendlyByteBuf) = ServerSettingsPacket(buffer.readBoolean(), buffer.readBoolean(), buffer.readBoolean(), buffer.readInt())
+        fun decode(buffer: RegistryFriendlyByteBuf) = ServerSettingsPacket(buffer.readBoolean(), buffer.readBoolean(), buffer.readBoolean(), buffer.readInt(), buffer.readInt(), buffer.readInt())
     }
 }

common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/sound/UnvalidatedPlaySoundS2CPacket.kt

@@ -25,14 +25,14 @@ import net.minecraft.resources.ResourceLocation
  * @author Licious
  * @since December 29th, 2022
  */
-internal class UnvalidatedPlaySoundS2CPacket(
-    val sound: ResourceLocation,
-    val category: SoundSource,
-    val x: Double,
-    val y: Double,
-    val z: Double,
-    val volume: Float,
-    val pitch: Float
+class UnvalidatedPlaySoundS2CPacket(
+    var sound: ResourceLocation,
+    var category: SoundSource,
+    var x: Double,
+    var y: Double,
+    var z: Double,
+    var volume: Float,
+    var pitch: Float
 ) : NetworkPacket<UnvalidatedPlaySoundS2CPacket> {
 
     override val id = ID

common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/spawn/SpawnExtraDataEntityPacket.kt

@@ -18,7 +18,7 @@ import net.minecraft.network.protocol.PacketUtils
 import net.minecraft.network.protocol.game.ClientboundAddEntityPacket
 import net.minecraft.world.phys.Vec3
 
-abstract class SpawnExtraDataEntityPacket<T: NetworkPacket<T>, E : Entity>(private val vanillaSpawnPacket: ClientboundAddEntityPacket) : NetworkPacket<T> {
+abstract class SpawnExtraDataEntityPacket<T: NetworkPacket<T>, E : Entity>(var vanillaSpawnPacket: ClientboundAddEntityPacket) : NetworkPacket<T> {
     override fun encode(buffer: RegistryFriendlyByteBuf) {
         this.encodeEntityData(buffer)
         this.vanillaSpawnPacket.write(buffer)

common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/spawn/SpawnNPCPacket.kt

@@ -30,13 +30,14 @@ import net.minecraft.resources.ResourceLocation
 import net.minecraft.world.entity.Entity
 
 class SpawnNPCPacket(
-    private val npcClass: ResourceLocation,
-    private val aspects: Set<String>,
-    private val level: Int,
-    private val battleIds: Set<UUID>,
-    private val name: Component,
-    private val poseType: PoseType,
-    private val texture: NPCPlayerTexture,
+    var npcClass: ResourceLocation,
+    var aspects: Set<String>,
+    var level: Int,
+    var battleIds: Set<UUID>,
+    var name: Component,
+    var poseType: PoseType,
+    var texture: NPCPlayerTexture,
+    var hideNameTag: Boolean,
     vanillaSpawnPacket: ClientboundAddEntityPacket
 ) : SpawnExtraDataEntityPacket<SpawnNPCPacket, NPCEntity>(vanillaSpawnPacket) {
 
@@ -50,6 +51,7 @@ class SpawnNPCPacket(
         entity.name,
         entity.entityData.get(NPCEntity.POSE_TYPE),
         entity.entityData.get(NPCEntity.NPC_PLAYER_TEXTURE),
+        entity.hideNameTag,
         vanillaSpawnPacket
     )
 
@@ -64,6 +66,7 @@ class SpawnNPCPacket(
         if (this.texture.model != NPCPlayerModelType.NONE) {
             buffer.writeByteArray(this.texture.texture)
         }
+        buffer.writeBoolean(this.hideNameTag)
     }
 
     override fun applyData(entity: NPCEntity) {
@@ -74,6 +77,7 @@ class SpawnNPCPacket(
         entity.entityData.set(NPCEntity.ASPECTS, aspects)
         entity.entityData.set(NPCEntity.POSE_TYPE, poseType)
         entity.entityData.set(NPCEntity.NPC_PLAYER_TEXTURE, texture)
+        entity.entityData.set(NPCEntity.HIDE_NAME_TAG, this.hideNameTag)
     }
 
     override fun checkType(entity: Entity): Boolean = entity is NPCEntity
@@ -93,9 +97,10 @@ class SpawnNPCPacket(
             } else {
                 NPCPlayerTexture(byteArrayOf(), model)
             }
+            val hideNameTag = buffer.readBoolean()
             val vanillaPacket = decodeVanillaPacket(buffer)
 
-            return SpawnNPCPacket(npc, aspects, level, battleIds, name, poseType, texture, vanillaPacket)
+            return SpawnNPCPacket(npc, aspects, level, battleIds, name, poseType, texture, hideNameTag, vanillaPacket)
         }
     }
 

common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/spawn/SpawnPokemonPacket.kt

@@ -24,26 +24,26 @@ import net.minecraft.network.protocol.game.ClientboundAddEntityPacket
 import net.minecraft.resources.ResourceLocation
 
 class SpawnPokemonPacket(
-    private val ownerId: UUID?,
-    private val scaleModifier: Float,
-    private val speciesId: ResourceLocation,
-    private val gender: Gender,
-    private val shiny: Boolean,
-    private val formName: String,
-    private val aspects: Set<String>,
-    private val battleId: UUID?,
-    private val phasingTargetId: Int,
-    private val beamMode: Byte,
-    private val platform: PlatformType,
-    private val nickname: MutableComponent?,
-    private val labelLevel: Int,
-    private val poseType: PoseType,
-    private val unbattlable: Boolean,
-    private val hideLabel: Boolean,
-    private val caughtBall: ResourceLocation,
-    private val spawnYaw: Float,
-    private val friendship: Int,
-    private val freezeFrame: Float,
+    var ownerId: UUID?,
+    var scaleModifier: Float,
+    var speciesId: ResourceLocation,
+    var gender: Gender,
+    var shiny: Boolean,
+    var formName: String,
+    var aspects: Set<String>,
+    var battleId: UUID?,
+    var phasingTargetId: Int,
+    var beamMode: Byte,
+    var platform: PlatformType,
+    var nickname: MutableComponent?,
+    var labelLevel: Int,
+    var poseType: PoseType,
+    var unbattlable: Boolean,
+    var hideLabel: Boolean,
+    var caughtBall: ResourceLocation,
+    var spawnYaw: Float,
+    var friendship: Int,
+    var freezeFrame: Float,
     vanillaSpawnPacket: ClientboundAddEntityPacket
 ) : SpawnExtraDataEntityPacket<SpawnPokemonPacket, PokemonEntity>(vanillaSpawnPacket) {
 

common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/storage/pc/OpenPCPacket.kt

@@ -26,16 +26,17 @@ import net.minecraft.network.RegistryFriendlyByteBuf
  * @author Hiroku
  * @since June 20th, 2022
  */
-class OpenPCPacket(val storeID: UUID) : NetworkPacket<OpenPCPacket> {
+class OpenPCPacket(val storeID: UUID, val box: Int = 1) : NetworkPacket<OpenPCPacket> {
 
     override val id = ID
 
     override fun encode(buffer: RegistryFriendlyByteBuf) {
         buffer.writeUUID(storeID)
+        buffer.writeInt(box)
     }
 
     companion object {
         val ID = cobblemonResource("open_pc")
-        fun decode(buffer: RegistryFriendlyByteBuf) = OpenPCPacket(buffer.readUUID())
+        fun decode(buffer: RegistryFriendlyByteBuf) = OpenPCPacket(buffer.readUUID(), buffer.readInt())
     }
 }

common/src/main/kotlin/com/cobblemon/mod/common/net/serverhandling/evolution/AcceptEvolutionHandler.kt

@@ -10,6 +10,7 @@ package com.cobblemon.mod.common.net.serverhandling.evolution
 
 import com.cobblemon.mod.common.api.net.ServerNetworkPacketHandler
 import com.cobblemon.mod.common.net.messages.server.pokemon.update.evolution.AcceptEvolutionPacket
+import com.cobblemon.mod.common.util.isInBattle
 import com.cobblemon.mod.common.util.party
 import net.minecraft.server.MinecraftServer
 import net.minecraft.server.level.ServerPlayer
@@ -17,7 +18,7 @@ import net.minecraft.server.level.ServerPlayer
 object AcceptEvolutionHandler : ServerNetworkPacketHandler<AcceptEvolutionPacket> {
     override fun handle(packet: AcceptEvolutionPacket, server: MinecraftServer, player: ServerPlayer) {
         val pokemon = player.party()[packet.pokemonUUID] ?: return
-        if (pokemon.entity?.isBusy == true) return
+        if (player.isInBattle() || pokemon.entity?.isBusy == true) return
         val evolution = pokemon.evolutionProxy.server().firstOrNull { evolution -> evolution.id.equals(packet.evolutionId, true) } ?: return
         pokemon.evolutionProxy.server().start(evolution)
     }