When you wish upon a star

Makes no difference who you are
Anything your heart desires
Will come to you
If your heart is in your dream
No request is too extreme
When you wish upon a star
As dreamers do
Fate is kind
She brings to those who love
The sweet fulfillment of
Their secret longing
Like a bolt out of the blue
Fate steps in and sees you through
When you wish upon a star
Your dreams come true

.gitattributes

@@ -3,4 +3,3 @@
 # are changed when only line endings change.
 src/generated/**/.cache/cache text eol=lf
 src/generated/**/*.json text eol=lf
-CHANGELOG.md merge=union

.gitignore

@@ -12,8 +12,7 @@ out
 *.ipr
 *.iws
 *.iml
-.idea/*
-!.idea/icon.png
+.idea
 
 # gradle
 build
@@ -22,9 +21,6 @@ build
 # other
 eclipse
 run
-runClient
-runServer
-utilityscripts/implementation/*.txt
 
 # Files from Forge MDK
 forge*changelog.txt
@@ -37,11 +33,4 @@ common/src/main/resources/assets/cobblemon/showdown
 # Generated files
 */generated/resources/*
 /fabric/src/generated/resources/cobblemon-common.accesswidener
-/fabric/src/main/generated/*
-/.ignored/
-common/.fabric
-.kotlin/
-
-# MacOS
-.DS_Store
-/common/config/*
+/.ignored/

.gitlab-ci.yml

@@ -1,189 +1,64 @@
-image: amazoncorretto:21
-
 before_script:
   - export GRADLE_USER_HOME=`pwd`/.gradle
 
-# TODO add client reference test process, search for import com.cobblemon.mod.common.client
-
 stages:
-  - preprocessing
-  - packsquash
-  - replaceresources
   - build
   - deploy
 
-check_assets_cache:
-  stage: preprocessing
-  script:
-    - echo "Checking if cached hash matches current hash"
-    - yum install -y findutils
-
-    # Calculate the current hash
-    - find common/src/main/resources/assets common/src/main/resources/data -type f -exec sha256sum {} + | sort -k 2 | sha256sum > current_hash.txt
-    - echo "Current hash:"
-    - cat current_hash.txt
-
-    # Check for the existence of the previous hash
-    - if [[ -f assets_data_hash.txt ]]; then
-      echo "Previous cached hash found:";
-      cat assets_data_hash.txt;
-      if cmp -s assets_data_hash.txt current_hash.txt; then
-      echo "Hashes match, skipping PackSquash";
-      rm -f run_packsquash.flag || true;
-      else
-      echo "Hashes differ, PackSquash needed";
-      touch run_packsquash.flag;
-      fi;
-      else
-      echo "No cached hash found, marking PackSquash as required";
-      touch run_packsquash.flag;
-      fi
-
-    # Save the current hash for future runs
-    - echo "Saving current hash to cache";
-    - cp current_hash.txt assets_data_hash.txt
-  artifacts:
-    paths:
-      - current_hash.txt
-      - assets_data_hash.txt
-      - run_packsquash.flag
-    expire_in: 7 days
-  cache:
-    key: "cache-${CI_COMMIT_REF_NAME}"
-    paths:
-      - assets_data_hash.txt
-      - ./compressed_pack.zip
-
-setup_resource_pack:
-  stage: preprocessing
-  script:
-    - echo "Setting up fake resource pack"
-    - mkdir ./fake_resource_pack
-    - cp -r common/src/main/resources/assets common/src/main/resources/data ./fake_resource_pack/
-    - echo '{"pack":{"pack_format":34,"description":"Fake Cobblemon Pack"}}' > ./fake_resource_pack/pack.mcmeta
-  artifacts:
-    paths:
-      - ./fake_resource_pack/
-    expire_in: 7 days
-
-setup_packsquash:
-  stage: preprocessing
-  script:
-    - echo "Installing wget & unzip"
-    - yum install -y wget unzip
-    - echo "Downloading PackSquash"
-    - wget https://github.com/ComunidadAylas/PackSquash/releases/download/v0.4.1/packsquash-x86_64-unknown-linux-musl.zip
-    - unzip packsquash-x86_64-unknown-linux-musl.zip -d ./packsquash_bin
-    - echo "Creating PackSquash options.toml"
-    - |
-      cat <<EOF > ./options.toml
-      pack_directory = "./fake_resource_pack/"
-      output_file_path = "./compressed_pack.zip"
-      zip_spec_conformance_level = "high"
-      ['**/*?.ogg']
-      transcode_ogg = false
-      two_pass_vorbis_optimization_and_validation = false
-      sampling_frequency = 999999
-      empty_audio_optimization=false
-      EOF
-  artifacts:
-    paths:
-      - ./packsquash_bin/
-      - ./options.toml
-    expire_in: 7 days
-
-default:
-  artifacts:
-    expire_in: 7 days
-
-run_packsquash:
-  stage: packsquash
-  dependencies:
-    - check_assets_cache
-    - setup_resource_pack
-    - setup_packsquash
-  script:
-    - ls -l
-    - if [[ ! -f ./compressed_pack.zip || -f run_packsquash.flag ]]; then
-      echo "Running PackSquash";
-      chmod +x ./packsquash_bin/packsquash;
-      ./packsquash_bin/packsquash ./options.toml;
-      else
-      echo "Skipping PackSquash; no changes detected and compressed pack exists";
-      fi
-  cache:
-    key: "cache-${CI_COMMIT_REF_NAME}"
-    policy: pull-push
-    paths:
-      - assets_data_hash.txt
-      - ./compressed_pack.zip
-  artifacts:
-    paths:
-      - ./compressed_pack.zip
-
-replace_resources:
-  stage: replaceresources
-  dependencies:
-    - run_packsquash
-  script:
-    - echo "Installing unzip"
-    - yum install -y unzip
-
-    - echo "Unzipping compressed pack"
-    - mkdir temp_unpack
-    - unzip ./compressed_pack.zip -d temp_unpack
-
-    - echo "Removing original assets and data"
-    - rm -rf common/src/main/resources/assets
-    - rm -rf common/src/main/resources/data
-
-    - echo "Replacing assets and data"
-    - mv temp_unpack/assets common/src/main/resources/
-    - mv temp_unpack/data common/src/main/resources/
-  artifacts:
-    paths:
-      - common/src/main/resources/
+#TODO add client reference test process, search for import com.cobblemon.mod.common.client
 
 build:
   stage: build
-  dependencies:
-    - replace_resources
+  only:
+    - branches@cable-mc/cobblemon
   script:
-    - yum install -y findutils
     - export GRADLE_OPTS="-Xmx4G -Xms4G"
     - chmod +x ./gradlew
     - ./gradlew build
-  artifacts:
+  cache:
+    key: "$CI_COMMIT_REF_NAME"
+    policy: push
     paths:
-      - neoforge/build/libs
+      - forge/build/libs
       - fabric/build/libs
 
 publish:
   stage: deploy
   dependencies:
     - build
+  cache:
+    key: "CI_COMMIT_REF_NAME"
+    policy: pull
+    paths:
+      - forge/build/libs/*.jar
+      - fabric/build/libs/*.jar
   rules:
-    - if: '$CI_PROJECT_PATH == "cable-mc/cobblemon" && $CI_COMMIT_BRANCH == "main"'
+    - if: '$CI_COMMIT_BRANCH == "main"'
   script:
-    - yum install -y findutils
     - export GRADLE_OPTS="-Xmx4G -Xms4G"
     - chmod +x ./gradlew
     - ./gradlew publish
-  artifacts:
-    paths:
-      - neoforge/build/libs/*.jar
-      - fabric/build/libs/*.jar
 
-deploy_artifacts:
+# Separate step to deploy the artifacts, save Norry the headache of keeping even more shit around
+deploy:
   stage: deploy
   dependencies:
     - build
-  script:
-    - yum install -y findutils
+  when: manual
+  cache:
+    key: "$CI_COMMIT_REF_NAME"
+    policy: pull
+    paths:
+      - forge/build/libs/*.jar
+      - fabric/build/libs/*.jar
+  script: 
     - echo "Collecting artifacts..."
-    - find neoforge/build/libs/ -type f -name "*.jar" | grep -vE "dev-shadow|sources|javadoc" | xargs -I {} mv {} ./
-    - find fabric/build/libs/ -type f -name "*.jar" | grep -vE "dev-shadow|sources|javadoc" | xargs -I {} mv {} ./
+    - mv forge/build/libs/*+*.jar ./
+    - mv fabric/build/libs/*+*.jar ./
     - for f in *.jar; do mv "$f" "$(echo "$f" | sed s/+/b$CI_PIPELINE_IID+/)"; done
   artifacts:
+    expire_in: 28 days
     paths:
       - ./*.jar
+#      - forge/build/libs/*+*.jar
+#      - fabric/build/libs/*+*.jar

README.md

@@ -1,6 +1,6 @@
 # Cobblemon
 
-An open-source Pokémon mod for Minecraft Java Edition, written in Kotlin for Fabric and NeoForge.
+An open-source Pokémon mod for Minecraft Java Edition, written in Kotlin for Fabric and Forge.
 
 ## Getting started
 

ai_bugs.txt

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

archive/archived-assets/README.md

@@ -1 +0,0 @@
-These are assets that may be used in the future, but can't be put in tFheir respective folders at the moment for some reason or another

build-logic/build.gradle.kts

@@ -0,0 +1,18 @@
+plugins {
+    `kotlin-dsl`
+}
+
+repositories {
+    gradlePluginPortal()
+    maven("https://maven.architectury.dev/")
+    maven("https://maven.fabricmc.net/")
+    maven("https://maven.minecraftforge.net/")
+}
+
+dependencies {
+    implementation(libs.kotlin)
+    implementation(libs.licenser)
+    implementation(libs.shadow)
+    implementation(libs.loom)
+    implementation(libs.architecturyPlugin)
+}

build-logic/settings.gradle.kts

@@ -0,0 +1,10 @@
+import ca.stellardrift.build.configurate.ConfigFormats
+import ca.stellardrift.build.configurate.catalog.PolyglotVersionCatalogExtension
+
+plugins {
+    id("ca.stellardrift.polyglot-version-catalogs") version "5.0.1"
+}
+
+extensions.configure<PolyglotVersionCatalogExtension> {
+    from(ConfigFormats.YAML, file("../gradle/libs.versions.yml"))
+}

build-logic/src/main/kotlin/cobblemon.base-conventions.gradle.kts

@@ -0,0 +1,71 @@
+/*
+ *
+ *  * 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/.
+ *
+ */
+
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
+val accessWidenerFile = "src/main/resources/cobblemon-common.accesswidener"
+
+plugins {
+    java
+    `java-library`
+    id("org.cadixdev.licenser")
+    id("dev.architectury.loom")
+    id("architectury-plugin")
+    kotlin("jvm")
+}
+
+repositories {
+    mavenCentral()
+    //JEI
+    maven("https://maven.blamejared.com/")
+    maven("https://maven.tterrag.com/")
+}
+
+license {
+    header(rootProject.file("HEADER"))
+}
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+}
+
+architectury {
+    minecraft = project.property("mc_version").toString()
+}
+
+loom {
+    silentMojangMappingsLicense()
+    accessWidenerPath.set(project(":common").file(ACCESS_WIDENER))
+
+    mixin {
+        defaultRefmapName.set("cobblemon-${project.name}-refmap.json")
+    }
+}
+
+dependencies {
+    minecraft("net.minecraft:minecraft:${rootProject.property("mc_version")}")
+    mappings("net.fabricmc:yarn:${rootProject.property("yarn_version")}:v2")
+}
+
+tasks {
+    withType<JavaCompile> {
+        options.encoding = "UTF-8"
+        options.release.set(17)
+    }
+
+    withType<KotlinCompile> {
+        kotlinOptions.jvmTarget = "17"
+    }
+
+    withType<Jar> {
+        from(rootProject.file("LICENSE"))
+    }
+}

build-logic/src/main/kotlin/cobblemon.platform-conventions.gradle.kts

@@ -0,0 +1,32 @@
+plugins {
+    id("cobblemon.base-conventions")
+    id("com.github.johnrengelman.shadow")
+}
+
+val bundle: Configuration by configurations.creating {
+    isCanBeConsumed = false
+    isCanBeResolved = true
+}
+
+tasks {
+
+    jar {
+        archiveBaseName.set("Cobblemon-${project.name}")
+        archiveClassifier.set("dev-slim")
+    }
+
+    shadowJar {
+        archiveClassifier.set("dev-shadow")
+        archiveBaseName.set("Cobblemon-${project.name}")
+        configurations = listOf(bundle)
+        mergeServiceFiles()
+    }
+
+    remapJar {
+        dependsOn(shadowJar)
+        inputFile.set(shadowJar.flatMap { it.archiveFile })
+        archiveBaseName.set("Cobblemon-${project.name}")
+        archiveVersion.set("${rootProject.version}")
+    }
+
+}

build-logic/src/main/kotlin/cobblemon.publish-conventions.gradle.kts

@@ -0,0 +1,37 @@
+plugins {
+    java
+    `java-library`
+    id("maven-publish")
+    id("dev.architectury.loom")
+}
+
+java {
+    withSourcesJar()
+    withJavadocJar()
+}
+
+publishing {
+    repositories {
+        maven("https://maven.impactdev.net/repository/development/") {
+            name = "ImpactDev-Public"
+            credentials {
+                username = System.getenv("COBBLEMON_MAVEN_USER")
+                password = System.getenv("COBBLEMON_MAVEN_PASSWORD")
+            }
+        }
+    }
+
+    publications {
+        create<MavenPublication>(project.name) {
+            artifact(tasks.remapJar)
+            artifact(tasks.remapSourcesJar)
+
+            @Suppress("UnstableApiUsage")
+            loom.disableDeprecatedPomGeneration(this)
+
+            groupId = "com.cobblemon"
+            artifactId = project.findProperty("maven.artifactId")?.toString() ?: project.name
+            version = rootProject.version.toString()
+        }
+    }
+}

build-logic/src/main/kotlin/cobblemon.root-conventions.gradle.kts

@@ -0,0 +1,21 @@
+plugins {
+    `java-library`
+}
+
+tasks {
+    val collectJars by registering(Copy::class) {
+        val tasks = subprojects.filter { it.path != ":common" }.map { it.tasks.named("remapJar") }
+        dependsOn(tasks)
+
+        from(tasks)
+        into(buildDir.resolve("libs"))
+    }
+
+    assemble {
+        dependsOn(collectJars)
+    }
+}
+
+tasks.withType<Test> {
+    useJUnitPlatform()
+}

build-logic/src/main/kotlin/constants.kt

@@ -1,3 +1,2 @@
-package utilities
 
 const val ACCESS_WIDENER = "src/main/resources/cobblemon-common.accesswidener"

build.gradle.kts

@@ -1,11 +1,13 @@
 plugins {
+    base
     id("cobblemon.root-conventions")
+    id ("net.nemerosa.versioning") version "2.8.2"
 }
 
+group = "com.cobblemon.mod"
 version = "${project.property("mod_version")}+${project.property("mc_version")}"
 
-val isSnapshot = project.property("snapshot")?.equals("true") == true
+val isSnapshot = project.property("snapshot")?.equals("true") ?: false
 if (isSnapshot) {
-    val fixedBranchName = versioning.info.branch.substringAfter("/")
-    version = "$version-${fixedBranchName}-${versioning.info.build}"
-}
+    version = "$version-SNAPSHOT-${versioning.info.branch}-${versioning.info.build}"
+}

changelogs/CHANGELOG-1.0.0.md

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

changelogs/CHANGELOG-1.1.0.md

@@ -1,56 +0,0 @@
-## [1.1.0 - The Swim and Sleep Update (November 27th, 2022)](#1-1-0)
-#### "Ideally not at the same time."
-### Additions
-- Added a new GUI for viewing party information, rearranging moves, and evolving Pokémon. It looks too good.
-- Starter Pokémon will sleep on top of you if sent out when you get on a bed.
-- Added sleeping animations for starters, the Weedle family, and the Caterpie family. More to come.
-- Added Alolan Rattata and Alolan Raticate, Sableye, Deerling and Sawsbuck, and Pyukumukurutudulu or whatever it's called.
-- Added swimming AI so Pokémon don't sink to the bottom in water.
-- Aquatic Pokémon like Magikarp desperately move to water if they're on land.
-- Added status condition indicators in the party overlay.
-- Added HP labels to the battle interface so that you can see how much health you actually have.
-- Added spawn data for all final and special evolutions previously lacking spawn data.
-- Added shiny textures for many Pokémon (thank you MageFX!): Aerodactyl, Articuno, Zapdos, Moltres, Chansey, the Dratini family, Electabuzz, Goldeen and Seaking, Hitmonchan and Hitmonlee, Jynx, Kabuto and Kabutops, Magmar, Lickitung, Mr. Mime, Omanyte and Omastar, Rhyhorn and Rhydon, Koffing and Weezing, Porygon, Scyther, Seadra, Staryu and Starmie, and Tangela. Phew!
-- Added a couple of new advancements.
-- Added new items: Calcium, Carbos, HP Up, Iron, Protein, and Zinc. Currently only obtainable in Creative Mode (It's a surprise tool that will help us later).
-
-### Changes
-- Significantly improved AI pathing for larger entities so they won't keep trying to move to places they cannot possibly fit.
-- Changed the starter menu and summary menu keybinds to `M` by default.
-- Pokémon that are sent out slowly raise friendship. Before this it was faster and even worked when not sent out (wildly unbalanced).
-- Updated Link Cable and Protector item sprites to be prettier.
-- Slightly polished the Poké Ball opening and Poké Ball item use sounds.
-- `/givepokemon random`, `/spawnpokemon random`, and `/spawnallpokemon` will now only choose implemented Pokémon.
-- The battle message box now displays even when the battle GUI is minimised so that you can still see what's going on.
-- Moved the `R` prompt in battle to be higher on the screen so that it's not as distracting.
-
-### Fixes
-- Fixed shinies and form variations not displaying in the party or PC.
-- Fixed servers getting stuck on shutdown due to non-closed showdown server connections.
-- Fixed a niche situation where players could challenge themselves. It's a little inspirational if you think about it.
-- Fixed Pokémon natures not saving such that every time you restarted they had a totally different nature.
-- Fixed some underground Pokémon spawning above ground instead. I'm told other weird spawns were probably fixed at the same time.
-- Fixed Pokémon sometimes running in place. "It's still possible, but much less likely" - Yeah, ok devs.
-- Fixed mod incompatibility with many Architectury API mods, including *Biome Makeover* and *Earth2Java*.
-- Fixed a mod incompatibility with Minecraft Transit Railway Fabric and probably a bunch of other Fabric mods.
-- Fixed being unable to customize keybinds on Forge.
-- Fixed Summary keybinding being labeled as PokéNav. That comes later.
-- Fixed apricorns spawning without leaves which meant sometimes apricorns were growing on the side of dirt and stone which doesn't make much sense to me.
-- Fixed messages appearing in the console whenever a healer is used.
-- Fixed spawning in several biome tag categories.
-- Fixed resource pack support for Pokémon models and textures.
-- **Model Fixes**
-    - Fixed Paras and Nidoqueen looking very weird.
-    - Fixed Hitmonchan asserting dominance with a T-pose as well as Grimer and Muk pointing their hands to the sky.
-    - Fixed specific Pokémon suddenly pausing their animation after staying still for a long time.
-    - Fixed Mankey's feet being buried in the ground.
-    - Updated the Substitute model and updated its shiny texture to be better for the red-green colorblind.
-    - Improved Horsea, Seadra, and Kingdra animations, especially on land.
-- **Battle Fixes**
-    - Fixed an issue with battles where Pokémon had a different max HP causing some desync issues with the health bars.
-    - Fixed Magnitude battle messages.
-    - Moves that are disabled or out of PP now show transparently in the battle GUI instead of being hidden completely.
-    - Statuses like sleep and frozen no longer last forever if it was carried over from a previous battle.
-
-### Localization
-- Added species, ability, and move translations for `ko_ko`, `jp_jp`, `fr_fr`, `es_es`, `it_it`, and `zh_cn`.

changelogs/CHANGELOG-1.1.1.md

@@ -1,3 +0,0 @@
-## [1.1.1 (November 27th, 2022)](#1-1-1)
-### Fixes
-- Fixed a critical issue with servers where Pokémon data didn't properly synchronize and so you couldn't see any.

changelogs/CHANGELOG-1.2.0.md

@@ -1,52 +0,0 @@
-## [1.2.0 - The Customization Update (January 1st, 2023)](#1-2-0)
-#### "There are going to be so many fakemon..."
-### Additions
-- Added models for Natu and Xatu, Murkrow and Honchkrow, Wailmer and Wailord.
-- Added new PC interface and it is beautiful.
-- Reworked the battle system so that battles load faster, cause fewer bugs, and can run on shared server hosts. This is a very big change that also reduced the size of the mod by 50mb!
-- Added full resource pack and data pack customization of models, textures, animations, spawning, and spawn file presets to make custom Pokémon species and variations very easy to create. You can find the guide for creating custom Pokémon on [our website](https://cobblemon.com/guides/custompokemon.html)!
-- Added water surface spawning for Pokémon like Lapras.
-- Added emissive texture support to Pokémon render layers.
-- Added compatibility for Mod Menu ([CurseForge](https://www.curseforge.com/minecraft/mc-mods/modmenu), [Modrinth](https://modrinth.com/mod/modmenu)).
-- Added blank ambient Pokémon cries so cries can be added via resource packs.
-- Added new sounds for GUIs and item uses.
-- Added `nature` and `pokeball` options to commands such as `/spawnpokemon` and `/givepokemon`.
-
-### Changes
-- Reinforced party and PC saving to make data corruption from crashes less bad.
-- Added a config option for whether the starter config will be exported, making it more maintainable as we add starter Pokémon.
-- Battles now start with the options menu open for convenience.
-- Doubled the default charge rate of healers. You'd need to reset your config under `./config/cobblemon/main.json` to see this change!
-- Changed the default Apricorn seed chance config value from 6% to 10%.
-- The mod now correctly reports our dependency on Architectury API so people don't get super confused when things don't work.
-- Pokémon now look at their opponents during battle.
-- Updated Sableye's animations to be super freaky.
-- Changed the healer advancements to make the healing machine's mechanics more obvious.
-
-### Fixes
-- Fixed an incompatibility with [Porting Lib](https://github.com/Fabricators-of-Create/Porting-Lib) used by Fabric ports of mods such as Create or Twilight Forest.
-- Fixed HP and max HP values in the battle GUI not being correct.
-- Fixed some animations on snake-type Pokémon being super slow.
-- Fixed a typo in the English name for Calcium. Calcuim.
-- Fixed Pokémon gradually becoming rarer around you if you move long distances.
-- Fixed a shoulder mount crash on Fabric.
-- Fixed a rare issue where chunks would take a really long time to generate.
-- Fixed a singleplayer bug where battles wouldn't work after leaving then rejoining a world.
-- Fixed stat calculations for everything except HP. HP was fine though :).
-- Fixed a randomized Pokémon spawning in mountains that corrupted the data of whatever party or PC it got into. Yikes.
-- Fixed a rare crash involving literally random number generation. A random crash involving random numbers.
-- Fixed all regular Mewtwo having the stats and types of Mega Mewtwo X - same deal with many other Pokémon.
-- Fixed the framing of many Pokémon in GUIs.
-- Fixed texture glitches with Rattata and Nidoqueen (again!).
-- Fixed dropped item forms of all Pokéballs and the Healing Machine, and slightly adjusted all other display settings
-- Fixed issues with forms not showing the correct evolution in the evolution menu.
-- Fixed some alternate forms not having the alternate stats and types.
-- Fixed moves that only work in double battles not being selectable at all (such as Helping Hand and Aromatic Mist).
-- Fixed abilities not remaining legal in some forms.
-- Fixed Poké Ball capture effects not triggering after a successful capture, such as the Heal Ball's healing effect.
-- Fixed multiple-hit moves sending gibberish into the battle chat.
-- Fixed Pyukumuku not being appropriately scaled.
-- Fixed shiny and other variations of Pokémon not showing in the battle GUI.
-- Fixed Eevee being poorly positioned and un-animated on shoulders.
-- Fixed a Pokémon's hitbox not updating when it evolves while sent out.
-- Fixed a Pokémon's PP going from zero to above the maximum when entering another battle.

changelogs/CHANGELOG-1.3.0.md

@@ -1,150 +0,0 @@
-## [1.3.0 - The Foundation Update (March 17th, 2023)](#1-3-0)
-#### "Now we can start doing the really cool stuff."
-
-### Dependencies
-- Upgraded Fabric API dependence to 0.75.1+1.19.2
-- Upgraded Architectury API dependence to 6.5.69
-- Cobblemon Forge now depends on Kotlin for Forge.
-
-### Additions
-- Added new models and animations for Poké Balls and reworked their mechanics to feel much smoother instead of being pure frustration.
-- Added party scrolling via holding R and using the mouse wheel so you don't need to take your hand off your mouse.
-- Added a cap of Pokémon spawns in an area because waiting a while made things insane. This is controlled by a new `pokemonPerChunk` config option.
-- Added models and animations for heaps of Pokémon (101): Riolu, Lucario, Chimchar, Monferno, Infernape, Turtwig, Grotle, Torterra, Popplio, Brionne, Primarina, Treeko, Grovyle, Sceptile, Snivy, Servine, Serperior, Tepig, Pignite, Emboar, Oshawott, Dewott, Samurott, Grookey, Thwackey, Rillaboom, Scorbunny, Raboot, Cinderace, Sobble, Drizzile, Inteleon, Fennekin, Braixen, Delphox, Froakie, Frogadier, Greninja, Chespin, Quilladin, Chesnaught, Miltank, Torkoal, Kricketot, Kricketune, Heatmor, Durant, Wooloo, Dubwool, Pumpkaboo, Gourgeist, Sigilyph, Cryogonal, Whismur, Loudred, Exploud, Misdreavus, Mismagius, Tatsugiri, Eiscue, Luvdisc, Stantler, Wyrdeer, Gible, Gabite, Garchomp, Sneasel, Weavile, Elgyem, Beheeyem, Baltoy, Claydol, Nacli, Naclstack, Alcremie, Milcery, Dhelmise, Morelull, Shiinotic, Xerneas, Klink, Klang, Klinklang, Joltik, Galvantula, Honedge, Duoblade, Aegislash, Spiritomb, Mawile, Carvanha, Sharpedo, Seedot, Nuzleaf, Shiftry, Lotad, Lombre, Ludicolo, Pineco, Forretress, and Spinda.
-- Added generation 3, 4, 5, 6, 7, and 8 Starter Pokémon to the starter select screen.
-- Added particle effect support for model animations
-- Added particle effect and animation for Gastly.
-- Added sleep and faint animations to many Pokémon.
-- Added item holding for Pokémon. Any Minecraft item can be given to a Pokémon by holding shift and right-clicking them. Traditional Pokémon held items will have their expected battle effects.
-- Added heaps of held items with crafting recipes: Assault Vest, Big Root, Black Belt, Black Sludge, Charcoal, Choice Band, Choice Scarf, Choice Specs, Dragon Fang, Exp. Share, Focus Band, Hard Stone, Heavy-Duty Boots, Leftovers, Light Clay, Lucky Egg, Magnet, Miracle Seed, Muscle Band, Mystic Water, Never-Melt Ice, Poison Barb, Quick Claw, Rocky Helmet, Safety Goggles, Sharp Beak, Silk Scarf, Silver Powder, Soft Sand, Spell Tag, Twisted Spoon, and Wise Glasses.
-- Added heaps of evolution items with crafting recipes: Milcery's sweets items, Chipped Pot, Cracked Pot, Deep Sea Scale, Deep Sea Tooth, Dragon Scale, Galarica Cuff, Galarica Wreath, Peat Block, Prism Scale, Razor Claw, Razor Fang, Reaper Cloth, Sachet, Sweet Apple, Tart Apple, and Whipped Dream.
-- Existing evolution items all now either have a crafting recipe or drop from Pokémon.
-- Added the Item [tags](https://minecraft.fandom.com/wiki/Tag) `cobblemon:held/experience_share` and `cobblemon:held/lucky_egg` allowing you to mark any items you desire to have the effects implied in the tag name.
-- Added an interface that appears when interacting with your Pokémon while sneaking. The interface allows for interactive options such as shouldering and exchanging held items.
-- Added blinking animations to many Pokémon.
-- Added animated texture support.
-- Added translucent option for aspect layers.
-- Added glowing textures to many Pokémon and it looks amazing.
-- Added the Saturation shoulder effect.
-- Added the Haste shoulder effect, initially for Joltik.
-- Added the Water Breathing shoulder effect, initially for Wooper.
-- Added the Speed shoulder effect, initially for Pichu and Pikachu.
-- [Dispensers](https://minecraft.fandom.com/wiki/Dispenser) can now use shears to automatically harvest fully grown Apricorns.
-- Added milking to Miltank.
-- Added shearing to Wooloo and Dubwool.
-- Added data for generation 9 Pokémon species, moves, and ability data. They're all still Substitute models, but their moves and abilities work.
-- Added support for custom Pokémon to implement 'quirks' such as blinks.
-- Added sound effect for harvesting Apricorns.
-- Added icon to summary and PC interfaces to indicated if a Pokémon is shiny.
-- Added the `/spawnpokemonat <pos> <properties>` command, the `pos` argument uses the same syntax as the Minecraft [summon](https://minecraft.fandom.com/wiki/Commands/summon) command.
-- Added the `/giveallpokemon` command which is definitely safe and not insane.
-- Added compatibility with Carry On by preventing the mod being able to interact with Cobblemon entities, the mod caused too many gameplay detrimental features to stay enabled.
-- Added healing to your party when you sleep in a bed.
-- Added the 'ability' Pokémon Property so commands can specify the ability.
-- Added block tag support to the 'neededBaseBlocks' and 'neededNearbyBlocks' spawn condition.
-- Added a config option for disallowing players from damaging Pokémon by hand.
-- Apricorn seeds can now be used with the [Composter](https://minecraft.fandom.com/wiki/Composter), these have the layer increase chance of 65% like Apricorns and various Minecraft crops.
-- Added support for Pokémon species data appending making it so datapack developers no longer need to overwrite files.
-- Added an implementation of every [catch rate](https://bulbapedia.bulbagarden.net/wiki/Catch_rate) from generation 1 to 9, these can be used by changing the `captureCalculator` config value:
-    - `generation_1` Sets the calculator to the generation 1 implementation.
-    - `generation_2` Sets the calculator to the generation 2 implementation.
-    - `generation_2_fixed` Sets the calculator to the generation 2 implementation with the status multiplier bug fixed.
-    - `generation_3_4` Sets the calculator to the generation 3 and 4 implementation.
-    - `generation_5` Sets the calculator to the generation 5 implementation.
-    - `generation_6` Sets the calculator to the generation 6 implementation.
-    - `generation_7` Sets the calculator to the generation 7 implementation.
-    - `generation_8` Sets the calculator to the generation 8 implementation.
-    - `generation_9` Sets the calculator to the generation 9 implementation.
-    - `cobblemon` Sets the calculator to the custom Cobblemon implementation. This is the default value.
-    - `debug` Sets the calculator to the debug/cheat implementation, every attempt will be a successful critical capture.
-
-### Changes
-- Pokémon now save to the world by default, meaning the same Pokémon will remain in the world and not disappear after you log out and log back in. They still despawn over time though.
-- Significantly sped up the Poké Ball shake animation so it takes less time to try to catch Pokémon.
-- Update the PC and Healing Machine models and bounding boxes.
-- The Healing Machine and PC now emit light when fully charged or when turned on respectively.
-- The PC block screen will now turn on when being used.
-- The Healing Machine will now visually display its charge level using 6 stages.
-- The Healing Machine will now emit a redstone signal with the strength of 1 for every 10% charge it has when attached to a [Redstone Comparator](https://minecraft.fandom.com/wiki/Redstone_Comparator).
-- Made it so that particles are not shown whenever you have a shoulder Pokémon that gives potion effects.
-- Changed hitbox and size definitions for Decidueye, Blastoise, and Magmortar
-- Apricorns can now be harvested with Axes, the speed will scale with enchantments and tool material, only dropping the Apricorn if fully grown, these will still destroy the Apricorn so the manual harvest still is recommended unless you're just keen on destroying trees.
-- Apricorns are now a part of the vanilla tag `minecraft:blocks/mineable/axe`.
-- Apricorns are now compatible with any mod that breaks a whole tree at once.
-- Apricorns no longer have a config value for the seed drop chance these are now a part of their loot table which can be found in `cobblemon/loot_tables/blocks/<color>_apricorn.json`.
-- Advancements were redone to be slightly more interesting, with improved names, descriptions, and sorting.
-- Updated models and textures for Tentacool line, Gengar, Slowpoke line, Tyrogue line, Doduo line, Dratini, Dragonair, Quagsire, and Piplup line. There were probably others, the team lost track.
-- Improved sending out Pokémon at the start of battle so that they are positioned in a less annoying way.
-- Name Tags will no longer be used on Pokémon and Poke Ball entities, this prevents the item from being wasted.
-- Lowered spawn rate of Tauros.
-- Sableye now spawns near gem ores as well as amethyst.
-- Added evolution stones and items to item tags
-- Pokémon now play their cry animations when clicked on the starter selection screen.
-
-### Fixes
-- Fixed catch rates being entirely too difficult.
-- Fixed various strange battle issues such as Flying types being vulnerable to Ground type moves and status effects hitting despite vulnerabilities.
-- Fixed shiny Gyarados not using the red Gyarados texture.
-- Improved the framing of all in-game Pokémon in the party and PC GUIs so they aren't halfway out of the screen or something else crazy.
-- Fixed incompatibility with Kotlin for Forge (by depending on Kotlin for Forge ourselves)
-- Fixed Gengar, Goodra, and many other Pokémon showing the types of an alternate form despite those not being modelled yet.
-- Fixed datapack Pokémon not being able to battle.
-- Fixed Pokémon always being created with a moveset as if they're level 1 instead of their current level.
-- Fixed an issue of Pokémon not rendering in GUIs on some Mac displays.
-- Fixed a soft-duplicate that could occur when a party Pokémon is pushed through a Nether Portal or left in a boat.
-- Fixed Pokémon that faint from poison appearing to be on full health and suckering you into false hope.
-- Fixed incorrect spawns of Tentacool, Tentacruel, Dragonite, Politoed, Tangrowth, Lickilicky, Electivire, and Magmortar.
-- Fixed crashes involving opening the Pokémon summary GUI with an empty party.
-- Fixed lower brightness settings causing Pokémon to appear much too dark in menus such as the party and PC.
-- Fixed Showdown sometimes failing to start, causing crashes.
-- Fixed Showdown initialization happening several times when you login, more depending on how many times you have relogged this session.
-- Fixed Showdown failing to update on first attempt. We totally weren't accidentally deleting our target directory or anything, nope.
-- Fixed HP recovery related battle actions not animating for the client nor updating the in-game Pokémon HP.
-- Fixed moves that force a switch such as Teleport and U-Turn soft locking battles.
-- Fixed missing battle text for Bide, Speed Boost, Belly Drum, Anger Point, and Haze.
-- Fixed battle messages for many field effects starting, ending, and actions caused by them such as blocking certain moves.
-- Improved battle messages for effects that prevent a move from being executed such as a Taunt, requiring a recharge, flinched, etc.
-- Fixed move names not being translated in battle messages.
-- Fixed stat change messages for boosts over 3 stages.
-- Fixed experience calculation not being completely accurate.
-- Fixed positioning of Poké Balls when rendered in Healing Machines.
-- Fixed a desync issue on servers where all Pokémon seemed like they were special forms when they weren't.
-- Fixed an incompatibility with [Exordium](https://www.curseforge.com/minecraft/mc-mods/exordium).
-- Fixed datapack Pokémon language key generation. A Pokémon under the namespace `example` named `Pogemon` will now correctly look for the lang key `example.species.pogemon.name`.
-- Fixed client not receiving messages for the different "stages" for the move Bide.
-- Fixed the Medium Slow and Medium Fast experience group IDs, they're now `medium_slow` and `medium_fast`. Any custom datapack Pokémon will require an update.
-- Fixed Pokémon friendship being capped to the maximum level config value instead of the friendship one when loading Pokémon data.
-- Fixed Poké Balls taking forever to capture Pokémon if you are underwater or up in the air where it takes a long time to hit the ground.
-- Fixed Pokémon being unable to spawn on blocks such as snow layers.
-- Fixed Pokémon spawning inside of trees.
-- Fixed Pokémon experience not loading after a restart and instead going back to the minimal amount for the current level.
-- Fixed being able to use `/healpokemon` in battle.
-- Fixed being able to select fainted party members in the switch menu causing the battle to lock.
-- Fixed `/spawnpokemon` command not supporting any command source other than players.
-- Fixed issues with Charizard's sleep pose.
-- Fixed players being able to use multiple healer machines at once.
-- Fixed Pokémon layers not rendering when a Pokémon is on your shoulder.
-- Fixed Caterpie and Weedle not moving or looking at players. That was meant to be Metapod and Kakuna; how embarrassing.
-- Fixed Pokémon not carrying over the correct equivalent original ability when evolving from stages that only had one ability.
-- Fixed Deerling and Sawsbuck not spawning with the correct season.
-- Fixed issue of not being able to drag the scroll bar in summary and battle interfaces.
-- Fixed optional aspects not saving and loading properly.
-- Fixed layering logic so multiple texture layers can exist on a Pokémon (probably).
-- Fixed not all Poké Balls being associated with the `cobblemon:pokeballs` item tag.
-- Fixed the `/pokemoneditother` command not working.
-- Fixed ambient sound file path for Porygon2.
-- Fixed forms not being able to unset the secondary type of a Pokémon in the stat JSON.
-- Fixed moves that haven't carried over from generation 8 onwards having the description they did in the generation 8 games instead of their last valid one.
-- Fixed shoulder mounted pokemon not returning to party on healer use and on evolution
-
-### Developer
-- Reworked CatchRateModifier, as such, existing implementations need to be updated.
-- Fixed minimumDistanceBetweenEntities option being half of what it's set as.
-- Fixed the contents of CobblemonEvents, CobblemonBlocks etc having getters instead of just being public static properties.
-- Added ApricornHarvestEvent.
-- Added a new item for representing Pokémon within native UI menus or item frames which display as the Pokémon's model. It's called a PokemonItem, with static functions to build one.
-
-### Localization
-- Added complete translations for French, German, Simplified Mandarin, Brazilian Portuguese, and Pirate English.
-- Added partial translations for Traditional Mandarin, Italian, and Spanish. We'd love more help with this!
-- Thank you to all of the fantastic volunteer translators for taking the time to help with this!

changelogs/CHANGELOG-1.3.1.md

@@ -1,96 +0,0 @@
-## [1.3.1 (March 31st, 2023)](#1-3-1)
-
-### Additions
-- Added Slugma, Magcargo, Nosepass, and Probopass.
-- Elgyem family now drops Chorus Fruit, Geodude family now drops Black Augurite.
-- Added missing spawn files for Golett and Bergmite family.
-- Apricorns can now be smelted into dyes.
-- Added animations to Staryu line and Porygon line.
-- Added faint animations to Klink line.
-- Add lava surface spawn preset.
-- Added an `any` evolution requirement allowing you to define `possibilities` of other evolution requirements, for example, this allows you to create an evolution that requires the Pokémon to be shiny or a female.
-- Added the `/spawnpokemonfrompool [amount]` or `/forcespawn [amount]` command to spawn Pokémon(s) in the surrounding area using the natural spawn rates/pool of that area, this will be a cheat command in the Minecraft permission system or use the permission `cobblemon.command.spawnpokemon` if a permission mod is present. On a successful execution of the command, the amount of Pokémon spawned will be the output.
-- Added the `/pokebox` and `/pokeboxall` commands to move Pokémon(s) to the PC from a Player's party, this will be a cheat command in the Minecraft permission system or use the permission `cobblemon.command.pokebox` if a permission mod is present. On a successful execution of the command the output will be the number of pokemon moved to the Player's PC.
-- Added the `/pc` command which opens up the PC UI the same way interacting with the block would, this will be a cheat command in the Minecraft permission system or use the permission `cobblemon.command.pc` if a permission mod is present.
-
-### Changes
-- You can now click the portraits of other Pokémon in the starter selection screen to navigate directly to them.
-- You can now click the right and left arrow keys to navigate PC boxes.
-- Link Cables will now require Pokémon to hold any held item normally required for their evolution.
-- After a battle, the last Pokémon used now becomes the selected one in your party.
-- The `/teach` command can now only allow the Pokémon to be given moves in their learnset, this can be controlled with the permission `cobblemon.command.teach.bypass`, to account for that change the base command now requires the permission `cobblemon.command.teach.base`, this change is meant only for people using a mod capable of providing permissions such as [LuckPerms](https://luckperms.net/).
-- Apricorns will no longer collide with their block form when picked, this should improve the experience in automatic farms.
-- Increased spawn chances for many Pokémon requiring specific blocks to be nearby.
-- Put Cryogonal in more snowy biomes.
-- Ditto as well as the Eevee, Gible, and Riolu families have been made more common.
-- Lowered spawn rate of Gyarados on the surface of water.
-- Apricorn leaves can now be used in the [Composter](https://minecraft.fandom.com/wiki/Composter) block, these have the same chance to raise the compost pile the Minecraft leaves do.
-- Updated Gengar's model and texture.
-- Updated Swinub line model and animations.
-- Tweaked portrait frames for the Pidgey line and for Walking Wake.
-- Changed all buff shoulder effects to only give a level 1 buff instead of level 2.
-- Made Weavile a little bigger.
-- Changed the recipes for Mystic Water, Miracle Seed, and Charcoal Stick to utilise the evolution stones, as well as Never-Melt Ice having an alternate recipe using the Ice Stone.
-- Replaced the `Failed to handle` battle messages to `Missing interpretation` to make it more clear that mechanics do work just still pending dedicated messages.
-- Healing Machine and PC are now mine-able with pickaxes and Apricorn leaves are mine-able using hoes.
-
-### Fixes
-- Fixed killing a Dodrio killing your game. Dodrio will never look the same to us.
-- Fixed non-Fire-type Pokémon being immune to lava.
-- Fixed custom Pokémon not being usable in battle, properly. A last minute fix caused this to break again; what are these devs not paid for?
-- Fixed being locked in an endless healing queue if you broke the healing machine during use.
-- Fixed an issue with the experience calculation when the Exp. Share is held.
-- Fixed Friendship-based attacks not using friendship values from your Pokémon.
-- Fixed Link Cables consuming held items they shouldn't due to not validating the held item of a Pokémon.
-- Fixed a crash when Aromatherapy cured the status of party members.
-- Fixed moves learnt on evolution not being given when said evolution happens. If you were affected by this issue your existing Pokémon will now be able to relearn those moves.
-- Fixed console spam when rendering Pokémon model items.
-- Fixed battle messages for 50+ moves and abilities and items.
-- Fixed the possible duplicate when capturing Pokémon (probably, this one's hard to reproduce to confirm it's fixed).
-- Previously duplicated Pokémon are cleaned from PCs and parties on restart.
-- Fixed an issue with some particle effects applying after a Pokémon has died or on top of the wrong Pokémon when using specific mods.
-- Fixed Pokémon not looking at each other in battle.
-- Fixed Experience Candy and Experience Share attempting to bring Pokémon above level cap causing crashes.
-- Fixed level 100 Pokémon having experience go over the cap total amount they should have.
-- Fixed `/pokemonspawnat` having the argument positions reverted making it impossible for Brigadier to understand when to suggest coordinates. It is now the intended `/spawnpokemonat <pos> <properties>`.
-- Fixed performance issues with shouldered Pokémon in certain systems.
-- Fixed learnset issues for Pokémon whose only modern debut was LGPE/BDSP/LA.
-- Fixed shiny Zubat, Grimer, Omanyte, Elgyem, Delphox and Aegislash displaying their normal texture.
-- Fixed sleeping in beds allowing fainted Pokémon to receive experience after a battle ends somehow.
-- Fixed an issue where a Pokémon will claim to have learnt a new move they already have in their moveset when learnt at an earlier level in their previous evolution. I realize that's confusing.
-- Fixed Dispensers not being able to shear Wooloo. This will also extend to other mods that check if an entity is valid to shear.
-- Fixed the currently held item of your Pokémon not dropping to the ground when removing it if your inventory was full.
-- Fixed creative mode allowing you to make your Pokémon hold more than 1 of the same item.
-- Fixed a Pokémon duplication glitch when teleporting between worlds.
-- Fixed dedicated servers being able to reload Cobblemon data with the vanilla `/reload` command causing unintended behavior for clients.
-- Fixed underground Pokémon spawning above ground.
-- Fixed Pokémon portrait not reverting back to the Pokémon after a failed capture during battle.
-- Fixed edge texture artifacts on pane elements for Tentacool and Tentacruel models.
-- Fixed crash caused by Pokémon pathing
-- Fixed Pokémon not returning to their balls when being healed in a healing machine
-- Fixed all Gen IX Pokémon as well as forms added in PLA and Wyrdeer, Kleavor, Ursaluna, Basculegion, Sneasler, Overqwil, and Enamorus having 0 exp yields.
-- Fixed Irons Leaves having bluetooth back legs. If you saw it, you know what I mean.
-- Fixed Golurk not having shoulder plates on its shoulders.
-- Fixed some water Pokémon walking onto land from the water even though they are fish.
-- Fixed Porygon2 and PorygonZ being too small.
-- Fixed Snivy line head look animation.
-- Fixed Staryu line not being able to swim.
-- Fixed an incompatibility with [Thorium](https://modrinth.com/mod/thorium) patch for [MC-84873](https://bugs.mojang.com/browse/MC-84873).
-- Fixed Pidgeotto wings when walking.
-- Fixed Delphox walk animation.
-- Fixed Froakie line sleep animations in battle.
-- Fixed Pokémon missing the non-level up moves they could relearn when rejoining a world until a new move was added to their relearn list.
-- Fixed instantly fleeing from Pokémon set to be unfleeable.
-- Fixed Pumpkaboo line forms not working. (Currently sizes aren't visual but check base stats to see which size you have.)
-- Fixed a bug that caused already interpreted messages for moves to be mistaken as uninterpreted.
-- Fixed a Pokémon spawner bug that caused Pokémon to not spawn due to dropped item entities.
-- Fixed a bug that causes Pokémon model items to be invisible.
-
-### Developer
-- Add events that are fired just before and after a Pokémon is released (ReleasePokemonEvent.Pre and .Post)
-
-### Localization
-- Added complete translations for Japanese, Thai, and Canadian French.
-- Added partial translations for Russian, Ukrainian, Mexican Spanish, and Korean.
-- Updated every existing language's translation.
-- All the translators that contributed are amazing.

changelogs/CHANGELOG-1.4.0.md

@@ -1,443 +0,0 @@
-## [1.4.0 - The Friends and Farms Update (October 13th, 2023)](#1-4-0)
-#### "No, we don't provide the friends."
-### Additions
-- Added pasture blocks, used to let your PC Pokémon roam around an area.
-- Added nicknaming from the summary menu of a Pokémon (click their name).
-- Added trading between players. Press R while looking at another player and you'll figure the rest out.
-- Added mints for changing Pokémon stats. These are most commonly found at high altitudes.
-- Added [Revival Herbs](https://wiki.cobblemon.com/index.php/Revival_Herb), with pep-up flowers when fully grown, growing in lush caves.
-- Added [Medicinal Leeks](https://wiki.cobblemon.com/index.php/Medicinal_Leek), growing on the surface of rivers and ponds. It is a potion ingredient and can be cooked as food!.
-- Added [Big Roots](https://wiki.cobblemon.com/index.php/Big_Root), generating from cave ceiling dirt which sometimes spread as energy roots.
-- Added [69 Berry Trees](https://wiki.cobblemon.com/index.php/Berry_Tree) and [Berries](https://wiki.cobblemon.com/index.php/Berry). Some are found in village farms, some from planting different berries close to each other.
-- Added mulches: Mulch Base, Growth Mulch, Surprise Mulch, Coarse Mulch, Humid Mulch, Rich Mulch, Loamy Mulch, Peat Mulch, and Sandy Mulch
-- Added [Vivichokes](https://wiki.cobblemon.com/index.php/Vivichoke), obtainable from wandering villager trades and some loot chests.
-- Added medicine brewing using medicinal leeks and berries in brewing stands.
-- Added Pokémon cries when in battles and being sent out.
-- Added medicinal items: Berry Juice, Heal Powder, Remedy, Fine Remedy, Superb Remedy, Revive, Max Revive, Potion, Super Potion, Hyper Potion, Max Potion, Full Restore, Full Heal, Antidote, Awakening, Burn Heal, Ice Heal, and Paralyze Heal.
-- Added battle items: X Attack, X Defence, X Sp.Atk, X Sp.Def, X Speed, Dire Hit, and Guard Spec.
-- Added EV items: Power Anklet, Power Band, Power Belt, Power Bracelet, Power Lens, Power Weight.
-- Added food items: Roasted Leek, Leek and Potato Stew, Braised Vivichoke, and Vivichoke Dip
-- Added evolution items: Auspicious Armor and Malicious Armor, which can be used to evolve Charcadet into Armarouge or Ceruledge respectively.
-- Added (mostly brewing) recipes for HP Up, Protein, Iron, Calcium, Zinc, Carbos, PP Up, PP Max, and Medicinal Leek to Magenta Dye.
-- Added held items: Bright Powder, Destiny Knot
-- Added AI for Nosepass to point towards world spawn when idle. We just think it's neat.
-- Added shoulder mounting for Mimikyu.
-- Added flying placeholder animations to Pidgey, Pidgeotto, Pidgeot, Golbat, Crobat, Scyther, Scizor, Zapdos, Moltres, Articuno, Dragonite, Rowlet, Dartrix, and Decidueye.
-- Added loot to various vanilla chest loot tables (Link Cable in Ancient Cities, Woodland Mansions, End Cities, and Igloos, Vivichoke Seeds in Jungle Temples, Dungeons, and Plains, Savanna, Snowy, and Taiga Villages, and all 7 Apricorn Sprouts in Desert, Plains, Savanna, Snowy, and Taiga Villages, as well as the Bonus Chest, which can also have 5 of the basic Poké Ball types)
-- Added a `doShinyStarters` gamerule to make it quick and easy to be offered shiny starters.
-- Added a `doPokemonLoot` gamerule to toggle Pokémon dropping items/exp on death.
-- Added ability activation announcement when in battle.
-- Added animations for Wailord and made it BIGGER.
-- Added Cherry Torterra variant.
-- Added 2 new face spots for Spinda. The number of unique Spindas increases...
-- Added Forretress Shulker variant.
-- Added the `/teststore <player> <store> <properties>` command allowing command block/mcfunction users to query a party, PC or both for Pokémon matching specific properties and returning the match count, this will be a cheat command in the Minecraft permission system or use the permission `cobblemon.command.teststore` if a permission mod is present.
-- Added the `/querylearnset <player> <slot> <move>` command allowing command block/mcfunction users to query a party slot and check if the Pokémon can learn a specific move returning a 1 if yes otherwise 0, this will be a cheat command in the Minecraft permission system or use the permission `cobblemon.command.querylearnset` if a permission mod is present.
-- Added the `/testpcslot <player> <slot> <properties>` command allowing command block/mcfunction users to query a pc slot and check if the Pokémon matches specific properties returning a 1 if yes otherwise 0, this will be a cheat command in the Minecraft permission system or use the permission `cobblemon.command.testpcslot` if a permission mod is present.
-- Added the `/testpartyslot <player> <slot> <properties>` command allowing command block/mcfunction users to query a party slot and check if the Pokémon matches a specific properties returning a 1 if yes otherwise 0, this will be a cheat command in the Minecraft permission system or use the permission `cobblemon.command.testpartyslot` if a permission mod is present.
-- Added the `/clearparty <player>` command for emptying a player's party.
-- Added the `/clearpc <player>` command for emptying a player's PC.
-- Added the `/pokemonrestart <reset_starters>` and the `/pokemonrestartother <player> <reset_starters>` command allowing command block/mcfunction users to reset a players Pokémon data.
-
-### Pokémon Added
-#### Gen 2
-
-- Chikorita
-- Bayleef
-- Meganium
-- Totodile
-- Croconaw
-- Feraligatr
-- Cyndaquil
-- Quilava
-- Typhlosion
-- Spinarak
-- Ariados
-- Shuckle
-- Chinchou
-- Lanturn
-- Aipom
-- Gligar
-- Hoothoot
-- Noctowl
-- Mareep
-- Flaaffy
-- Ampharos
-- Sudowoodo
-- Snubbull
-- Granbull
-- Phanpy
-- Donphan
-- Teddiursa
-- Ursaring
-
-#### Gen 3
-
-- Taillow
-- Swellow
-- Relicanth
-- Duskull
-- Dusclops
-- Shroomish
-- Breloom
-- Cacnea
-- Cacturne
-- Poochyena
-- Mightyena
-- Wingull
-- Pelipper
-- Numel
-- Camerupt
-- Clamperl
-- Huntail
-- Gorebyss
-- Surskit
-- Masquerain
-- Chimecho
-- Barboach
-- Whiscash
-- Volbeat
-- Illumise
-- Zigzagoon
-- Linoone
-- Ralts
-- Kirlia
-- Gardevoir
-- Nincada
-- Ninjask
-- Shedinja
-- Beldum
-- Metang
-- Metagross
-
-#### Gen 4
-
-- Carnivine
-- Shinx
-- Luxio
-- Luxray
-- Ambipom
-- Gliscor
-- Dusknoir
-- Chingling
-- Bonsly
-- Chatot
-- Combee
-- Vespiquen
-- Buizel
-- Floatzel
-- Starly
-- Staravia
-- Staraptor
-- Gallade
-
-#### Gen 5
-
-- Bouffalant
-- Roggenrola
-- Boldore
-- Gigalith
-- Venipede
-- Whirlipede
-- Scolipede
-- Yamask
-- Cofagrigus
-- Patrat
-- Watchog
-- Lillipup
-- Herdier
-- Stoutland
-- Cottonee
-- Whimsicott
-- Pidove
-- Tranquill
-- Unfezant
-- Timburr
-- Gurdurr
-- Conkeldurr
-
-#### Gen 6
-
-- Scatterbug
-- Spewpa
-- Vivillon
-- Skrelp
-- Dragalge
-- Bunnelby
-- Diggersby
-- Phantump
-- Trevenant
-- Fletchling
-- Fletchinder
-- Talonflame
-
-#### Gen 7
-
-- Wishiwashi
-- Cutiefly
-- Ribombee
-- Stufful
-- Bewear
-- Comfey
-- Alolan Exeggutor
-- Alolan Raichu
-- Alolan Meowth
-- Alolan Persian
-- Komala
-- Wimpod
-- Golisopod
-- Crabrawler
-- Crabominable
-- Mudbray
-- Mudsdale
-
-#### Gen 8
-
-- Arrokuda
-- Barraskewda
-- Nickit
-- Thievul
-- Falinks
-- Galarian Farfetch'd
-- Sirfetch'd
-- Rookidee
-- Corvisquire
-- Corviknight
-- Galarian Ponyta
-- Galarian Rapidash
-- Yamper
-- Boltund
-- Galarian Zigzagoon
-- Galarian Linoone
-- Obstagoon
-- Galarian Meowth
-- Perrserker
-- Ursaluna
-
-#### Gen 9
-
-- Sprigatito
-- Floragato
-- Meowscarada
-- Fuecoco
-- Crocalor
-- Skeledirge
-- Quaxly
-- Quaxwell
-- Quaquaval
-- Flittle
-- Espathra
-- Garganacl
-- Fidough
-- Dachsbun
-- Armarouge
-- Ceruledge
-- Cetoddle
-- Cetitan
-- Shroodle
-- Grafaiai
-- Tandemaus
-- Maushold
-- Varoom
-- Revavroom
-- Squawkabilly
-- Glimmet
-- Glimmora
-- Annihilape
-- Tinkatink
-- Tinkatuff
-- Tinkaton
-- Maschiff
-- Mabosstiff
-- Lechonk
-- Oinkologne
-- Paldean Wooper
-- Clodsire
-
-### Changes
-- Removed the existing shoulder effects from Pokémon until we have more balanced versions of them (they're too powerful!)
-- Updated models and textures of Weedle, Dwebble and Crustle, Spiritomb, Koffing and Weezing, Kadabra and Alakazam, Emolga, Oshawott, Doduo and Dodrio, Dratini and Dragonair and Dragonite, Sneasel and Weavile, Gyarados, Hitmonlee and Hitmonchan, Chesnaught, Spinda, Mamoswine, Steelix, Misdreavus and Mismagius, Buneary and Lopunny, Golduck, Meowth and Persian, Fennekin and Braixen and Delphox, Snivy and Servine and Serperior, Ratatta and Raticate, Nidorina and Nidoqueen, Nidoran Male and Nidoking, Riolu and Lucario, Haunter and Gengar, Mankey and Primeape, Mew and Mewtwo, Arcanine, Magnemite and Magneton and Magnezone, Exeggcute and Exeggutor, Elekid and Electabuzz and Electivire, Pichu and Pikachu and Raichu, Wooper, Drowzee and Hypno, Aerodactyl, Spearow and Fearow, Lickitung and Lickilicky, Pidgey and Pidgeotto and Pidgeot, Scyther and Scizor and Kleavor, Popplio and Brionne and Primarina, Torchic and Combusken and Blaziken, Happiny and Chansey and Blissey.
-- Updated animations for Steelix, Turtwig and Grotle and Torterra, Ponyta and Rapidash, Piplup and Prinplup and Empoleon, Drowzee and Hypno, Farfetch'd, Exeggcute and Exeggutor, Bidoof, Chimecho, Lickitung and Lickilicky, Popplio and Brionne, Luvdisc, Chimchar and Monferno and Infernape, Sobble and Drizzile and Inteleon, Greninja, Heatmor, Aerodactyl, Ditto, Lotad and Lombre and Ludicolo, Pumpkaboo and Gourgeist.
-- Updated sprites for EV medicines, the rare candy, and the apricorn door item.
-- Updated textures for apricorn doors and all the evolution stone ores.
-- Ponyta and Rapidash now have animated textures; they look insane.
-- Updated Apricorn Leaves color.
-- Wild Pokémon now heal if you are defeated by them or flee from them.
-- Doubled the default time between ambient Pokémon cries (they have cries if you're using a resource pack to add them)
-- Moved spawn attempts per tick to a config option (ticksBetweenSpawnAttempts)
-- PCs can now be waterlogged
-- Starter selection prompt now appears as a tutorial-esque toast instead of plain text
-- Reorganised the advancements recipes folder
-- Pokéedit command now supports IVs and EVs.
-- Reorganised creative categories
-- Pokémon can now wander into non-solid blocks such as foliage
-- Thrown Poké Balls now despawn after 30 seconds so that they don't fly forever.
-- Dive Balls will now have the same motion speed underwater as if they were thrown in the air.
-- Hardcoded potion shoulder effects have been removed. You can now use any potion vanilla or otherwise with the parameters you'd like, for more information see the [Datapack & Resourcepack Creators](#datapack-&-resourcepack-creators) section.
-- Clicking categories of the Stat subsection or the party reorder button in the Summary screen will now produce a click sound.
-- Updated PC Recipe.
-- Improved Pokémon AI and movement.
-- Friendship will slowly increase when Pokémon are shoulder-mounted.
-- Master Balls are now unable to be burned when dropped into fire/lava. They're made from stronger stuff.
-- Pokémon will appear red when hurt, like regular entities, except when they're fainting.
-- Pokémon's air meter no longer depletes while battling underwater.
-- Sleeping partially restores PP of Pokémon
-- Shoulder mounts now match the shoulder position a bit more accurately when sneaking.
-- Poison Heal will now cause poisoned Pokémon to heal outside of battle.
-- Updated Poké Ball, PC, UI, evolution and Healing Machine sounds.
-
-### Added cries to the following Pokémon:
-- All starters and their evolutions
-- Caterpie, Metapod, Butterfree
-- Weedle, Kakuna, Beedrill
-- Pidgey, Pidgeotto, Pidgeot
-- Rattata, Raticate
-- Spearow, Fearow
-- Ekans, Arbok
-- Pichu, Pikachu, Raichu, Alolan Raichu
-- Cleffa, Clefairy, Clefable
-- Mankey, Primeape, Annihilape
-- Ponyta, Rapidash, Galarian Ponyta, Galarian Rapidash
-- Farfetch'd, Galarian Farfetch'd, Sirfetch'd
-- Onix, Steelix
-- Tauros
-- Ditto
-- Eevee, Vaporeon, Jolteon, Flareon, Espeon, Umbreon, Leafeon, Glaceon, Sylveon
-- Hoothoot, Noctowl
-- Mareep, Flaaffy, Ampharos
-- Aipom, Ambipom
-- Wooper, Quagsire, Clodsire
-- Snubbull, Granbull
-- Miltank
-- Poochyena, Mightyena
-- Taillow, Swellow
-- Ralts, Kirlia, Gardevoir, Gallade
-- Shroomish, Breloom
-- Nincada, Ninjask, Shedinja
-- Buneary, Lopunny
-- Chingling
-- Chatot
-- Riolu, Lucario
-- Pidove, Tranquill, Unfezant
-- Roggenrola, Boldore, Gigalith
-- Venipede, Whirlipede, Scolipede
-- Maractus
-- Dwebble, Crustle
-- Yamask, Cofagrigus
-- Bunnelby, Diggersby
-- Fletchling, Fletchinder, Talonflame
-- Scatterbug, Spewpa, Vivillon
-- Honedge, Doublade, Aegislash
-- Skrelp, Dragalge
-- Phantump, Trevenant
-- Pumpkaboo, Gourgeist
-- Bergmite, Avalugg
-- Mudbray, Mudsdale
-- Stufful, Bewear
-- Mimikyu
-- Rookidee, Corvisquire, Corviknight
-- Nickit, Thievul
-- Wooloo, Dubwool
-- Yamper, Boltund
-- Tandemaus
-- Fidough, Dachsbun
-- Squawkabilly
-- Nacli, Naclstack, Garganacl
-- Charcadet, Armarouge, Ceruledge
-- Maschiff, Mabosstiff
-- Shroodle, Grafaiai
-- Flittle, Espathra
-- Tinkatink, Tinkatuff, Tinkaton
-- Varoom, Revavroom
-- Glimmet, Glimmora
-- Cetoddle, Cetitan
-- Tatsugiri
-
-### Fixes
-- Fixed spawning moon phase dependent Pokémon only when the moon phase is wrong (that's a funny woopsy)
-- Fixed large Pokémon spawning partially inside walls where they suffocate.
-- Fixed custom Pokémon in your party or PC not being removed when the addon is removed, causing major issues.
-- Fixed messages for entry hazards, screens, weather, damage, healing, Tailwind, Perish Song, Destiny Bond, Shed Skin, Uproar, Forewarn, Disguise, Arena Trap, Yawn, Curse, Clamp, Whirlpool, Liquid Ooze, Miracle Eye, Safeguard, Magic Bounce, Lock On, Focus Energy, Confusion, and more.
-- Fixed Porygon not evolving with an Upgrade.
-- Fixed super sized Pumpkaboo not having any moves.
-- Fixed Infernape look animation.
-- Fixed Garchomp T-posing while swimming which was very funny.
-- Fixed a bug that caused sleeping Pokémon to stay asleep. Forever. The years passing them by as they dream of a world without hate...
-- Fixed a bug that would freeze a battle when a Pokémon gets trapped by an ability, making the trap abilities even scarier and trap-like than they were before.
-- Fixed the Poké Ball close animation canceling whenever colliding with a block.
-- Fixed lighting and Pokémon label issues when a Pokémon item frame is nearby.
-- Fixed Pokémon being able to spawn outside the world border as a tease.
-- Fixed deepslate water stone ore items looking like deepslate fire stone ores. Huh?
-- Fixed a bunch of client-side logging errors when Pokémon are shoulder mounted. You didn't notice? Good.
-- Fixed a crash when wild Pokémon have to struggle under specific circumstances.
-- Fixed uncolored pixels on Yanma's shiny texture.
-- Fixed apricorn tree leaves looking gross on the Fast graphics mode.
-- Fixed hoes not breaking apricorn tree leaves any faster.
-- Fixed Shiftry's PC model position.
-- Fixed the `/pc` command not playing the opening sound.
-- Fixed different forms of Pokémon not being able to appear as different sizes.
-- Fixed the Healing Machine soft locking you from using others when removed by non-players.
-- Fixed animations being sped up when using the Replay Mod.
-- Fixed particle animations not running when a Pokémon is off-screen.
-- Fixed Pokémon variants and layers not rendering correctly when shouldered and playing on a dedicated server, existing shoulders affected will need to be retrieved and shouldered again.
-- Fixed shoulder effects not staying applied through situations that remove potion effects such as drinking milk.
-- Fixed Shedinja not being able to recover naturally.
-- Fixed Shedinja evolving to use the consumed Poké Ball and removed the held item to prevent dupes.
-- Fixed Shedinja healing above 1 HP.
-- Fixed Shedinja, basically.
-- Fixed shearing Pokémon dropping 0-2 wool instead of 1-3.
-- Fixed some alignment issues in the stat hexagon of the summary menu. OCD people rejoice.
-- Fixed capture calculations not applying ball bonuses entirely correctly.
-- Fixed battles soft-locking when consecutive Pokémon faint on switch-in.
-- Fixed timing and color of battle window messages.
-- Fixed players being able to trade, battle and let out their Pokémon while in spectator mode.
-- Fixed Galarian Yamask not being able to evolve and by proxy the `damage_taken` evolution requirement.
-- Fixed Bisharp not being able to evolve and by proxy the `defeat` evolution requirement.
-- Fixed White-Striped Basculin not being able to evolve because of a broken `recoil` evolution requirement.
-- Fixed Primeape, Qwilfish and Stantler not being able to evolve because of a broken `use_move` evolution requirement.
-- Fixed Bramblin, Pawmo, and Rellor not being able to evolve because of a broken `blocks_traveled` evolution requirement.
-- Fixed displayName property in spawn files not doing what it's meant to do.
-- Fixed Pokémon not sleeping in the wild like we wanted them to.
-
-### Developer
-- Added SpawnEvent, ThrownPokeballHitEvent, PokemonSentEvent, PokemonRecalledEvent.
-- Added BattleFledEvent, BattleStartedEvent, BattleFaintedEvent.
-- Added persistent NBT property inside Pokémon to store quick and simple data.
-- Species and FormData have had their evolutions, pre-evolution and labels properties exposed. It is still recommended to work using a Pokémon instance when possible.
-- Added capture check to BattleVictoryEvent.
-- The various hardcoded potion shoulder effects have been removed, make use of PotionBaseEffect.
-- Added ContextManager for tracking causes and contexts of conditions created during a battle. See BattleContext for types of conditions that are tracked.
-- Added MongoDB support for storing Pokémon and Player data. Must be enabled in config, requires MongoDB core and sync drivers (4.10.0+).
-- CobblemonShowdown updated to version 10.
-- Generation of a battle can be set in BattleFormat.
-- Pokémon now have `teraType`, `dmaxLevel`, and `gmaxFactor` properties. Gimmicks can be used during battle by adding the respective identifiers to `keyItems` in PlayerData: `key_stone`, `z_ring`, `dynamax_band`, and `tera_orb`. Dynamax is only supported in Gen 8 battles. Mega Evolution and Z-Power require custom held items to be added (e.g. an item with the path `gengarite` will allow Gengar to Mega Evolve). Currently custom Z-Crystals and Mega Stones are not supported.
-
-### Datapack & Resourcepack Creators
-- All potion related shoulder effects have had their IDs changed. They now all share the same type being `potion_effect` and use the vanilla Potion data [parameters](https://minecraft.fandom.com/wiki/Potion#Item_data). For example, here is the converted Pidgey asset:
-    - `json
-    {
-      "type": "potion_effect",
-      "effect": "minecraft:slow_falling",
-      "amplifier": 0,
-      "ambient": true,
-      "showParticles": false,
-      "showIcon": false
-    }
-    `
-- Renamed the `walked_steps` evolution requirement to `blocks_traveled`.
-- Added support for scale in animations.
-- Added support for jump keyframes (i.e. pre and post keyframes)
-- Added structure spawning conditions
-- Added Advancement trigger for defeating Pokémon and collecting varieties of Pokémon.
-- Added support for "isBattle" and "isTouchingWater" properties on resource pack Pokémon poses. This allows your custom Pokémon to be posed differently when in battle.
-- Added support for "isVisible" on a transformed part on resource pack Pokémon poses. This allows your custom Pokémon to have bones disappear in specific poses, such as hiding Greninja's throwing star when not in a battle pose.
-- Added support for battle music. Sounds can be added to the `battle.pvp.default` and `battle.pvw.default` sound events.
-- Added 'enabled' optional property on model layers, allowing later variations to disable previously-defined layers. See [this issue](https://gitlab.com/cable-mc/cobblemon/-/issues/335) for how this looks.
-- Cobblemon items can now all have their own tooltips via resourcepacks. To add a tooltip, add a lang entry like "item.cobblemon.{item_id}.tooltip". If you want to add multiple tooltip lines you can do so with "item.cobblemon.{item_id}.tooltip_1" and upwards.
-- Item interaction evolutions and held item requirements now support NBT by creating an object JSON containing the key `item` for what used to be the existing condition support and a `nbt` key for the NBT format, this is the string [format](https://minecraft.fandom.com/wiki/NBT_format) expected in commands. Existing data does not need to be updated.
-- Fixed faint animations not working properly in add-ons.
-- Fixed non-existent species in spawn pool files causing random species to spawn.
-
-### Localization
-- Added partial translations for Dutch, Polish, Swedish, Hungarian, Czech, Cyprus Greek, and even Esperanto.
-- Updated translation for French and Canadian French, Simplified Chinese, Japanese, Korean, Spanish and Mexican Spanish, Pirate English, German, Thai, Turkish, Portuguese and Brazilian Portuguese, Ukrainian, and Russian.

changelogs/CHANGELOG-1.4.1.md

@@ -1,130 +0,0 @@
-## [1.4.1 (December 23rd, 2023)](#1-4-1)
-
-### Additions
-- Added battle spectating. Press R on a player in a battle and you can spectate and bully them for their tactics.
-- Added the Litwick and Drifloon lines.
-- Cobblemon now has compatibility with [Adorn](https://modrinth.com/mod/adorn), allowing you to craft Apricorn wood furniture.
-- Berries can now be used in recipes from [Farmer's Delight](https://modrinth.com/mod/farmers-delight) and [Farmer's Delight (Fabric)](https://modrinth.com/mod/farmers-delight-fabric), as well as any other mods using the same berry tags.
-- Boats, signs and hanging signs are now craftable with Apricorn wood.
-- Added the Fairy Feather, Iron Ball, Cleanse Tag, Flame Orb, Life Orb, Smoke Ball, and Toxic Orb held items.
-- Added the Inferno, Void, and Forsaken patterns for Vivillon. These can be obtained by evolving a Spewpa in the Nether, End, or Deep Dark respectively.
-- Bees can now be fed using Pep-Up Flowers.
-- Mooshtank can now be milked with a bowl for Mushroom Stew.
-- Updated Showdown version to use generation 9 battle data.
-- Added cries to Beldum, Metang and Metagross.
-- Added a `/bedrockparticle` command to run Snowstorm-format particle effects.
-- Added data for Dipplin, Fezandipiti, Munkidori, Ogerpon, Okidogi, Poltchageist and Sinistcha.
-- Added additional nickname trigger "Grumm" for Inkay's evolution.
-
-### Changes
-- Using Potions, Status Heals, Ethers, and Antidotes will now return a glass bottle
-- Using a Remedy, Fine Remedy, or Superb Remedy will no longer lower friendship with a Pokémon.
-- The Healing Machine now has a [much more difficult recipe](https://wiki.cobblemon.com/index.php/Healing_Machine), placing it later game.
-- Made the EXP. Share recipe cheaper.
-- Turtwig can now be put on your shoulder.
-- Updated Zubat line model, texture, and animations.
-- Updated Geodude line models and textures.
-- Added animations for Hitmontop, Tyrogue, and Mightyena.
-- Tweaked animations for Dusknoir, Ratatta, Bewear, Exeggutor, and Alolan Exeggutor.
-- Sized Kantonian Exeggutor down. Still big, but not TOO big.
-- Tweaked cries for Pikachu, Raichu and Alolan Raichu.
-- Fixed Swimming behaviors for Wimpod line, Oshawott line, Quaxly line, and Clodsire
-- Changed the way level scaling works in spawning. By default, anything with a spawn range of up to 5 either side of the party highest level and everything else will spawn per its specified ranges.
-- The nature of Pokémon will now be displayed italicized when a mint has been applied. Hovering over the nature will display the mint that was applied.
-- Slightly lowered the volume of all cries.
-- Giving Pokémon items now plays a sound
-- Updated the Poké Ball model and animations.
-- Pasture blocks will now also connect their bottom left and right sides to walls, iron bars, glass panes, and any other modded block that follows the same connection rules.
-- The config option `consumeHeldItems` has been removed, please see the Datapack & Resourcepack Creators section for instructions on the updated method.
-- Heal Powder can now be composted with a 75% chance of adding a layer
-- Mental, Power, White, and Mirror Herbs can now be composted with a 100% chance of adding a layer.
-- Added glowing eyes to Hoothoot and Noctowl.
-- Mining Evolution Stone Ores with a Fortune pickaxe will now increase the amount of items received.
-- Black Augurite can now be used to craft stone axes and obsidian.
-- Using Experience Candies brings up the Party Pokémon Select screen when not targeting a Pokémon.
-- Added tab completion for statuses to commands.
-- Remedies can now be cooked in a Smoker and on a Campfire.
-- Vertically flipped the Destiny Knot recipe.
-
-### Fixes
-- Fixed Raticate, Onix, Unfezant, Bergmite, Avalugg, Boltund and Revavroom cries not playing.
-- Fixed Alolan Ratticate animations causing a crash.
-- Fixed Quaxwell not doing its cry.
-- Fixed Shroomish not using its idle.
-- Fixed how Weight and Height is calculated for Pokémon, fixing the damage from moves like Low Kick.
-- Fixed a staggering number of battle messages.
-- Fixed various stone related blocks not being valid for Big Roots to spread onto on the Fabric version.
-- Updated the registration of compostable items to improve compatibility with Fabric forks such as Quilt. Please note this does not mean we officially support Quilt, this change was only done since it was possible by correcting the registration to use the new intended way in the Fabric API.
-- Fixed Dispensers being unable to shear grown Apricorns.
-- Fixed Bowl not being given back to player after using Berry Juice
-- Fixed missing text for attempting to catch an uncatchable Pokémon
-- Fixed Moonphases for Clefairy line
-- Fixed issue where Potions, Super Potions, and Hyper Potions did not work during battle
-- Fixed the compatibility patch with the Forge version of [Carry On](https://modrinth.com/mod/carry-on) due to a bug on the mod, the Fabric version was unchanged and is still compatible.
-- Added the ability to place Berries on modded Farmland blocks.
-- Shouldered Pokémon now hop off when selected in team and R is pressed. This also is in effect in battles leading to shouldered Pokémon jumping of the shoulder of the trainer when it is their turn.
-- Made more items compostable and changed the process for making items compostable.
-- Added the ability for Hoppers to fill Brewing Stands with Medicinal Brews and Potions.
-- Apricorn blocks are now flammable. Probably should have started that way, but we got there.
-- The default pose for Pokémon being passengers is now "standing".
-- Fixed issue where some IVs were changing every time a player logged back in.
-- Fixed advancement crash from bad datapack evolution data.
-- Fixed global influences being applied to TickingSpawners twice.
-- Reverted the default SpawningSelector back to FlatContextWeightedSelector. This fixes multiple weight related issues, including weights with SpawningInfluences.
-- Apricorn Planting advancement should work again.
-- Advancement "Vivillonaire" should now allow High Plains and Icy Snow Vivillon to register.
-- Fixed the last battle critical hits evolution requirement not working.
-- Fixed the damage taken evolution requirement not saving progress.
-- Fixed the defeated Pokémon evolution requirement not saving progress.
-- Fixed potion brewing recipes not showing up JEI and similar mods on the Forge version.
-- Fixed an exploit that could convert a single piece of Blaze Powder into an extra Medicinal Brew on the Forge version.
-- Fixed an issue where health percentages would show incorrectly after healing
-- Fixed the move Revival Blessing not allowing you to select from fainted party members.
-- Fixed villagers not being able to pick up and plant mint seeds, vivichoke seeds, and revival herbs.
-- Fixed Exeggcute faint.
-- Fixed various spawn configuration issues across the board.
-- Fixed a possible visual duplication of sent out Pokémon.
-- Fixed battle text for Trace, Receiver, and Power of Alchemy.
-- Fixed tooltips being appended too late in items.
-- Fixed battles ending background music when battle music is not present.
-- Fixed battles ending background music, instead of pausing, when battle music is played.
-- Fixed a bunch of regionals to actually be obtainable, namely the unmodelled ones
-- Fixed battle text for moves that were missing.
-- Fixed a formatting error that affected Pokémon nicknames when the storage type is JSON.
-- Fixed a crash that could occur on some servers relating to chunk loading and teleporting.
-- Fixed an issue with Inkay's evolution requirement.
-- Fixed conflicting evolution requirements that would cause the Ocean, River, Sun, and Tundra variants of Vivillon to be unobtainable through evolution.
-- Fixed the Modern variant of Vivillon not being obtainable through evolution.
-- Fixed Pokémon pathing through berry bushes, harming themselves in the process.
-
-### Developer
-- Fixed the `SpawnEvent` not respecting usage of `Cancelable#cancel`.
-- Added the `EvolutionTestedEvent`, this allows listening and overriding the final result of evolution requirement tests.
-- Rebuilt the scheduling API to more clearly force side choices and allow more local temporal frames of reference for tasks.
-- Added utility script that can be used to generate all Spawn JSONS for all pokemon from the spawning spreadsheet in 1 click ([cobblemon_spawn_csv_to_json.py](utilityscripts%2Fcobblemon_spawn_csv_to_json.py)).
-- The `HeldItemManager` has a new method `shouldConsumeItem`, this will return false by default to prevent breaking changes, see the documentation and update your implementations as needed.
-- Added and implemented minSkyLight and maxSkyLight as config options for SpawnConditions
-- Player specific battle themes can now be assigned to `PlayerData#battleTheme`.
-- Changed design of `BattleStartedPreEvent`. Will now expose the `PokemonBattle`.
-
-### Datapack & Resourcepack Creators
-- Added 3 new item tags: `cobblemon:held/consumed_in_npc_battle`, `cobblemon:held/consumed_in_pvp_battle` & `cobblemon:held/consumed_in_wild_battle` these will determine which items get consumed in the implied battle types by Cobblemon, keep in mind the controller for this behaviour can be overriden by 3rd party.
-- Unique wild encounter themes can now be associated with a specific species (or form) by assigning a SoundEvent identifier to the `battleTheme` field in the species' data configuration.
-- Added a `structure` evolution condition, used to check if a Pokémon is in a given structure.
-
-### Localization
-- Updated translations for:
-    - French and Canadian French
-    - Simplified and Traditional Chinese
-    - Spanish and Mexican Spanish
-    - Pirate English
-    - German
-    - Thai
-    - Portuguese and Brazilian Portuguese
-    - Polish
-    - Italian
-    - Dutch
-    - Ukrainian
-    - Russian
-
-Thank you so much to all of our community translators that bring the mod to the rest of the world!

changelogs/CHANGELOG-1.5.0.md

@@ -1,362 +0,0 @@
-## [1.5.0 - The Ruins and Revival Update (May 12th, 2024)](#1-5-0)
-#### "You're telling me that Mojang has added archaeology to the game? Hmm... that gives me an idea."
-
-### Additions
-- Added 17 ruin structures, where you can find Pokémon-themed Armor Trims and Pottery Sherds, Tumblestones, and more.
-- Added 23 fossil structures, where you can brush Suspicious Sand/Gravel for [Fossils](https://wiki.cobblemon.com/index.php/Fossil). You can add [custom fossils using datapacks](https://wiki.cobblemon.com/index.php/Fossils_File).
-- Added the Data Monitor, Fossil Compartment, and Restoration Tank blocks. Placed in the correct formation, you can use these to create a [Restoration Machine](https://wiki.cobblemon.com/index.php/Resurrection_Machine) where you can bring fossils back to life. Use organic material to fill the tank first!
-- Added 3 variants of [Tumblestone](https://wiki.cobblemon.com/index.php/Tumblestone), which can be planted near Lava or Magma to grow harvestable Tumblestone Clusters.
-- Added Tumblestone Blocks, a storage block crafted from 9 Tumblestones.
-- Added Ancient Poké Balls, which are aesthetic variants crafted from Tumblestones.
-- Added the Ancient Feather, Wing, and Jet Balls, which fly further than regular Poké Balls.
-- Added the Ancient Heavy, Leaden, and Gigaton Balls, which are heavier and don't fly as far as regular Poké Balls. These will receive more functionality in a future update.
-- Added visual effects for many Poké Balls when sending out or capturing Pokémon.
-- Added a new send-out ball toss animation that showcases the ball used for the Pokémon.
-- Added simple move animations for Pokémon in battle with a proof of concept (Flamethrower) for more complicated animations. More and more specific animations will come in future updates.
-- Added Original Trainer to the summary menu. To edit the OT through commands, you must specify originaltrainertype=<Player/NPC>, and originaltrainer=<Username or UUID/NPC Name>
-- Added support for planting Apricorn trees, berries, and mints in [Botany Pots](https://modrinth.com/mod/botany-pots)
-- Added the hidden "True Vivillionaire" advancement.
-- Added the [Display Case](https://wiki.cobblemon.com/index.php/Display_Case) block. Use it to display your archaeological findings, Poké Balls, or other items.
-- Added 6 Pokémon-themed Pottery Sherds, obtained from ruin structures. Sherds... sh-erds. Weird word.
-- Added a Pokémon-themed armor trim, obtained from ruin structures.
-- Added Nether Fire Stone Ore to, surprisingly, the Nether.
-- Added Terracotta Sun Stone Ore to Badlands biomes.
-- Added the EV Boosting Feathers.
-- Added [Gilded Chests](https://wiki.cobblemon.com/index.php/Gilded_Chest), available in all Apricorn colors.
-- Added Relic Coins, Relic Coin Pouches, and Relic Coin Sacks. Gimmighoul might be interested in these.
-- Added Type Gems. These will have additional uses later, so you should start collecting them.
-- Added new held items: Ability Shield, Absorb Bulb, Air Balloon, Binding Band, Blunder Policy, Cell Battery, Covert Cloak, Damp Rock, Eject Button, Eviolite, Expert Belt, Float Stone, Focus Sash, Heat Rock, Icy Rock, Iron Ball, Light Ball, Loaded Dice, Red Card, Shell Bell, Sticky Barb, Smooth Rock, Soothe Bell and Weakness Policy.
-- Added Hisui starters to the starter selection menu. They come inside of ancient Poké Balls.
-- Added a bubble quirk to Krabby that only plays during clear sunsets. It looks familiar...
-- Added forfeit option to PVP battles.
-- Added visual changes for entities affected by Illusion, Imposter, or Transform in battle.
-- Added shoulder mounting for Squirtle, Ralts, Roggenrola, Charcadet, Sizzlipede, Litwick, Cutiefly, Flabebe, Flittle, and Scatterbug
-- Added species data for Hydrapple, Iron Boulder, Iron Crown, Pecharunt, Raging Bolt, and Terapagos
-- Added various new tags for search-ability and better mod compatibility.
-- Added the [Ability Capsule](https://bulbapedia.bulbagarden.net/wiki/Ability_Capsule) and [Patch](https://bulbapedia.bulbagarden.net/wiki/Ability_Patch). These have no way of getting them (for now) and only work as intended with the traditional ability format of 1 to 2 common abilities and 1 hidden ability.
-
-### Pokémon Added
-#### Gen 2
-- Sentret
-- Furret
-- Qwilfish
-- Heracross
-- Skarmory
-- Larvitar
-- Pupitar
-- Tyranitar
-
-#### Gen 3
-- Lileep
-- Cradily
-- Anorith
-- Armaldo
-- Tropius
-- Roselia
-- Aron
-- Lairon
-- Aggron
-- Solrock
-- Lunatone
-- Makuhita
-- Hariyama
-- Trapinch
-- Vibrava
-- Flygon
-
-#### Gen 4
-- Shieldon
-- Bastiodon
-- Cranidos
-- Rampardos
-- Budew
-- Roserade
-- Hippopotas
-- Hippowdon
-
-#### Gen 5
-- Tirtouga
-- Carracosta
-- Archen
-- Archeops
-- Zorua
-- Zoroark
-- Petilil
-- Lilligant
-- Darumaka
-- Darmanitan
-- Woobat
-- Swoobat
-- Sandile
-- Krokorok
-- Krookodile
-- Frillish
-- Jellicent
-- Cubchoo
-- Beartic
-- Deino
-- Zweilous
-- Hydreigon
-- Larvesta
-- Volcarona
-- Alomomola
-- Ferroseed
-- Ferrothorn
-
-#### Gen 6
-- Tyrunt
-- Tyrantrum
-- Amaura
-- Aurorus
-- Goomy
-- Sliggoo
-- Goodra
-- Carbink
-- Flabébé
-- Floette
-- Florges
-- Klefki
-
-#### Gen 7
-- Turtonator
-- Fomantis
-- Lurantis
-- Salandit
-- Salazzle
-- Jangmo-o
-- Hakamo-o
-- Kommo-o
-- Alolan Diglett
-- Alolan Dugtrio
-
-#### Gen 8
-- Gossifleur
-- Eldegoss
-- Arctozolt
-- Arctovish
-- Dracozolt
-- Dracovish
-- Basculegion
-- Hisuian Decidueye
-- Hisuian Typhlosion
-- Hisuian Samurott
-- Hisuian Lilligant
-- Hisuian Sliggoo
-- Hisuian Goodra
-- Hisuian Zorua
-- Hisuian Zoroark
-- Hisuian Voltorb
-- Hisuian Electrode
-- Hisuian Qwilfish
-- Overqwil
-- Hisuian Sneasel
-- Sneasler
-- Stonjourner
-- Cufant
-- Copperajah
-- Dreepy
-- Drakloak
-- Dragapult
-- Impidimp
-- Morgrem
-- Grimmsnarl
-
-#### Gen 9
-- Gimmighoul
-    - Using Relic Coins, you can increase Gimmighoul's Coin Stash. Upon reaching 999, it can be evolved into Gholdengo.
-    - Additionally, if you give Gimmighoul a Netherite Scrap, you can increase its Netherite Stash. But what will that do to when you evolve it?
-- Gholdengo
-
-#### Cobblemon Exclusives
-- Hisui Bias Rowlet
-- Hisui Bias Dartrix
-- Hisui Bias Cyndaquil
-- Hisui Bias Quilava
-- Hisui Bias Oshawott
-- Hisui Bias Dewott
-- Hisui Bias Goomy
-- Hisui Bias Petilil
-
-These are our compromise for having both regular and Hisuian forms of these Pokémon in the game. Hisui Biased variations will evolve into the Hisuian evolutions under most conditions. They are otherwise purely cosmetic differences.
-
-### Added cries to the following Pokémon
-- Alolan Raticate
-- Vulpix, Ninetales
-- Zubat, Golbat, Crobat
-- Meowth, Persian
-- Psyduck, Golduck
-- Growlithe, Arcanine
-- Geodude, Graveler, Golem
-- Doduo, Dodrio
-- Seel, Dewgong
-- Muk, Grimer
-- Krabby, Kingler
-- Voltorb, Electrode, Hisuian Voltorb, Hisuian Electrode
-- Tangela, Tangrowth
-- Snorlax
-- Cubone, Marowak
-- Koffing, Weezing
-- Aerodactyl
-- Elekid, Electabuzz, Electivire
-- Omanyte, Omastar
-- Kabuto, Kabutops
-- Lapras
-- Scyther
-- Hisui Bias Cyndaquil, Hisui Bias Quilava
-- Igglybuff
-- Yanma, Yanmega
-- Gligar, Gliscor
-- Qwilfish, Hisuian Qwilfish, Overqwil
-- Sneasel, Hisuian Sneasel, Weavile, Sneasler
-- Larvitar, Pupitar, Tyranitar
-- Swinub, Piloswine, Mamoswine
-- Aron, Lairon, Aggron
-- Trapinch, Vibrava, Flygon
-- Cacnea, Cacturne
-- Barboach, Whiscash
-- Lileep, Cradily
-- Anorith, Armaldo
-- Tropius
-- Chimecho
-- Bidoof, Bibarel
-- Buizel, Floatzel
-- Gible, Gabite, Garchomp
-- Hisui Bias Oshawott, Hisui Bias Dewott
-- Petilil, Lilligant, Hisui Bias Petilil, Hisuian Lilligant
-- Basculin, Basculegion
-- Sandile, Krokolok, Krookodile
-- Darumaka, Darmanitan
-- Archen, Archeops
-- Zorua, Zoroark, Hisuian Zorua, Hisuian Zoroark
-- Tyrunt, Tyrantrum
-- Amaura Aurorus
-- Carbink
-- Goomy, Sliggoo, Goodra, Hisui Bias Goomy, Hisuian Sliggoo, Hisuian Goodra
-- Klefki
-- Hisui Bias Rowlet, Hisui Bias Dartrix
-- Komala
-- Impidimp, Morgrem, Grimmsnarl
-- Cufant, Copperajah
-- Dreepy, Drakloak, Dragapult
-- Dracozolt, Arctozolt, Dracovish, Arctovish
-- Lechonk, Oinkologne
-- Maushold family of three and four
-
-
-### Changes
-- Alolan Pikachu and Exeggcute changed to Alola Bias.
-- Pokémon now transition more smoothly between different poses.
-- Updated models for Mimikyu, Alcremie, Squirtle, Wartortle, Blastoise, Pidgey, Pidgeotto, Pidgeot, Omanyte, Omastar, Growlithe, Arcanine, Nidoran Male, Nidoran Female, Lapras, Swinub, Piloswine, Basculin, Rowlet, Dartrix, Decidueye, Kabuto, Kabutops, Piplup, Prinplup, Elekid, Electabuzz, Cubone, Marowak, Paras, Mawile, Drifloon, Drifblim, Venonat, Venomoth, Yanma, Yanmega, Psyduck, Dusknoir, Diglett, Dugtrio, Natu, Xatu, Oshawott, Samurott, Torchic, Grovyle, Sceptile, Sizzlipede, Mismagius, and Raboot.
-- Updated animations for Squirtle, Wartortle, Blastoise, Pidgey, Pidgeotto, Diglett, Dugtrio, Magikarp, Dragonite, Omanyte, Omastar, Kabuto, Pinsir, Chinchou, Lanturn, Ralts, Kirlia, Gardevoir, Gallade, Buizel, Garchomp, Pumpkaboo, Falinks, Lechonk, Litwick, Lampent, Chandelure, Carnivine, Galarian Meowth, Galarian Rapidash, Venonat, Venomoth, Phanphy, Donphan, Dratini, Dragonair, Happiny, Chansey, Blissey, Volbeat, Illumise, Numel, Sizzlipede, Centiskorch, Obstagoon, Timburr, Gurdurr, Conkeldurr, Drifloon, and Drifblim.
-- Resized Drifloon.
-- Added more held items to the held item tag, and Metal Coat to the held item tab.
-- Added all ores to the modloader ore tags, and added tags for each ore type to the mod (both blocks and items).
-- Changed the Destiny Knot to be crafted with a Ghast Tear rather than a diamond. We have big plans for the Destiny Knot...
-- You can now punch grown apricorns to harvest them. We saw so many content creators breaking apricorns with their fists that it was making us die inside.
-- The "Poké Ball" Vivillon variant is now obtainable by evolving a Spewpa after obtaining the "Aspiring Vivillionaire" advancement.
-- Renamed the "Vivillionaire" advancement to "Aspiring Vivillionaire"
-- Removed the Inferno, Forsaken, Poké Ball, and Void patterns from the Aspiring Vivillionaire advancement.
-- Updated the biome tags for Spewpa's evolutions into the various Vivillon patterns. You should mostly be getting one evolution option at a time now.
-- Apricorn Sprouts can now be planted directly on Apricorn leaves to create a new Apricorn of the same color.
-- Added tooltips to interaction GUIs to make it clearer what they do.
-- Poké Ball recipes now use tags for their center ingredient, rather than specifically Copper Ingots, Iron Ingots, Gold Ingots, and Diamonds, allowing for further datapack customisation and mod compatibility.
-- Starter Toast now closes once the corresponding button is pressed once.
-- Moved some items into the vanilla Food & Drinks category.
-- Stacked Cobblemon Potion Bases can now be quick moved into Brewing Stands.
-- Changed the Healing Machine recipe to swap the Max Revive for a Revive so that it is a bit easier to craft.
-- Upped the rate that Gastly drop Ghast Tears from 2.5% to 5%, further helping the crafting of a Healing Machine.
-- Pokémon with a low Blaze Powder drop chance now drop it more frequently in the Nether.
-- Reorganised a few advancements.
-- Pokémon entity shadows now scale when the Pokémon is being sent out or recalled.
-- Remade Torkoal particles, now they only appear when in battle.
-- Improved the shiny icon within summary and PC interfaces.
-- Changed the Poison Barb sprite so that it doesn't look like a sword when held. It's a Poison Barb, not a Poison Sword. Wait, that gives me an idea.
-- Moon Stone ore generates more frequently in Taigas and has been added to Magical and Spooky biomes. Ooo... Sorry.
-- Density, Season, and Nether biome tags have been moved and renamed within the biome tags directory.
-- Added particles to Lucario when in battle. Lucario is special.
-- Movesets updated for Blueberry DLC.
-
-### Fixes
-- Re-added the recipe for the Iron vitamin. Well, technically it's a mineral.
-- Fixed Exeggcute and Pikachu not being able to evolve.
-- Fixed evolution priority for Exeggcute and Pikachu regional evolutions. Using a thunder stone on Kantonian Pikachu on the beach will give Alolan Raichu. A second thunder stone would then give Kantonian Raichu.
-- Fixed battle text for the Poison Touch Ability.
-- Finally found Sudowoodo and Bonsly. They were missing spawn data. Same with Drifloon and Litwick. Uh... sorry about that.
-- Fixed Squawkabilly forms not being recognized.
-- Fixed the bounce animation for Poké Balls being delayed by like, a full second. It's enough to drive you mad.
-- Note blocks now play the correct sound on the Apricorn Plank-based blocks.
-- Fixed an issue with transformed parts in posers causing whacky positional issues.
-- Fixed Poké Balls freezing in an open state if you're looking away at the moment that it's meant to close. This actually fixes some other things but it's hard to explain.
-- Fixed thrown Poké Balls technically having no name.
-- Fixed very many issues with Bedrock particle effects. There are probably many more. Life goes on.
-- Fixed Arbok patterns not being as specific in spawning as they were intended to be.
-- Fixed Pokémon not avoiding danger at all when pathfinding.
-- Fixed Pokémon pathing over snow layers and carpets.
-- Fixed the Sobble line not being able to swim or breathe underwater.
-- Fixed mod incompatibility with [Just Enough Resources](https://modrinth.com/mod/just-enough-resources-jer).
-- Fixed mod incompatibility with [Visual Overhaul](https://modrinth.com/mod/visual-overhaul).
-- Fixed an issue that allowed Pokémon to spawn on rails.
-- Fixed the data set on Pokémon when abilities are given via properties such as in `/spawnpokemon`.
-- Fixed Pokémon sometimes losing hidden abilities when evolving. This fix will only take effect for newly created Pokémon because of technical reasons that were explained to me but which I then forgot.
-- Fixed capture messages not displaying in battle.
-- Fixed the Illusion ability causing the wrong Pokémon to be targeted in battle.
-- Fixed battles started with fainted party members causing a soft-lock on defeat.
-- Fixed some issues with eyes in the faint animations of Hitmonlee and Phantump
-- Fixed missing evolution moves, for example Stone Axe for Kleavor.
-- Cleaned up empty evolutions declaration in species data (And no, I'm not listing all 169. No I don't care what you pay me, I'm not doing it).
-- Fixed non-consumable held items being consumed or swapped in battle permanently.
-
-### Developer
-- Significantly changed the way the properties in PokemonEntity work. This could break some plugins (not in a big way, but changes will be needed for some things).
-- Rebuilt the scheduling API to more clearly force side choices and temporal frames of reference for tasks. The developers say that how it works is cool but I stopped listening.
-- Added dialogue API and data registry. This is powerful, and there is a full example in the Cobblemon mod you can trigger using `/opendialogue <username> cobblemon:example`. The example JSON is inside the data folder of the mod.
-- Opened up the ItemDropEntry class to allow for it to be extended.
-- Added a new "advancement" evolution variant that takes an advancement identifier and succeeds if the player has the advancement.
-- Made the spawning API capable of non-entity spawning. You can make it 'spawn' commands if you want. Go nuts.
-- Made `PokemonProperties.parse` more interoperable with Java. Save yourself and stop using Java.
-- Added the `HeldItemEvent`, this comes with 2 implementation `HeldItemEvent.Pre` and `HeldItemEvent.Post`.
-- Corrections to the ability implementation have been made that make `Ability.forced` function as intended and never reroll an ability for a Pokémon, please check your implementations to ensure the corrected behavior is intended for your use case.
-- `Pokemon.ability` no longer has a public setter. Please migrate to using `Pokemon#updateAbility`, this handles the ability coordinate storage for you when necessary.
-- `Ability.forced`, `Ability.index` and `Ability.priority` have all had their setters internalized, there is no longer any need to manually adjust these migrate to the method mentioned above to handle that process for you.
-- `AbilityChanger` has been added to API alongside some implementations, this is subject to change as the ability capsule and patch currently only expect the traditional behaviour in the Pokémon games of 1 or 2 regular abilities and 1 hidden ability.
-- `Pokemon#rollAbility` has been added which re9rolls for a legal ability for the Pokémon.
-- `docs/cobblemon-tags` tags and spawn-presets can now be auto-generated from the current tags in the Cobblemon mod with the `generateSpawnPresetList.py` and `generateTagList.py` scripts.
-- `public_spawns_to_json.py` script has been added to give the powerful spawn.json generator a simplistic UI.
-- Updated Showdown with Gen 9 DLC.
-- Changed mixins to be Java 17 for compatibility level instead of 16, removing a warning from startup logs.
-
-### Datapack & Resourcepack Creators
-- The maximum amount of fossils that can fit in the Fossil Analyzer can be adjusted in the config.
-- Custom fossils can be defined using a list of items and the resulting Pokémon. An example of `aerodactyl.json`:
-  `JSON
-  {
-    "result": "aerodactyl",
-    "fossils": [
-      "cobblemon:old_amber_fossil"
-    ]
-  }
-  `
-- Fetus models can be defined in `bedrock/fossils`.
-- Fetus textures can be defined in `textures/fossils`.
-- Fuel for the Restoration Machine is registered inside the `natural_materials` folder. To register more fuels, create a JSON file containing an array of objects. Each object supports the following fields:
-    - `content`: Integer containing the amount of fuel to add.
-    - `item` OR `tag`: Identifier of the item or item tag to be inserted.
-    - `returnItem`: Identifier of an item to return to the player after consumption.
-- Added 3 new item tags: `ancient_poke_balls`, `fossils`, and `tumblestones`.
-- Added a spawn rules system to modify general spawning behaviour, see the [wiki](https://wiki.cobblemon.com/index.php/Spawn_Rules) for more information.
-- Added dialogue datapack folder and `/opendialogue` command.
-- Added the item tag `cobblemon:held/leaves_leftovers` this can be used to flag apple-like items that can create leftovers when eaten.
-- You can now add support for dynamic lighting implementations, Cobblemon ships with a default implementation for [LambDynamicLights](https://modrinth.com/mod/lambdynamiclights) and the [Dynamic Lights Reforged](https://www.curseforge.com/minecraft/mc-mods/dynamiclights-reforged), add the following to any species or form:
-  `JSON
-  {
-    "lightingData": {
-      "lightLevel": 14,
-      "_lightLevelCommentRemoveMe": "Above supports 0 to 15",
-      "liquidGlowMode": "LAND",
-      "_liquidGlowModeCommentRemoveMe": "Above supports LAND, UNDERWATER or BOTH"
-    }
-  }
-  `
-- Following up on this change `light_source` was removed as a possible shoulder effect due to becoming unnecessary and never having had a default implementation.
-- Added the item tag `cobblemon:ability_changers`, contains the `cobblemon:ability_capsule` & `cobblemon:ability_patch` by default.
-- Added the item tag `cobblemon:held/is_friendship_booster`, allows items to give the Soothe Bell effect of a boost of 1.5x Friendship gained, contains `cobblemon:soothe_bell` by default.

changelogs/CHANGELOG-1.5.1.md

@@ -1,105 +0,0 @@
-## [1.5.1 (May 27th, 2024)](#1-5-1)
-
-### Additions
-- Added unique send out particles for Cherish, Dream, Beast, and Ancient Origin balls.
-- Made Wooloo and Dubwool dye-able like sheep. So cute!
-- Added stat up and down particles.
-- Most status effects now have particles! These include: Paralysis, Poison, Sleep, Confusion, Infatuation.
-#### Move Particle Effects
-- Confusion
-- Cotton Guard
-- Growl
-- Ice Punch
-- Fire Punch
-- Thunder Punch
-- Minimize
-- Quick Attack
-- Protect
-- Swords Dance
-- Sand Attack
-- Poison Powder
-- Sleep Powder
-- Stun Spore
-- Powder
-- Rage Powder
-- Spore
-- Thunder Wave
-
-### Changes
-- Sounds for Relic Coin Sacks have been correctly renamed. Relic Coin Pouches received new sounds for breaking and placing.
-- Readjusted Petilil portraits so they fit a bit better.
-- Improved handling of Pokémon taken from the Restoration Tank block to be a bit more stable.
-- Made Mulch cheaper to craft.
-
-### Fixes
-- Fixed a bug in which adding organic material to the restoration tank via right click was adding the full count of the stack currently in hand - but only taking 1 of the item.
-- Fixed a niche issue where some properties of entities were not initialized correctly, causing Pokémon that appeared to be level 1 until you battle them.
-- Fixed Fossilized Drake being missing from the Fossils item tag.
-- Fixed Gilded Chest block entity not being cleared on block break, creating spooky ghost blocks. Old ones can be fixed by placing something like a furnace where it was, then breaking the furnace.
-- Fixed sherd brokenness on Forge.
-- Fixed Supplementaries incompatibility.
-- Fixed Fossil Compartment crash with Jade / WAILA forks.
-- Fixed pasture block PC lookups when the player is offline.
-- Fixed an untranslated battle message that occurs when using a move that just ran out of PP (e.g. Fire Blast that just got spited mid-turn).
-- Fixed held items being eaten even when the held item evolutions are already unlocked.
-- Fixed Hisuian Decidueye not being Grass/Fighting.
-- Fixed both Decidueye forms learning both Triple Arrows and Spirit Shackle.
-- Fixed Pineco being unable to evolve into Shulker Forretress.
-- Fixed Kabutops T-posing when underwater. It doesn't have proper swimming animations yet, though.
-- Fixed Pidgey's missing walk animation.
-- Fixed Cyndaquil's hidden flames clipping if it was swimming.
-- Fixed Chimecho and Chingling being unable to spawn near bells. They are meant to!
-- Fixed Tyrantrum and Wailord Party Overlay models peeking through the chat box. It was kinda funny though.
-- Fixed hitbox sizes for Seedot, Nuzleaf, and Shiftry.
-- Fixed Budew and Lechonk sliding if they walked for too long.
-- Fixed Shedinja T-posing in battle.
-- Fixed recoil evolution condition not working, making things like Basculegion unobtainable.
-- Fixed issue where poser debug tools didn't work on JSON posers.
-- Fixed issue where gilded chests don't close when going far away.
-- Fixed issue where the restoration tank's renderer was reading old data, making it appear wrong.
-- Fixed issue where the lights on the restoration tank would not animate if it was facing east. Very specific.
-- Fixed client crash with the fossil machine when updating block state on a chunk that is unloaded in the client. I don't understand this but the devs are sure that all of those are real words.
-- Fixed Restoration Tank crash with Create upon the tank block's destruction.
-- Fixed Restoration Tank over consuming items when interacting with Create blocks.
-- Fixed addons that add very many moves to a learn-set causing disappearing Pokémon (visually) issues on servers.
-- Fixed Hyper Cutter and Big Pecks incorrectly stating that it prevented accuracy from being lowered in battle.
-- Fixed missing messages for Rough Skin and Iron Barbs in battle.
-- Fixed a bug where sometimes Pokémon sendouts wouldn't create an entity, or the entity would spawn at 0 0 0 which is not a good place for a Pokémon to be. Or any of us, really.
-- Fixed issue in which a locked gilded chest would animate to the open state when the client fails to open it, such as when it is locked.
-- Fixed a bug where aspects of a form would not be properly reflected on form changes (eg. Normal -> Hisui).
-- Fixed generic battle effect sounds not sounding the way they were intended to.
-- Fixed particle effects often not having access to some specific entity functions from MoLang.
-- Fixed particles sometimes lasting a single tick too long, causing (very quick) visual glitches.
-- Fixed particle rotations being inverted.
-- Fixed particle events not spawning at the instigating particle's location.
-- Fixed a bunch of spam during world generation.
-- Fixed a bug in which throwing a Poké Ball at a player owned Pokémon with the ability Illusion would reveal its true species. Hilarious meta strategy.
-- Fixed root-part animations not working for JSON posed Pokémon. You didn't notice this but if we didn't fix this in this update then if you use Quick Attack a lot you'd have seen a whole lot of [this](https://cdn.discordapp.com/attachments/1076993968803434627/1242660506783715369/Minecraft__1.20.1_-_Singleplayer_2024-05-21_22-08-17.mp4?ex=66549408&is=66534288&hm=ff95ee293eb15634fd63e6546534ea279540a1c892605e8d561593ca2c5600c5&) which is damn funny but very unintended.
-
-### Developer
-- Changed SpawnAction#complete to return a nullable generic R (the spawn action result) instead of a boolean. Provides more information this way.
-- Added an event that fires when a fossil is revived, with or without a player.
-- Added IVS and EVS property extractors.
-- Fixed PCStore#resize not allowing PC boxes size reduction.
-
-### Data Pack & Resource Pack Creators
-- Added support for MoLang conditions for quirks and poses.
-- Changed the AttackDefenceRatio requirement to StatCompare and StatEqual. There is some backwards compatibility for AttackDefenceRatio, though.
-- Changed "dimensions" spawn condition to check with dimension IDs instead of effects, so custom dimension IDs can be used.
-- Added parametric motion and rotation support to particle effects.
-- Added entity_scale as a molang var for particles (likely only applicable to Pokemon)
-- Added support for primary quirk animations using the following format:
-  `JSON
-  {
-    "quirks": [
-      "q.bedrock_primary_quirk('<pokemon>', '<animation>', <minSeconds>, <maxSeconds>, <loopTimes>, '<excludedLabels>', q.curve('<waveFunction>'))"
-    ]
-  }
-  `
-- Added support for custom stashes, similar to Gimmighoul's coin and scrap stashes.
-- Added the ability to create custom brewing stand recipes.
-
-### Localization
-- Updated translations for:
-    - Simplified and Traditional Chinese.
-    - Spanish.

changelogs/CHANGELOG-1.5.2.md

@@ -1,5 +0,0 @@
-## [1.5.2 (May 27th, 2024)](#1-5-2)
-### Fixes
-- Fixed Wooloo and Dubwool dyeing making your game start dying. Only if you do it on a server.
-- Fixed Gimmighoul causing PCs and parties to look glitched out, also only in a server.
-- Fixed players being able to dye other people's sheep Pokémon.

changelogs/CHANGELOG-1.6.0.md

@@ -1,487 +0,0 @@
-## [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!"
-
-### Additions
-- Added the Pokédex as a craftable item that can be placed on lecterns.
-- Added Pokémon (and item) fishing using modified fishing rods - Poké Rods! You'll need a Poké Rod smithing template, a fishing rod, and some type of Poké Ball. Each Poké Ball makes a differently themed rod because it's cool.
-- Added Lure Ball functionality, increasing the catch rate of Pokémon that were caught on a fishing rod.
-- Added Repeat Ball functionality, increasing the catch rate of Pokémon that are already registered as caught in a player's Pokédex.
-- Added flat level battling with options to set all Pokémon to level 50, 100, or 5 for the duration of a battle. No experience or EVs are granted for a flat battle.
-- Added support for Double Battles, Triple Battles, and Multi-battles.
-- Added raft platforms for non-swimming, non-flying Pokémon to stand on during battles that take place on the water's surface (Flying Pokémon will fly over water in battle, and water breathing Pokémon will swim in water during battle).
-- Added smarter send-out positions for Pokémon in battle. They should get in your way less!
-- CriticalCaptures and Pokédex progress capture multiplier now work with the Pokédex.
-- Added shiny Pokémon particle effects and sounds to help find them.
-- Added effects for the burn status effect.
-- Added effects for the moves: Seismic Toss, Withdraw, Bite, Crunch, Super Fang, Hyper Fang, Pursuit, Mist, Haze, Lick, Kinesis, Psychic, Water Sport, and Mud Sport.
-- Added extra visuals to early berry growth stages.
-- Added Polished Tumblestone and Tumblestone Brick block sets from Tumblestone, Black Tumblestone, and Sky Tumblestone.
-- Moves impacted by the abilities Pixelate, Refrigerate, Aerilate, Galvanize, and Normalize now display as their altered typing.
-- Added Fire, Water, Thunder, Leaf, Ice, Sun, Moon, Shiny, Dawn, and Dusk Stone storage blocks.
-- Added Eject Pack, Metronome, Protective Pads, Punching Glove, Room Service, Scope Lens, Shed Shell, Terrain Extender, Throat Spray, Utility Umbrella, Wide Lens, and Zoom Lens held items.
-- Added a full evolution particle effect for Pokémon that are sent out when evolution is started.
-- Added a Nurse profession that can be unlocked by having villagers claim a healing machine block.
-- Pokémon are now animated when seen in any GUI that isn't the party GUI.
-- Added animation and sounds for trading.
-- Added icons for pending trade, team-up, and battle requests from other players.
-- Quirk animations can now occur for Pokémon that are shoulder mounted.
-- Added new sounds for Poké Balls bouncing off of Pokémon and landing on the ground during capture.
-- Added a unique set of sounds for Ancient Poké Balls.
-- Added a sound for using Exp Candy and Rare Candy items.
-- Added revamped Poké Ball animation for Pokémon breaking out.
-- Added battle log messages for switching out Pokémon.
-- Added config setting `displayEntityNameLabel` and `displayEntityLabelsWhenCrouchingOnly` to control what and when is displayed for the pokemon label.
-- Added `no_ai` and `freeze_frame` options to the `/spawnpokemon` command.
-- Added `moves` option to Pokémon properties, allowing you to set the moves of a Pokémon in commands and spawn files using comma-separated move names.
-- Added a `natural` block state property for the healing machine block; when property is set to true, the block will have a different texture and drop an iron ingot instead of itself.
-- Added a `battleInvulnerability` gamerule to make players invulnerable to any damage during a battle.
-- Added a `mobTargetInBattle` gamerule to exclude players from being targeted by mobs during a battle.
-- Added a `/freezepokemon` command to pause a Pokémon's animation at a specific point in time.
-- Added `/spawnnpc` and `/spawnnpcat` commands.
-- Added `hiddenability=false` option to `/spawnpokemon` and `/pokemonedit` commands, allowing the Pokémon's ability to be reverted to a normal ability.
-- Added `aspect` and `unaspect` PokemonProperty arguments (which also includes commands such as `/pokemonedit`, `/spawnpokemon`, and `/givepokemon`) to allow forcing or un-forcing an aspect on a Pokémon.
-- Added `type` alternatively `elemental_type` PokemonProperty argument, this is only used for filtering and is not applied to Pokémon. Example `type=fire` would be true for Charmander but false for Squirtle.
-
-### Structures Added
-- Fishing boat structure that contain an Explorer Map leading to a shipwreck cove and a Poké Rod Smithing Template.
-- Stonjourner Henge Ruins, Luna Henge Ruins, and Sol Henge Ruins.
-- Submerged Shipwreck Cove and Lush Shipwreck Cove.
-- Pokémon Centers to all 5 village types.
-
-### Pokémon Added
-#### Gen 1
-- Alola Bias Cubone (built-in resource pack)
-- Alolan Marowak
-
-#### Gen 2
-- Ledyba
-- Ledian
-- Sunkern
-- Sunflora
-- Wobbuffet
-- Girafarig
-- Corsola
-- Remoraid
-- Octillery
-- Mantine
-- Smeargle
-- Delibird
-
-#### Gen 3
-- Slakoth
-- Vigoroth
-- Slaking
-- Corphish
-- Crawdaunt
-- Feebas
-- Milotic
-- Wynaut
-- Absol
-- Spheal
-- Sealeo
-- Walrein
-- Bagon
-- Shelgon
-- Salamence
-- Kecleon
-
-#### Gen 4
-- Mantyke
-- Finneon
-- Lumineon
-- Shellos
-- Gastrodon
-- Rotom
-
-#### Gen 5
-- Purrloin
-- Liepard
-- Scraggy
-- Scrafty
-
-#### Gen 6
-- Clauncher
-- Clawitzer
-
-#### Gen 7
-- Pikipek
-- Trumbeak
-- Toucannon
-- Mareanie
-- Toxapex
-- Sandygast
-- Palossand
-- Bruxish
-
-#### Gen 8
-- Cramorant
-- Hatenna
-- Hattrem
-- Hatterene
-- Pincurchin
-
-#### Gen 9
-- Wattrel
-- Kilowattrel
-- Veluza
-- Farigiraf
-- Klawf
-- Finizen
-- Palafin
-- Wiglett
-- Wugtrio
-- Flamigo
-- Dondozo
-
-#### Unique Forms
-- Magikarp Jump variants for Magikarp
-- Magikarp Jump variants for Gyarados (built-in resource pack, enabled by default on Fabric)
-
-### Added cries to the following Pokémon
-- Sandshrew, Sandslash
-- Magnemite, Magneton, Magnezone
-- Gastly, Haunter, Gengar
-- Rhyhorn, Rhydon, Rhyperior
-- Happiny, Chansey
-- Horsea, Seadra, Kingdra
-- Magby, Magmar, Magmortar
-- Porygon, Porygon2, Porygon-Z
-- Sentret, Furret
-- Misdreavus, Mismagius
-- Corsola
-- Mantyke, Mantine
-- Girafarig, Farigiraf
-- Wynaut, Wobbuffet
-- Lunatone
-- Solrock
-- Corphish, Crawdaunt
-- Feebas, Milotic
-- Kecleon
-- Absol
-- Spheal, Sealeo, Walrein
-- Relicanth
-- Bagon, Shelgon, Salamence
-- Munchlax
-- Finneon, Lumineon
-- Purrloin, Liepard
-- Timburr, Gurdurr, Conkeldurr
-- Joltik, Galvantula
-- Elgyem, Beheeyem
-- Golett, Golurk
-- Deino, Zweilous, Hydreigon
-- Flabébé, Floette, Florges
-- Clauncher, Clawitzer
-- Mareanie, Toxapex
-- Wimpod, Golisopod
-- Bruxish
-- Hatenna, Hattrem, Hatterene
-- Pincurchin
-- Klawf
-- Finizen, Palafin \[Zero\], Palafin \[Hero\]
-- Dondozo
-
-### Added shoulder mounts for the following Pokémon
-- Weedle
-- Caterpie
-- Spearow
-- Mew
-- Murkrow
-- Smoochum
-- Larvitar
-- Tailow
-- Plusle
-- Minun
-- Beldum
-- Starly
-- Buneary
-- Combee
-- Pachirisu
-- Tepig
-- Pidove
-- Petilil, Hisui Bias Petilil
-- Zorua, Hisui Bias Zorua
-- Elgyem
-- Fletchling
-- Skrelp
-- Klefki
-- Litten
-- Fomantis
-- Morelull
-- Dreepy
-- Sprigatito
-- Shroodle
-- Tatsugiri
-- Glimmet
-- Gimmighoul \[Roaming\]
-
-### Animation updates for the following Pokémon
-- Bellsprout, Weepinbell, Victreebel
-- Shellder, Cloyster
-- Porygon, Porygon2, Porygon-Z
-- Furret
-- Swinub, Piloswine, Mamoswine
-- Skarmory
-- Tyrogue
-- Spinda
-- Torkoal
-- Nincada, Ninjask
-- Lunatone
-- Solrock
-- Buneary, Lopunny
-- Magnezone
-- Alomomola
-- Tepig, Pignite, Emboar
-- Flabebe, Floette, Florges
-- Litten, Torracat, Incineroar
-- Fomantis, Lurantis
-- Dreepy, Drakloak
-- Kleavor
-- Scorbunny
-- Gimmighoul \[Roaming\]
-
-### Model updates for the following Pokémon
-- Bulbasaur, Ivysaur, Venusaur
-- Charmander, Charmeleon, Charizard
-- Caterpie
-- Kakuna, Beedrill
-- Lapras
-- Porygon, Porygon2, Porygon-Z
-- Igglybuff, Jigglypuff, Wigglytuff
-- Poliwhirl, Poliwrath
-- Bellsprout, Weepinbell, Victreebel
-- Shellder, Cloyster
-- Gastly, Haunter
-- Onix
-- Krabby, Kingler
-- Rhyhorn, Rhydon, Rhyperior
-- Horsea, Seadra, Kingdra
-- Goldeen, Seaking
-- Magby, Magmar, Magmortar
-- Magikarp, Gyarados
-- Munchlax, Snorlax
-- Swinub, Piloswine, Mamoswine
-- Mudkip, Marshtomp, Swampert
-- Baltoy, Claydol
-- Carvanha
-- Relicanth
-- Prinplup, Empoleon
-- Gible, Gabite, Garchomp
-- Riolu, Lucario
-- Snivy, Servine, Serperior
-- Tepig, Pignite, Emboar
-- Krookodile
-- Dwebble, Crustle
-- Joltik, Galvantula
-- Klink, Klang, Klinglang
-- Golett, Golurk
-- Fennekin, Braixen, Delphox
-- Phantump, Trevenant
-- Litten, Torracat, Incineroar
-- Popplio, Brionne, Primarina
-- Mudbray
-- Lurantis
-- Scorbunny, Cinderace
-- Quaxly
-- Skeledirge
-- Tatsugiri
-
-### Changes
-- Buffed Dusk Ball catch multipliers: Increased multiplier to 3.5 (from 3.0) in light level 0. Increased multiplier to 3.0 (from 1.5) in light levels 1-7.
-- Altered the item model for Medicinal Leeks and Roasted Leeks to be held like sticks and other rod items.
-- Adjusted some berry balance values like yield and growth times.
-- Adjusted volumes of sounds made by Display Cases, Berry Bushes, Energy Root, Medicinal Leek, Vivichoke, Mints, Revival Herbs and Gilded Chests.
-- Changes to mulch buffs/durations.
-- Updated potion sprites.
-- Changed Link Cable recipe to be much cheaper.
-- Updated sounds for Medicinal Leeks, Big Roots, Energy Roots and Revival Herbs.
-- Updated UI sounds for clicking and evolving Pokémon.
-- Updated cries for Chansey, Crobat, Hoothoot, Noctowl.
-- Removed the interchangeable evolution results for the first stage Hisuian starters to prevent confusion. The method still exists for stage 2 to 3, but stage 1 to 2 was not distinguishable enough for many users.
-- Vivillon wings will stop being clear when you remove any Vivillon related resourcepacks. The default pattern will be the meadow wings.
-- Wild Pokémon interaction range increased to 12 blocks (from 10 blocks).
-- Player trade range increased to 12 blocks (from 10 blocks).
-- PvP battle range increased to 32 blocks (from 10 blocks).
-- Spectate range increased to 64 blocks (from 10 blocks).
-- The inventory key now closes our GUIs if they are open, mirroring how Minecraft screens usually work.
-- The noise from the pasture and PC blocks being interacted with now activates Sculk sensors.
-- Updated dialogue GUI assets with proper assets not made by a programmer. Well, it was still a programmer, but- someone who can also draw!
-- Updated party switching interface when in battle.
-- Relic coin pouches can now be waterlogged.
-- The "Press R to start battle prompt" will now disappear after a player's first battle has been won. You've probably figured that detail out by then.
-- The default number of digits for the Pokédex number in the summary has been increased, from 3 to 4. There sure are a lot of Pokémon these days.
-- The pasture block model's screen is now off by default.
-- The Poké Balls creative tab is now named Utility Items as it also encompasses Poké Rod and Pokédex items.
-- Moves can now be benched without specifying a replacement move, allowing for empty move slots.
-- Moves learned via Sketch now persist after battle.
-- Hidden Power now displays its effective typing.
-- Updated particles for moves: Confusion, Protect, Sand Attack, and Quick Attack.
-- Updated particles for status effects: Paralysis, Poison, and Sleep.
-- Updated particles on Gastly.
-- Revamped stat buff and de-buff particles.
-- Improved the performance of display cases that contain Pokémon photos.
-- Updated sounds for Poké Balls closing, opening and for Pokémon breaking out.
-- Improved the performance of display cases that contain Pokémon Model items.
-- Removed species Base Stats from the summary interface as it is now viewable within the Pokédex.
-- Changed summary tab text labels to icons. You'll get used to them. Or else.
-- Clicking the summary interface exit button while the swap moves or evolve screen is open will cause the interface to switch back to the party screen. The button will exit the interface otherwise.
-- Ancient Poke Balls now jump once rather than shaking 3 times when capturing Pokémon.
-    - The jump height indicate the number of shakes that would have occurred.
-        - A high wobbly jump indicates 1 shake.
-        - A high jump indicates 2 shakes.
-        - A medium jump indicates 3 shakes.
-        - A short jump indicates that you caught the Pokémon.
-- Pokémon sent out during battle will spawn facing their opponent.
-- Pokémon sent out outside a battle will spawn facing their trainer.
-- Wailord is now 25% bigger. ... [But I have an idea.](https://tenor.com/view/star-wars-more-gif-21856591)
-- Region-biased Pokémon forms are now optional to a built-in resource pack. This pack is enabled by default for Fabric. For NeoForge users, all our built-in resource packs default to disabled because that's all it supports right now.
-- Update item sprites for Cell Battery, Chipped Pot, Covert Cloak, Cracked Pot, Masterpiece Teacup, Red Card, Sachet, and Unremarkable Teacup.
-
-### Fixes
-- Fixed Ability Patches not reverting Hidden Abilities back to Normal Abilities.
-- Fixed awarding Pokémon experience upon forfeiting battles.
-- Scaled down Amaura's fetus model to avoid clipping through the tank while animating.
-- Fixed Cubone's cry not having a sound (as if that Pokémon needed to be more tragic).
-- Fixed the sendout sound erroneously playing when a wild Pokémon breaks out of a Poké ball.
-- Flamethrower is no longer missing sounds.
-- Fixed the Seafloor spawning context not being a usable context.
-- Fixed Pokemon spawning in non-full blocks like slabs.
-- Fixed Gilded Chests not dropping the chest itself when broken, only the contents.
-- Fixed Pokémon losing their Hidden Ability through evolution if the middle stage did not have a Hidden Ability.
-- Hidden Power no longer plays the water type action effect (It now plays the normal type action effect).
-- Fixed Crumbling Arch structures not blending in with the world.
-- Fixed Energy Root being usable on a fainted Pokémon.
-- Fixed Pokémon not being sent out when starting a battle while recalling said Pokémon.
-- Fixed species comparison not using namespace for both sides in `PokemonProperties.isSubsetOf`.
-- Fixed `PokemonProperties#asString` prefixing nicknames with a '$'.
-- Fixed shearable Pokémon not dropping correct wool colors.
-- Fixed pasture spawning Pokémon inside solid blocks when closest spawning position is blocked off.
-- Fixed Tumbling Down advancement not being granted by tumblestone variants.
-- Improve error handling when loading spawn sets to ensure invalid configurations don't crash the server.
-- Fixed empty `JsonPlayerData` files resulting in players being unable to join server/world.
-- Sound for evolving Pokémon through the Summary Menu is now correctly playing again.
-- Fix Starter prompt not showing up.
-- Fixed owned Poké balls floating upwards if pausing the game mid-transition (which looked absolutely hilarious).
-- Fixed all mouse buttons working for Battle UI navigation (now it's only primary/left click).
-- Fixed trading Pokémon setting their friendship to 0 instead of the base value.
-- Fixed a scenario where a Pokémon that rolled to spawn with a special Tera type sometimes having a Tera type that is already a part of their natural typing.
-- Fixed PokemonProperty argument suggestions for `tera` and `tera_type` not suggesting `stellar`.
-- Fixed being able to stack Relic Coin Pouches on top of each other.
-- Fixed model loader generating misleading crash-reports when client is crashing - that resurrection tank error wasn't our fault! We're innocent, your honour!
-- Big Roots and Energy Roots now share the same sounds as intended.
-- Fixed sounds made by blocks playing at a lower pitch than intended.
-- Fixed Chimchar and Monferno comically T posing whenever they sleep.
-- Fixed Cetitan's cry breaking its walk and sleep animations.
-- Fixed the Magby line not having any placeholder walk animations.
-- Fixed Duskull and Dusclops using skylight levels for their nether spawn data. There is no sun in the Nether!
-- Fixed Hisuian Zoroark using base Zoroark stats.
-- Fixed Bellossom clipping into the player head when shoulder mounted.
-- Fixed Shroomish's look range to prevent it from looking higher than it should.
-- Fixed Maushold's faint animations not playing. It's even sadder than Tandemaus!
-- Fixed Slowking's battle idle.
-- Fixed Grafaiai's walk speed to prevent model sliding.
-- Fixed Alolan Exeggutor's tail not showing in the party UI. It will now also stand in front of all Pokémon in the party menu :)
-- Fixed Timburr duplicating its log while fainting.
-- Fixed hitbox sizes for Grotle and Torterra being set to default values.
-- Fixed Hisuian Sneasel using Johtonian Sneasel's cry. Johto-nian. Jotonion. Jotunheim?
-- Fixed Trevenant T-posing after 8 seconds of sleeping. I also do that.
-- Fixed Bewear T-posing for a bit if a wild one faints where you can see.
-- Fixed Noctowl's placeholder fly animation.
-- Corrected Lotad blinking animation.
-- Fixed reviving items causing errors when used in battle.
-- Fixed messages for Focus Sash, Confusion, Mummy, Ice Face, Own Tempo, and Revive.
-- Improve error handling when loading spawn-sets to ensure invalid configurations don't crash the server.
-- Fixed Crumbling Arch Ruins generating a giant cube of air and removed the chest.
-- Fixed possible crash on large population servers due to concurrent access of data.
-- Quickly sending out and recalling Pokémon now looks smoother and can no longer be spammed to cause desync issues.
-- Pokémon are now invulnerable during sendout animation and intangible during recall animation.
-- Scrolling with party keybinding now behaves properly when using high scroll speed or scroll sensitivity.
-- Fixed battle log GUI flashing when Battle GUI is opened.
-- Bag Items used during a turn will now be refunded if the battle ends before the next turn begins.
-- Pokémon whose current owner is not its Original Trainer now gain extra experience.
-- Fixed Fossil Resurrection advancement not being granted.
-- Fixed village generation caps not applying for berry farms. You were not meant to see more than two berry farms per village! This has been broken for ages but no one noticed... Hmmm... We could just remove it from here...
-- Fixed the Ice Face ability activation being displayed incorrectly in a battle.
-- Fixed edge case of F1 and R locking you in battle with no R functionality (requiring ESC to get out).
-- Fixed Poké Ball render orientation in battle interface when capturing.
-- Fixed sync issues with recently learned moves where their PP would not go down until you logout and in.
-- Fixed some Pokémon photos in display cases flashing if the Pokémon has gender differences.
-- Fixed Bidoof and Jigglypuff sleep animations stopping after some time, causing them to be 'asleep' while T-posing menacingly.
-- Fixed entities not changing poses unless you're looking at them.
-- Fixed cries not playing on send-out if the Pokémon is off-screen.
-- Fixed text row selection highlight in battle log.
-- Fixed top black border rendering in scroll interfaces in summary UI.
-- Fixed aspect tracking for Advancements.
-- Fixed illusion not copying aspects or caught ball.
-- Prevent summary stats tab from making sounds when clicking on an already open tab.
-- Fixed display case not being able to be fed items from underneath.
-- Fixed Pokémon battling in water continuously sinking to the bottom.
-- Fixed passive healing and wake from faint not disabling when their config values are set to 0.
-- Fixed an issue where rebinding the R key to a mouse button prevented players from closing the battle interface using that button.
-
-### Developer
-- `SpawnCause` is now an implementation of `SpawningInfluence`.
-- Many types related to `Pokemon` including itself now have dedicated `Codec`, please migrate to them from the NBT/JSON/PacketBuffer write/read methods.
-- `PokemonBattle` now starts on turn 0.
-- Renamed Pokemon.hp to Pokemon.maxHealth to make it clearer. Backwards compatibility is provided but it is an active deprecation, please migrate away from it.
-- Serialization of PokemonStores and Pokemon themselves now require registry access, which will break some sidemods. This sucked for us more than it will suck for you! If you have a world or player instance, you can get it from there.
-- ``TeraTypes`` now implements ``Iterable``.
-- Added `forcedAspects` to Pokémon to make it easier to easily add basic aspects to a Pokémon in a way that persists. We already know that everyone is going to overuse this.
-- Made the `Pokemon.aspects` setter private. This could technically break side-mods but if you are affected by this then you were using it wrong! Use `Pokemon.forcedAspects` to fix it.
-- Cobblemon's main logger is properly static now.
-- `PokemonEntity.enablePoseTypeRecalculation` can be used to disable automatic pose type recalculation.
-- Added CollectEggEvent and HatchEggEvent for compatibility usage.
-- Added events for:
-    - Showdown Instructions
-    - Mega Showdown Instruction
-    - Terastallize Showdown Instruction
-    - ZPower Showdown Instruction
-    - Bait Consumed, Bait Set, and an event to register custom BaitEffect Functions
-    - Bobber Bucket Chosen
-    - Bobber Spawn Pokémon
-    - Pokérod Cast
-    - Pokérod Reel
-    - Pokémon Heal (with context)
-        - Added HealingSource, an interface applied to all sources of healing from player actions, for easier tracking of healing sources.
-    - Move Change
-    - Shiny Chance Calculation Event (with player context)
-    - Dex Information Changed (Pre and Post); this event is fired when the Pokédex is updated with new information.
-- Rebuilt large swaths of the model animation code to simplify it.
-- Renamed a bunch of things from %Poseable% to %Posable% because spelling.
-- Renamed StatelessAnimation to PoseAnimation.
-- Renamed StatefulAnimation to ActiveAnimation.
-- Documented the animation system.
-- Allowed for SpawnSnowstormEntityParticleHandler to handle non-posable entities (due to being non-posable, locators are useless - to set the offset use the settings in the particle itself).
-- Added property chaining support for duplicate CustomPokemonPropertyType elements.
-
-### Data Pack & Resource Pack Creators
-- Added experimental `flow` datapack directory for handling events using MoLang event handlers.
-- Added support for "shedders" similar to Shedinja's evolution logic.
-- Fixed the placeholder `WingFlapIdle` animation so the wings are not rotating opposite to each other.
-- 'player' type dialogue faces can now be explicitly stated so that NPC mods that use fake players can show in dialogue portraits.
-- Added `isLeftSide` field for dialogue faces. This determines what side of dialogue box the portrait is on.
-- `sounds/attacks` directory has been renamed to `sounds/move`.
-- Moves sharing generic sounds now have unique sound events, allowing them to be changed with resource packs.
-- All move sound events have been renamed to `move.<NAME>.<SOURCE>` for consistency.
-- Status moves have been moved out of the `attacks` directory and split into volatile and nonvolatile.
-- `status.badlypoison.actor` sound event has been renamed to `status.toxpoison.actor`
-- Mulch and berry harvesting sound events have been renamed and moved to their respective directories in `sounds/block`.
-- All sounds related to evolving Pokémon have been moved to the `sounds/evolution` directory.
-- Sound events for all blocks now start with `block`.
-- Gimmighoul chest and item interaction sounds have been moved to where its cry is.
-- Unused sound files and sound events have been removed.
-- Poké Ball sounds are now in their animation files, making them more flexible to edit.
-- Added MoLang compatibility in the isVisible property for transformed parts.
-- Added `q.has_aspect('some_aspect')` function to animations, posers, and entity particle effects.
-- Added support for conditional pose animations.
-- Added a new universal locator called "top".
-- Added `eggs_collected` and `eggs_hatched` Advancement triggers.
-- Added missing `minYaw` configuration to the `q.look()` function for JSON posers.
-- Some pose condition names have been changed:
-    - `isTouchingWaterOrRain` has been changed to `isInWaterOrRain`
-    - `isSubermegedInWater` has been changed to `isUnderWater`
-
-
-### Localization
-- Updated translations for:
-    - Czech, German, Greek, Spanish, Mexican Spanish, French, Canadian French, Hungarian, Italian, Japanese, Korean, Dutch, Polish, Portuguese, Brazilian Portuguese, Russian, Ukrainian, Simplified Chinese, and Traditional Chinese
-- Migrated translation project to Weblate at https://lang.cobblemon.com/projects/cobblemon/mod/

changelogs/CHANGELOG-1.6.1.md

@@ -1,219 +0,0 @@
-## [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 config setting `hideUnimplementedPokemonInThePokedex` which hides unimplemented Pokémon from the Pokédex when set to true.
-- Added debug renderer for posable entity locators.
-- Added crossover paintings from Close Combat, Premonition, Altar, Slumber, and Nomad.
-- Added optional box argument to the /pc command
-
-### 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.
-- 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.
-- Added more support for a variety of Fabric/NeoForge Convention tags.
-- Reformatted some tags to be more consistent.
-- Edited some recipes to utilize tags instead of direct item ids, for greater mod compatibility.
-- Berries will drop if broken at age 0
-- Improved Fortune drops on Mint Seeds
-- New Slowpoke shiny texture.
-- Updated drops for many Pokémon.
-- Completely resynced Pokémon move and stat data based on later games. Learnsets have changed considerably to maximise available moves.
-- Cobblemon save data now saves .old files where applicable as a means to recover from file corruption due to crashes or similar abrupt stops
-
-### 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
-- Magnezone
-
-### Cry updates for the following Pokémon
-- Sceptile
-
-### Changes
-- 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 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 (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.
-- 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 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.
-- 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.
-- 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.
-- Fixed Pokémon Model offsets for larger species.
-- 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. No Pokémon were harmed by this bug, probably.
-- Fixed NPC editing GUI not updating aspects until a game restart.
-- 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 & 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.
-- Fixed suffocation of Pokémon when a pokeball breaks near a wall
-
-### 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)
-    - `battle_fainted`: Triggered when a Pokémon faints in 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.
-    - `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:
-    - 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.

changelogs/CHANGELOG-1.7.1.md

@@ -1,61 +0,0 @@
-# Changelog
-## [1.7.1 (November 29th, 2025)](#1-7-1)
-
-### Additions
-- Added trades for Saccharine Saplings, Hearty Grains, Chipped Pot, and Masterpiece Teacup to the Wandering Trader.
-- Added brewing recipe for Throat Spray.
-- Added vanilla sprinting's field of view change to Pokémon land mounts.
-- Added a customizable keybind for the riding freelook button.
-- Added double tap to sprint on land mounts.
-
-### Changes
-- Made Jet pitch turning 1.5x faster across all Pokémon.
-- Party Pokémon now attack only mobs that are attacking their owner, instead of randomly targeting unrelated mobs and getting themselves hurt.
-- Reduced the cost of the Vivichoke Seed trade with the Wandering Trader.
-
-### Fixes
-- Fixed incorrect camera pivot on Bird, Jet, and Dolphin mounts, leading to some disorienting riding.
-- Fixed players suffocating while on vanilla mounts.
-- Fixed a graphics crash that could occur on some machines when campfire pots were nearby.
-- Fixed ride controls overlay being displayed to passengers. The passengers probably don't need to know about those.
-- Fixed mount jumping so that it doesn't switch back to ground animations.
-- Fixed ridden Pokémon land collision and some issues around stepping up blocks. Land mounts are smoother overall now.
-- Fixed Furfrou's pink and magenta trims being swapped. Only a man could make that mistake.
-- Fixed friendship being reset to the default value when evolving a Pokémon.
-- Fixed Combees not depositing honey upon leaving a hive if they entered it with nectar.
-- Fixed pastured Combees not moving during the night or in rain.
-- Fixed a case in which a Combee might try to path to a flower that no longer exists.
-- Fixed Combees attempting to enter a full hive.
-- Fixed a crash involving Combees and hives. 500 bee bugs. Bugged bees? We can be bees. Mark, this is good news.
-- Fixed a crash related to NPC navigation.
-- Fixed a crash when opening a PC box with certain wallpapers while using *VulkanMod*.
-- Fixed a crash when you place a block in the way of hearty grains 2nd block.
-- Fixed passengers hearing the shiny noise of a ridden shiny Pokémon.
-- Ponigiri can no longer be eaten at full hunger.
-- Fixed Poké Snack spawning sounds not coming from the block.
-- Medicinal Brew's Campfire Pot recipe now correctly displays that it can be made using an empty glass bottle or a filled bottle.
-- Fixed glass bottle not being returned when slathering honey on a saccharine leaf block.
-- Fixed saccharine hanging signs sometimes dropping their oak wood counterpart when being broken.
-- Fixed a bunch of incompatibilities with NeoForge mods.
-- Fixed a bug where wind charges hitting pasture blocks would recall all Pokémon in it.
-- Fixed the Home on the Range advancement triggering when opening the Pokémon interaction wheel.
-- Fixed recipes that use concrete not working on NeoForge.
-- Fixed Boltund's model.
-- Fixed Cyclizar's textures.
-
-### Developer
-
-### Molang & Datapacks
-- Removed automatic generation of PC wallpaper screen glow if no asset is provided; it is now optional.
-    - This is because there's no practical way to do this without blowing up things like *VulkanMod*.
-
-### Particles
-
-### Localization
-- Updated translations for:
-    - French
-    - Japanese
-    - Korean
-    - Brazilian Portuguese
-    - Simplified Chinese
-    - Traditional Chinese

changelogs/CHANGELOG-1.7.2.md

@@ -1,137 +0,0 @@
-# Changelog
-## [1.7.2 (January 25th, 2026)](#1-7-2)
-
-### Additions
-- Added Saccharine wood furniture for Adorn.
-- Added the Partner Mark, which party Pokémon have a very small chance to earn as the player walks, provided they have enough friendship.
-- Added decorative block models for existing items: Potion, Super Potion, Hyper Potion, Max Potion, Full Restore, Antidote, Awakening, Burn Heal, Ice Heal, Paralyze Heal, Full Heal, Ether, Elixir, Max Ether, Max Elixir, X Accuracy, X Attack, X Defence, X Special Attack, X Special Defence, X Speed, Dire Hit, Guard Spec, Weakness Policy, Blunder Policy, Cleanse Tag, and Spell Tag.
-- Added decorative sign blocks called Plaques.
-- Added ride style labels to ride stats in Pokédex, as well as ride style icons in the summary GUI.
-- Added more seasonings for sinister tea:
-  - Mental Herb - Mental Restoration I for 10 seconds, which staves off Insomnia.
-  - White Herb - Removes negative effects.
-  - Milk, Moomoo Milk - Removes effects.
-- Added dispenser support for:
-  - Applying a Honey Bottle to Saccharine Logs.
-  - Washing honey off of Saccharine Slathered Logs.
-  - Applying and removing honey on Saccharine Leaves.
-- Added riding statistics: `Distance by Pokémon on Land`, `Distance by Pokémon in Air` and `Distance by Pokémon in Liquid`.
-
-### New rideable Pokémon
-- Honchkrow 
-- Mantine
-
-### Pokémon Added
-
-#### Gen 5
-- Throh
-- Sawk
-
-#### Gen 6
-- Litleo
-- Pyroar
-- Spritzee
-- Aromatisse
-- Swirlix
-- Slurpuff
-
-### Model updates for the following Pokémon
-- Falinks
-- Cottonee
-- Whimsicott
-- Ferroseed
-- Ferrothorn
-- Chingling
-- Chimecho
-
-### Animation updates for the following Pokémon
-- Mantine (ride animations)
-- Flygon (ride jump animation)
-- Honchkrow (ride animations)
-- Croagunk
-- Toxicroak
-
-### Changes
-- Added a new config option, `Enable In-Flight Dismounting` (default: off), which lets you dismount while riding a Pokémon in the air. This is the textbook definition of caveat emptor.
-- Ride sounds have been separated into stereo for passengers and mono for other players. Riding will now sound more spacious.
-- Battle AI now uses a smarter threshold for switching, reducing unnecessary switches.
-- AI will always use the most damaging move when at low HP and when it is not switching, improving endgame decision-making.
-- Items given from interacting with Saccharine Leaves are placed in the active hotbar slot if possible.
-- Added `label` as an alternate key to the `tag` property.
-
-### Fixes
-- Fixed crashing when viewing another player in spectator mode. Some said this was reason to release this update a month ago. They were probably right.
-- Fixed crashing when sending a Pokémon out after editing its form.
-- Fixed all Pokémon being saved to chunks and never despawning even when they should be.
-- Fixed Poké Snacks crashing if there was no available spawn.
-- Fixed Poké Snack / Bait effects so that EV Yield, Type, and Egg Group filters now all apply together when weighting spawns. And you thought you were going crazy.
-- Fixed Furfrou not being trimmable on NeoForge specifically.
-- Fixed honey from Saccharine Leaves being harvestable at less than the max age.
-- Fixed possible error on world generation when Combee are placed in naturally generated bee nests.
-- Fixed Galarian Weezing crashing the world if it decides to blink the wrong way. The same could happen to you!
-- Fixed Galarian Mr. Mime incorrectly being rideable. Some would argue that regular Mr. Mime shouldn't be rideable, but that would make them wrong.
-- Fixed missing apricorn textures for Adorn blocks.
-- Fixed Apricorn block model rotation for counters/sinks/cupboards/drawers to match that of most recent version of Adorn.
-- Fixed item interaction sometimes not working properly when playing on servers.
-- Fixed Mint Leaves not being usable for filling the Resurrection Machine.
-- Fixed Super Potion recipes incorrectly using Hondew Berry instead of Aguav Berry. They look similar, to be fair.
-- Fixed Wishiwashi not schooling properly.
-- Fixed battle item duplication issue. How did it work? Wouldn't you like to know, weather boy.
-- Fixed the ordering of Aprijuice's riding stat boosts so they always have the same order.
-- Fixed the movesets of certain Pokémon being incorrectly sanitized upon reload, causing some forms to keep losing moves.
-- Fixed selected leading Pokémon in battle not being used when levels are set.
-- Fixed the bottom half of pasture blocks having an incorrect hit-box when facing north or south.
-- Fixed gimmicks not being usable in double and triple battles.
-- Fixed gimmick buttons showing when already used in the same turn in double and triple battles.
-- Fixed mochi items consuming two items at a time.
-- Fixed Fresh Start Mochi's EV reset not syncing health changes properly.
-- Fixed Pokémon spawn influences not being specific to regional forms.
-- Fixed memory leak from battles not being cleaned up after ending.
-- Fixed orientation not getting reset after crashing while flying and getting back on the Pokémon.
-- Fixed shiny Pokémon not respecting the `silent` flag on spawn.
-- Fixed 'Plain' prefix not being applied to all low-quality Aprijuice.
-- Fixed Pokémon interactions not playing sound effects when the volume was not specified.
-- Fixed Pokémon interaction cooldowns taking longer than intended when the Pokémon was in the player’s party.
-- Fixed Pokémon interactions occasionally crashing the game when spamming an interaction with a 0 cooldown.
-- Fixed Pokémon fullness decreasing more than intended when the Pokémon was pastured.
-- Fixed Scraggy line, Milcery line, and Morpeko spawning on unnatural blocks. 
-- Fixed invulnerability-bypassed damage being resisted by invulnerable NPC entities.
-- Fixed Fabric network packets not being handled immediately, fixing incompatibilities with Supplementaries, Prometheus, Sleep Tight, and others.
-- Fixed killer not being set early enough on a wild Pokémon entity from `WinInstruction`.
-- Fixed requirements such as `biomeCondition` crashing the game when used to define Pokémon interactions.
-- Fixed an issue that prevented registering custom dispenser behaviours (no longer overrides vanilla behaviour).
-- Fixed an issue navigation that prevented Combee from pathing into and out of Saccharine Leaves.
-- Added Saccharine Boats and Saccharine Boat with Chests to relevant boat tags.
-- Fixed Soothe Bell not being properly tagged as a held item.
-- Fixed `/calculateseatpositions` expecting a locator format that even we don't use. It needs an underscore after "seat".
-- Fixed the `run_script` Molang function to not fail if the environment's context is null.
-- Fixed the Molang functions `date_local_time`, `date_of`, `date_is_after` to use the correct date format.
-
-### Developer
-- Changed the `owner` parameter in the `OwnerQueryRequirement` interface from `ServerPlayer` to `Player`. This method is now also called on the client to verify whether a Pokémon interaction succeeded, so make sure to update your implementations to handle both server and client contexts.
-- Added the `pnx` to the `BattleFaintedEvent` and `FormeChangeEvent`.
-- Added register methods for custom instructions to `ShowdownInterpreter`.
-- Changed callback operations in `BattlePokemon` to allow multiple callbacks and be mutable.
-- Added `display_name`, `description`, and `max_pp` functions to the `MoveTemplate` struct.
-- Changed the implementations of `AIBattleActor` to be open classes to allow extension.
-- Changed the resource location of Poké Ball icons in the GUI to use the balls namespace instead of Cobblemon's, allowing mods to properly use their own namespace for these textures.
-
-### Molang & Datapacks
-- Ride sounds can now be set as exclusive to passengers.
-- Ride sounds no longer play when submerged unless specified with a new setting.
-- Exception handling has been added to `run_molang`, resolving some crashes caused by malformed MoLang expressions.
-- Added the `create_itemstack`, `has_inventory_space`, `set_inventory_slot`, and `give_item` MoLang functions for item and inventory utility.
-- Added the `get_move_from_id` MoLang function for general move info queries without requiring a Moveset object to access.
-- Added support for optional message variants in battle activate instructions for more context-specific battle text.
-  - Example: `this.add('-activate', pokemon, 'ability: example', '[msg]message1');` will parse to lang key `cobblemon.battle.activate.example.message1`.
-
-### Localization
-- Updated translations for:
-  - French
-  - Canadian French
-  - Simplified Chinese
-  - Ukrainian
-  - Brazilian Portuguese
-  - Spanish
-  - Korean
-  - Japanese

changelogs/CHANGELOG-1.7.3.md

@@ -1,22 +0,0 @@
-# Changelog
-## [1.7.3 (January 31st, 2026)](#1-7-3)
-
-### Fixes
-- Fixed mounted Pokémon not playing sounds.
-- Fixed players failing to join servers randomly.
-- Fixed some Pokémon having no stamina for flying.
-- Fixed `/pctake` not respecting the actual size of the PC.
-### Developer
-- Poké Ball GUI textures now respect the ball's namespace, enabling proper texture loading for custom balls from other mods.
-
-### Molang & Datapacks
-- Added a `chance` requirement type for Pokémon interactions.
-
-### Localization
-- Updated translations for:
-  - French
-  - Canadian French
-  - Korean
-  - Portuguese
-  - Simplified Chinese
-  - Spanish

changelogs/CHANGELOG-1.8.0.md

@@ -1,529 +0,0 @@
-# Changelog
-## [1.8.0 - Make Your Move Update (September 6th, 2026)](#1-8-0)
-#### I think the red eyes mean they're friendly!
-
-### Additions
-- Added Alpha Pokémon
-    - Alpha Pokémon are bigger, stronger, and more aggressive than regular Pokémon.
-    - They are also scarier.
-    - They always know a TM move and will adapt to be stronger than your party.
-    - Alphas will always lead herds and spawn in herds.
-- Added alpha Pokémon attraction bait effect to Hopo Berries.
-- Added intrinsic scaling to all Pokémon (anywhere from 5% smaller to 5% bigger than normal). Some cases, such as shoulder mounting, will not scale so that the shoulder animations don't look silly.
-- Added scaling to "baby" Pokémon (10% smaller at level 1 → normally sized at level 10).
-- Added TMs.
-    - Added TM Machine. TMs are made from elemental type gems, and their recipes are unlocked by having Pokémon that know the move.
-    - Added config options for making TMs infinite-use and instant unlocking of all TM recipes.
-    - Added Type Gem blocks as well as crystal clusters and deepslate core blocks that are used for growing elemental type gems.
-- Added a new Starter Selection menu that looks way better.
-- Added a "Move Dex" to the Pokédex to help identify what moves a Pokémon can learn and what Pokémon can get a move.
-- Added the Habitat Block, a spawner block for servers and adventure maps that controls spawning in an area.
-- Added 49 new habitat structures. In these habitats you will find rarer Pokémon and sometimes different Pokémon will appear on different days.
-- Added a toast to notify players of how they can scroll through their party. Did you know you can hold R and scroll instead of using arrow keys? It's true!!!
-- Added a way to obtain Porygon by inserting an Upgrade or Dubious Disc into a data monitor.
-- Added Disk Rack for storing disks and being an audio sequencer for Noteblocks. What does that have to do with Pokémon? How about you mind your own business!
-- Added missing crops to Botany Pots integration.
-- Added conditional seats for riding. Seats can be gated by Molang such as "is_alpha".
-- Added 10 new ruin structures.
-- Added a new shipwreck cove structure called the Magma Shipwreck Cove.
-- Added 7 new advancements.
-- Pokémon cries now play when clicking Pokémon in the summary screen.
-- Held item visibility can now be controlled by the `held_item_visible` command argument.
-- Added config option to disable Pokémon spawning on a per-world basis.
-- Added config options to award experience to fainted Pokémon for opponents they helped defeat (`awardExperienceToFaintedPokemon`) and to still award experience for defeated enemies even after battle loss/forfeit (`awardExperienceOnBattleLoss`).
-- Added `/givetm` command.
-- Added advancement triggers for learning TMs: `cobblemon:has_learn_specific_tm` (per-TM), `cobblemon:has_learn_all_tm` (all TMs learned), and `cobblemon:tms_learned` (count-based), backed by a new `totalTMLearnedCount` on player advancement data.
-- Added `cobblemon:catch_alpha_pokemon` advancement trigger and `totalAlphaCaptureCount` stat for captured Alpha Pokémon.
-
-### New rideable Pokémon
-- Crobat
-- Skarmory
-- Milotic
-- Archeops
-- Goodra
-- Goodra (Hisuian Form)
-- Drampa
-- Duraludon
-- Archaludon
-
-### Pokémon Added
-#### Generation 3
-- Wurmple
-- Silcoon
-- Beautifly
-- Cascoon
-- Dustox
-- Skitty
-- Delcatty
-- Seviper
-- Zangoose
-
-#### Generation 4
-- Cherubi
-- Cherrim
-- Stunky
-- Skuntank
-
-#### Generation 5
-- Audino
-- Pawniard
-- Bisharp
-
-#### Generation 6
-- Pancham (+ Cosmetic with Black Glasses)
-- Pangoro (+ Cosmetic with Black Glasses)
-
-#### Generation 7
-- Rockruff
-- Lycanroc
-
-#### Generation 8
-- Rolycoly
-- Carkol
-- Coalossal
-- Runerigus
-- Snom
-- Frosmoth
-- Indeedee
-- Duraludon
-- Applin
-- Flapple
-- Appletun
-
-#### Generation 9
-
-- Nymble
-- Lokix
-- Kingambit
-- Dipplin
-- Archaludon
-- Hydrapple
-
-#### Regional Forms
-- Sandshrew (Alolan Form)
-- Sandslash (Alolan Form)
-- Yamask (Galarian Form)
-- Avalugg (Hisuian Form)
-
-### Model updates for the following Pokémon
-
-- Sandshrew
-- Sandslash
-- Nidoking
-- Zubat
-- Golbat
-- Crobat
-- Ditto
-- Porygon
-- Porygon2
-- Porygon-Z
-- Skarmory
-- Smoochum
-- Jynx
-- Popplio
-- Brionne
-- Primarina
-- Fletchling
-- Fletchinder
-- Talonflame
-- Sableye
-- Mawile
-- Goomy
-- Sliggoo
-- Goodra
-- Nacli
-- Naclstack
-- Garganacl
-- Bidoof
-- Cranidos
-- Chatot
-- Yamask
-- Cofagrigus
-- Tyranitar
-- Turtonator
-- Golett
-- Corsola
-- Arbok (New Patterns: Angry, Cartoon, Clown, Comedic, Crow, Grin, Ink, Modern, Rain, Scribble, Silence, Sloth, Suspicious, Will)
-- ... and Substitute
-
-#### Model changes to the regional bias resource pack:
-- Added Mime Jr. (Galar Bias)
-- Added Bergmite (Hisui Bias)
-- Changed models for every existing regional bias
-
-### Animation updates for the following Pokémon
-
-- Kakuna
-- Grimer
-- Nidoran♀ (+ New shoulder mount)
-- Nidorina
-- Nidoran♂ (+ New shoulder mount)
-- Sandshrew
-- Diglett
-- Dugtrio
-- Graveler
-- Happiny
-- Chansey
-- Blissey
-- Poliwhirl
-- Poliwrath
-- Zubat
-- Vulpix
-- Drowzee
-- Hypno
-- Noctowl
-- Skarmory
-- Skitty
-- Flygon
-- Shellos
-- Riolu
-- Lucario
-- Purrloin
-- Liepard
-- Joltik
-- Galvantula
-- Nidoking
-- Fletchling
-- Fletchinder
-- Talonflame
-- Archeops
-- Drampa
-- Sewaddle
-- Swadloon
-- Leavanny
-- Goomy
-- Sliggoo
-- Goodra
-- Shedinja
-- Skwovet
-- Greedent
-- Bidoof
-- Cranidos
-- Chatot
-- Yamask
-- Cofagrigus
-- Luvdisc
-- Staryu
-- Starmie
-- Togetic
-- Rellor
-- Rabsca
-- Yungoos
-- Gumshoos
-- Cottonee
-- Whimsicott
-- Corsola
-
-#### Added sounds to the following moves
-
-- Absorb
-- Aurora Beam
-- Double Team
-- Draco Meteor
-- Fire Punch
-- Fire Spin
-- Flame Charge
-- Flame Wheel
-- Giga Drain
-- Ice Punch
-- Leech Life
-- Magical Leaf
-- Mega Drain
-- Minimize
-- Poison Gas
-- Rock Throw
-- Scary Face
-- Seed bomb
-- Smokescreen
-- String Shot
-- Tail Whip
-
-### Changes
-- Removed the penalty for block destruction speed when on a hover mount, making them better for digging.
-- Golden Apples can now be crafted using the Applin Apples.
-- Prismarine Crystals and Amethyst Shards can now be used to craft Pokedexes.
-- Updated Pokédex Screens item tag to support tagged variants of Redstone and Glowstone Dust.
-- Sharp Beak can now be crafted using bones and Flying Gems.
-- Metal Alloy can now be crafted using iron and Thunder Stones.
-- Ability Capsules can now be brewed from Medicinal Brew and Dragon Breath.
-- Using an Ability Capsule will now return an Empty Bottle.
-- Decreased the default pastured wander radius to 32 blocks.
-- Added alternate versions of the basic PC Wallpapers based on the original design of Cobblemon's PC, before public release.
-- Rooted Arch Ruins, Crumbling Arch Ruins, and all fossil structures have been improved so that they generate more naturally in terrain.
-- Gimmighoul towers now generate at ground-level rather than sinking one block into the ground.
-- All ruin structures that did not generate with a gimmighoul/gilded chest before will now generate with one.
-- All ruin structures gilded chest loot tables have been updated to include a guaranteed TM not learned naturally by any Pokémon through their level-up moveset. Each ruin gets its own specific TM, so you can now go hunting ruins to complete your move dex!
-- The Prehistoric Underwater Fissure and Prehistoric Submerged Impact fossil structures now use the biome tag `#cobblemon:is_temperate_ocean`.
-- The lush shipwreck cove's phantom mob spawner has been replaced with breezes.
-- Shipwreck coves now generate slightly more frequently.
-- Added equipment loot tables for shipwreck cove enemies.
-- Maps from abandoned fishing boats leading to shipwreck coves now will skip explored chunks, allowing the player to find more shipwreck coves more easily.
-- All shipwreck coves' spawners have been adjusted to give compatible mobs enchanted iron or diamond armour and weapons while in its ominous state. The armour given to the mobs will also use the automaton trim. We upped the difficulty because it was too easy now that your Pokémon can fight for you.
-- One TM of the elemental hyper beams has been added as guaranteed loot to the main treasure chest in every shipwreck cove. (Magma Cove gets Blast Burn, Lush Cove gets Frenzy Plant, and Submerged Cove gets Hydro Cannon.)
-- The following items can now be obtained by brushing the following Pokémon:
-    - Pink Wool - Wigglytuff
-    - White Wool - Swablu, Altaria
-    - Shed Shell - Ekans, Arbok, Dratini, Dragonair, Dunsparce, Treecko, Grovyle, Sceptile, Seviper, Scraggy, Scrafty, Helioptile, Heliolisk, Salandit, Salazzle, Sobble, Drizzile, Inteleon, Silicoblra, Sandaconda, Toxel, Toxtricity, Orthworm, Dudunsparce
-    - Phantom Membrane - Dreepy, Drakloak, Dragapult
-- The following items can now be obtained by evolving the following Pokémon into any of their evolutions:
-    - Turtle Scute - Squirtle, Wartortle, Turtwig, Grotle, Tirtouga, Chewtle
-    - Shed Shell - Metapod, Kakuna, Ekans, Paras, Venonat, Krabby, Scyther, Kabuto, Dratini, Dragonair, Ledyba, Spinarak, Yanma, Pineco, Dunsparce, GLigar, Pupitar, Treecko, Grovyle, Silcoon, Cascoon, Surskit, Nincada, Trapinch, Vibrava, Corphish, Anorith, Bagon, Shelgon, Kricketot, Burmy, Combee, Skorupi, Swadloon, Whirlipede, Dwebble, Scraggy, Karrablast, Joltik, Larvesta, Spewpa, Clauncher, Helioptile, Charjabug, Crabrawler, Cutiefly, Dewpider, Salandit, Wimpod, Poipole, Sobble, Drizzile, Dottler, Silicobra, Toxel, Sizzlipede, Snom, Tarountula, Nymble, Rellor
-- Saccharine Leaves now drop Tart, Sweet, or Syrupy Apples, depending on their honey coating stage, instead of vanilla Apples.
-- Fixed the height of the Tumblestone Bud items when held in hand, placed on head, viewed in a GUI, and placed in an Item Frame.
-- Refactored all advancements, removing several deemed unnecessary. Due to this cleanup, all previously obtained advancements will be reset besides the root (for picking a starter Pokémon). This sucks, and we're sorry. We had to do this eventually so better now than later.
-- Forces between colliding hitboxes now factors in the weight of Pokémon.
-- Improved berry tree performance on singleplayer and servers.
-- Updated stat increase and decrease particle effects with the addition of alpha boost particles.
-- Improved the performance of pasture blocks on singleplayer and servers.
-- Changed the bait effects of the following items: (Vanilla) Sweet & Glow Berries, Golden & Enchanted Golden Apples (Cobblemon) Custap, Eggant, Hopo & Micle Berries, Sweet Hearts.
-- Wild Pokémon now reliably have at least one offensive move if they can have offensive moves at that level. No more free lunches with Pokémon that can't even hurt you.
-- Data Monitor can accept Disks (TMs, Music Disks, Upgrade, Dubious Disk, etc.) to change what's being displayed on the screen.
-- The party overlay's experience-gained animation now displays the amount of EXP the Pokémon gained.
-- Pressing the inventory key now closes the Pokémon interact wheel GUI.
-- Updated the sound for harvesting Apricorns.
-- Lowered the volume of harvesting berries.
-- Improved compatibility with various mods
-    - Farmer's Delight's cutting board can now be used to strip Apricorn and Saccharine's logs, or salvage their planks from various blocks. It can also separate their boats from chests.
-    - Farmer's Delight's cutting board can be used to get two white dye from Pep-Up Flowers and two magenta dye from Medicinal Leeks.
-    - Farmer's Delight's cutting board can separate Tumblestone Blocks back into Tumblestones.
-    - Farmer's Delight's cutting board can salvage Type Gems from their Gem Blocks.
-    - Farmer's Delight's Onions, Tomatoes, and Cabbages can be used to cook Open-Faced Sandwiches. Nature's Spirit's Olives also can be used.
-    - Farmer's Delight's cutting board can be used on Hearty Grains to obtain rice and straw, similarly to Farmer's Delight's Rice Panicles.
-    - Farmer's Delight's Apple Pies and Apple Ciders can now be made using Applin Apples, alongside the Vanilla counterpart.
-    - Amendments allows for cooking Leek and Potato Stew in a Cauldron.
-    - Any mods that utilise Moonlight's Soft Fluid system can store Leek and Potato Stew, Medicinal Brew, Antidote, Awakening, Burn Heal, Ice Heal, Paralyze Heal, Full Heal, Potion, Super Potion, Hyper Potion, Max Potion, Full Restore, Ability Capsules, Moomoo Milk, and Berry Juice in liquid form (such as Suplementaries' Jar or Goblet, or Cauldrons while using Amendments).
-    - Supplementaries' Hourglass can now use Bright Powder, Quick Powder, Metal Powder, Heal Powder, Silver Powder, and Remedy.
-    - Berry Trees are now compatible with the Planter properly
-    - Saccharine Way Signs (added by Supplementaries automagically) now use a premade texture to prevent odd visual issues.
-    - Supplementaries' Jar can now store various Cobblemon cookies, candies, and similar items.
-    - Some of Supplementaries' items have been added to the `#cobblemon:held/container_held_items` item tag, including sacks, safes, and lunch baskets.
-    - Experience Nuggets can be used in place of Sculk for making the EXP Candies if using Create.
-    - Rage Candy Bar has a Create Mixing recipe.
-    - All Cobblemon ores can now be crushed in Create's Crushing Wheels. All Gem and Tumblestone Clusters can be crushed for automatic, low return, gems.
-    - Hearty Grains can be milled like Farmer's Delight Rice Panicles if both Farmer's Delight and Create are installed.
-    - Big Roots and Revival Herbs can be milled to their respective powders.
-    - Pep-Up Flowers, Medicinal Leeks, and all 70 berries can be milled in Create's Millstone for additional dye drops.
-    - Auspicious Armour and Upgrades can be Haunted using Create's crafting systems.
-    - Applin Apples can be used to make Honeyed Apples in Create.
-- Sounds for interacting with various Cobblemon blocks now play from the centre of the block, rather than the corner. You probably didn't notice.
-- Dragonite's mailbag cosmetic can now also be obtained with a chest in the cosmetic slot.
-- Adjusted the walk speed for Croagunk and Aerodactyl.
-- The `/pc` command no longer plays PC activation sounds
-- Pressing the Summary key while either the starter selection or summary screen are open now closes those screens.
-- Ice type Pokémon are now immune to Packed Snow.
-- Added cobweb block slowness immunity for spider Pokémon
-
-### Fixes
-- Fixed rare Pokémon being far too likely to spawn multiple times in a single spawn cycle. The dev told me that the exact bug is too complicated to explain.
-- Fixed Omanyte and Omastar incorrectly using water animations on land.
-- Fixed Pokédex layout for genderless variations.
-- Fixed odd stacking behaviour with Poké Baits.
-- Fixed a compatibility issue with World Game Rules which caused some log spam in specific cases.
-- Fixed improper validation of Pokémon when performing a trade.
-- Fixed an issue where particles like beams can disappear when you don't see the beginning of the beam, or you look away.
-- Fixed Bedrock particle materials sometimes being incorrectly invisible from some sides.
-- Fixed an occasional crash on retrieving revived fossils.
-- Fixed brushing not working on Neoforge. Again.
-- Fixed braking not working for submarine-style mounts (whoops).
-- Fixed strafing not having the same friction as forward movement (funny whoops).
-- Fixed submarine-style mounts' surface-water animations not playing when supposed to.
-- Fixed submarine-style mounts' camera freaking out when looking up or down on the surface.
-- Fixed pastured Pokémon despawning and running away.
-- Fixed Apricorn trees crashing when other mods bonemeal them.
-- Fixed the issue that caused hover-style mounts without a ground style to be rendered useless upon touching the ground on a server.
-- Fixed horizontal and vertical collisions with hover-style mounts so they no longer accumulate or retain momentum.
-- Fixed NeoForge brewing stand unexpectedly crashing users when shift clicking items within its menu. Well, I suppose all crashes are unexpected. You know what I mean.
-- Fixed NPCs switching Pokémon very often during battles.
-- Fixed Campfire Pot causing crashes under certain circumstances.
-- Fixed Type Gems not being consumed upon use in battles.
-- Fixed several Ancient Pokéball's not using the correct capture multiplier.
-- Fixed a server warning that could occur when recalling Pokémon.
-- Fixed sliding particles incorrectly handling block collision.
-- Fixed Full Heal not curing status conditions in battle. Literally it's one job.
-- Fixed a rare issue with battles locking up when you are forced to switch, with the switch menu appearing instantly.
-- Fixed the combined effects of Pledge moves having broken Showdown message handling and localisation.
-- Fixed a very niche issue where structures would spawn in an incorrect location, creating very funky world gen.
-- Fixed Galarian Ponyta missing its cry.
-- Fixed various log warnings caused by redundant files and sound events.
-- Traded Pokémon will now retain the original friendship level when traded back to its OT.
-- Tumblestone Clusters now display correctly on maps.
-- Fixed removing mulch from berry trees with a shovel not working. That was meant to be a thing.
-- Fixed collecting honey from Saccharine Leaf blocks deleting Honey Bottles when the inventory was full.
-- Fixed Stripped Saccharine Wood recipe being... not there.
-- Fixed some performance issues with a kind of sound event causing lag by attempting to create sounds every tick when out of range of hearing.
-- Fixed stat-reducing Aprijuice not being possible to apply on a maxed out Pokémon. Also fixed the possibility of going into negatives.
-- Fixed exploit where you could take out the bait or drop your Pokérod with bait to avoid consuming bait, now the bobber will just disappear if you do so.
-- Fixed Apricorn and Saccharine boats incorrectly using chest boat models.
-- Fixed wild and trainer battle AI refusing to select moves with the `adjacentAlly` target type, even when it's their only option.
-- Fixed gilded chests being more accessible than intended.
-- Fixed fished up Pokémon not being added as "seen" to the Pokédex.
-- Fixed surprised Gimmighoul encounters not being added as "seen" to the Pokédex.
-- Fixed a crash involving berry trees that have been world edited.
-- Fixed visual desync in multiplayer for players mounting Pokémon outside other players' loaded chunks.
-- Fixed Pokémon entities leveled by rare candy not getting stronger as Minecraft entities unless recalled.
-- Fixed a freeze during game load that occurred when multiple mods tried to load Cobblemon API classes at the same time.
-- Lowered the volume of Blitzle and Zebstrika's cry (shut up!).
-- Regional Foods will now prioritise being eaten instead of used for healing Pokémon - shift clicking will use it as healing.
-- Resolved z-fighting (texture flickering) on Pokédex Models.
-- Restored Ninjask's ability to do barrel rolls.
-- Fixed Raichu (male) and Alolan Raichu (both genders) not displaying the correct Partner Cap when Pewter Crunchies are in the cosmetic slot.
-- Fixed a crash caused by adding enchanted items to the Resurrection Machine.
-- Fixed a crash that could occur when starting a PvN battle with only fainted Pokémon.
-- Fixed the Remember Riding Camera config not being respected when dismounting and resolved the incompatibility with the Auto Third Person mod.
-- Fixed Full Heal block not dropping Full Heals. Lmao.
-- Fixed status cure items not returning an empty bottle when used.
-- Fixed Panpour consuming its held item when evolving with a Water Stone.
-- Fixed Smoked Tail Curry returning a Wooden Bowl when consumed despite it not being included in the recipe. Free bowls!
-- Fixed `/giveallpokemon` not respecting the min and max arguments.
-- Fixed the choose starter toast not disappearing when capturing a Pokémon instead of opening the starter selection screen.
-- Fixed an issue where certain Sinister Tea seasonings were only applying as instant effects and would not apply over time.
-- Long config option labels now scroll instead of overflowing in the configuration menu.
-- Fixed some z-fighting and clipping on Dewott and Hisui-Bias Dewott.
-- Eggant Berries can now be composted properly on NeoForge.
-- Composting chances are now the same on NeoForge as on Fabric.
-- Fixed problem where furnaces which had smelted Revival Herbs into Heal Powder in older versions would glitch out on trying to get the experience out of the block.
-- Fixed the Battle AI not recognizing Surging Strikes as a multistrike move.
-- Fixed Tentacool not using its swim animation when on water surface.
-- Fixed Eevee using its left shoulder pose when in battle.
-- Fixed Magikarp and Gyarados Jump Pattern resourcepacks replacing shiny textures of addons targeting Magikarp or Gyarados.
-- Fixed Combee's pollinated texture overwriting the shiny and female textures.
-- Fixed a colour mistake with Dracovish's shiny.
-- Fixed Togedemaru's back spikes z-fighting.
-- Fixed Sliggoo (+ Hisuian) evolving in the Nether and End where it can't actually rain.
-- Corrected the scales, hitbox sizes, and eye heights for Ariados, Cetoddle, Durant, Galvantula, Klink, Lanturn, Lumineon, Mantine, Mantyke, Mudbray, Numel, Staravia, and Torkoal.
-- Fixed Torkoal's walk speed not matching its animation. He will no longer move faster than Bunnelby and Buneary. This tortoise would've won.
-- Fixed Lanturn T-posing due to missing ground walk and sleep animations.
-- Fixed Oshawott and Dewott using their sleep animation in unintended scenarios.
-- Fixed Dudunsparce and Maushold always having the same form instead of having the 1 in 100 chance of being different.
-- Fixed bird mounts rapidly switching between their flying and gliding animations when flying at low speed.
-- Fixed some battles being startable with fainted Pokémon in the initial sendout.
-- Fixed random gender selection for forms with strict gender divides (such as Meowstic and Oinkologne) never choosing female (that's sexist).
-- Fixed the "Press R to battle" prompt not disappearing after you finish your first battle, at least until you relogged.
-- Fixed the composter block being listed as "composer" in the cosmetic items species feature
-- Fixed Castform's forms being tagged as introduced in generation 4 instead of 3.
-- Fixed Blitzle's base scale being `1` rather than the intended `0.8`.
-- Fixed Magnezone's emissive layer for the shiny having the wrong name, thus displaying wrongly.
-- Fixed Litleo not blinking.
-
-### Developer
-- Added `PokeSnackSpawnerFactory` which allows influence registration on PokeSnack encounters.
-- Added `FishingSpawnerFactory` which allows influence registration on fishing encounters.
-- Added `BattleFleeAttemptEvent` fired from `PokemonBattle.checkFleeAttempt`, allowing developers to intercept and control flee attempts.
-- Tweaked the spawning selector interface to take a bucket function rather than a bucket directly.
-- Added a new `cobblemon:height_range` processor type to allow developers to restrict structure-spawning ranges.
-- Separated all the functions of MoLangFunctions.kt into their own files.
-- Spawn buckets and their base weights are now provided by the spawner, with different base weights for world, fishing, snack, and habitat spawn buckets.
-- Removed "SpawnBucket" class in favour of just storing maps of bucket names to weights.
-- Fixed nicknames not being applied to Pokémon spawned from `spawn_pool_world` files.
-- Added support for `profilePokedexScale`, `profilePokedexTranslation`, `profileSummaryScale`, and `profileSummaryTranslation` in poser files for finer control over profile displays.
-- Fixed riding camera offsets defined on Pokémon forms not being applied.
-- Marks can now provide aspects.
-
-### Molang & Datapacks
-- Added `moveset_builders` datapack folder for different styles of movesets.
-- Added `party_pools` datapack folder for defining groups of Pokémon for complex NPC party definitions.
-- Added `party_compositions` datapack folder for arranging parties on NPCs that rely on party pools.
-- Added `composed_pool` NPC party provider type which combines a party pool with a party composition to create more complex NPC parties.
-- Added basic chatter NPC Behaviour.
-- Added `q.item.is_enchanted()`.
-- Added `q.item.has_enchantment(minecraft:sharpness, 3)`.
-- Added `has_chosen_starter` and `get_starter_uuid` as available Molang functions.
-- Added `has_tm_move_unlocked`, `unlock_tm_move`, and `lock_tm_move` as available Molang functions for Players.
-- Added `marks`, `has_mark`, and `remove_marks` as available Molang functions for Pokémon.
-- Added Data Component support for species drops, eg `"components": {"minecraft:custom_model_data": 123}`
-- Added the new `sortOrder` field to mark entries, (defaults to 0 if not specified) which controls the order in which marks are rendered on the HUD, with higher numbers being rendered on top of lower numbers.
-- Added optional `order` field to starter categories. It will allow explicitly sorting categories in the starter selection screen.
-- SpeciesAdditions append vs override now matches the wiki documentation.
-- Added `weighted_choice` as a new feature type. It requires setting weights for each choice and allows developers to simplify the process of assigning random aspect choice based on marble chance.
-- Added `q.world.spawn_loot_table_items(loot_table_id, x, y, z)` which spawns the items from the loot table at the position. Use type: `minecraft:chest` for the loot table.
-- Added `q.pokemon.entity` to access the entity of Pokémon.
-- Flamethrower and Seismic Toss had their action effect JSON cleaned up.
-- Ride sounds can now be set as exclusive to passengers.
-- Ride sounds no longer play when submerged unless specified with a new setting.
-- NPC Trainers can now call a `command` animation when issuing a command in battle.
-- Added a q.failed function to move action effects.
-- Herd spawned Pokémon have their levels controlled differently. The `levelRange` property now acts as a pre-offset clamp instead of a filter, with a new `herdLevelRange` property to do the filter behaviour.
-- `q.sound` now accepts three parameters (sound event, volume, and pitch) instead of just the sound event and pitch.
-- Added a new layer property that makes a layer scroll in a direction. "scrolling": {"speedU": 0.1, "speedV": 0.1}
-- Cleaned up seat data. Removed all now unused fields from seats in all species files. Also made locator seat names explicit in the species files (however, this doesn't break the legacy format)
-
-### Particles
-
-#### New Move Animations
-- Blizzard
-- Disarming Voice
-- Draco Meteor
-- Dragon Breath
-- Dragon Rage
-- Drain Punch
-- Fairy Wind
-- Fire Fang
-- Gust
-- Horn Drill
-- Hydro Pump
-- Ice Fang
-- Leafage
-- Leaf Storm
-- Light Screen
-- Night Shade
-- Play Rough
-- Pyro Ball
-- Reflect
-- Rock Slide
-- Sonic Boom
-- Sucker Punch
-- Supersonic
-- Thunder Fang
-
-#### Tweaks and Fixes (Moves)
-
-- Confusion
-- Dragon Claw
-- Eruption
-- Fire Punch
-- Flame Burst
-- Flame Charge
-- Flamethrower
-- Frost Breath
-- Hypnosis
-- Ice Punch
-- Icy Wind
-- Mud Sport
-- Poison Fang
-- Protect
-- Psychic
-- Quick Attack
-- Rage Powder
-- Razor Leaf
-- Sand Attack
-- Scratch
-- Shadow Claw
-- Sing
-- Spore
-- String Shot
-- Tackle
-- Tail Whip
-- Thunder
-- Thunder Punch
-- Thunder Wave
-- Water Gun
-- Water Pulse
-- Water Sport
-
-#### Miscellaneous Particles
-
-- Added Wild Might particles for Alpha Pokémon.
-- Updated stat increase and decrease particles.
-
-### Localization
-- Updated translations for:
-    - Japanese
-    - German
-    - Spanish
-    - Ecuadorian Spanish
-    - Portuguese
-    - Brazilian Portuguese
-    - Simplified Chinese
-    - Traditional Chinese
-    - Korean
-    - Russian

changelogs/CHANGELOG-1.8.1.md

@@ -1,41 +0,0 @@
-# Changelog
-## [1.8.1 (September 13th, 2026)](#1-8-1)
-
-### Animation updates for the following Pokémon
-- Flapple, Appletun, Dipplin, Hydrapple (placeholder animations only).
-
-### Fixes
-- Fixed a potential world generation stall caused by Type Gem clusters.
-- Fixed Pokémon on shoulders not animating if they are visibly holding a held item.
-- Fixed NPCs getting their own TM progress file.
-- Fixed odd NeoForge crash due to a dependency being outdated. It will now correctly flag the dependency for being outdated.
-- Fixed the TM Machine refusing move selections that the `unlockAllMoveDexMovesByDefault` config had made visible, leaving the move slot blank and the craft button unresponsive.
-- Fixed the Beast Ball not applying its 0.1× penalty to Pokémon that are not Ultra Beasts.
-- Fixed the Moon Ball reading the world's total elapsed time instead of the time of day, so its bonus applied during the day instead.
-- Fixed the Love Ball never awarding its 2.5× opposite gender bonus, and matching species by display name instead of identifier.
-- Fixed the Timer Ball being weaker than a regular Poké Ball on early turns and only reaching 4× on turn 14 instead of turn 10.
-- Fixed the Luxury Ball only doubling Friendship gains of 1, leaving level up and berry gains unaffected.
-- Fixed Rufflet, Braviary, and Hisuian Braviary flooding logs with errors about missing sound events.
-- Fixed Pokémon property typos in Pangoro and Dedenne herd spawn files.
-- Fixed unintentional watermelon cosmetic for Hisuian Electrode. 
-- Fixed Blastoise having an unintentional passenger seat.
-- Fixed form typo in Rockruff-Dusk spawn, preventing it from being able to spawn.
-- Fixed the `stat_compare` and `stat_equal` evolution requirements crashing the game when given `special_attack` or `special_defence`, and made them treat any non-permanent stat as a failed requirement instead of crashing.
-- Fixed Rowap and Jacoba berries not correctly altering Pokémon sizes when used as bait.
-- Fixed Ampharos' eyes not emitting particles.
-- Fixed Alolan Raticate's cry not playing.
-- Fixed several incorrect light-based spawning conditions for ghosts and bugs. 
-- Removed unused, placeholder habitat pools.
-- Fixed Mantyke, Mantine, and Quaxly getting stuck in a recoil 'expression' during battles due to having an expression assigned as a recoil animation. 
-- Fixed Lucario's aura particles not emitting.
-- Fixed Lycanroc's head movement.
-- Added head movement to Archaludon.
-- Fixed Duraludon line not having their sleep animations.
-- Fixed Diglett line not having their faint animations.
-- Fixed Kingambit moving its legs while walking.
-
-### Localization
-- Updated translations for:
-  - Brazilian Portuguese
-  - Simplified Chinese
-  - Japanese

common/build.gradle.kts

@@ -1,10 +1,3 @@
-
-import utilities.isSnapshot
-import utilities.version
-import java.time.OffsetDateTime
-import java.time.ZoneOffset
-import java.time.format.DateTimeFormatter
-
 /*
  *
  *  * Copyright (C) 2023 Cobblemon Contributors
@@ -18,50 +11,45 @@ import java.time.format.DateTimeFormatter
 plugins {
     id("cobblemon.base-conventions")
     id("cobblemon.publish-conventions")
-
-    id("net.kyori.blossom")
-    id("org.jetbrains.gradle.plugin.idea-ext")
 }
 
 architectury {
-    common("neoforge", "fabric")
+    common("forge", "fabric")
 }
 
 repositories {
     maven(url = "${rootProject.projectDir}/deps")
     maven(url = "https://api.modrinth.com/maven")
-    maven(url = "https://maven.neoforged.net/releases")
-    maven(url = "https://maven.gegy.dev")
     mavenLocal()
 }
 
 dependencies {
-    implementation(libs.bundles.kotlin)
-    modImplementation(libs.fabric.loader)
+    implementation(libs.stdlib)
+    implementation(libs.reflect)
+
+    modImplementation(libs.fabricLoader)
+    //Flywheel has no common dep so just pick one and don't use any platform specific code in common
+//    modCompileOnly(libs.flywheelFabric)
     modApi(libs.molang)
+    compileOnlyApi(libs.jeiApi)
+    modCompileOnly(libs.adornFabric)
+    modCompileOnly(libs.lambDynamicLights) { isTransitive = false }
 
-    // Integrations
-    compileOnlyApi(libs.jei.api)
-    modCompileOnly(libs.bundles.common.integrations.compileOnly) {
-        isTransitive = false
-    }
-    // LambDynamicLights is handled differently because we need the Mojang-mappings version of it.
-    modCompileOnly(libs.lambDynamicLights) {
-        capabilities {
-            requireCapability("dev.lambdaurora.lambdynamiclights:api-mojmap")
-        }
-    }
-    // Flywheel has no common dep so just pick one and don't use any platform specific code in common
-    // modCompileOnly(libs.flywheelFabric)
+    // For Showdown
+    modCompileOnly(libs.graal)
 
-    // Showdown
-    modCompileOnly(libs.graal.core)
+    //shadowCommon group: 'commons-io', name: 'commons-io', version: '2.6'
 
-    // Data Storage
-    modCompileOnly(libs.bundles.mongo)
+    // For datastore
+    modCompileOnly(libs.mongoDriverCore)
+    modCompileOnly(libs.mongoDriverSync)
 
-    // Unit Testing
-    testImplementation(libs.bundles.unitTesting)
+    testRuntimeOnly(libs.junitEngine)
+    testImplementation(libs.junitApi)
+    testImplementation(libs.junitParams)
+    testImplementation(libs.mockito)
+    testImplementation(libs.mockk)
+    testImplementation(libs.classgraph)
 }
 
 tasks.withType<Test> {
@@ -71,38 +59,3 @@ tasks.withType<Test> {
         setExceptionFormat("full")
     }
 }
-
-tasks.processResources {
-    exclude("data/**/README.md")
-}
-
-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/src/main/java/com/cobblemon/mod/common/DoubleJump.java

@@ -1,13 +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;
-
-public interface DoubleJump {
-    boolean isDoubleJumping();
-}

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

@@ -1,15 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common;
-
-import com.cobblemon.mod.common.api.orientation.OrientationController;
-
-public interface OrientationControllable {
-    OrientationController getOrientationController();
-}

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

@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common;
-
-import com.cobblemon.mod.common.api.spawning.spawner.PlayerSpawner;
-
-/**
- * Used for mixin shenanigans. ServerPlayers now store their Cobblemon spawner
- * inside, so this interface helps execute that.
- *
- * @author Hiroku
- * @since October 27th, 2025
- */
-public interface PlayerSpawnerAccessor {
-    PlayerSpawner getPlayerSpawner();
-    void setPlayerSpawner(PlayerSpawner spawner);
-}

common/src/main/java/com/cobblemon/mod/common/bridges/StructureProcessorListBridge.java

@@ -8,7 +8,7 @@
 
 package com.cobblemon.mod.common.bridges;
 
-import net.minecraft.world.level.levelgen.structure.templatesystem.StructureProcessor;
+import net.minecraft.structure.processor.StructureProcessor;
 
 public interface StructureProcessorListBridge {
     void append(StructureProcessor processor);

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

@@ -9,8 +9,9 @@
 package com.cobblemon.mod.common.client.render.models.blockbench.pose;
 
 import com.cobblemon.mod.common.client.render.models.blockbench.repository.RenderContext;
-import com.mojang.blaze3d.vertex.PoseStack;
-import com.mojang.blaze3d.vertex.VertexConsumer;
+import net.minecraft.client.render.VertexConsumer;
+import net.minecraft.client.util.math.MatrixStack;
+
 import java.util.Map;
 
 /**
@@ -41,17 +42,23 @@ public interface Bone {
      * @param buffer The vertex consumer deployed by the renderer
      * @param packedLight The light level to be applied to the bone
      * @param packedOverlay The overlay value to be applied to the bone
-     * @param color RGBA packed integer color value
+     * @param r A value representing the amount of red coloring that should be applied on the RGB scale
+     * @param g A value representing the amount of green coloring that should be applied on the RGB scale
+     * @param b A value representing the amount of blue coloring that should be applied on the RGB scale
+     * @param a The alpha value to apply to the model based on the RGB scale
      *
      * @since 1.4.0
      */
     void render(
             RenderContext context,
-            PoseStack stack,
+            MatrixStack stack,
             VertexConsumer buffer,
             int packedLight,
             int packedOverlay,
-            int color
+            float r,
+            float g,
+            float b,
+            float a
     );
 
     /**
@@ -59,5 +66,5 @@ public interface Bone {
      *
      * @since 1.4.0
      */
-    void transform(PoseStack matrixStack);
+    void transform(MatrixStack matrixStack);
 }

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

@@ -0,0 +1,96 @@
+/*
+ * 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.compat;
+
+import com.cobblemon.mod.common.CobblemonEntities;
+import com.cobblemon.mod.common.client.render.layer.PokemonOnShoulderRenderer;
+import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
+import com.cobblemon.mod.common.pokemon.FormData;
+import com.cobblemon.mod.common.pokemon.lighthing.LightingData;
+import dev.lambdaurora.lambdynlights.api.DynamicLightHandler;
+import dev.lambdaurora.lambdynlights.api.DynamicLightHandlers;
+import net.minecraft.entity.EntityType;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.util.Pair;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Optional;
+
+// Java class due to relying on entrypoint on Fabric side
+public class LambDynamicLightsCompat {
+
+    // This is all called on client side
+    // These things are checked every tick so try to keep it as free as possible
+    // That being said it's unlikely school Toshiba person is running dynamic lighting and shaders to enjoy this
+    // Make sure not to call anything Fabric specific :)
+    public static void hookCompat() {
+        // Pokémon entities
+        DynamicLightHandlers.registerDynamicLightHandler(
+                CobblemonEntities.POKEMON,
+                DynamicLightHandler.makeHandler(
+                        pokemon -> resolvedPokemonLightLevel(pokemon, false),
+                        pokemon -> true
+                )
+        );
+        DynamicLightHandlers.registerDynamicLightHandler(
+                CobblemonEntities.POKEMON,
+                DynamicLightHandler.makeHandler(
+                        pokemon -> resolvedPokemonLightLevel(pokemon, true),
+                        pokemon -> false
+                )
+        );
+
+        // Shouldered Pokémon
+        DynamicLightHandlers.registerDynamicLightHandler(
+                EntityType.PLAYER,
+                DynamicLightHandler.makeHandler(
+                        player -> resolvedShoulderLightLevel(player, false),
+                        player -> true
+                )
+        );
+        DynamicLightHandlers.registerDynamicLightHandler(
+                EntityType.PLAYER,
+                DynamicLightHandler.makeHandler(
+                        player -> resolvedShoulderLightLevel(player, true),
+                        player -> false
+                )
+        );
+    }
+
+    private static int resolvedPokemonLightLevel(PokemonEntity pokemon, boolean underwater) {
+        return extractFormLightLevel(pokemon.getForm(), underwater).orElse(0);
+    }
+
+    private static int resolvedShoulderLightLevel(PlayerEntity player, boolean underwater) {
+        final Pair<PokemonOnShoulderRenderer.ShoulderData, PokemonOnShoulderRenderer.ShoulderData> shoulderDataPair = PokemonOnShoulderRenderer.shoulderDataOf(player);
+        final Optional<Integer> leftLightLevel = extractShoulderLightLevel(shoulderDataPair.getLeft(), underwater);
+        final Optional<Integer> rightLightLevel = extractShoulderLightLevel(shoulderDataPair.getRight(), underwater);
+        return Math.max(leftLightLevel.orElse(0), rightLightLevel.orElse(0));
+    }
+
+    private static Optional<Integer> extractFormLightLevel(@NotNull FormData form, boolean underwater) {
+        if (form.getLightingData() == null || !liquidGlowModeSupport(form.getLightingData().getLiquidGlowMode(), underwater)) {
+            return Optional.empty();
+        }
+        return Optional.of(form.getLightingData().getLightLevel());
+    }
+
+    private static Optional<Integer> extractShoulderLightLevel(@Nullable PokemonOnShoulderRenderer.ShoulderData shoulderData, boolean underwater) {
+        if (shoulderData == null) {
+            return Optional.empty();
+        }
+        return extractFormLightLevel(shoulderData.getForm(), underwater);
+    }
+
+    private static boolean liquidGlowModeSupport(@NotNull LightingData.LiquidGlowMode liquidGlowMode, boolean underwater) {
+        return underwater ? liquidGlowMode.getGlowsUnderwater() : liquidGlowMode.getGlowsInLand();
+    }
+
+}

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

@@ -1,28 +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.compat.lambdynamiclights;
-
-import com.cobblemon.mod.common.pokemon.FormData;
-import com.cobblemon.mod.common.pokemon.lighthing.LightingData;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.Optional;
-
-public abstract class CustomLuminance {
-    protected static Optional<Integer> extractFormLightLevel(@NotNull FormData form, boolean underwater) {
-        if (form.getLightingData() == null || !liquidGlowModeSupport(form.getLightingData().getLiquidGlowMode(), underwater)) {
-            return Optional.empty();
-        }
-        return Optional.of(form.getLightingData().getLightLevel());
-    }
-
-    protected static boolean liquidGlowModeSupport(@NotNull LightingData.LiquidGlowMode liquidGlowMode, boolean underwater) {
-        return underwater ? liquidGlowMode.getGlowsUnderwater() : liquidGlowMode.getGlowsInLand();
-    }
-}

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

@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.compat.lambdynamiclights;
-
-import com.cobblemon.mod.common.Cobblemon;
-import dev.lambdaurora.lambdynlights.api.DynamicLightsContext;
-import dev.lambdaurora.lambdynlights.api.DynamicLightsInitializer;
-import dev.lambdaurora.lambdynlights.api.entity.luminance.EntityLuminance;
-import dev.lambdaurora.lambdynlights.api.item.ItemLightSourceManager;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.entity.EntityType;
-
-public class LambDynamicLightsInitializer implements DynamicLightsInitializer {
-    public static final EntityLuminance.Type POKEMON_LUMINANCE = EntityLuminance.Type.registerSimple(
-            ResourceLocation.fromNamespaceAndPath(Cobblemon.MODID, "pokemon"),
-            PokemonLuminance.INSTANCE
-    );
-    public static final EntityLuminance.Type PLAYER_LUMINANCE = EntityLuminance.Type.registerSimple(
-            ResourceLocation.fromNamespaceAndPath(Cobblemon.MODID, "shoulder"),
-            PlayerLuminance.INSTANCE
-    );
-
-    @Override
-    public void onInitializeDynamicLights(DynamicLightsContext context) {
-        Cobblemon.LOGGER.info("Lamb Dynamic Lights compatibility enabled");
-
-        context.entityLightSourceManager().onRegisterEvent().register(ctx -> {
-            ctx.register(EntityType.PLAYER, PlayerLuminance.INSTANCE);
-        });
-    }
-
-    @SuppressWarnings({"removal", "UnstableApiUsage"})
-    @Override
-    public void onInitializeDynamicLights(ItemLightSourceManager itemLightSourceManager) {}
-}
-

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

@@ -1,72 +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.compat.lambdynamiclights;
-
-import com.cobblemon.mod.common.Cobblemon;
-import com.cobblemon.mod.common.client.render.layer.PokemonOnShoulderRenderer;
-import dev.lambdaurora.lambdynlights.api.entity.luminance.EntityLuminance;
-import dev.lambdaurora.lambdynlights.api.item.ItemLightSourceManager;
-import net.minecraft.core.registries.Registries;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.tags.TagKey;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.item.Item;
-import net.minecraft.world.item.ItemStack;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-import org.jetbrains.annotations.Range;
-
-public final class PlayerLuminance extends CustomLuminance implements EntityLuminance {
-    public static final PlayerLuminance INSTANCE = new PlayerLuminance();
-    private static final TagKey<Item> POKEDEX = TagKey.create(Registries.ITEM, ResourceLocation.fromNamespaceAndPath(Cobblemon.MODID, "pokedex"));
-
-    @Override
-    public @NotNull Type type() {
-        return LambDynamicLightsInitializer.PLAYER_LUMINANCE;
-    }
-
-    @Override
-    public @Range(from = 0L, to = 15L) int getLuminance(@NotNull ItemLightSourceManager itemLightSourceManager, @NotNull Entity entity) {
-        if (entity instanceof Player player) {
-            final int shoulderLightLevel = shoulderLuminance(itemLightSourceManager, player);
-
-            final int itemLightLevel = player.isHolding(stack -> stack.is(POKEDEX)) ? 13 : 0;
-
-            return Math.max(shoulderLightLevel, itemLightLevel);
-        } else {
-            return 0;
-        }
-    }
-
-    private @Range(from = 0L, to = 15L) static int shoulderLuminance(@NotNull ItemLightSourceManager itemLightSourceManager, @NotNull Player player) {
-        final var leftShoulder = PokemonOnShoulderRenderer.shoulderDataFrom(player.getShoulderEntityLeft());
-        final var rightShoulder = PokemonOnShoulderRenderer.shoulderDataFrom(player.getShoulderEntityRight());
-
-        if (leftShoulder == null && rightShoulder == null) {
-            return 0;
-        }
-
-        final int leftShoulderLightLevel = extractShoulderLightLevel(leftShoulder, itemLightSourceManager, player.isUnderWater());
-        final int rightShoulderLightLevel = extractShoulderLightLevel(rightShoulder, itemLightSourceManager, player.isUnderWater());
-        return Math.max(leftShoulderLightLevel, rightShoulderLightLevel);
-    }
-
-    private static int extractShoulderLightLevel(@Nullable PokemonOnShoulderRenderer.ShoulderData shoulderData, @NotNull ItemLightSourceManager itemLightSourceManager, boolean underwater) {
-        if (shoulderData == null) {
-            return 0;
-        }
-
-        ItemStack item = shoulderData.getShownItem();
-        int itemLightLevel = item.isEmpty() ? 0 : itemLightSourceManager.getLuminance(item, underwater);
-        int formLightLevel = extractFormLightLevel(shoulderData.getForm(), underwater).orElse(0);
-
-        return Math.max(itemLightLevel, formLightLevel);
-    }
-}

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

@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.compat.lambdynamiclights;
-
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
-import dev.lambdaurora.lambdynlights.api.entity.luminance.EntityLuminance;
-import dev.lambdaurora.lambdynlights.api.item.ItemLightSourceManager;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.item.ItemStack;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Range;
-
-public final class PokemonLuminance extends CustomLuminance implements EntityLuminance {
-    public static final PokemonLuminance INSTANCE = new PokemonLuminance();
-
-    private PokemonLuminance() {}
-
-    @Override
-    public @NotNull Type type() {
-        return LambDynamicLightsInitializer.POKEMON_LUMINANCE;
-    }
-
-    @Override
-    public @Range(from = 0L, to = 15L) int getLuminance(
-            @NotNull ItemLightSourceManager itemLightSourceManager,
-            @NotNull Entity entity
-    ) {
-        if (entity instanceof PokemonEntity pokemon) {
-            boolean underwater = pokemon.isUnderWater();
-            ItemStack item = pokemon.getShownItem();
-            int itemLightLevel = item.isEmpty() ? 0 : itemLightSourceManager.getLuminance(item, underwater);
-            int formLightLevel = extractFormLightLevel(pokemon.getForm(), underwater).orElse(0);
-
-            return Math.max(itemLightLevel, formLightLevel);
-        } else {
-            return 0;
-        }
-    }
-}

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

@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.duck;
-
-import com.mongodb.lang.Nullable;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.level.BlockGetter;
-import org.joml.Vector3f;
-
-public interface CameraDuck {
-    BlockGetter cobblemon$getLevel();
-
-    @Nullable
-    Entity cobblemon$getEntity();
-
-    Vector3f cobblemon$getForwards();
-
-    Vector3f cobblemon$getUp();
-
-    Vector3f cobblemon$getLeft();
-
-    float cobblemon$getXRot();
-    void cobblemon$setXRot(float xRot);
-
-    float cobblemon$getYRot();
-    void cobblemon$setYRot(float yRot);
-}

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

@@ -1,18 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.duck;
-
-public interface ChannelDuck {
-    void cobblemon$applyLowPassFilter(float gain, float hfGain);
-    void cobblemon$inverseAttenuation(float rolloffFactor);
-    void cobblemon$clearFilters();
-
-    void cobblemon$applyReverb(float decayTime, float gain, float diffusion, float density);
-    void cobblemon$clearReverb();
-}

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

@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.duck;
-
-import net.minecraft.resources.ResourceKey;
-import net.minecraft.world.level.Level;
-
-import java.util.Optional;
-
-/**
- * Duck that facilitates getting a level key for a given level.
- *
- * @author dualspiral
- * @since August 30th, 2026
- */
-public interface MinecraftServerDuck {
-    Optional<ResourceKey<Level>> cobblemon$getLevelKey(Level level);
-}

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

@@ -1,18 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.duck;
-
-import org.joml.Vector3f;
-
-public interface PlayerDuck {
-	void setDriverInput(Vector3f driverInput);
-	Vector3f getDriverInput();
-	void setLastSentDriverInput(Vector3f driverInput);
-	Vector3f getLastSentDriverInput();
-}

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

@@ -1,15 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.duck;
-
-import net.minecraft.world.item.crafting.RecipeManager;
-
-public interface RecipeAwareSlot {
-	void setRecipeManager(RecipeManager recipeManager);
-}

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

@@ -1,20 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.duck;
-
-import net.minecraft.world.phys.Vec3;
-
-public interface RidePassenger {
-	void cobblemon$setRideXRot(float rideXRot);
-	float cobblemon$getRideXRot();
-	void cobblemon$setRideYRot(float rideYRot);
-	float cobblemon$getRideYRot();
-	void cobblemon$setRideEyePos(Vec3 rideEyePos);
-	Vec3 cobblemon$getRideEyePos();
-}

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

@@ -1,21 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.duck;
-
-import net.minecraft.resources.ResourceLocation;
-
-/**
- * Duck that facilitates getting a level key that we store on the level.
- *
- * @author dualspiral
- * @since August 30th, 2026
- */
-public interface ServerLevelDuck {
-    ResourceLocation cobblemon$getLevelResourceLocation();
-}

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

@@ -1,21 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.duck;
-
-import org.jetbrains.annotations.Nullable;
-
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.sounds.SoundSource;
-
-public interface SoundEngineDuck {
-
-    void pauseSounds(@Nullable ResourceLocation id, @Nullable SoundSource category);
-
-    void resumeSounds(@Nullable ResourceLocation id, @Nullable SoundSource category);
-}

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

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

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

@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.duck;
+
+import net.minecraft.client.sound.SoundInstance;
+import net.minecraft.sound.SoundCategory;
+import net.minecraft.util.Identifier;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Collection;
+
+public interface SoundSystemDuck {
+
+    void pauseSounds(@Nullable Identifier id, @Nullable SoundCategory category);
+
+    void resumeSounds(@Nullable Identifier id, @Nullable SoundCategory category);
+
+    Collection<SoundInstance> getSounds(@Nullable SoundCategory category);
+}

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

@@ -1,51 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.mixin;
-
-import com.cobblemon.mod.common.OrientationControllable;
-import com.cobblemon.mod.common.duck.RidePassenger;
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
-import net.minecraft.world.entity.EntityType;
-import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.entity.projectile.AbstractArrow;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.level.Level;
-import org.jetbrains.annotations.Nullable;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-@Mixin(AbstractArrow.class)
-public abstract class AbstractArrowMixin {
-
-    @Inject(
-            method = "<init>(Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/level/Level;Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/item/ItemStack;)V",
-            at = @At("TAIL")
-    )
-    private void cobblemon$adjustSpawnPosition(
-            EntityType<? extends AbstractArrow> entityType,
-            LivingEntity owner,
-            Level level,
-            ItemStack pickupItemStack,
-            @Nullable ItemStack firedFromWeapon,
-            CallbackInfo ci
-    ) {
-        AbstractArrow arrow = (AbstractArrow)(Object)this;
-        if(!(owner.getVehicle() instanceof OrientationControllable vehicle)) return;
-        if(!(vehicle instanceof PokemonEntity)) return;
-        var vehicleController = vehicle.getOrientationController();
-
-        // If this is a pokemon ride passenger then use the rider eye position to set the arrow spawn position.
-        if (owner instanceof RidePassenger ridePassenger && vehicleController != null ) {
-            var eyePos = ridePassenger.cobblemon$getRideEyePos(); //.add(0.0, -2.0, 0.0);
-            arrow.setPos(eyePos);
-        }
-    }
-}

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

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

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

@@ -1,132 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.mixin;
-
-
-import com.cobblemon.mod.common.CobblemonMemories;
-import com.cobblemon.mod.common.api.ai.config.task.PathToBeeHiveTaskConfig;
-import com.cobblemon.mod.common.api.pokemon.PokemonProperties;
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
-import com.cobblemon.mod.common.world.feature.SaccharineTreeFeature;
-import net.minecraft.core.BlockPos;
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.tags.BlockTags;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.entity.EntityType;
-import net.minecraft.world.entity.ai.memory.MemoryStatus;
-import net.minecraft.world.item.component.CustomData;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.level.block.BeehiveBlock;
-import net.minecraft.world.level.block.HorizontalDirectionalBlock;
-import net.minecraft.world.level.block.entity.BeehiveBlockEntity;
-import net.minecraft.world.phys.Vec3;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
-
-@Mixin(BeehiveBlockEntity.Occupant.class)
-public abstract class BeeOccupantMixin {
-
-    @Inject(method = "createEntity", at = @At("RETURN"), cancellable = true)
-    private void cobblemon$createEntity(Level level, BlockPos pos, CallbackInfoReturnable<Entity> cir) {
-        // Needing to replicate all the post op stuff on the hive isn't great
-        if (cir.getReturnValue() == null) {
-            final BeehiveBlockEntity.Occupant occupant = (BeehiveBlockEntity.Occupant) (Object) this;
-            CompoundTag compoundTag = occupant.entityData().copyTag();
-            String id = compoundTag.getString("id");
-            Entity entity = null;
-            if (id.equals(SaccharineTreeFeature.Companion.getPOKEMON_PLACEHOLD_ID())) {
-                // Special case for Pokemon stuffed into a beenest upon world gen.
-                // For technical reasons we cannot create them as full entities during world gen.
-                // So we look for this special id tag and complete the entity when it attempts to exit a hive.
-                if (compoundTag.contains("pokemonProperties")) {
-                    String properties = compoundTag.getString("pokemonProperties");
-                    PokemonProperties pokemon = PokemonProperties.Companion.parse(properties);
-                    entity = pokemon.createEntity(level);
-                }
-            } else {
-                entity = EntityType.loadEntityRecursive(compoundTag, level, (entityx) -> entityx);
-            }
-
-            if (entity instanceof PokemonEntity pokemonEntity) {
-                var state = level.getBlockState(pos);
-                var newPos = Vec3.ZERO;
-                var newYaw = 0f;
-                var brain = pokemonEntity.getBrain();
-                if (state.is(BlockTags.BEEHIVES)) {
-                    // position in front of the entrance, face away from the block
-                    var facing = state.getValue(HorizontalDirectionalBlock.FACING);
-                    newPos = pos.relative(facing).getCenter();
-                    newYaw = facing.toYRot();
-                    if (brain.checkMemory(CobblemonMemories.HIVE_LOCATION, MemoryStatus.REGISTERED)) {
-                        brain.setMemory(CobblemonMemories.HIVE_LOCATION, pos); // This needs to be set in the case that the hive was picked up and moved.
-                    }
-                } else {
-                    // Block has likely been destroyed
-                    var center = pos.getCenter();
-                    newPos = new Vec3(
-                            center.x + level.random.nextFloat() * 0.6 - 0.3,
-                            center.y + level.random.nextFloat() * 0.6 - 0.3,
-                            center.z + level.random.nextFloat() * 0.6 - 0.3
-                    );
-                    newYaw = level.random.nextFloat() * 360F;
-                    if (brain.checkMemory(CobblemonMemories.HIVE_LOCATION, MemoryStatus.REGISTERED)) {
-                        brain.eraseMemory(CobblemonMemories.HIVE_LOCATION);
-                    }
-                }
-                entity.yRotO = newYaw;
-                entity.setPos(newPos);
-                // Do honey logic
-                if (brain.checkMemory(CobblemonMemories.HAS_NECTAR, MemoryStatus.REGISTERED)) {
-                    var hasNectar = brain.getMemory(CobblemonMemories.HAS_NECTAR).orElse(false);
-                    if (hasNectar) {
-                        // Remove nectar and reset got to hive cooldown
-                        brain.eraseMemory(CobblemonMemories.HAS_NECTAR);
-                        if (brain.checkMemory(CobblemonMemories.HIVE_LOCATION, MemoryStatus.REGISTERED)) {
-                            brain.setMemoryWithExpiry(CobblemonMemories.HIVE_COOLDOWN, true, PathToBeeHiveTaskConfig.STAY_OUT_OF_HIVE_COOLDOWN);
-                        }
-                        // Increment honey level of the hive
-                        if (state.is(BlockTags.BEEHIVES, (blockStateBase) -> blockStateBase.hasProperty(BeehiveBlock.HONEY_LEVEL))) {
-                            int i = state.getValue(BeehiveBlock.HONEY_LEVEL);
-                            if (i < 5) {
-                                int j = level.random.nextInt(100) == 0 ? 2 : 1;
-                                if (i + j > 5) {
-                                    --j;
-                                }
-                                level.setBlockAndUpdate(pos, state.setValue(BeehiveBlock.HONEY_LEVEL, i + j));
-                            }
-                        }
-                    }
-                }
-                cir.setReturnValue(entity);
-            }
-        }
-    }
-
-    @Inject(method = "of", at = @At("HEAD"), cancellable = true)
-    private static void cobblemon$of(Entity entity, CallbackInfoReturnable<BeehiveBlockEntity.Occupant> cir) {
-        if (entity instanceof PokemonEntity pokemonEntity) {
-            List<String> IGNORED_BEE_TAGS = Arrays.asList("Air", "ArmorDropChances", "ArmorItems", "CanPickUpLoot", "DeathTime", "FallDistance", "FallFlying", "Fire", "HandDropChances", "HandItems", "HurtByTimestamp", "HurtTime", "LeftHanded", "Motion", "NoGravity", "OnGround", "PortalCooldown", "Pos", "Rotation", "Passengers", "leash", "UUID");
-            CompoundTag compoundTag = new CompoundTag();
-            entity.save(compoundTag);
-            Objects.requireNonNull(compoundTag);
-            IGNORED_BEE_TAGS.forEach(compoundTag::remove);
-            boolean hasNectar = pokemonEntity.getBrain().checkMemory(CobblemonMemories.HAS_NECTAR, MemoryStatus.REGISTERED)
-                    && pokemonEntity.getBrain().getMemory(CobblemonMemories.HAS_NECTAR).orElse(false);
-            cir.setReturnValue(new BeehiveBlockEntity.Occupant(CustomData.of(compoundTag), 0, hasNectar ? 2400 : 600));
-            cir.cancel();
-        }
-
-    }
-}

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

@@ -1,102 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.mixin;
-
-
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
-import com.cobblemon.mod.common.mixin.accessor.BeeDataAccessor;
-import com.cobblemon.mod.common.mixin.accessor.BeehiveBlockEntityAccessor;
-import com.cobblemon.mod.common.mixin.accessor.BlockEntityAccessor;
-import com.google.common.collect.Lists;
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.entity.ai.memory.MemoryModuleType;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.level.block.entity.BeehiveBlockEntity;
-import net.minecraft.world.level.block.state.BlockState;
-import org.jetbrains.annotations.Nullable;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Accessor;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.Redirect;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-import java.util.List;
-
-@Mixin(BeehiveBlockEntity.class)
-public abstract class BeehiveBlockEntityMixin {
-
-
-    // Accessor for the private 'stored' field in BeehiveBlockEntity
-    @Accessor("stored")
-    public abstract List<BeeDataAccessor> getStored();
-
-    @Inject(method = "emptyAllLivingFromHive", at = @At("HEAD"))
-    private void cobblemon$emptyAllLivingFromHive(@Nullable Player player, BlockState state, BeehiveBlockEntity.BeeReleaseStatus releaseStatus, CallbackInfo ci) {
-        if (player != null) {
-            final BeehiveBlockEntity blockEntity = (BeehiveBlockEntity) (Object) this;
-            // if the block is sedated or the player is too far away, no aggro should be applied
-            if (blockEntity.isSedated() || player.position().distanceToSqr(blockEntity.getBlockPos().getCenter()) > 16.0)
-                return;
-            // from this point need to access private members of the block entity
-            final BeehiveBlockEntityAccessor blockEntityAccessor = (BeehiveBlockEntityAccessor) this;
-            List<Object> storedList = blockEntityAccessor.getStored();
-
-            List<Entity> list = Lists.newArrayList();
-            storedList.removeIf((beeData) -> {
-                        BeehiveBlockEntity.Occupant occupant = ((BeeDataAccessor) beeData).invokeToOccupant();
-                        // Checking the for the tag allows us to make sure it's one of our pokemon before trying to rehydrate it into an entity
-                        boolean isPokemon = false;
-                        if (occupant.entityData().contains("id")) {
-                            isPokemon = "cobblemon:pokemon".equals(occupant.entityData().getUnsafe().getString("id"));
-                        }
-                        if (isPokemon) {
-                            return BeehiveBlockEntityAccessor.releaseOccupant(
-                                    ((BlockEntityAccessor) blockEntityAccessor).getLevel(),
-                                    ((BlockEntityAccessor) blockEntityAccessor).getWorldPosition(),
-                                    state,
-                                    occupant,
-                                    list,
-                                    releaseStatus,
-                                    blockEntityAccessor.savedFlowerPos());
-                        } else {
-                            return false;
-                        }
-                    }
-            );
-            for (Entity entity : list) {
-                if (entity instanceof PokemonEntity) {
-                    ((PokemonEntity) entity).getBrain().setMemory(MemoryModuleType.ATTACK_TARGET, player);
-                }
-            }
-        }
-    }
-
-    @Redirect(
-            method = "releaseOccupant",
-            at = @At(
-                    value = "INVOKE",
-                    target = "Lnet/minecraft/world/level/Level;addFreshEntity(Lnet/minecraft/world/entity/Entity;)Z"
-            )
-    )
-    private static boolean cobblemon$captureReleasedEntity(
-            Level level, Entity entity,
-            Level lvl, BlockPos pos, BlockState state,
-            BeehiveBlockEntity.Occupant occupant, @Nullable List<Entity> bees,
-            BeehiveBlockEntity.BeeReleaseStatus releaseStatus, @Nullable BlockPos flowerPos) {
-
-        if (bees != null && !bees.contains(entity)) {
-            // Avoid duplicates if vanilla also adds bees to the list on your version
-            bees.add(entity);
-        }
-        return level.addFreshEntity(entity);
-    }
-}
-

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

@@ -10,21 +10,22 @@ package com.cobblemon.mod.common.mixin;
 
 import com.cobblemon.mod.common.client.render.item.CobblemonBuiltinItemRenderer;
 import com.cobblemon.mod.common.client.render.item.CobblemonBuiltinItemRendererRegistry;
-import com.mojang.blaze3d.vertex.PoseStack;
-import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer;
-import net.minecraft.client.renderer.MultiBufferSource;
-import net.minecraft.world.item.ItemDisplayContext;
-import net.minecraft.world.item.ItemStack;
+import net.minecraft.client.render.VertexConsumerProvider;
+import net.minecraft.client.render.item.BuiltinModelItemRenderer;
+import net.minecraft.client.render.model.json.ModelTransformation;
+import net.minecraft.client.render.model.json.ModelTransformationMode;
+import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.item.ItemStack;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-@Mixin(BlockEntityWithoutLevelRenderer.class)
+@Mixin(BuiltinModelItemRenderer.class)
 public class BuiltinModelItemRendererMixin {
 
-    @Inject(method = "renderByItem", at = @At("HEAD"), cancellable = true)
-    private void cobblemon$useDynamicItemRenderer(ItemStack stack, ItemDisplayContext mode, PoseStack matrices, MultiBufferSource vertexConsumers, int light, int overlay, CallbackInfo ci) {
+    @Inject(method = "render", at = @At("HEAD"), cancellable = true)
+    private void cobblemon$useDynamicItemRenderer(ItemStack stack, ModelTransformationMode mode, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, int overlay, CallbackInfo ci) {
         CobblemonBuiltinItemRenderer renderer = CobblemonBuiltinItemRendererRegistry.INSTANCE.rendererOf(stack.getItem());
         if (renderer != null) {
             renderer.render(stack, mode, matrices, vertexConsumers, light, overlay);

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

@@ -1,48 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.mixin;
-
-import static com.cobblemon.mod.common.datafixer.CobblemonSchemas.VERSION_KEY;
-
-import com.cobblemon.mod.common.datafixer.CobblemonSchemas;
-import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
-import com.mojang.serialization.MapCodec;
-import java.util.Optional;
-import java.util.function.Supplier;
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.nbt.IntTag;
-import net.minecraft.resources.ResourceKey;
-import net.minecraft.util.datafix.DataFixTypes;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.level.chunk.ChunkGenerator;
-import net.minecraft.world.level.chunk.storage.ChunkStorage;
-import net.minecraft.world.level.storage.DimensionDataStorage;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.ModifyVariable;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-
-@Mixin(ChunkStorage.class)
-public class ChunkStorageMixin {
-    //Modifies the NBT returned by the vanilla upgradeChunkTag to also incorporate cobblemon fixup stuff
-    @ModifyExpressionValue(
-        method = "upgradeChunkTag(Lnet/minecraft/resources/ResourceKey;Ljava/util/function/Supplier;Lnet/minecraft/nbt/CompoundTag;Ljava/util/Optional;)Lnet/minecraft/nbt/CompoundTag;",
-        at = @At(
-            value = "INVOKE",
-            target = "Lnet/minecraft/util/datafix/DataFixTypes;updateToCurrentVersion(Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/nbt/CompoundTag;I)Lnet/minecraft/nbt/CompoundTag;"
-        )
-    )
-    public CompoundTag cobblemon$doChunkFix(
-        CompoundTag vanillaFixed
-    ) {
-        int curVersion = vanillaFixed.contains(VERSION_KEY) ? vanillaFixed.getInt(VERSION_KEY) : 0;
-        return DataFixTypes.CHUNK.update(CobblemonSchemas.getDATA_FIXER(), vanillaFixed, curVersion, CobblemonSchemas.DATA_VERSION);
-    }
-}

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

@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.mixin;
-
-import com.cobblemon.mod.common.CobblemonBuildDetails;
-import net.minecraft.CrashReport;
-import net.minecraft.CrashReportCategory;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-@Mixin(CrashReport.class)
-public final class CrashReportMixin {
-
-    @Inject(method = "getDetails(Ljava/lang/StringBuilder;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/SystemReport;appendToCrashReportString(Ljava/lang/StringBuilder;)V"))
-    public void cobblemon$printCobblemonDetails(StringBuilder builder, CallbackInfo callback) {
-        CrashReportCategory cobblemon = new CrashReportCategory("Cobblemon");
-        cobblemon.setDetail("Version", CobblemonBuildDetails.VERSION);
-        cobblemon.setDetail("Is Snapshot", CobblemonBuildDetails.SNAPSHOT);
-        cobblemon.setDetail("Git Commit", CobblemonBuildDetails.INSTANCE.smallCommitHash() + " (" + "https://gitlab.com/cable-mc/cobblemon/-/commit/" + CobblemonBuildDetails.GIT_COMMIT + ")");
-        cobblemon.setDetail("Branch", CobblemonBuildDetails.BRANCH);
-
-        cobblemon.getDetails(builder);
-        builder.append("\n\n");
-    }
-
-}

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

@@ -9,10 +9,9 @@
 package com.cobblemon.mod.common.mixin;
 
 import com.cobblemon.mod.common.sherds.CobblemonSherds;
-import net.minecraft.resources.ResourceKey;
-import net.minecraft.world.item.Item;
-import net.minecraft.world.level.block.entity.DecoratedPotPattern;
-import net.minecraft.world.level.block.entity.DecoratedPotPatterns;
+import net.minecraft.block.DecoratedPotPatterns;
+import net.minecraft.item.Item;
+import net.minecraft.registry.RegistryKey;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -20,14 +19,12 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(DecoratedPotPatterns.class)
 public abstract class DecoratedPotPatternsMixin {
-    @Inject(method = "getPatternFromItem", at=@At("HEAD"), cancellable = true)
-    private static void cobblemon$getCobblemonSherdTexture(
-        Item sherd,
-        CallbackInfoReturnable<ResourceKey<DecoratedPotPattern>> cir
-    ) {
+    @Inject(method = "fromSherd", at=@At("HEAD"), cancellable = true)
+    private static void cobblemon$getCobblemonSherdTexture(Item sherd,
+        CallbackInfoReturnable<RegistryKey<String>> cir) {
         if (CobblemonSherds.INSTANCE.getSherdToPattern().containsKey(sherd)) {
             cir.setReturnValue(CobblemonSherds.INSTANCE.getSherdToPattern().get(sherd));
-            cir.cancel();
+            return;
         }
     }
 }

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

@@ -1,62 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.mixin;
-
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
-import net.minecraft.world.InteractionHand;
-import net.minecraft.world.InteractionResultHolder;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.item.EnderpearlItem;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.phys.AABB;
-import net.minecraft.world.phys.Vec3;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-
-import java.util.Comparator;
-
-@Mixin(EnderpearlItem.class)
-public abstract class EnderPearlItemMixin {
-    @Inject(method = "use", at = @At(value = "HEAD"), cancellable = true)
-    private void cobblemon$use(Level level, Player player, InteractionHand usedHand, CallbackInfoReturnable<InteractionResultHolder<ItemStack>> cir) {
-        double range = player.entityInteractionRange();
-        Entity closestEntity = level.getEntities(player, AABB.ofSize(player.position(), range, range, range)).stream()
-            .filter(entity -> isLookingAt(player, entity))
-            .min(Comparator.comparingDouble(entity -> entity.distanceTo(player)))
-            .orElse(null);
-
-        if (closestEntity instanceof PokemonEntity pokemonEntity) {
-            if (player.isCrouching() && pokemonEntity.getOwnerUUID() == player.getUUID()) {
-                cir.cancel();
-            }
-        }
-    }
-
-    public boolean isLookingAt(Player player, Entity other) {
-        float maxDistance = 10F;
-        float stepDistance = 0.1F;
-        double step = stepDistance;
-        Vec3 startPos = player.getEyePosition();
-        Vec3 direction = player.getLookAngle();
-
-        while (step <= maxDistance) {
-            Vec3 location = startPos.add(direction.scale(step));
-            step += stepDistance;
-
-            if (other.getBoundingBox().contains(location)) {
-                return true;
-            }
-        }
-        return false;
-    }
-}

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

@@ -1,61 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.mixin;
-
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
-import com.cobblemon.mod.common.pokemon.ai.EntityBehaviour;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.world.entity.Mob;
-import net.minecraft.world.entity.ai.goal.AvoidEntityGoal;
-import net.minecraft.world.entity.monster.Creeper;
-import net.minecraft.world.level.Level;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-@Mixin(Creeper.class)
-public class EntityCreeperMixin extends Mob {
-
-    private EntityCreeperMixin(net.minecraft.world.entity.EntityType<? extends Creeper> entityType, Level world) {
-        super(entityType, world);
-    }
-
-    @Inject(method = "registerGoals", at = @At(value = "TAIL"), cancellable = false)
-    private void cobblemon$initGoals(CallbackInfo callbackInfo) {
-        final Creeper creeper = (Creeper) (Object) this;
-        // Pokemon Entities
-        this.goalSelector.addGoal(
-            3,
-            new AvoidEntityGoal<>(
-                creeper,
-                PokemonEntity.class,
-                6.0f,
-                1.0,
-                1.2,
-                 entity -> ((PokemonEntity)entity).getBehaviour().getEntityInteract().getAvoidedByCreeper() && ((PokemonEntity)entity).getBeamMode() != 1
-            )
-        );
-
-        // Players with shoulder mounted Pokemon
-        this.goalSelector.addGoal(
-            3,
-            new AvoidEntityGoal<>(
-                creeper,
-                ServerPlayer.class,
-                6.0f,
-                1.0,
-                1.2,
-                entity -> EntityBehaviour.Companion.hasCreeperFearedShoulderMount((ServerPlayer)entity)
-            )
-        );
-
-    }
-}
-

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

@@ -1,62 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.mixin;
-
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
-import com.cobblemon.mod.common.pokemon.ai.EntityBehaviour;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.world.entity.Mob;
-import net.minecraft.world.entity.ai.goal.AvoidEntityGoal;
-import net.minecraft.world.entity.animal.Fox;
-import net.minecraft.world.entity.monster.Creeper;
-import net.minecraft.world.level.Level;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-@Mixin(Fox.class)
-public class EntityFoxMixin extends Mob {
-
-    private EntityFoxMixin(net.minecraft.world.entity.EntityType<? extends Creeper> entityType, Level world) {
-        super(entityType, world);
-    }
-
-    @Inject(method = "registerGoals", at = @At(value = "TAIL"), cancellable = false)
-    private void cobblemon$initGoals(CallbackInfo callbackInfo) {
-        final Fox fox = (Fox) (Object) this;
-        // Pokemon Entities
-        this.goalSelector.addGoal(
-            4,
-            new AvoidEntityGoal<>(
-                    fox,
-                PokemonEntity.class,
-                8.0f,
-                1.6,
-                1.4,
-                 entity -> ((PokemonEntity)entity).getBehaviour().getEntityInteract().getAvoidedByFox() && ((PokemonEntity)entity).getBeamMode() != 1
-            )
-        );
-
-        // Players with shoulder mounted Pokemon
-        this.goalSelector.addGoal(
-            3,
-            new AvoidEntityGoal<>(
-                fox,
-                ServerPlayer.class,
-                8.0f,
-                1.6,
-                1.4,
-                entity -> EntityBehaviour.Companion.hasFoxFearedShoulderMount((ServerPlayer)entity)
-            )
-        );
-
-    }
-}
-

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

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

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

@@ -1,62 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.mixin;
-
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
-import com.cobblemon.mod.common.pokemon.ai.EntityBehaviour;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.world.entity.EntityType;
-import net.minecraft.world.entity.Mob;
-import net.minecraft.world.entity.ai.goal.AvoidEntityGoal;
-import net.minecraft.world.entity.monster.AbstractSkeleton;
-import net.minecraft.world.level.Level;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-@Mixin(AbstractSkeleton.class)
-public class EntitySkeletonMixin extends Mob {
-
-    private EntitySkeletonMixin(EntityType<? extends Mob> entityType, Level world) {
-        super(entityType, world);
-    }
-
-    @Inject(method = "registerGoals", at = @At(value = "TAIL"))
-    private void cobblemon$initGoals(CallbackInfo callbackInfo) {
-        final AbstractSkeleton skeleton = (AbstractSkeleton) (Object) this;
-        // Pokemon Entities
-        this.goalSelector.addGoal(
-            3,
-            new AvoidEntityGoal<>(
-                skeleton,
-                PokemonEntity.class,
-                6.0f,
-                1.0,
-                1.2,
-                 entity -> ((PokemonEntity)entity).getBehaviour().getEntityInteract().getAvoidedBySkeleton() && ((PokemonEntity)entity).getBeamMode() != 1
-            )
-        );
-
-        // Players with shoulder mounted Pokemon
-        this.goalSelector.addGoal(
-            3,
-            new AvoidEntityGoal<>(
-                skeleton,
-                ServerPlayer.class,
-                6.0f,
-                1.0,
-                1.2,
-                entity -> EntityBehaviour.Companion.hasSkeletonFearedShoulderMount((ServerPlayer)entity)
-            )
-        );
-
-    }
-}
-

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

@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.mixin;
-
-import static com.cobblemon.mod.common.datafixer.CobblemonSchemas.VERSION_KEY;
-
-import com.cobblemon.mod.common.datafixer.CobblemonSchemas;
-import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.nbt.IntTag;
-import net.minecraft.util.datafix.DataFixTypes;
-import net.minecraft.world.level.chunk.storage.EntityStorage;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-
-@Mixin(EntityStorage.class)
-public class EntityStorageMixin {
-    //Modifies the NBT returned by the vanilla upgradeChunkTag to also incorporate cobblemon fixup stuff
-    @ModifyExpressionValue(
-        method = "method_31731(Lnet/minecraft/world/level/ChunkPos;Ljava/util/Optional;)Lnet/minecraft/world/level/entity/ChunkEntities;",
-        at = @At(
-            value = "INVOKE",
-            target = "Lnet/minecraft/world/level/chunk/storage/SimpleRegionStorage;upgradeChunkTag(Lnet/minecraft/nbt/CompoundTag;I)Lnet/minecraft/nbt/CompoundTag;"
-        )
-    )
-    public CompoundTag cobblemon$doEntityFix(
-        CompoundTag vanillaFixed
-    ) {
-        int curVersion = vanillaFixed.contains(VERSION_KEY) ? vanillaFixed.getInt(VERSION_KEY) : 0;
-        CompoundTag newTag =  DataFixTypes.ENTITY_CHUNK.update(CobblemonSchemas.getDATA_FIXER(), vanillaFixed, curVersion, CobblemonSchemas.DATA_VERSION);
-        newTag.put(VERSION_KEY, IntTag.valueOf(CobblemonSchemas.DATA_VERSION));
-        return newTag;
-    }
-}

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

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

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

@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.mixin;
+
+import com.cobblemon.mod.common.block.PreEmptsExplosion;
+import net.minecraft.block.BlockState;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+import net.minecraft.world.explosion.Explosion;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+
+@Mixin(value = Explosion.class)
+public class ExplosionMixin {
+
+    @Redirect(
+            method = "affectWorld",
+            at = @At(
+                    value = "INVOKE",
+                    target = "Lnet/minecraft/world/World;getBlockState(Lnet/minecraft/util/math/BlockPos;)Lnet/minecraft/block/BlockState;",
+                    ordinal = 0
+            )
+    )
+    public BlockState cobblemon$whenExploded(World world, BlockPos pos) {
+        BlockState blockState = world.getBlockState(pos);
+        if(blockState.getBlock() instanceof PreEmptsExplosion preExplosionBlock) {
+            preExplosionBlock.whenExploded(world, blockState, pos);
+        }
+        return blockState;
+    }
+}

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

@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.mixin;
+
+import com.cobblemon.mod.common.api.scheduling.ClientTaskTracker;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.render.GameRenderer;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(GameRenderer.class)
+public class GameRendererMixin {
+    @Unique
+    long lastTime = -1;
+
+    @Inject(
+            method = "render",
+            at = @At(value = "TAIL")
+    )
+    public void render(float tickDelta, long startTime, boolean tick, CallbackInfo ci) {
+        MinecraftClient client = MinecraftClient.getInstance();
+        long newTime = System.currentTimeMillis();
+        // Don't play scheduled animations when the game is paused
+        if (client.isPaused()) {
+            lastTime = newTime;
+            return;
+        }
+
+        if (lastTime != -1) {
+            ClientTaskTracker.INSTANCE.update((newTime - lastTime) / 1000F);
+        }
+        lastTime = newTime;
+    }
+
+}

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

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

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

@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.mixin;
-
-import com.cobblemon.mod.common.util.DataKeys;
-import com.mojang.serialization.Dynamic;
-import net.minecraft.util.datafix.fixes.ItemStackComponentizationFix;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Unique;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-import java.util.stream.Stream;
-
-@Mixin(ItemStackComponentizationFix.class)
-public class ItemStackComponentizationFixMixin
-{
-    @Inject(method = "fixItemStack", at = @At("TAIL"))
-    private static void fixItemStack(ItemStackComponentizationFix.ItemStackData itemStackData, Dynamic<?> dynamic, CallbackInfo ci) {
-        cobblemon$attemptPokemonModelDataFix(itemStackData, dynamic);
-    }
-
-    @Unique
-    private static void cobblemon$attemptPokemonModelDataFix(ItemStackComponentizationFix.ItemStackData itemStackData, Dynamic<?> dynamic)
-    {
-        var species = itemStackData.removeTag(DataKeys.POKEMON_ITEM_SPECIES).asString();
-        var aspects = itemStackData.removeTag(DataKeys.POKEMON_ITEM_ASPECTS).asList(dynamic1 -> dynamic1);
-        var redTint = itemStackData.removeTag(DataKeys.POKEMON_ITEM_TINT_RED).asNumber();
-        var greenTint = itemStackData.removeTag(DataKeys.POKEMON_ITEM_TINT_GREEN).asNumber();
-        var blueTint = itemStackData.removeTag(DataKeys.POKEMON_ITEM_TINT_BLUE).asNumber();
-        var alphaTint = itemStackData.removeTag(DataKeys.POKEMON_ITEM_TINT_ALPHA).asNumber();
-        if(species.hasResultOrPartial() && aspects != null) {
-            var pokeComponent = dynamic.emptyMap().set("species", dynamic.createString(species.getOrThrow()));
-            pokeComponent = pokeComponent.set("aspects", dynamic.createList(aspects.stream()));
-            if(redTint.hasResultOrPartial() || blueTint.hasResultOrPartial() || greenTint.hasResultOrPartial() || alphaTint.hasResultOrPartial()) {
-                pokeComponent = pokeComponent.set("tint", dynamic.createList(Stream.of(redTint, greenTint, blueTint, alphaTint)
-                                                                                     .map(x -> x.mapOrElse(Number::floatValue, error -> 0F))
-                                                                                     .map(dynamic::createFloat)));
-            }
-            itemStackData.setComponent("cobblemon:pokemon_item", pokeComponent);
-        }
-    }
-}

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

@@ -1,63 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.mixin;
-
-import com.cobblemon.mod.common.block.entity.LecternBlockEntity;
-import com.cobblemon.mod.common.CobblemonBlocks;
-import com.cobblemon.mod.common.CobblemonSounds;
-import com.cobblemon.mod.common.item.PokedexItem;
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.Direction;
-import net.minecraft.sounds.SoundSource;
-import net.minecraft.world.InteractionHand;
-import net.minecraft.world.ItemInteractionResult;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.level.block.HorizontalDirectionalBlock;
-import net.minecraft.world.level.block.LecternBlock;
-import net.minecraft.world.level.block.entity.BlockEntity;
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.phys.BlockHitResult;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-
-import static net.minecraft.world.level.block.LecternBlock.HAS_BOOK;
-
-@Mixin(LecternBlock.class)
-public abstract class LecternBlockMixin {
-    @Inject(method = "useItemOn", at = @At(value = "HEAD"), cancellable = true)
-    private void cobblemon$useItemOn(ItemStack itemStack, BlockState blockState, Level world, BlockPos blockPos, Player player, InteractionHand interactionHand, BlockHitResult blockHitResult, CallbackInfoReturnable<ItemInteractionResult> cir) {
-        if (!world.isClientSide && itemStack.getItem() instanceof PokedexItem) {
-            BlockEntity blockEntity = world.getBlockEntity(blockPos);
-            if (!blockState.getValue(HAS_BOOK)
-                && blockEntity instanceof net.minecraft.world.level.block.entity.LecternBlockEntity
-                && blockState.getBlock() instanceof LecternBlock
-            ) {
-                ItemStack pokedexItemStack = itemStack.copy();
-                Direction facing = blockState.getValue(HorizontalDirectionalBlock.FACING);
-                itemStack.consumeAndReturn(1, player);
-                blockEntity.setRemoved();
-                BlockState newBlockState = CobblemonBlocks.LECTERN.defaultBlockState().setValue(HorizontalDirectionalBlock.FACING, facing);
-                world.setBlockAndUpdate(blockPos, newBlockState);
-                BlockEntity lecternEntity = world.getBlockEntity(blockPos);
-
-                if (lecternEntity instanceof LecternBlockEntity) {
-                    ((LecternBlockEntity) lecternEntity).setItemStack((pokedexItemStack));
-                    world.playSound(null, blockPos, CobblemonSounds.POKEDEX_CLOSE, SoundSource.BLOCKS, 0.5F, 1.25F);
-                    cir.setReturnValue(ItemInteractionResult.SUCCESS);
-                } else {
-                    cir.setReturnValue(itemStack.isEmpty() && interactionHand == InteractionHand.MAIN_HAND ? ItemInteractionResult.SKIP_DEFAULT_BLOCK_INTERACTION : ItemInteractionResult.PASS_TO_DEFAULT_BLOCK_INTERACTION);
-                }
-            }
-        }
-    }
-}

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

@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.mixin;
-
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.entity.LightningBolt;
-import net.minecraft.world.phys.AABB;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-import java.util.List;
-
-
-@Mixin(LightningBolt.class)
-public abstract class LightningBoltMixin {
-
-    @Inject(method = "spawnFire", at = @At(value = "Head"), cancellable = true)
-    private void cobblemon$spawnFire(int extraIgnitions, CallbackInfo ci) {
-        // This prevents fire from spawning around Pokemon who otherwise should be immune to lightning and effectively absorb the hit
-        final LightningBolt lightningBolt = (LightningBolt) (Object) this;
-        List<Entity> list = lightningBolt.level().getEntities(
-                lightningBolt,
-                new AABB(lightningBolt.getX() - 2.0, lightningBolt.getY() - 2.0, lightningBolt.getZ() - 2.0, lightningBolt.getX() + 2.0, lightningBolt.getY() + 2.0, lightningBolt.getZ() + 2.0),
-                it -> {
-                    if (!it.isAlive() || !(it instanceof PokemonEntity)) {
-                        return false;
-                    }
-                    String abilityName = ((PokemonEntity) it).getPokemon().getAbility().getName();
-                    return abilityName.equals("lightningrod") || abilityName.equals("voltabsorb") || abilityName.equals("motordrive");
-                });
-        if (!list.isEmpty()) {
-            ci.cancel();
-        }
-    }
-}

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

@@ -8,154 +8,23 @@
 
 package com.cobblemon.mod.common.mixin;
 
-import com.cobblemon.mod.common.CobblemonNetwork;
-import com.cobblemon.mod.common.OrientationControllable;
-import com.cobblemon.mod.common.api.orientation.OrientationController;
 import com.cobblemon.mod.common.api.pokemon.effect.ShoulderEffectRegistry;
-import com.cobblemon.mod.common.api.riding.RidingStyle;
-import com.cobblemon.mod.common.api.riding.Seat;
-import com.cobblemon.mod.common.api.riding.behaviour.types.liquid.SubmarineBehaviour;
-import com.cobblemon.mod.common.client.entity.PokemonClientDelegate;
-import com.cobblemon.mod.common.client.render.MatrixWrapper;
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
-import com.cobblemon.mod.common.net.messages.server.orientation.ServerboundUpdateOrientationPacket;
-import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
-import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.world.effect.MobEffectInstance;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.entity.EntityType;
-import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.level.ClipContext;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.phys.HitResult;
-import net.minecraft.world.phys.Vec3;
-import org.jetbrains.annotations.NotNull;
-import org.joml.Quaternionf;
-import org.joml.Vector3f;
+import net.minecraft.entity.LivingEntity;
+import net.minecraft.entity.effect.StatusEffectInstance;
+import net.minecraft.server.network.ServerPlayerEntity;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(LivingEntity.class)
-public abstract class LivingEntityMixin extends Entity implements OrientationControllable {
+public abstract class LivingEntityMixin {
 
-    public LivingEntityMixin(EntityType<?> entityType, Level level) {
-        super(entityType, level);
-    }
-
-    @Unique
-    private final OrientationController cobblemon$orientationController = new OrientationController((LivingEntity) (Object) this);
-
-    public OrientationController getOrientationController() {
-        return cobblemon$orientationController;
-    }
-
-    @Inject(method = "onEffectRemoved", at = @At(value = "TAIL"))
-    private void cobblemon$onEffectRemoved(MobEffectInstance effect, CallbackInfo ci) {
+    @Inject(method = "onStatusEffectRemoved", at = @At(value = "TAIL"))
+    private void cobblemon$onStatusEffectRemoved(StatusEffectInstance effect, CallbackInfo ci) {
         final LivingEntity entity = (LivingEntity) (Object) this;
-        if (entity instanceof ServerPlayer) {
-            ShoulderEffectRegistry.INSTANCE.onEffectEnd((ServerPlayer) entity);
-        }
-    }
-
-    @WrapOperation(method = "baseTick", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/LivingEntity;isInWall()Z"))
-    public boolean cobblemon$preventMountSuffocation(LivingEntity instance, Operation<Boolean> original) {
-        if (instance.getVehicle() instanceof PokemonEntity) {
-            return false;
-        }
-        return original.call(instance);
-    }
-
-    @Override
-    public @NotNull HitResult pick(double hitDistance, float partialTicks, boolean hitFluids) {
-        Entity vehicle = this.getVehicle();
-        if (vehicle instanceof PokemonEntity pokemonEntity && pokemonEntity.getDelegate() instanceof PokemonClientDelegate delegate) {
-            int seatIndex = pokemonEntity.getPassengers().indexOf(this);
-            Seat seat = pokemonEntity.getSeats().get(seatIndex);
-            MatrixWrapper locator = delegate.getLocatorStates().get(seat.getLocator());
-
-            Vec3 locatorOffset = new Vec3(locator.getMatrix().getTranslation(new Vector3f()));
-
-            Vec3 eyePosition = cobblemon$getEyePosition(partialTicks, pokemonEntity, locatorOffset);
-
-            Vec3 viewVector = this.getViewVector(partialTicks);
-            Vec3 viewDistanceVector = eyePosition.add(viewVector.x * hitDistance, viewVector.y * hitDistance, viewVector.z * hitDistance);
-
-            return this.level()
-                    .clip(
-                            new ClipContext(
-                                    eyePosition, viewDistanceVector, ClipContext.Block.OUTLINE, hitFluids ? net.minecraft.world.level.ClipContext.Fluid.ANY : net.minecraft.world.level.ClipContext.Fluid.NONE, this
-                            )
-                    );
-        }
-
-        return super.pick(hitDistance, partialTicks, hitFluids);
-    }
-
-    @Unique
-    private Vec3 cobblemon$getEyePosition(float partialTicks, PokemonEntity pokemonEntity, Vec3 locatorOffset) {
-        OrientationController controller = this.getOrientationController();
-
-        float currEyeHeight = this.getEyeHeight();
-        Vec3 offset = locatorOffset.add(pokemonEntity.position());
-        if (controller.isActive() && controller.getOrientation() != null) {
-            Quaternionf orientation = controller.getRenderOrientation(partialTicks);
-            Vec3 rotatedEyeHeight = new Vec3(orientation.transform(new Vector3f(0f, currEyeHeight - (this.getBbHeight() / 2), 0f)));
-
-            offset.add(rotatedEyeHeight);
-        }
-
-        return offset;
-    }
-
-    @Inject(method = "tick", at = @At("HEAD"))
-    private void cobblemon$updateRenderOrientation(CallbackInfo ci) {
-        this.cobblemon$orientationController.tick();
-    }
-
-    @Override
-    public void absMoveTo(double x, double y, double z, float yaw, float pitch) {
-        if (cobblemon$orientationController.getActive()) {
-            this.absMoveTo(x, y, z);
-            this.setYRot(yaw % 360.0f);
-            this.setXRot(pitch % 360.0f);
-            this.yRotO = this.getYRot();
-            this.xRotO = this.getXRot();
-        } else {
-            this.absMoveTo(x, y, z);
-            this.absRotateTo(yaw, pitch);
-        }
-    }
-
-    @Inject(method = "decreaseAirSupply", at = @At("HEAD"), cancellable = true)
-    private void cobblemon$conditionalWaterBreathing(
-            int currentAir,
-            CallbackInfoReturnable<Integer> cir
-    ) {
-        var entity = (LivingEntity) (Object) this;
-        if (!(entity instanceof Player player)) return;
-        if (!(player.getVehicle() instanceof PokemonEntity vehicle)) return;
-
-        var ridingController = vehicle.getRidingController();
-        if (ridingController == null) return;
-
-        var activeContext = ridingController.getContext();
-        if (activeContext == null) return;
-
-        // If the rider is currently on a submarine and the ride still has stamina.
-        var stamina = activeContext.getState().getStamina().get();
-        if (
-                activeContext.getStyle() == RidingStyle.LIQUID &&
-                activeContext.getBehaviour().equals(SubmarineBehaviour.Companion.getKEY()) &&
-                stamina > 0.0f
-        ) {
-            cir.setReturnValue(currentAir);
-            cir.cancel();
+        if (entity instanceof ServerPlayerEntity) {
+            ShoulderEffectRegistry.INSTANCE.onEffectEnd((ServerPlayerEntity) entity);
         }
     }
 

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

@@ -9,20 +9,20 @@
 package com.cobblemon.mod.common.mixin;
 
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
-import net.minecraft.server.ServerInterface;
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.world.entity.Entity;
+import net.minecraft.entity.Entity;
+import net.minecraft.server.dedicated.DedicatedServer;
+import net.minecraft.server.world.ServerWorld;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
-@Mixin(ServerLevel.class)
-public abstract class MinecraftDedicatedServerMixin implements ServerInterface {
+@Mixin(ServerWorld.class)
+public abstract class MinecraftDedicatedServerMixin implements DedicatedServer {
 
-    @Inject(method = "shouldDiscardEntity", at = @At(value = "HEAD"), cancellable = true)
+    @Inject(method = "shouldCancelSpawn", at = @At(value = "HEAD"), cancellable = true)
     public void cobblemon$allowPokemonSpawns(Entity entity, CallbackInfoReturnable<Boolean> callback) {
-        if (entity instanceof PokemonEntity) {
+        if(entity instanceof PokemonEntity) {
             callback.setReturnValue(false);
         }
     }

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

@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.mixin;
-
-import com.cobblemon.mod.common.duck.MinecraftServerDuck;
-import net.minecraft.resources.ResourceKey;
-import net.minecraft.server.MinecraftServer;
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.world.level.Level;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-
-import java.util.Map;
-import java.util.Optional;
-
-@Mixin(MinecraftServer.class)
-public class MinecraftServerMixin implements MinecraftServerDuck {
-
-    @Shadow
-    @Final
-    private Map<ResourceKey<Level>, ServerLevel> levels;
-
-    @Override
-    public Optional<ResourceKey<Level>> cobblemon$getLevelKey(final Level level) {
-        return this.levels.entrySet()
-                .stream()
-                // Reference equality is intended here, the level we're handed is the same one as in the
-                // map so we don't need to check value semantics.
-                .filter(entry -> entry.getValue() == level)
-                .map(Map.Entry::getKey)
-                .findFirst();
-    }
-}

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

@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.mixin;
+
+import com.cobblemon.mod.common.client.CobblemonBakingOverrides;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Map;
+import net.minecraft.client.color.block.BlockColors;
+import net.minecraft.client.render.model.ModelLoader;
+import net.minecraft.client.render.model.UnbakedModel;
+import net.minecraft.client.render.model.json.JsonUnbakedModel;
+import net.minecraft.client.util.ModelIdentifier;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.profiler.Profiler;
+import org.slf4j.Logger;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.InjectionPoint;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.points.BeforeStringInvoke;
+
+@Mixin(ModelLoader.class)
+public abstract class ModelLoaderMixin {
+
+    @Shadow protected abstract void addModel(ModelIdentifier modelId);
+
+    @Final
+    @Shadow
+    private Map<Identifier, UnbakedModel> unbakedModels;
+
+    @Final
+    @Shadow
+    private static Logger LOGGER;
+
+    @Inject(
+        method = "<init>",
+        at = @At("TAIL")
+    )
+    public void init(BlockColors blockColors,
+        Profiler profiler,
+        Map jsonUnbakedModels,
+        Map blockStates,
+        CallbackInfo ci) {
+        CobblemonBakingOverrides.INSTANCE.getModels().forEach(bakingOverride -> {
+            try {
+                this.unbakedModels.put(bakingOverride.getModelIdentifier(), this.loadModelFromJson(bakingOverride.getModelLocation()));
+                this.addModel(bakingOverride.getModelIdentifier());
+            } catch (IOException e) {
+                LOGGER.error("Error loading a Cobblemon BakedModel:", e);
+                throw new RuntimeException(e);
+            }
+        });
+    }
+
+    @Shadow
+    private JsonUnbakedModel loadModelFromJson(Identifier id) throws IOException {
+        return null;
+    }
+}

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

@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.mixin;
+
+import com.cobblemon.mod.common.client.render.models.blockbench.PoseableEntityModel;
+import com.cobblemon.mod.common.client.render.models.blockbench.pose.Bone;
+import com.cobblemon.mod.common.client.render.models.blockbench.repository.RenderContext;
+import net.minecraft.client.model.ModelPart;
+import net.minecraft.client.render.VertexConsumer;
+import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.entity.Entity;
+import org.jetbrains.annotations.NotNull;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+
+import java.util.Map;
+
+@Mixin(ModelPart.class)
+public abstract class ModelPartMixin implements Bone {
+    @Shadow public abstract void render(MatrixStack matrices, VertexConsumer vertices, int light, int overlay, float red, float green, float blue, float alpha);
+
+    @Shadow public abstract void rotate(MatrixStack matrixStack);
+
+    @Shadow @Final
+    public Map<String, ModelPart> children;
+
+    @NotNull
+    @Override
+    public Map<String, Bone> getChildren() {
+        return (Map<String, Bone>) (Object) children;
+    }
+
+    @Override
+    public void render(RenderContext context, MatrixStack stack, VertexConsumer buffer, int packedLight, int packedOverlay, float r, float g, float b, float a) {
+        this.render(stack, buffer, packedLight, packedOverlay, r, g, b, a);
+    }
+
+    @Override
+    public void transform(MatrixStack matrixStack) {
+        this.rotate(matrixStack);
+    }
+}

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

@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.mixin;
-
-import com.cobblemon.mod.common.client.sound.BattleMusicController;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.resources.sounds.SoundInstance;
-import net.minecraft.client.sounds.MusicManager;
-import org.jetbrains.annotations.Nullable;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-@Mixin(MusicManager.class)
-public class MusicManagerMixin {
-
-    @Shadow @Final
-    private Minecraft minecraft;
-
-    @Shadow @Nullable
-    private SoundInstance currentMusic;
-
-    /** Freezes the tracker while a BattleMusicInstance is in progress. Current SoundInstance being tracked will be paused by BattleMusicHandler. */
-    @Inject(method = "tick()V", at = @At("HEAD"), cancellable = true)
-    public void tick(CallbackInfo cb) {
-        if (this.minecraft.getSoundManager().isActive(BattleMusicController.INSTANCE.getMusic())) cb.cancel();
-    }
-}

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

@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.mixin;
+
+import com.cobblemon.mod.common.client.sound.battle.BattleMusicController;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.sound.MusicTracker;
+import net.minecraft.client.sound.SoundInstance;
+import org.jetbrains.annotations.Nullable;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(MusicTracker.class)
+public class MusicTrackerMixin {
+
+    @Shadow @Final
+    private MinecraftClient client;
+
+    @Shadow @Nullable
+    private SoundInstance current;
+
+    /** Freezes the tracker while a BattleMusicInstance is in progress. Current SoundInstance being tracked will be paused by BattleMusicHandler. */
+    @Inject(method = "tick()V", at = @At("HEAD"), cancellable = true)
+    public void tick(CallbackInfo cb) {
+        if (this.client.getSoundManager().isPlaying(BattleMusicController.INSTANCE.getMusic())) cb.cancel();
+    }
+}

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

@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.mixin;
-
-import static com.cobblemon.mod.common.datafixer.CobblemonSchemas.VERSION_KEY;
-
-import com.cobblemon.mod.common.datafixer.CobblemonSchemas;
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.nbt.NbtUtils;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-
-@Mixin(NbtUtils.class)
-public class NbtUtilsMixin {
-    @Inject(
-        method = "addCurrentDataVersion(Lnet/minecraft/nbt/CompoundTag;)Lnet/minecraft/nbt/CompoundTag;",
-        at = @At("TAIL")
-    )
-    private static void addCobblemonDataVersion(
-        CompoundTag tag,
-        CallbackInfoReturnable<CompoundTag> cir
-    ) {
-        tag.putInt(VERSION_KEY, CobblemonSchemas.DATA_VERSION);
-    }
-}

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

@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.mixin;
-
-import com.cobblemon.mod.common.block.entity.DiscShelfBlockEntity;
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.Holder;
-import net.minecraft.sounds.SoundEvent;
-import net.minecraft.sounds.SoundEvents;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.level.block.NoteBlock;
-import net.minecraft.world.level.block.state.properties.NoteBlockInstrument;
-import net.minecraft.world.level.block.entity.BlockEntity;
-import net.minecraft.world.level.block.state.BlockState;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-
-@Mixin(NoteBlock.class)
-public abstract class NoteBlockMixin {
-    @Inject(method = "triggerEvent", at = @At("HEAD"), cancellable = true)
-    private void cobblemon$triggerTMShelfSequencer(BlockState state, Level level, BlockPos pos, int type, int data, CallbackInfoReturnable<Boolean> cir) {
-        final BlockPos shelfPos = pos.below();
-        final BlockEntity blockEntity = level.getBlockEntity(shelfPos);
-        if (!(blockEntity instanceof DiscShelfBlockEntity discShelfBlockEntity)) {
-            return;
-        }
-
-        if (!level.isClientSide) {
-            final BlockPos instrumentPos = shelfPos.below();
-            final SoundEvent soundEvent;
-            if (level.getBlockState(instrumentPos).isAir()) {
-                soundEvent = SoundEvents.NOTE_BLOCK_BIT.value();
-            } else {
-                final NoteBlockInstrument instrument = level.getBlockState(instrumentPos).instrument();
-                final Holder<SoundEvent> holder = instrument.getSoundEvent();
-                soundEvent = holder.value();
-            }
-            discShelfBlockEntity.onNoteBlockPulse(level, pos, soundEvent);
-        }
-
-        // Suppress vanilla note-block playback while it is on top of a TM Shelf.
-        cir.setReturnValue(false);
-    }
-}

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

@@ -10,6 +10,8 @@ package com.cobblemon.mod.common.mixin;
 
 import com.cobblemon.mod.common.api.snowstorm.ParticleMaterials;
 import com.google.common.collect.ImmutableList;
+import net.minecraft.client.particle.ParticleManager;
+import net.minecraft.client.particle.ParticleTextureSheet;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Mutable;
@@ -19,19 +21,17 @@ import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 import java.util.List;
-import net.minecraft.client.particle.ParticleEngine;
-import net.minecraft.client.particle.ParticleRenderType;
 
-@Mixin(ParticleEngine.class)
+@Mixin(ParticleManager.class)
 final class ParticleManagerMixin {
     @Mutable
     @Final
     @Shadow
-    private static List<ParticleRenderType> RENDER_ORDER;
+    private static List<ParticleTextureSheet> PARTICLE_TEXTURE_SHEETS;
 
     @Inject(at = @At("RETURN"), method = "<clinit>")
     private static void lodestone$addTypes(CallbackInfo ci) {
-        RENDER_ORDER = ImmutableList.<ParticleRenderType>builder().addAll(RENDER_ORDER)
+        PARTICLE_TEXTURE_SHEETS = ImmutableList.<ParticleTextureSheet>builder().addAll(PARTICLE_TEXTURE_SHEETS)
                 .add(ParticleMaterials.INSTANCE.getADD(), ParticleMaterials.INSTANCE.getALPHA(), ParticleMaterials.INSTANCE.getBLEND(), ParticleMaterials.INSTANCE.getOPAQUE()).build();
     }
 }

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

@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.mixin;
+
+import com.cobblemon.mod.common.client.CobblemonClient;
+import com.cobblemon.mod.common.client.keybind.keybinds.PartySendBinding;
+import net.minecraft.client.Mouse;
+import org.objectweb.asm.Opcodes;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(Mouse.class)
+public class PartyScrollMixin {
+    @Shadow
+    private double eventDeltaWheel;
+
+    @Inject(
+            method = "onMouseScroll",
+            at = @At(
+                    value = "FIELD",
+                    target="Lnet/minecraft/client/Mouse;eventDeltaWheel:D",
+                    opcode = Opcodes.PUTFIELD,
+                    ordinal = 2,
+                    shift = At.Shift.BEFORE
+            ),
+            cancellable = true
+    )
+    public void onMouseScroll(long window, double horizontal, double vertical, CallbackInfo ci) {
+        if (PartySendBinding.INSTANCE.getWasDown()) {
+            int i = (int)eventDeltaWheel;
+            if (i > 0) {
+                while (i-- > 0) CobblemonClient.INSTANCE.getStorage().shiftSelected(false);
+                ci.cancel();
+                eventDeltaWheel = 0;
+                PartySendBinding.INSTANCE.actioned();
+            } else if (i < 0) {
+                while (i++ < 0) CobblemonClient.INSTANCE.getStorage().shiftSelected(true);
+                ci.cancel();
+                eventDeltaWheel = 0;
+                PartySendBinding.INSTANCE.actioned();
+            }
+        }
+    }
+}

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

@@ -1,57 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.mixin;
-
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
-import com.cobblemon.mod.common.pokemon.ai.EntityBehaviour;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.world.entity.ai.goal.Goal;
-import net.minecraft.world.entity.monster.Phantom;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Unique;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-
-
-
-@Mixin(targets = "net.minecraft.world.entity.monster.Phantom$PhantomSweepAttackGoal")
-public abstract class PhantomSweepAttackGoalMixin extends Goal {
-
-    @Unique
-    private Phantom phantomSelf; // Allows access to the outer class
-
-    @Inject(method = "<init>", at = @At("TAIL"))
-    private void onInit(Phantom phantom, CallbackInfo ci) {
-        this.phantomSelf = phantom;
-    }
-
-    @Inject(method = "canContinueToUse", at = @At("RETURN"), cancellable = true)
-    private void modifyCanContinueToUse(CallbackInfoReturnable<Boolean> cir) {
-        Phantom phantom = this.phantomSelf; // Outer class instance
-        if(phantom == null) return;
-
-        if (cir.getReturnValue()) {
-            var nearbyFearedEntities = phantom.level().getEntities(phantom, phantom.getBoundingBox().inflate(16.0),
-                    (entity -> ((entity instanceof PokemonEntity && ((PokemonEntity) entity).getBeamMode() == 0 && ((PokemonEntity) entity).getBehaviour().getEntityInteract().getAvoidedByPhantom())
-                            || (entity instanceof ServerPlayer && EntityBehaviour.Companion.hasPhantomFearedShoulderMount((ServerPlayer)entity)))));
-            if (!nearbyFearedEntities.isEmpty()) {
-               nearbyFearedEntities.forEach(entity -> {
-                   if (entity instanceof PokemonEntity) {
-                       ((PokemonEntity) entity).cry();
-                   }
-                   //TODO: Find a way to make shoulder mounted Pokemon cry
-               });
-                cir.setReturnValue(false);
-            }
-        }
-    }
-}
-

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

@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.mixin;
-
-import com.cobblemon.mod.common.CobblemonItems;
-import net.minecraft.world.entity.monster.piglin.PiglinAi;
-import net.minecraft.world.item.ItemStack;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-
-
-@Mixin(PiglinAi.class)
-public class PiglinBarterMixin {
-
-    @Inject(method = "isBarterCurrency", at = @At(value = "RETURN"), cancellable = true)
-    private static void cobblemon$acceptsForBarter(ItemStack stack, CallbackInfoReturnable<Boolean> ci) {
-        if (!ci.getReturnValue()) {
-            //TODO: Make a tag?
-            if (stack.is(CobblemonItems.RELIC_COIN_POUCH))
-                ci.setReturnValue(true);
-        }
-    }
-
-
-}

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

@@ -1,31 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.mixin;
-
-import com.cobblemon.mod.common.CobblemonItems;
-import net.minecraft.world.entity.EquipmentSlot;
-import net.minecraft.world.entity.monster.piglin.Piglin;
-import net.minecraft.world.item.ItemStack;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-@Mixin(Piglin.class)
-public abstract class PiglinEntityMixin  {
-    @Inject(method = "holdInOffHand", at = @At(value = "HEAD"), cancellable = true)
-    public void cobblemon$isValidBarteringItem(ItemStack stack, CallbackInfo ci) {
-        Piglin entity = (Piglin)(Object) this;
-        if (stack.is(CobblemonItems.RELIC_COIN_POUCH)) {
-            entity.setItemSlot(EquipmentSlot.OFFHAND, stack);
-            entity.setGuaranteedDrop(EquipmentSlot.OFFHAND);
-            ci.cancel();
-        }
-    }
-}

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

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

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

@@ -10,135 +10,82 @@ package com.cobblemon.mod.common.mixin;
 
 import com.cobblemon.mod.common.Cobblemon;
 import com.cobblemon.mod.common.CobblemonItems;
-import com.cobblemon.mod.common.OrientationControllable;
 import com.cobblemon.mod.common.api.events.CobblemonEvents;
 import com.cobblemon.mod.common.api.events.item.LeftoversCreatedEvent;
-import com.cobblemon.mod.common.api.orientation.OrientationController;
-import com.cobblemon.mod.common.api.pokemon.PokemonSpecies;
-import com.cobblemon.mod.common.api.riding.RidingStyle;
-import com.cobblemon.mod.common.api.riding.behaviour.types.air.HoverBehaviour;
+import com.cobblemon.mod.common.api.storage.NoPokemonStoreException;
 import com.cobblemon.mod.common.api.storage.party.PartyStore;
-import com.cobblemon.mod.common.api.storage.party.PlayerPartyStore;
 import com.cobblemon.mod.common.api.tags.CobblemonItemTags;
-import com.cobblemon.mod.common.duck.PlayerDuck;
-import com.cobblemon.mod.common.duck.RidePassenger;
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
-import com.cobblemon.mod.common.pokedex.scanner.PokedexEntityData;
-import com.cobblemon.mod.common.pokedex.scanner.ScannableEntity;
-import com.cobblemon.mod.common.pokemon.FormData;
-import com.cobblemon.mod.common.pokemon.Gender;
 import com.cobblemon.mod.common.pokemon.Pokemon;
-import com.cobblemon.mod.common.pokemon.Species;
 import com.cobblemon.mod.common.util.CompoundTagExtensionsKt;
-import com.cobblemon.mod.common.util.CompoundTagUtilities;
 import com.cobblemon.mod.common.util.DataKeys;
-import com.cobblemon.mod.common.world.gamerules.CobblemonGameRules;
-import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
-import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.nbt.Tag;
-import net.minecraft.network.chat.Component;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.util.Mth;
-import net.minecraft.world.damagesource.DamageSource;
-import net.minecraft.world.entity.EntityDimensions;
-import net.minecraft.world.entity.EntityType;
-import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.entity.Pose;
-import net.minecraft.world.entity.item.ItemEntity;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.food.FoodProperties;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.phys.Vec3;
-import org.jetbrains.annotations.Nullable;
-import org.joml.Vector3f;
+import net.minecraft.entity.EntityType;
+import net.minecraft.entity.ItemEntity;
+import net.minecraft.entity.LivingEntity;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NbtCompound;
+import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.text.Text;
+import net.minecraft.world.World;
 import org.objectweb.asm.Opcodes;
-import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
-import java.util.*;
-import java.util.stream.Collectors;
+import java.util.Objects;
+import java.util.UUID;
 
-@Mixin(Player.class)
-public abstract class PlayerMixin extends LivingEntity implements ScannableEntity, OrientationControllable, PlayerDuck, RidePassenger {
+@Mixin(PlayerEntity.class)
+public abstract class PlayerMixin extends LivingEntity {
 
-    @Unique
-    private Vector3f cobblemon$driverInput;
-    @Unique
-    private Vector3f cobblemon$lastSentDriverInput;
+    @Shadow public abstract NbtCompound getShoulderEntityLeft();
 
-    @Shadow public abstract CompoundTag getShoulderEntityLeft();
+    @Shadow public abstract NbtCompound getShoulderEntityRight();
 
-    @Shadow public abstract CompoundTag getShoulderEntityRight();
+    @Shadow public abstract void dropShoulderEntity(NbtCompound entityNbt);
 
-    @Shadow public abstract void respawnEntityOnShoulder(CompoundTag entityNbt);
+    @Shadow public abstract void setShoulderEntityRight(NbtCompound entityNbt);
 
-    @Shadow public abstract void setShoulderEntityRight(CompoundTag entityNbt);
-
-    @Shadow public abstract void setShoulderEntityLeft(CompoundTag entityNbt);
+    @Shadow public abstract void setShoulderEntityLeft(NbtCompound entityNbt);
 
     @Shadow public abstract boolean isSpectator();
 
-    @Shadow public abstract boolean addItem(ItemStack stack);
+    @Shadow public abstract boolean giveItemStack(ItemStack stack);
 
-    @Shadow public abstract void displayClientMessage(Component message, boolean overlay);
+    @Shadow public abstract void sendMessage(Text message, boolean overlay);
 
-    @Shadow @Final private static Map<Pose, EntityDimensions> POSES;
-    @Shadow @Final public static EntityDimensions STANDING_DIMENSIONS;
-    @Shadow protected int jumpTriggerTime;
-    @Unique private final OrientationController cobblemon$orientationController = new OrientationController(this);
 
-    @Unique private float cobblemon$rideXRot = 0.0f;
-
-    @Unique private float cobblemon$rideYRot = 0.0f;
-
-    @Unique private Vec3 cobblemon$rideEyePos = Vec3.ZERO;
-
-    protected PlayerMixin(EntityType<? extends LivingEntity> p_20966_, Level p_20967_) {
+    protected PlayerMixin(EntityType<? extends LivingEntity> p_20966_, World p_20967_) {
         super(p_20966_, p_20967_);
     }
 
-    @Inject(method = "respawnEntityOnShoulder", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/EntityType;create(Lnet/minecraft/nbt/CompoundTag;Lnet/minecraft/world/level/Level;)Ljava/util/Optional;"), cancellable = true)
-    private void cobblemon$removePokemon(CompoundTag nbt, CallbackInfo ci) {
+    @Inject(method = "dropShoulderEntity", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/EntityType;getEntityFromNbt(Lnet/minecraft/nbt/NbtCompound;Lnet/minecraft/world/World;)Ljava/util/Optional;"), cancellable = true)
+    private void cobblemon$removePokemon(NbtCompound nbt, CallbackInfo ci) {
         if (CompoundTagExtensionsKt.isPokemonEntity(nbt)) {
-            final UUID uuid = CompoundTagUtilities.getPokemonID(nbt);
-            if (CompoundTagUtilities.isShoulderPokemon(this.getShoulderEntityRight())) {
-                final UUID uuidRight = CompoundTagUtilities.getPokemonID(this.getShoulderEntityRight());
+            final UUID uuid = this.getPokemonID(nbt);
+            if (this.isShoulderPokemon(this.getShoulderEntityRight())) {
+                final UUID uuidRight = this.getPokemonID(this.getShoulderEntityRight());
                 if (uuid.equals(uuidRight)) {
                     this.recallPokemon(uuidRight);
-                    this.setShoulderEntityRight(new CompoundTag());
+                    this.setShoulderEntityRight(new NbtCompound());
                 }
             }
-            if (CompoundTagUtilities.isShoulderPokemon(this.getShoulderEntityLeft())) {
-                final UUID uuidLeft = CompoundTagUtilities.getPokemonID(this.getShoulderEntityLeft());
+            if (this.isShoulderPokemon(this.getShoulderEntityLeft())) {
+                final UUID uuidLeft = this.getPokemonID(this.getShoulderEntityLeft());
                 if (uuid.equals(uuidLeft)) {
                     this.recallPokemon(uuidLeft);
-                    this.setShoulderEntityLeft(new CompoundTag());
+                    this.setShoulderEntityLeft(new NbtCompound());
                 }
             }
             ci.cancel();
         }
     }
 
-    @Override
-    public EntityDimensions getDefaultDimensions(Pose pose) {
-        if (this.getVehicle() instanceof PokemonEntity) {
-            return STANDING_DIMENSIONS;
-        }
-        return POSES.getOrDefault(pose, STANDING_DIMENSIONS);
-    }
-
     @Inject(
-        method = "removeEntitiesOnShoulder",
+        method = "dropShoulderEntities",
         at = @At(
             value = "JUMP",
             opcode = Opcodes.IFGE,
@@ -149,76 +96,61 @@ public abstract class PlayerMixin extends LivingEntity implements ScannableEntit
     )
     private void cobblemon$preventPokemonDropping(CallbackInfo ci) {
         // We want to allow both of these to forcefully remove the entities
-        if (this.isSpectator() || this.isDeadOrDying())
+        if (this.isSpectator() || this.isDead())
             return;
-        if (!CompoundTagUtilities.isShoulderPokemon(this.getShoulderEntityLeft())) {
-            this.respawnEntityOnShoulder(this.getShoulderEntityLeft());
-            this.setShoulderEntityLeft(new CompoundTag());
+        if (!this.isShoulderPokemon(this.getShoulderEntityLeft())) {
+            this.dropShoulderEntity(this.getShoulderEntityLeft());
+            this.setShoulderEntityLeft(new NbtCompound());
         }
-        if (!CompoundTagUtilities.isShoulderPokemon(this.getShoulderEntityRight())) {
-            this.respawnEntityOnShoulder(this.getShoulderEntityRight());
-            this.setShoulderEntityRight(new CompoundTag());
+        if (!this.isShoulderPokemon(this.getShoulderEntityRight())) {
+            this.dropShoulderEntity(this.getShoulderEntityRight());
+            this.setShoulderEntityRight(new NbtCompound());
         }
         ci.cancel();
     }
 
-    private void recallPokemon(UUID uuid) {
-        // We need to do this cause the Entity doesn't store a reference to its storage
-        final PartyStore party = Cobblemon.INSTANCE.getStorage().getParty(this.getUUID(), this.registryAccess());
-        for (Pokemon pokemon : party) {
-            if (pokemon.getUuid().equals(uuid)) {
-                pokemon.recall();
-            }
-        }
+    private UUID getPokemonID(NbtCompound nbt) {
+        return nbt.getCompound(DataKeys.POKEMON)
+                .getUuid(DataKeys.POKEMON_UUID);
     }
 
-    @Redirect(
-            method = "getDestroySpeed",
-            at = @At(
-                    value = "INVOKE",
-                    target = "Lnet/minecraft/world/entity/player/Player;onGround()Z"
-            )
-    )
-    private boolean cobblemon$considerHoverOnGround(Player player) {
-        // If riding a Hover Mount, return true to bypass the 5x slowdown
-        if (player.getVehicle() instanceof PokemonEntity vehicle) {
-
-            var ridingController = vehicle.getRidingController();
-            if (ridingController == null) player.onGround();
-
-            var activeContext = ridingController.getContext();
-            if (activeContext == null) player.onGround();
-
-            if (activeContext.getStyle() == RidingStyle.AIR &&
-                activeContext.getBehaviour().equals(HoverBehaviour.Companion.getKEY())) {
-                return true;
+    private void recallPokemon(UUID uuid) {
+        // We need to do this cause the Entity doesn't store a reference to its storage
+        try {
+            final PartyStore party = Cobblemon.INSTANCE.getStorage().getParty(this.uuid);
+            for (Pokemon pokemon : party) {
+                if (pokemon.getUuid().equals(uuid)) {
+                    pokemon.recall();
+                }
             }
-        }
-        // Otherwise, return the actual value
-        return player.onGround();
+        } catch (NoPokemonStoreException ignored) {}
+    }
+
+    private boolean isShoulderPokemon(NbtCompound nbt) {
+        return CompoundTagExtensionsKt.isPokemonEntity(nbt);
     }
 
     @Inject(
-        method = "eat",
+        method = "eatFood",
         at = @At(
             value = "INVOKE",
-            target = "Lnet/minecraft/world/entity/player/Player;getFoodData()Lnet/minecraft/world/food/FoodData;",
+            target = "Lnet/minecraft/entity/player/PlayerEntity;getHungerManager()Lnet/minecraft/entity/player/HungerManager;",
             shift = At.Shift.AFTER
         )
     )
-    public void onEatFood(Level world, ItemStack stack, FoodProperties foodComponent, CallbackInfoReturnable<ItemStack> cir) {
-        if (!level().isClientSide) {
-            if (stack.is(CobblemonItemTags.LEAVES_LEFTOVERS) && level().random.nextDouble() < Cobblemon.config.getAppleLeftoversChance()) {
+    public void onEatFood(World world, ItemStack stack, CallbackInfoReturnable<ItemStack> cir) {
+        if (!getWorld().isClient) {
+            if (stack.isIn(CobblemonItemTags.LEAVES_LEFTOVERS) && getWorld().random.nextDouble() < Cobblemon.config.getAppleLeftoversChance()) {
                 ItemStack leftovers = new ItemStack(CobblemonItems.LEFTOVERS);
-                ServerPlayer player = Objects.requireNonNull(getServer()).getPlayerList().getPlayer(uuid);
+                ServerPlayerEntity player = Objects.requireNonNull(getServer()).getPlayerManager().getPlayer(uuid);
                 assert player != null;
                 CobblemonEvents.LEFTOVERS_CREATED.postThen(
                     new LeftoversCreatedEvent(player, leftovers),
                     leftoversCreatedEvent -> null,
                     leftoversCreatedEvent -> {
-                        if(!player.addItem(leftoversCreatedEvent.getLeftovers())) {
-                            var itemPos = player.getLookAngle().scale(0.5f).add(position());
-                            level().addFreshEntity(new ItemEntity(level(), itemPos.x(), itemPos.y(), itemPos.z(), leftoversCreatedEvent.getLeftovers()));
+                        if(!player.giveItemStack(leftoversCreatedEvent.getLeftovers())) {
+                            var itemPos = player.getRotationVector().multiply(0.5).add(getPos());
+                            getWorld().spawnEntity(new ItemEntity(getWorld(), itemPos.getX(), itemPos.getY(), itemPos.getZ(), leftoversCreatedEvent.getLeftovers()));
                         }
                         return null;
                     }
@@ -226,149 +158,4 @@ public abstract class PlayerMixin extends LivingEntity implements ScannableEntit
             }
         }
     }
-
-    @Inject(method = "isInvulnerableTo", at = @At("HEAD"), cancellable = true)
-    public void isInvulnerableTo(DamageSource source, CallbackInfoReturnable<Boolean> ci) {
-        if (!level().isClientSide && (Object) this instanceof ServerPlayer player) {
-            boolean invulnerableInBattle = this.level().getGameRules().getBoolean(CobblemonGameRules.BATTLE_INVULNERABILITY);
-            boolean inBattle = Cobblemon.INSTANCE.getBattleRegistry().getBattleByParticipatingPlayer(player) != null;
-            if (invulnerableInBattle && inBattle) {
-                ci.setReturnValue(true);
-            }
-        }
-    }
-
-    @Override @Nullable
-    public PokedexEntityData resolvePokemonScan() {
-        if (CompoundTagUtilities.isShoulderPokemon(this.getShoulderEntityRight())){
-            return getDataFromShoulderPokemon(this.getShoulderEntityRight());
-        }
-        if (CompoundTagUtilities.isShoulderPokemon(this.getShoulderEntityLeft())){
-            return getDataFromShoulderPokemon(this.getShoulderEntityLeft());
-        }
-        return null;
-    }
-
-    @Nullable @Unique
-    private PokedexEntityData getDataFromShoulderPokemon(CompoundTag shoulderTag) {
-        Pokemon pokemon;
-        if (level().isClientSide) {
-            CompoundTag pokemonTag = shoulderTag.getCompound(DataKeys.POKEMON);
-            if (pokemonTag.isEmpty()) return null;
-            Species species = PokemonSpecies.getByIdentifier(ResourceLocation.parse(pokemonTag.getString(DataKeys.POKEMON_SPECIES_IDENTIFIER)));
-            if (species == null) return null;
-            String formId = pokemonTag.getString(DataKeys.POKEMON_FORM_ID);
-            FormData form = species.getStandardForm();
-            List<FormData> formList = species.getForms().stream().filter(it -> it.formOnlyShowdownId().equals(formId)).toList();
-            if (!formList.isEmpty()) form = formList.getFirst();
-            if (form == null) return null;
-            String genderString = pokemonTag.getString(DataKeys.POKEMON_GENDER);
-            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());
-
-            pokemon = new Pokemon();
-            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 (pokemon == null) ? null : new PokedexEntityData(pokemon, null);
-    }
-
-    @Override
-    public LivingEntity resolveEntityScan() {
-        return this;
-    }
-
-    @Override
-    public void absMoveTo(double x, double y, double z, float yaw, float pitch) {
-        if (cobblemon$orientationController.getActive()) {
-            this.absMoveTo(x, y, z);
-            this.setYRot(yaw % 360.0f);
-            this.setXRot(pitch % 360.0f);
-            this.yRotO = this.getYRot();
-            this.xRotO = this.getXRot();
-        }
-        else {
-            this.absMoveTo(x, y, z);
-            this.absRotateTo(yaw, pitch);
-        }
-    }
-
-    @WrapOperation(
-            method = "rideTick()V",
-            at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/player/Player;wantsToStopRiding()Z")
-    )
-    public boolean delegateDismountToController(Player instance, Operation<Boolean> original) {
-        if (this.getVehicle() instanceof PokemonEntity pokemonEntity) {
-            return pokemonEntity.ifRidingAvailableSupply(false, (behaviour, settings, state) -> {
-                return behaviour.dismountOnShift(settings, state, pokemonEntity) && original.call(instance);
-            });
-        }
-        return original.call(instance);
-    }
-
-    @Override
-    public OrientationController getOrientationController() {
-        return cobblemon$orientationController;
-    }
-
-    @Override
-    public void setDriverInput(Vector3f driverInput) {
-        cobblemon$driverInput = driverInput;
-    }
-
-    @Override
-    public Vector3f getDriverInput() {
-        return cobblemon$driverInput;
-    }
-
-    @Override
-    public void setLastSentDriverInput(Vector3f lastSentDriverInput) {
-        cobblemon$lastSentDriverInput = lastSentDriverInput;
-    }
-
-    @Override
-    public Vector3f getLastSentDriverInput() {
-        return cobblemon$lastSentDriverInput;
-    }
-
-    @Override
-    public float cobblemon$getRideXRot() {
-        return this.cobblemon$rideXRot;
-    }
-
-    @Override
-    public void cobblemon$setRideXRot(float rideXRot) {
-        this.cobblemon$rideXRot = Mth.wrapDegrees(rideXRot);
-    }
-
-    @Override
-    public float cobblemon$getRideYRot() {
-        return this.cobblemon$rideYRot;
-    }
-
-    @Override
-    public void cobblemon$setRideYRot(float rideYRot) {
-        this.cobblemon$rideYRot = Mth.wrapDegrees(rideYRot);
-    }
-
-    @Override
-    public Vec3 cobblemon$getRideEyePos() {
-        return this.cobblemon$rideEyePos;
-    }
-
-    @Override
-    public void cobblemon$setRideEyePos(Vec3 rideEyePos) {
-        this.cobblemon$rideEyePos = rideEyePos;
-    }
-
-}
+}

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

@@ -9,9 +9,9 @@
 package com.cobblemon.mod.common.mixin;
 
 import com.cobblemon.mod.common.api.tags.CobblemonBlockTags;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.PointedDripstoneBlock;
-import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.PointedDripstoneBlock;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Redirect;
@@ -21,12 +21,12 @@ import org.spongepowered.asm.mixin.injection.Slice;
 public abstract class PointedDripstoneBlockMixin {
 
     @Redirect(
-            method = "canGrow(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/block/state/BlockState;)Z",
-            at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/block/state/BlockState;is(Lnet/minecraft/world/level/block/Block;)Z", ordinal = 0),
-            slice = @Slice(from = @At(value = "FIELD", target = "Lnet/minecraft/world/level/block/Blocks;DRIPSTONE_BLOCK:Lnet/minecraft/world/level/block/Block;"))
+            method = "canGrow(Lnet/minecraft/block/BlockState;Lnet/minecraft/block/BlockState;)Z",
+            at = @At(value = "INVOKE", target = "Lnet/minecraft/block/BlockState;isOf(Lnet/minecraft/block/Block;)Z", ordinal = 0),
+            slice = @Slice(from = @At(value = "FIELD", target = "Lnet/minecraft/block/Blocks;DRIPSTONE_BLOCK:Lnet/minecraft/block/Block;"))
     )
     private static boolean cobblemon$validateMoonStoneDripstone(BlockState instance, Block block) {
-        return instance.is(CobblemonBlockTags.DRIPSTONE_GROWABLE);
+        return instance.isIn(CobblemonBlockTags.DRIPSTONE_GROWABLE);
     }
 
 }

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

@@ -1,28 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.mixin;
-
-import com.bedrockk.molang.runtime.value.DoubleValue;
-import com.cobblemon.mod.common.entity.MoLangScriptingEntity;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.level.block.PowderSnowBlock;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-
-@Mixin(PowderSnowBlock.class)
-public abstract class PowderSnowBlockMixin {
-    @Inject(method = "canEntityWalkOnPowderSnow", at = @At(value = "RETURN"), cancellable = true)
-    private static void cobblemon$canEntityWalkOnPowderSnow(Entity entity, CallbackInfoReturnable<Boolean> ci) {
-        if (ci.getReturnValue() == false && entity instanceof MoLangScriptingEntity) {
-            ci.setReturnValue(((MoLangScriptingEntity) entity).getConfig().getMap().getOrDefault("can_stand_on_powder_snow", DoubleValue.ZERO).asDouble() == 1.0);
-        }
-    }
-}

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

@@ -1,141 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.mixin;
-
-import com.cobblemon.mod.common.CobblemonNetwork;
-import com.cobblemon.mod.common.OrientationControllable;
-import com.cobblemon.mod.common.api.net.NetworkPacket;
-import com.cobblemon.mod.common.api.orientation.OrientationController;
-import com.cobblemon.mod.common.duck.PlayerDuck;
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
-import com.cobblemon.mod.common.mixin.accessor.ChunkMapAccessor;
-import com.cobblemon.mod.common.mixin.accessor.TrackedEntityAccessor;
-import com.cobblemon.mod.common.net.messages.client.orientation.ClientboundUpdateDriverInputPacket;
-import com.cobblemon.mod.common.net.messages.client.orientation.ClientboundUpdateOrientationPacket;
-import com.cobblemon.mod.common.net.messages.client.pokemon.update.ClientboundUpdateRidingStatePacket;
-import com.cobblemon.mod.common.net.messages.client.pokemon.update.evolution.ClientboundSeatAssignmentPacket;
-import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
-import net.minecraft.network.protocol.Packet;
-import net.minecraft.network.protocol.game.ClientGamePacketListener;
-import net.minecraft.server.level.ChunkMap;
-import net.minecraft.server.level.ServerEntity;
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.server.network.ServerPlayerConnection;
-import net.minecraft.world.entity.Entity;
-import org.joml.Matrix3f;
-import org.joml.Vector3f;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.Unique;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-import java.util.List;
-import java.util.LinkedHashMap;
-import java.util.Set;
-import java.util.function.Consumer;
-
-@Mixin(ServerEntity.class)
-public abstract class ServerEntityMixin {
-
-    @Shadow
-    @Final
-    private Consumer<Packet<?>> broadcast;
-    @Shadow
-    @Final
-    private Entity entity;
-    @Unique
-    private Matrix3f cobblemon$lastSentOrientation;
-    @Unique
-    private boolean cobblemon$lastSentActive;
-    @Unique
-    private List<Entity> cobblemon$lastSeatPassengers = List.of();
-
-    @Inject(method = "sendChanges", at = @At("TAIL"))
-    private void cobblemon$sendChanges(CallbackInfo ci) {
-        cobblemon$sendOrientationChanges();
-        cobblemon$sendRidingStateChanges();
-        cobblemon$sendDriverInput();
-        cobblemon$sendOccupiedSeatsChange();
-    }
-
-    private void cobblemon$sendRidingStateChanges() {
-        if (!(this.entity instanceof PokemonEntity pokemonEntity)) return;
-        if (pokemonEntity.getRidingController() == null) return;
-        var ridingController = pokemonEntity.getRidingController();
-        if (ridingController.getContext() == null) return;
-        var context = ridingController.getContext();
-        var ridingBehaviour = context.getBehaviour();
-        var ridingState = context.getState();
-        var previousRidingState = pokemonEntity.getPreviousRidingState();
-        if (previousRidingState != null && !ridingState.shouldSync(previousRidingState)) return;
-        cobblemon$broadcast(new ClientboundUpdateRidingStatePacket(pokemonEntity.getId(), ridingBehaviour, ridingState, null));
-    }
-
-    private void cobblemon$sendOrientationChanges() {
-        if (!(this.entity instanceof OrientationControllable controllable)) return;
-        OrientationController controller = controllable.getOrientationController();
-        Matrix3f currOrientation = controller.getOrientation();
-        boolean currActive = controller.getActive();
-
-        if (currOrientation == null || currOrientation.equals(cobblemon$lastSentOrientation) && (currActive == cobblemon$lastSentActive))
-            return;
-        cobblemon$lastSentOrientation = new Matrix3f(currOrientation);
-        cobblemon$lastSentActive = currActive;
-
-        cobblemon$broadcast(new ClientboundUpdateOrientationPacket(currOrientation, currActive, entity.getId()));
-    }
-
-    private void cobblemon$sendDriverInput() {
-        if (!(this.entity instanceof ServerPlayer serverPlayer)) return;
-        if(!(serverPlayer.getVehicle() instanceof PokemonEntity)) return;
-        Vector3f driverInput = ((PlayerDuck)serverPlayer).getDriverInput();
-        if(driverInput == null) return;
-
-        // If no change in input is detected then don't send a new packet
-        Vector3f lastSentDriverInput = ((PlayerDuck)serverPlayer).getLastSentDriverInput();
-        if (driverInput.equals(lastSentDriverInput)) return;
-        ((PlayerDuck)serverPlayer).setLastSentDriverInput(driverInput);
-        cobblemon$broadcast(new ClientboundUpdateDriverInputPacket(driverInput, entity.getId()));
-    }
-
-    private void cobblemon$sendOccupiedSeatsChange() {
-        if (!(this.entity instanceof PokemonEntity pokemon)) return;
-
-        List<Entity> currentPassengers = pokemon.getPassengers();
-        if (currentPassengers.equals(cobblemon$lastSeatPassengers)) return;
-        cobblemon$lastSeatPassengers = List.copyOf(currentPassengers);
-
-        var assignments = new LinkedHashMap<String, Integer>();
-        pokemon.getOccupiedSeats().forEach((seat, passenger) -> {
-            if (seat.getLocator() == null) return;
-            if (passenger == null) return;
-            assignments.put(seat.getLocator(), passenger.getId());
-        });
-        cobblemon$broadcast(new ClientboundSeatAssignmentPacket(pokemon.getId(), assignments));
-    }
-
-    private void cobblemon$broadcast(NetworkPacket<?> packet) {
-        if (!(entity.level() instanceof ServerLevel level)) return;
-        ChunkMap chunkMap = level.getChunkSource().chunkMap;
-        Int2ObjectMap<?> entityMap = ((ChunkMapAccessor) chunkMap).getEntityMap();
-        Object tracked = entityMap.get(entity.getId());
-        if (!(tracked instanceof TrackedEntityAccessor tracker)) return;
-
-        Set<ServerPlayerConnection> seenBy = tracker.getSeenBy();
-        for (ServerPlayerConnection conn : seenBy) {
-            ServerPlayer player = conn.getPlayer();
-            if (player == entity) continue;
-            CobblemonNetwork.INSTANCE.sendPacketToPlayer(player, packet);
-        }
-    }
-}

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

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

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

@@ -1,145 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.mixin;
-
-import com.cobblemon.mod.common.Cobblemon;
-import com.cobblemon.mod.common.OrientationControllable;
-import com.cobblemon.mod.common.PlayerSpawnerAccessor;
-import com.cobblemon.mod.common.api.riding.RidingStyle;
-import com.cobblemon.mod.common.api.spawning.spawner.PlayerSpawner;
-import com.cobblemon.mod.common.api.spawning.spawner.PlayerSpawnerFactory;
-import com.cobblemon.mod.common.api.stats.CobblemonStats;
-import com.cobblemon.mod.common.duck.ServerLevelDuck;
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
-import com.cobblemon.mod.common.world.gamerules.CobblemonGameRules;
-import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
-import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
-import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
-import com.llamalad7.mixinextras.sugar.Local;
-import net.minecraft.server.MinecraftServer;
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.world.entity.Entity;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.Unique;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-@Mixin(ServerPlayer.class)
-public abstract class ServerPlayerMixin implements PlayerSpawnerAccessor {
-
-    @Shadow
-    public abstract ServerLevel serverLevel();
-
-    @Shadow
-    @Final
-    public MinecraftServer server;
-    @Unique
-    public PlayerSpawner cobblemon$spawner;
-
-    @Override
-    public PlayerSpawner getPlayerSpawner() {
-        ServerPlayer player = (ServerPlayer)(Object)this;
-        if (cobblemon$spawner == null) {
-            cobblemon$spawner = PlayerSpawnerFactory.INSTANCE.create(player);
-        }
-        return cobblemon$spawner;
-    }
-
-    @Override
-    public void setPlayerSpawner(PlayerSpawner spawner) {
-        this.cobblemon$spawner = spawner;
-    }
-
-    @Inject(method = "tick", at = @At("TAIL"))
-    private void cobblemon$tickSpawner(CallbackInfo ci) {
-        if (cobblemon$canSpawn()) {
-            getPlayerSpawner().tick();
-        }
-    }
-
-    @Inject(method = "rideTick", at = @At("HEAD"))
-    private void cobblemon$updateOrientationControllerRideTick(CallbackInfo ci) {
-        ServerPlayer player = (ServerPlayer)(Object)this;
-        Entity vehicle = player.getVehicle();
-        if (!(vehicle instanceof OrientationControllable controllableVehicle)) return;
-        var shouldUseCustomOrientation = cobblemon$shouldUseCustomOrientation(vehicle);
-        controllableVehicle.getOrientationController().setActive(shouldUseCustomOrientation);
-    }
-
-    @Unique
-    private boolean cobblemon$shouldUseCustomOrientation(Entity entity) {
-        if (entity == null) return false;
-        if (!(entity instanceof PokemonEntity pokemonEntity)) return false;
-        return pokemonEntity.ifRidingAvailableSupply(false, (behaviour, settings, state) -> {
-            return behaviour.shouldRoll(settings, state, pokemonEntity);
-        });
-    }
-
-    @Inject(method = "stopRiding", at = @At("HEAD"))
-    public void cobblemon$resetOrientationOnDismount(CallbackInfo ci) {
-        ServerPlayer player = (ServerPlayer)(Object)this;
-        if (!(player.getVehicle() instanceof OrientationControllable controllableVehicle)) return;
-        controllableVehicle.getOrientationController().setActive(false);
-    }
-
-    //TODO: Switch to sending out on load instead of preventing saving
-    @ModifyExpressionValue(method = "addAdditionalSaveData", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/Entity;hasExactlyOnePlayerPassenger()Z"))
-    private boolean cobblemon$cancelSavingPokemonMounts(boolean original, @Local(ordinal=0) Entity entity) {
-        return original && !(entity instanceof PokemonEntity);
-    }
-
-    @WrapOperation(method = "checkRidingStatistics", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/level/ServerPlayer;getVehicle()Lnet/minecraft/world/entity/Entity;"))
-    public Entity cobblemon$checkRidingStatistics(ServerPlayer player, Operation<Entity> original, @Local int distance) {
-        var entity = original.call(player);
-        if (!(entity instanceof PokemonEntity pokemonEntity)) {
-            return entity;
-        }
-
-        var ridingController = pokemonEntity.getRidingController();
-        if (ridingController == null) return entity;
-
-        var activeContext = ridingController.getContext();
-        if (activeContext == null) return entity;
-
-        var ridingStyle = activeContext.getStyle();
-        CobblemonStats.CobblemonStat stat = switch (ridingStyle) {
-            case RidingStyle.LAND -> CobblemonStats.RIDING_LAND;
-            case RidingStyle.AIR -> CobblemonStats.RIDING_AIR;
-            case RidingStyle.LIQUID -> CobblemonStats.RIDING_LIQUID;
-            default -> null;
-        };
-
-        if (stat != null) {
-            player.awardStat(CobblemonStats.getStat(stat), distance);
-        }
-
-        return entity;
-    }
-
-    /**
-     * Gets whether we should spawn Cobblemon entities here.
-     *
-     * @return true if we can spawn cobblemon in the current level,
-     *         false otherwise
-     */
-    @SuppressWarnings("resource")
-    @Unique
-    private boolean cobblemon$canSpawn() {
-        return Cobblemon.config.getEnableSpawning() &&
-                this.serverLevel().getGameRules().getBoolean(CobblemonGameRules.DO_POKEMON_SPAWNING) &&
-                // intentionally last as this is a more expensive check, even with all the caching
-                !Cobblemon.config.getWorldSpawningBlocklist().contains(
-                        ((ServerLevelDuck) this.serverLevel()).cobblemon$getLevelResourceLocation()
-                );
-    }
-}

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

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

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

@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.mixin;
-
-import com.cobblemon.mod.common.block.HeartyGrainsBlock;
-import com.llamalad7.mixinextras.sugar.Local;
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.level.WorldGenLevel;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.DoublePlantBlock;
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.levelgen.feature.FeaturePlaceContext;
-import net.minecraft.world.level.levelgen.feature.SimpleBlockFeature;
-import net.minecraft.world.level.levelgen.feature.configurations.SimpleBlockConfiguration;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-
-@Mixin(SimpleBlockFeature.class)
-public class SimpleBlockFeatureMixin {
-    //this mixin inserts the logic needed to ensure that when hearty grains are of a certain age, they place with the upper block too
-    //similarly to what the doubleblock logic is here
-    @Inject(method = "place", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/block/state/BlockState;canSurvive(Lnet/minecraft/world/level/LevelReader;Lnet/minecraft/core/BlockPos;)Z", shift = At.Shift.AFTER), cancellable = true)
-    public void place(FeaturePlaceContext<SimpleBlockConfiguration> context, CallbackInfoReturnable<Boolean> cir,
-                      @Local BlockState blockState, @Local BlockPos blockPos, @Local WorldGenLevel worldGenLevel) {
-        if (!(blockState.getBlock() instanceof HeartyGrainsBlock)) {
-            return;
-        }
-        if (blockState.getValue(HeartyGrainsBlock.Companion.getAGE()) <= HeartyGrainsBlock.AGE_AFTER_HARVEST) {
-            return; //block is too young to be double
-        }
-        if (!worldGenLevel.isEmptyBlock(blockPos.above())) {
-            cir.setReturnValue(false); //no space for the 2nd block above
-            return;
-        }
-        DoublePlantBlock.placeAt(worldGenLevel, blockState, blockPos, Block.UPDATE_CLIENTS);
-        cir.setReturnValue(true);
-    }
-}