Merge branch 'main' into '1.2.0'

Update Changelog See merge request cable-mc/cobblemon!246
Update Changelog [skip-ci]
2026-10-24 16:16:24 -04:00 · 2023-01-01 04:20:56 +00:00 · 2023-01-01 04:20:55 +00:00 · 2023-01-01 14:04:26 +10:00 · 2023-01-01 13:59:52 +10:00 · 2023-01-01 13:44:51 +10:00
6994 changed files with 394944 additions and 21465 deletions
@@ -5,7 +5,8 @@ bin
 .metadata
 .classpath
 .project
-
+/.architectury-transformer/
+common/src/main/resources/assets/cobblemon/showdown
 # idea
 out
 *.ipr
@@ -23,6 +24,12 @@ run

 # Files from Forge MDK
 forge*changelog.txt
-/src/main/resources/showdown/package-lock.json
-/src/main/resources/showdown/node_modules/
 /showdown/
+/logs/
+.vscode/launch.json
+.vscode
+common/src/main/resources/assets/cobblemon/showdown
+
+# Generated files
+*/generated/resources/*
+/fabric/src/generated/resources/cobblemon-common.accesswidener
@@ -5,19 +5,20 @@ stages:
  - build
  - deploy

-#TODO add client reference test process, delete client from sources and see if compilation is successful
+#TODO add client reference test process, search for import com.cobblemon.mod.common.client

 build-job:
  stage: build
  script:
-      - export GRADLE_OPTS="-Xmx3G -Xms3G"
+      - export GRADLE_OPTS="-Xmx4G -Xms4G"
      - chmod +x ./gradlew
      - ./gradlew build
  cache:
    key: "$CI_COMMIT_REF_NAME"
    policy: push
    paths:
-      - build/libs
+      - forge/build/libs
+      - fabric/build/libs

 # Separate step to deploy the artifacts, save Norry the headache of keeping even more shit around
 deploy-job:
@@ -27,11 +28,16 @@ deploy-job:
    key: "$CI_COMMIT_REF_NAME"
    policy: pull
    paths:
-      - build/libs/*
+      - forge/build/libs/*.jar
+      - fabric/build/libs/*.jar
  script: 
    - echo "Collecting artifacts..."
-    - mv build/libs/*.jar ./
+    - mv forge/build/libs/*-remap.jar ./
+    - mv fabric/build/libs/*-remap.jar ./
+    - for f in *.jar; do mv "$f" "$(echo "$f" | sed s/+/b$CI_PIPELINE_IID+/ | sed s/-remap//)"; done
  artifacts:
-    expire_in: 10 days  
+    expire_in: 28 days
    paths:
      - ./*.jar
+#      - forge/build/libs/*-forge.jar
+#      - fabric/build/libs/*-remap.jar
@@ -0,0 +1,117 @@
+# Changelog
+
+## [1.2.0 - The Customization Update (January 1st, 2023)](#1-2-0)
+### 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 / 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.
+
+## [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.
+
+## [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`.
+
+## [1.0.0 (November 12th, 2022)](#1-0-0)
+- Initial release.
@@ -1,65 +0,0 @@
-Minecraft Forge: Credits/Thank You
-
-Forge is a set of tools and modifications to the Minecraft base game code to assist 
-mod developers in creating new and exciting content. It has been in development for 
-several years now, but I would like to take this time thank a few people who have 
-helped it along it's way.
-
-First, the people who originally created the Forge projects way back in Minecraft 
-alpha. Eloraam of RedPower, and SpaceToad of Buildcraft, without their acceptiance 
-of me taking over the project, who knows what Minecraft modding would be today.
-
-Secondly, someone who has worked with me, and developed some of the core features
-that allow modding to be as functional, and as simple as it is, cpw. For developing
-FML, which stabelized the client and server modding ecosystem. As well as the base
-loading system that allows us to modify Minecraft's code as elegently as possible.
-
-Mezz, who has stepped up as the issue and pull request manager. Helping to keep me
-sane as well as guiding the community into creating better additions to Forge.
-
-Searge, Bspks, Fesh0r, ProfMobious, and all the rest over on the MCP team {of which 
-I am a part}. For creating some of the core tools needed to make Minecraft modding 
-both possible, and as stable as can be.
-  On that note, here is some specific information of the MCP data we use:
-    * Minecraft Coder Pack (MCP) *
-      Forge Mod Loader and Minecraft Forge have permission to distribute and automatically 
-      download components of MCP and distribute MCP data files. This permission is not 
-      transitive and others wishing to redistribute the Minecraft Forge source independently
-      should seek permission of MCP or remove the MCP data files and request their users 
-      to download MCP separately.
-      
-And lastly, the countless community members who have spent time submitting bug reports, 
-pull requests, and just helping out the community in general. Thank you.
-
--LexManos
-
-=========================================================================
-
-This is Forge Mod Loader.
-
-You can find the source code at all times at https://github.com/MinecraftForge/MinecraftForge/tree/1.12.x/src/main/java/net/minecraftforge/fml
-
-This minecraft mod is a clean open source implementation of a mod loader for minecraft servers
-and minecraft clients.
-
-The code is authored by cpw.
-
-It began by partially implementing an API defined by the client side ModLoader, authored by Risugami.
-http://www.minecraftforum.net/topic/75440-
-This support has been dropped as of Minecraft release 1.7, as Risugami no longer maintains ModLoader.
-
-It also contains suggestions and hints and generous helpings of code from LexManos, author of MinecraftForge.
-http://www.minecraftforge.net/
-
-Additionally, it contains an implementation of topological sort based on that 
-published at http://keithschwarz.com/interesting/code/?dir=topological-sort
-
-It also contains code from the Maven project for performing versioned dependency
-resolution. http://maven.apache.org/
-
-It also contains a partial repackaging of the javaxdelta library from http://sourceforge.net/projects/javaxdelta/
-with credit to it's authors.
-
-Forge Mod Loader downloads components from the Minecraft Coder Pack
-(http://mcp.ocean-labs.de/index.php/Main_Page) with kind permission from the MCP team.
-
@@ -0,0 +1,5 @@
+Copyright (C) 2022 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/.
@@ -1,20 +1,22 @@
-# Pokémon Cobbled
+# Cobblemon

-An open-source Pokémon mod written in Kotlin.
+An open-source Pokémon mod for Minecraft Java Edition, written in Kotlin for Fabric and Forge.

 ## Getting started

-To set up the development workspace, first clone the project and open the build.gradle with Intellij. This will automatically
+To set up the development workspace, first clone the project and open the build.gradle with Intellij.  There will be
+errors until you go to File -> Settings -> Build, Execution, Deployment -> Build Tools -> Gradle and change the Gradle JVM
+to 17. After changing this, click the icon for reloading the project. This will automatically
 put together all the dependencies and project setup.

-Run `gradlew genIntellijRuns`, and then in Intellij go to your run configurations, and change whichever you plan on
-running to use a Java 16 JRE. runClient is as if you booted up in singleplayer, runServer is a server without a client,
+Run `./gradlew genEclipseRuns`, and then in Intellij go to your run configurations, and change whichever you plan on
+running to use a Java 17 JRE. runClient is as if you booted up in singleplayer, runServer is a server without a client,
 and runData is for summoning the Eldritch gods or something, idk.

 ## Contributing

 If you're interested in contributing to the project, you can simply fork the repository and comment on any of the issues 
-[here](https://gitlab.com/cable-mc/pokemon-cobbled/-/issues?scope=all&state=opened&label_name[]=accepted&assignee_id=None).
+[here](https://gitlab.com/cable-mc/cobblemon/-/issues?scope=all&state=opened&label_name[]=accepted&assignee_id=None).

 If you want a more involved role in the project, involving branches on the main repository instead of forking and involvement
-in design discussions, add and message Hiroku#4373 on Discord.
+in design discussions, add and message Hiroku#4373 on our Discord here: https://discord.gg/AsNpJSST7G.
@@ -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)
+}
@@ -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"))
+}
@@ -0,0 +1,58 @@
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
+val accessWidenerFile = "src/main/resources/cobblemon-common.accesswidener"
+
+plugins {
+    `java-library`
+    id("org.cadixdev.licenser")
+    id("dev.architectury.loom")
+    id("architectury-plugin")
+    kotlin("jvm")
+}
+
+repositories {
+    mavenCentral()
+}
+
+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")}")
+
+}
+
+tasks {
+    withType<JavaCompile> {
+        options.encoding = "UTF-8"
+        options.release.set(17)
+    }
+
+    withType<KotlinCompile> {
+        kotlinOptions.jvmTarget = "17"
+    }
+
+    withType<Jar> {
+        from(rootProject.file("LICENSE"))
+    }
+}
@@ -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}")
+        archiveClassifier.set("${rootProject.version}-remap")
+    }
+
+}
@@ -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()
+}
@@ -0,0 +1,2 @@
+
+const val ACCESS_WIDENER = "src/main/resources/cobblemon-common.accesswidener"
@@ -1,224 +0,0 @@
-buildscript {
-    ext.kotlin_version = '1.5.31'
-    repositories {
-        // These repositories are only for Gradle plugins, put any other repositories in the repository block further below
-        maven { url = 'https://maven.minecraftforge.net' }
-        maven { url = 'https://maven.parchmentmc.org' }
-        mavenCentral()
-    }
-    dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true
-        classpath 'org.spongepowered:mixingradle:0.7.+'
-        classpath 'org.parchmentmc:librarian:1.+'
-    }
-}
-
-plugins {
-    id 'com.github.johnrengelman.shadow' version '7.1.0'
-}
-
-println('Java: ' + System.getProperty('java.version') + ' JVM: ' + System.getProperty('java.vm.version') + '(' + System.getProperty('java.vendor') + ') Arch: ' + System.getProperty('os.arch'))
-
-apply plugin: "java"
-apply plugin: "net.minecraftforge.gradle"
-apply plugin: "org.parchmentmc.librarian.forgegradle"
-apply plugin: "kotlin"
-apply plugin: "maven-publish"
-apply plugin: 'org.spongepowered.mixin'
-
-version = '0.0.1'
-group = 'com.cablemc.pokemoncobbled'
-archivesBaseName = 'PokemonCobbled'
-
-minecraft {
-    mappings channel: 'parchment', version: '2021.08.15-1.17.1'
-
-    accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') // Currently, this location cannot be changed from the default.
-
-    runs {
-        client {
-            workingDirectory project.file('run')
-            property 'forge.logging.markers', 'REGISTRIES'
-            property 'forge.logging.console.level', 'debug'
-            property 'mixin.env.remapRefMap', 'true'
-            property 'mixin.env.refMapRemappingFile', "${buildDir}/createSrgToMcp/output.srg"
-
-            mods {
-                pokemoncobbled {
-                    source sourceSets.main
-                }
-            }
-        }
-
-        server {
-            workingDirectory project.file('run')
-            property 'forge.logging.markers', 'REGISTRIES'
-            property 'forge.logging.console.level', 'debug'
-            property 'mixin.env.remapRefMap', 'true'
-            property 'mixin.env.refMapRemappingFile', "${buildDir}/createSrgToMcp/output.srg"
-
-            mods {
-                pokemoncobbled {
-                    source sourceSets.main
-                }
-            }
-        }
-
-        data {
-            workingDirectory project.file('run')
-            property 'forge.logging.markers', 'REGISTRIES'
-            property 'forge.logging.console.level', 'debug'
-            property 'mixin.env.remapRefMap', 'true'
-            property 'mixin.env.refMapRemappingFile', "${buildDir}/createSrgToMcp/output.srg"
-
-            // Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources.
-            args '--mod', 'pokemoncobbled', '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/')
-
-            mods {
-                pokemoncobbled {
-                    source sourceSets.main
-                }
-            }
-        }
-    }
-}
-
-configurations {
-    // Create the library configuration, where our non-mod libraries will be added to
-    library
-    // Any dependency in the library configuration will also be added to the implementation configuration
-    implementation.extendsFrom library
-}
-
-// Configure all runs with the following
-minecraft.runs.all {
-    // Set the minecraft_classpath token to the paths of all jars in the library configuration
-    // This is added with the actual Minecraft classpath to get the real classpath information later on
-    lazyToken('minecraft_classpath') {
-        configurations.library.copyRecursive().resolve().collect { it.absolutePath }.join(File.pathSeparator)
-    }
-}
-
-mixin {
-    // Refmaps for each SourceSet
-    add sourceSets.main, 'mixins.pokemoncobbled.refmap.json'
-
-    // Configs to add to runs and jars
-    config 'mixins.pokemoncobbled.json'
-
-    // Specify options for dev run configs
-    debug.verbose = true
-    debug.export = true
-    dumpTargetOnFailure = true
-
-    // Options for the Annotation Processor
-    quiet
-}
-
-repositories {
-    mavenCentral()
-    maven { url "https://repo.codemc.org/repository/maven-public" }
-    maven { url "https://repo.aikar.co/content/groups/aikar/" }
-    maven { url "https://jitpack.io/" }
-    maven {
-        name = 'kotlinforforge'
-        url = 'https://thedarkcolour.github.io/KotlinForForge/'
-    }
-}
-
-dependencies {
-    minecraft 'net.minecraftforge:forge:1.17.1-37.0.103'
-    implementation('thedarkcolour:kotlinforforge:2.0.1')
-    annotationProcessor 'org.spongepowered:mixin:0.8.4:processor'
-
-    // For Showdown
-    shadow 'com.caoccao.javet:javet:1.0.6' // Linux or Windows
-    shadow 'com.caoccao.javet:javet-macos:1.0.6' // Mac OS (x86_64 Only)
-    shadow group: 'commons-io', name: 'commons-io', version: '2.6'
-
-    // For Showdown
-    library 'com.caoccao.javet:javet:1.0.6' // Linux or Windows
-    library 'com.caoccao.javet:javet-macos:1.0.6' // Mac OS (x86_64 Only)
-    library group: 'commons-io', name: 'commons-io', version: '2.6'
-
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.3.2'
-    testImplementation 'org.junit.jupiter:junit-jupiter-params:5.5.2'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.3.2'
-    testImplementation 'org.mockito:mockito-core:3.3.3'
-    testImplementation 'io.mockk:mockk:1.12.1'
-}
-
-
-// Testing -------------
-test {
-    useJUnitPlatform()
-}
-// ---------------------
-
-jar {
-    manifest {
-        attributes([
-                "Specification-Title"     : "pokemoncobbled",
-                "Specification-Vendor"    : "Cable MC",
-                "Specification-Version"   : "1", // We are version 1 of ourselves
-                "Implementation-Title"    : project.name,
-                "Implementation-Version"  : project.jar.archiveVersion,
-                "Implementation-Vendor"   : "Cable MC",
-                "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
-        ])
-    }
-}
-
-compileKotlin {
-    kotlinOptions.jvmTarget = "16"
-    kotlinOptions.freeCompilerArgs = ["-Xjvm-default=all"]
-}
-
-/*compileJava {
-    options.compilerArgs += ["-parameters"]
-    options.fork = true
-    options.forkOptions.executable = 'javac'
-}*/
-
-// Example configuration to allow publishing using the maven-publish plugin
-// This is the preferred method to reobfuscate your jar file
-jar.finalizedBy('reobfShadowJar')
-
-shadowJar {
-    classifier = null
-    configurations = [project.configurations.shadow]
-    //minimize()
-    exclude "**/module-info.class"
-    exclude "**/NOTICE"
-//    exclude '**/*.kotlin_metadata'
-//    exclude '**/*.kotlin_module'
-//    exclude '**/*.kotlin_builtins'
-    // relocate('kotlin', 'shaded.kotlin4')
-}
-
-reobf {
-    shadowJar {}
-}
-// Mojang ships Java 16 to end users in 1.17+ instead of Java 8 in 1.16 or lower, so your mod should target Java 16.
-java.toolchain.languageVersion = JavaLanguageVersion.of(16)
-
-
-// Include resources generated by data generators.
-sourceSets.main.resources { srcDir 'src/generated/resources' }
-
-// However if you are in a multi-project build, dev time needs unobfed jar files, so you can delay the obfuscation until publishing by doing
-// publish.dependsOn('reobfJar')
-
-publishing {
-    publications {
-        mavenJava(MavenPublication) {
-            artifact jar
-        }
-    }
-    repositories {
-        maven {
-            url "file://${project.projectDir}/mcmodsrepo"
-        }
-    }
-}
@@ -0,0 +1,13 @@
+
+plugins {
+    base
+    id("cobblemon.root-conventions")
+}
+
+group = "com.cobblemon.mod"
+version = "${project.property("mod_version")}+${project.property("mc_version")}"
+
+val isSnapshot = project.property("snapshot")?.equals("true") ?: false
+if (isSnapshot) {
+    version = "$version-SNAPSHOT"
+}
@@ -1 +0,0 @@
- Added shit
@@ -0,0 +1,56 @@
+plugins {
+    id("cobblemon.base-conventions")
+    id("maven-publish")
+}
+
+architectury {
+    common()
+}
+
+repositories {
+    maven(url = "https://dl.cloudsmith.io/public/geckolib3/geckolib/maven/")
+}
+
+dependencies {
+    implementation(libs.stdlib)
+    implementation(libs.reflect)
+
+    modImplementation(libs.fabricLoader)
+    modApi(libs.architectury)
+    modApi(libs.molang)
+    modApi(libs.mclib)
+
+    // For Showdown
+    modCompileOnly(libs.graal)
+
+    //shadowCommon group: 'commons-io', name: 'commons-io', version: '2.6'
+
+    testRuntimeOnly(libs.junitEngine)
+    testImplementation(libs.junitApi)
+    testImplementation(libs.junitParams)
+    testImplementation(libs.mockito)
+    testImplementation(libs.mockk)
+
+    compileOnly("net.luckperms:api:${rootProject.property("luckperms_version")}")
+}
+
+publishing {
+    repositories {
+        maven("https://maven.impactdev.net/repository/development/") {
+            name = "ImpactDev-Public"
+            credentials {
+                username = System.getenv("NEXUS_USER")
+                password = System.getenv("NEXUS_PW")
+            }
+        }
+    }
+
+    publications {
+        create<MavenPublication>("mod") {
+            from(components["java"])
+            groupId = "com.cobblemon"
+            artifactId = "mod"
+            version = rootProject.version.toString()
+        }
+    }
+}
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2022 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.command.argument.*;
+import com.mojang.brigadier.arguments.ArgumentType;
+import net.minecraft.command.argument.ArgumentTypes;
+import net.minecraft.command.argument.serialize.ArgumentSerializer;
+import net.minecraft.command.argument.serialize.ConstantArgumentSerializer;
+import net.minecraft.util.registry.Registry;
+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(ArgumentTypes.class)
+public class ArgumentTypesMixin {
+
+    @Shadow
+    private static <A extends ArgumentType<?>, T extends ArgumentSerializer.ArgumentTypeProperties<A>> ArgumentSerializer<A, T> register(Registry<ArgumentSerializer<?, ?>> registry, String string, Class<? extends A> clazz, ArgumentSerializer<A, T> argumentSerializer) {
+        throw new AssertionError("Should not be executed.");
+    }
+
+    @Inject(method = "register(Lnet/minecraft/util/registry/Registry;)Lnet/minecraft/command/argument/serialize/ArgumentSerializer;", at = @At("RETURN"))
+    private static void register(Registry<ArgumentSerializer<?, ?>> registry, CallbackInfoReturnable<ArgumentSerializer<?, ?>> ci) {
+        register(registry, "cobblemon:pokemon", PokemonArgumentType.class, ConstantArgumentSerializer.of(PokemonArgumentType.Companion::pokemon));
+        register(registry, "cobblemon:pokemonproperties", PokemonPropertiesArgumentType.class, ConstantArgumentSerializer.of(PokemonPropertiesArgumentType.Companion::properties));
+        register(registry, "cobblemon:spawnbucket", SpawnBucketArgumentType.class, ConstantArgumentSerializer.of(SpawnBucketArgumentType.Companion::spawnBucket));
+        register(registry, "cobblemon:move", MoveArgumentType.class, ConstantArgumentSerializer.of(MoveArgumentType.Companion::move));
+        register(registry, "cobblemon:partyslot", PartySlotArgumentType.class, ConstantArgumentSerializer.of(PartySlotArgumentType.Companion::partySlot));
+    }
+
+}
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2022 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 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;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+import java.util.Map;
+
+@Mixin(EntityRenderDispatcher.class)
+public class EntityRenderDispatcherMixin {
+
+    @Shadow private Map<String, EntityRenderer<? extends PlayerEntity>> modelRenderers;
+
+    @Inject(
+        method = "reload",
+        at = @At(value = "TAIL")
+    )
+    public void resourceManagerReloadHook(ResourceManager resourceManager, CallbackInfo ci) {
+        CobblemonClient.INSTANCE.onAddLayer(this.modelRenderers);
+    }
+}
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2022 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.ScheduledTaskTracker;
+import net.minecraft.client.render.GameRenderer;
+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(GameRenderer.class)
+public class GameRendererMixin {
+    @Inject(
+            method = "render",
+            at = @At(value = "TAIL")
+    )
+    public void render(float tickDelta, long startTime, boolean tick, CallbackInfo ci) {
+            ScheduledTaskTracker.INSTANCE.update();
+    }
+}
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2022 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.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(ServerWorld.class)
+public abstract class MinecraftDedicatedServerMixin implements DedicatedServer {
+
+    @Inject(method = "shouldCancelSpawn", at = @At(value = "HEAD"), cancellable = true)
+    public void cobblemon$allowPokemonSpawns(Entity entity, CallbackInfoReturnable<Boolean> callback) {
+        if(entity instanceof PokemonEntity) {
+            callback.setReturnValue(false);
+        }
+    }
+
+}
@@ -0,0 +1,118 @@
+/*
+ * Copyright (C) 2022 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.api.storage.NoPokemonStoreException;
+import com.cobblemon.mod.common.api.storage.party.PartyStore;
+import com.cobblemon.mod.common.pokemon.Pokemon;
+import com.cobblemon.mod.common.util.CompoundTagExtensionsKt;
+import com.cobblemon.mod.common.util.DataKeys;
+import net.minecraft.entity.EntityType;
+import net.minecraft.entity.LivingEntity;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.nbt.NbtCompound;
+import net.minecraft.world.World;
+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;
+
+import java.util.UUID;
+
+@Mixin(PlayerEntity.class)
+public abstract class PlayerMixin extends LivingEntity {
+
+    @Shadow public abstract NbtCompound getShoulderEntityLeft();
+
+    @Shadow public abstract NbtCompound getShoulderEntityRight();
+
+    @Shadow public abstract void dropShoulderEntity(NbtCompound entityNbt);
+
+    @Shadow public abstract void setShoulderEntityRight(NbtCompound entityNbt);
+
+    @Shadow public abstract void setShoulderEntityLeft(NbtCompound entityNbt);
+
+    @Shadow public abstract boolean isSpectator();
+
+    protected PlayerMixin(EntityType<? extends LivingEntity> p_20966_, World p_20967_) {
+        super(p_20966_, p_20967_);
+    }
+
+    @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 = 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 NbtCompound());
+                }
+            }
+            if (this.isShoulderPokemon(this.getShoulderEntityLeft())) {
+                final UUID uuidLeft = this.getPokemonID(this.getShoulderEntityLeft());
+                if (uuid.equals(uuidLeft)) {
+                    this.recallPokemon(uuidLeft);
+                    this.setShoulderEntityLeft(new NbtCompound());
+                }
+            }
+            ci.cancel();
+        }
+    }
+
+    @Inject(
+        method = "dropShoulderEntities",
+        at = @At(
+            value = "JUMP",
+            opcode = Opcodes.IFGE,
+            ordinal = 0,
+            shift = At.Shift.AFTER
+        ),
+        cancellable = true
+    )
+    private void cobblemon$preventPokemonDropping(CallbackInfo ci) {
+        // We want to allow both of these to forcefully remove the entities
+        if (this.isSpectator() || this.isDead())
+            return;
+        if (!this.isShoulderPokemon(this.getShoulderEntityLeft())) {
+            this.dropShoulderEntity(this.getShoulderEntityLeft());
+            this.setShoulderEntityLeft(new NbtCompound());
+        }
+        if (!this.isShoulderPokemon(this.getShoulderEntityRight())) {
+            this.dropShoulderEntity(this.getShoulderEntityRight());
+            this.setShoulderEntityRight(new NbtCompound());
+        }
+        ci.cancel();
+    }
+
+    private UUID getPokemonID(NbtCompound nbt) {
+        return nbt.getCompound(DataKeys.POKEMON)
+                .getUuid(DataKeys.POKEMON_UUID);
+    }
+
+    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();
+                }
+            }
+        } catch (NoPokemonStoreException ignored) {}
+    }
+
+    private boolean isShoulderPokemon(NbtCompound nbt) {
+        return CompoundTagExtensionsKt.isPokemonEntity(nbt);
+    }
+
+}
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2022 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.tags.CobblemonBlockTags;
+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;
+
+@Mixin(PointedDripstoneBlock.class)
+public abstract class PointedDripstoneBlockMixin {
+
+    @Redirect(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))
+    private static boolean cobblemon$validateMoonStoneDripstone(BlockState instance, Block block) {
+        return instance.isIn(CobblemonBlockTags.INSTANCE.getDRIPSTONE_GROWABLE());
+    }
+
+}
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2022 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.spawning.mixins.CachedOnlyChunkAccessor;
+import com.mojang.datafixers.util.Either;
+import net.minecraft.server.world.ChunkHolder;
+import net.minecraft.server.world.ServerChunkManager;
+import net.minecraft.util.math.ChunkPos;
+import net.minecraft.world.chunk.Chunk;
+import net.minecraft.world.chunk.ChunkManager;
+import net.minecraft.world.chunk.ChunkStatus;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+
+import java.util.concurrent.CompletableFuture;
+
+@Mixin(ServerChunkManager.class)
+public abstract class ServerChunkManagerMixin extends ChunkManager implements CachedOnlyChunkAccessor {
+    @Shadow @Nullable protected abstract ChunkHolder getChunkHolder(long pos);
+
+    @Override
+    public Chunk cobblemon$request(int x, int z, @NotNull ChunkStatus status) {
+        long l = ChunkPos.toLong(x, z);
+
+        ChunkHolder holder = getChunkHolder(l);
+        if (holder != null) {
+            CompletableFuture<Either<Chunk, ChunkHolder.Unloaded>> future = holder.getFutureFor(status);
+            if (future.isDone()) {
+                return future.join().left().orElse(null);
+            }
+        }
+
+        return null;
+    }
+}
@@ -0,0 +1,21 @@
+/*
+ * Copyright (C) 2022 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.mixin.accessor;
+
+import net.minecraft.entity.Entity;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+@Mixin(Entity.class)
+public interface AccessorEntity {
+
+    @Accessor("standingEyeHeight")
+    void standingEyeHeight(float standingEyeHeight);
+
+}
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2022 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.mixin.accessor;
+
+import net.minecraft.client.option.KeyBinding;
+import net.minecraft.client.util.InputUtil;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+@Mixin(KeyBinding.class)
+public interface KeyBindingAccessor {
+
+    @Accessor("boundKey")
+    InputUtil.Key boundKey();
+
+}
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2022 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.mixin.entity;
+
+import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
+import net.minecraft.entity.passive.TameableEntity;
+import net.minecraft.world.World;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+
+@Mixin(TameableEntity.class)
+public class TameableEntityMixin {
+
+    @Redirect(method = "onDeath", at = @At(value = "FIELD", target = "Lnet/minecraft/world/World;isClient:Z"))
+    public boolean cobblemon$checkIfPokemonBeforeSendingMessage(World world) {
+        return world.isClient || (this.getClass().isAssignableFrom(PokemonEntity.class));
+    }
+
+}
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2022 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.pokeball;
+
+import com.cobblemon.mod.common.item.PokeBallItem;
+import net.minecraft.client.render.VertexConsumerProvider;
+import net.minecraft.client.render.item.ItemModels;
+import net.minecraft.client.render.item.ItemRenderer;
+import net.minecraft.client.render.model.BakedModel;
+import net.minecraft.client.render.model.json.ModelTransformation;
+import net.minecraft.client.util.ModelIdentifier;
+import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.client.world.ClientWorld;
+import net.minecraft.entity.LivingEntity;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+@Mixin(ItemRenderer.class)
+public abstract class ItemRendererMixin {
+
+    @Shadow @Final private ItemModels models;
+
+    @Shadow public abstract void renderItem(ItemStack stack, ModelTransformation.Mode renderMode, boolean leftHanded, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, int overlay, BakedModel model);
+
+    @Inject(method = "getModel", at = @At("HEAD"), cancellable = true)
+    private void cobblemon$bakePokeballModel(ItemStack stack, World world, LivingEntity entity, int seed, CallbackInfoReturnable<BakedModel> cir) {
+        if (stack.getItem() instanceof PokeBallItem pokeBallItem) {
+            ModelIdentifier modelIdentifier = new ModelIdentifier(pokeBallItem.getPokeBall().getModel3d());
+            BakedModel model = this.models.getModelManager().getModel(modelIdentifier);
+            ClientWorld clientWorld = world instanceof ClientWorld ? (ClientWorld) world : null;
+            BakedModel overriddenModel = model.getOverrides().apply(model, stack, clientWorld, entity, seed);
+            cir.setReturnValue(overriddenModel == null ? this.models.getModelManager().getMissingModel() : overriddenModel);
+        }
+    }
+
+    @Inject(
+            method = "renderItem(Lnet/minecraft/item/ItemStack;Lnet/minecraft/client/render/model/json/ModelTransformation$Mode;ZLnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;IILnet/minecraft/client/render/model/BakedModel;)V",
+            at = @At("HEAD"),
+            cancellable = true
+    )
+    private void cobblemon$determinePokeballModel(ItemStack stack, ModelTransformation.Mode renderMode, boolean leftHanded, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, int overlay, BakedModel model, CallbackInfo ci) {
+        boolean shouldBe2d = renderMode == ModelTransformation.Mode.GUI || renderMode == ModelTransformation.Mode.FIXED;
+        if (shouldBe2d && stack.getItem() instanceof PokeBallItem pokeBallItem) {
+            ModelIdentifier modelIdentifier = new ModelIdentifier(pokeBallItem.getPokeBall().getModel2d());
+            BakedModel replacementModel = this.models.getModelManager().getModel(modelIdentifier);
+            if (!model.equals(replacementModel)) {
+                ci.cancel();
+                renderItem(stack, renderMode, leftHanded, matrices, vertexConsumers, light, overlay, replacementModel);
+            }
+        }
+    }
+
+}
@@ -0,0 +1,382 @@
+/*
+ * Copyright (C) 2022 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.advancement.CobblemonCriteria
+import com.cobblemon.mod.common.api.Priority
+import com.cobblemon.mod.common.api.SeasonResolver
+import com.cobblemon.mod.common.api.data.DataProvider
+import com.cobblemon.mod.common.api.drop.CommandDropEntry
+import com.cobblemon.mod.common.api.drop.DropEntry
+import com.cobblemon.mod.common.api.drop.ItemDropEntry
+import com.cobblemon.mod.common.api.events.CobblemonEvents.BATTLE_VICTORY
+import com.cobblemon.mod.common.api.events.CobblemonEvents.DATA_SYNCHRONIZED
+import com.cobblemon.mod.common.api.events.CobblemonEvents.EVOLUTION_COMPLETE
+import com.cobblemon.mod.common.api.events.CobblemonEvents.LIVING_DEATH
+import com.cobblemon.mod.common.api.events.CobblemonEvents.PLAYER_QUIT
+import com.cobblemon.mod.common.api.events.CobblemonEvents.POKEMON_CAPTURED
+import com.cobblemon.mod.common.api.events.CobblemonEvents.SERVER_STARTED
+import com.cobblemon.mod.common.api.events.CobblemonEvents.SERVER_STOPPED
+import com.cobblemon.mod.common.api.events.CobblemonEvents.TICK_POST
+import com.cobblemon.mod.common.api.net.serializers.PoseTypeDataSerializer
+import com.cobblemon.mod.common.api.net.serializers.StringSetDataSerializer
+import com.cobblemon.mod.common.api.net.serializers.Vec3DataSerializer
+import com.cobblemon.mod.common.api.permission.PermissionValidator
+import com.cobblemon.mod.common.api.pokeball.catching.calculators.CaptureCalculator
+import com.cobblemon.mod.common.api.pokeball.catching.calculators.CobblemonGen348CaptureCalculator
+import com.cobblemon.mod.common.api.pokemon.PokemonSpecies
+import com.cobblemon.mod.common.api.pokemon.effect.ShoulderEffectRegistry
+import com.cobblemon.mod.common.api.pokemon.experience.ExperienceCalculator
+import com.cobblemon.mod.common.api.pokemon.experience.ExperienceGroups
+import com.cobblemon.mod.common.api.pokemon.experience.StandardExperienceCalculator
+import com.cobblemon.mod.common.api.pokemon.feature.ChoiceSpeciesFeatureProvider
+import com.cobblemon.mod.common.api.pokemon.feature.FlagSpeciesFeatureProvider
+import com.cobblemon.mod.common.api.pokemon.feature.GlobalSpeciesFeatures
+import com.cobblemon.mod.common.api.pokemon.feature.SpeciesFeatures
+import com.cobblemon.mod.common.api.pokemon.stats.EvCalculator
+import com.cobblemon.mod.common.api.pokemon.stats.Generation8EvCalculator
+import com.cobblemon.mod.common.api.pokemon.stats.StatProvider
+import com.cobblemon.mod.common.api.properties.CustomPokemonProperty
+import com.cobblemon.mod.common.api.reactive.Observable.Companion.filter
+import com.cobblemon.mod.common.api.reactive.Observable.Companion.map
+import com.cobblemon.mod.common.api.reactive.Observable.Companion.takeFirst
+import com.cobblemon.mod.common.api.scheduling.ScheduledTaskTracker
+import com.cobblemon.mod.common.api.spawning.BestSpawner
+import com.cobblemon.mod.common.api.spawning.CobblemonSpawningProspector
+import com.cobblemon.mod.common.api.spawning.context.AreaContextResolver
+import com.cobblemon.mod.common.api.spawning.prospecting.SpawningProspector
+import com.cobblemon.mod.common.api.starter.StarterHandler
+import com.cobblemon.mod.common.api.storage.PokemonStoreManager
+import com.cobblemon.mod.common.api.storage.adapter.conversions.ReforgedConversion
+import com.cobblemon.mod.common.api.storage.adapter.flatifle.FileStoreAdapter
+import com.cobblemon.mod.common.api.storage.adapter.flatifle.JSONStoreAdapter
+import com.cobblemon.mod.common.api.storage.adapter.flatifle.NBTStoreAdapter
+import com.cobblemon.mod.common.api.storage.factory.FileBackedPokemonStoreFactory
+import com.cobblemon.mod.common.api.storage.pc.PCStore
+import com.cobblemon.mod.common.api.storage.pc.link.PCLinkManager
+import com.cobblemon.mod.common.api.storage.player.PlayerDataStoreManager
+import com.cobblemon.mod.common.battles.BattleFormat
+import com.cobblemon.mod.common.battles.BattleRegistry
+import com.cobblemon.mod.common.battles.BattleSide
+import com.cobblemon.mod.common.battles.ShowdownThread
+import com.cobblemon.mod.common.battles.actor.PokemonBattleActor
+import com.cobblemon.mod.common.battles.pokemon.BattlePokemon
+import com.cobblemon.mod.common.config.CobblemonConfig
+import com.cobblemon.mod.common.config.constraint.IntConstraint
+import com.cobblemon.mod.common.config.starter.StarterConfig
+import com.cobblemon.mod.common.data.CobblemonDataProvider
+import com.cobblemon.mod.common.events.AdvancementHandler
+import com.cobblemon.mod.common.events.ServerTickHandler
+import com.cobblemon.mod.common.item.PokeBallItem
+import com.cobblemon.mod.common.net.messages.client.settings.ServerSettingsPacket
+import com.cobblemon.mod.common.net.serverhandling.ServerPacketRegistrar
+import com.cobblemon.mod.common.permission.LaxPermissionValidator
+import com.cobblemon.mod.common.pokemon.Pokemon
+import com.cobblemon.mod.common.pokemon.aspects.GENDER_ASPECT
+import com.cobblemon.mod.common.pokemon.aspects.SHINY_ASPECT
+import com.cobblemon.mod.common.pokemon.evolution.variants.BlockClickEvolution
+import com.cobblemon.mod.common.pokemon.feature.BattleCriticalHitsFeature
+import com.cobblemon.mod.common.pokemon.feature.DamageTakenFeature
+import com.cobblemon.mod.common.pokemon.feature.TagSeasonResolver
+import com.cobblemon.mod.common.pokemon.properties.HiddenAbilityPropertyType
+import com.cobblemon.mod.common.pokemon.properties.UncatchableProperty
+import com.cobblemon.mod.common.pokemon.properties.UntradeableProperty
+import com.cobblemon.mod.common.pokemon.properties.tags.PokemonFlagProperty
+import com.cobblemon.mod.common.pokemon.stat.CobblemonStatProvider
+import com.cobblemon.mod.common.registry.CompletableRegistry
+import com.cobblemon.mod.common.starter.CobblemonStarterHandler
+import com.cobblemon.mod.common.util.cobblemonResource
+import com.cobblemon.mod.common.util.getServer
+import com.cobblemon.mod.common.util.ifDedicatedServer
+import com.cobblemon.mod.common.util.party
+import com.cobblemon.mod.common.util.removeAmountIf
+import com.cobblemon.mod.common.world.CobblemonGameRules
+import com.cobblemon.mod.common.world.feature.CobblemonOrePlacedFeatures
+import com.cobblemon.mod.common.world.placement.CobblemonPlacementTypes
+import dev.architectury.event.EventResult
+import dev.architectury.event.events.common.CommandRegistrationEvent
+import dev.architectury.event.events.common.InteractionEvent
+import dev.architectury.hooks.item.tool.AxeItemHooks
+import java.io.File
+import java.io.FileReader
+import java.io.FileWriter
+import java.io.PrintWriter
+import java.util.UUID
+import kotlin.properties.Delegates
+import kotlin.reflect.KMutableProperty
+import kotlin.reflect.full.memberProperties
+import net.minecraft.client.MinecraftClient
+import net.minecraft.entity.data.TrackedDataHandlerRegistry
+import net.minecraft.server.network.ServerPlayerEntity
+import net.minecraft.util.WorldSavePath
+import net.minecraft.util.registry.RegistryKey
+import net.minecraft.world.World
+import org.apache.logging.log4j.LogManager
+
+object Cobblemon {
+    const val MODID = "cobblemon"
+    const val VERSION = "1.2.0"
+    const val CONFIG_PATH = "config/$MODID/main.json"
+    val LOGGER = LogManager.getLogger()
+
+    lateinit var implementation: CobblemonImplementation
+    var captureCalculator: CaptureCalculator = CobblemonGen348CaptureCalculator
+    var experienceCalculator: ExperienceCalculator = StandardExperienceCalculator
+    var evYieldCalculator: EvCalculator = Generation8EvCalculator
+    var starterHandler: StarterHandler = CobblemonStarterHandler()
+    var isDedicatedServer = false
+    var showdownThread = ShowdownThread()
+    lateinit var config: CobblemonConfig
+    var prospector: SpawningProspector = CobblemonSpawningProspector
+    var areaContextResolver: AreaContextResolver = object : AreaContextResolver {}
+    val bestSpawner = BestSpawner
+    val battleRegistry = BattleRegistry
+    var storage = PokemonStoreManager()
+    lateinit var playerData: PlayerDataStoreManager
+    lateinit var starterConfig: StarterConfig
+    val dataProvider: DataProvider = CobblemonDataProvider
+    var permissionValidator: PermissionValidator by Delegates.observable(LaxPermissionValidator().also { it.initialize() }) { _, _, newValue -> newValue.initialize() }
+    var statProvider: StatProvider = CobblemonStatProvider
+    var seasonResolver: SeasonResolver = TagSeasonResolver
+
+    fun preinitialize(implementation: CobblemonImplementation) {
+        DropEntry.register("command", CommandDropEntry::class.java)
+        DropEntry.register("item", ItemDropEntry::class.java, isDefault = true)
+
+        ExperienceGroups.registerDefaults()
+
+        this.loadConfig()
+        this.implementation = implementation
+
+        CobblemonCriteria // Init the fields and register the criteria
+        CobblemonEntities.register()
+        CobblemonBlocks.register()
+        CobblemonBlockEntities.register()
+        CobblemonItems.register()
+        ServerPacketRegistrar.registerHandlers()
+        CobblemonSounds.register()
+        CobblemonFeatures.register()
+        CobblemonGameRules.register()
+
+        ShoulderEffectRegistry.register()
+
+        DATA_SYNCHRONIZED.subscribe {
+            storage.onPlayerDataSync(it)
+            playerData.get(it).sendToPlayer(it)
+            starterHandler.handleJoin(it)
+            ServerSettingsPacket().sendToPlayer(it)
+        }
+        PLAYER_QUIT.subscribe {
+            PCLinkManager.removeLink(it.uuid)
+            BattleRegistry.getBattleByParticipatingPlayer(it)?.stop()
+        }
+        LIVING_DEATH.pipe(filter { it is ServerPlayerEntity }, map { it as ServerPlayerEntity }).subscribe {
+            battleRegistry.getBattleByParticipatingPlayer(it)?.stop()
+        }
+
+        InteractionEvent.RIGHT_CLICK_BLOCK.register(InteractionEvent.RightClickBlock { pl, _, pos, _ ->
+            val player = pl as? ServerPlayerEntity ?: return@RightClickBlock EventResult.pass()
+            val block = player.world.getBlockState(pos).block
+            player.party().forEach { pokemon ->
+                pokemon.evolutions
+                    .filterIsInstance<BlockClickEvolution>()
+                    .forEach { evolution ->
+                        evolution.attemptEvolution(pokemon, BlockClickEvolution.BlockInteractionContext(block, player.world))
+                    }
+            }
+            return@RightClickBlock EventResult.pass()
+        })
+        TrackedDataHandlerRegistry.register(Vec3DataSerializer)
+        TrackedDataHandlerRegistry.register(StringSetDataSerializer)
+        TrackedDataHandlerRegistry.register(PoseTypeDataSerializer)
+    }
+
+    fun initialize() {
+        showdownThread.start()
+
+        CompletableRegistry.allRegistriesCompleted.thenAccept {
+            LOGGER.info("All registries loaded.")
+        }
+
+        CobblemonPlacementTypes.register()
+        CobblemonOrePlacedFeatures.register()
+
+        // Start up the data provider.
+        CobblemonDataProvider.registerDefaults()
+
+        SHINY_ASPECT.register()
+        GENDER_ASPECT.register()
+
+        SpeciesFeatures.types["choice"] = ChoiceSpeciesFeatureProvider::class.java
+        SpeciesFeatures.types["flag"] = FlagSpeciesFeatureProvider::class.java
+
+        GlobalSpeciesFeatures.register(DamageTakenFeature.ID) { DamageTakenFeature() }
+        GlobalSpeciesFeatures.register(BattleCriticalHitsFeature.ID) { BattleCriticalHitsFeature() }
+
+        CustomPokemonProperty.register(UntradeableProperty)
+        CustomPokemonProperty.register(UncatchableProperty)
+        CustomPokemonProperty.register(PokemonFlagProperty)
+        CustomPokemonProperty.register(HiddenAbilityPropertyType)
+
+        CommandRegistrationEvent.EVENT.register(CobblemonCommands::register)
+
+        ifDedicatedServer {
+            isDedicatedServer = true
+            TICK_POST.subscribe { ScheduledTaskTracker.update() }
+            CobblemonNetwork.clientHandlersRegistered.complete(Unit)
+        }
+
+        CobblemonBlocks.completed.thenAccept {
+            AxeItemHooks.addStrippable(CobblemonBlocks.APRICORN_LOG.get(), CobblemonBlocks.STRIPPED_APRICORN_LOG.get())
+            AxeItemHooks.addStrippable(CobblemonBlocks.APRICORN_WOOD.get(), CobblemonBlocks.STRIPPED_APRICORN_WOOD.get())
+        }
+
+        SERVER_STARTED.subscribe { server ->
+            playerData = PlayerDataStoreManager().also { it.setup(server) }
+            val pokemonStoreRoot = server.getSavePath(WorldSavePath.ROOT).resolve("pokemon").toFile()
+
+            storage.registerFactory(
+                priority = Priority.LOWEST,
+                factory = FileBackedPokemonStoreFactory(
+                    adapter = if (config.storageFormat == "nbt") {
+                        NBTStoreAdapter(pokemonStoreRoot.absolutePath, useNestedFolders = true, folderPerClass = true)
+                    } else {
+                        JSONStoreAdapter(pokemonStoreRoot.absolutePath, useNestedFolders = true, folderPerClass = true)
+                    }.with(ReforgedConversion(server.getSavePath(WorldSavePath.ROOT))) as FileStoreAdapter<*>,
+                    createIfMissing = true,
+                    pcConstructor = { uuid -> PCStore(uuid).also { it.resize(config.defaultBoxCount) } }
+                )
+            )
+        }
+
+        SERVER_STOPPED.subscribe {
+            storage.unregisterAll()
+            playerData.saveAll()
+        }
+        SERVER_STARTED.subscribe {
+            bestSpawner.onServerStarted()
+            battleRegistry.onServerStarted()
+        }
+        TICK_POST.subscribe { ServerTickHandler.onTick(it) }
+        POKEMON_CAPTURED.subscribe { AdvancementHandler.onCapture(it) }
+//        EGG_HATCH.subscribe { AdvancementHandler.onHatch(it) }
+        BATTLE_VICTORY.subscribe { AdvancementHandler.onWinBattle(it) }
+        EVOLUTION_COMPLETE.subscribe(Priority.LOWEST) { event ->
+            AdvancementHandler.onEvolve(event)
+            val pokemon = event.pokemon
+            val ninjaskIdentifier = cobblemonResource("ninjask")
+            // Ensure the config option is enabled and that the result was a ninjask and that shedinja exists
+            if (this.config.ninjaskCreatesShedinja && pokemon.species.resourceIdentifier == ninjaskIdentifier && PokemonSpecies.getByIdentifier(Pokemon.SHEDINJA) != null) {
+                val player = pokemon.getOwnerPlayer() ?: return@subscribe
+                if (player.inventory.containsAny { it.item is PokeBallItem }) {
+                    player.inventory.removeAmountIf(1) { it.item is PokeBallItem }
+                    val properties = event.evolution.result.copy()
+                    properties.species = Pokemon.SHEDINJA.toString()
+                    val product = pokemon.clone()
+                    properties.apply(product)
+                    pokemon.storeCoordinates.get()?.store?.add(product)
+                }
+            }
+        }
+
+        showdownThread.showdownStarted.thenAccept {
+            PokemonSpecies.observable.pipe(takeFirst()).subscribe {
+                LOGGER.info("Starting dummy Showdown battle to force it to pre-load data.")
+                battleRegistry.startBattle(
+                    BattleFormat.GEN_8_SINGLES,
+                    BattleSide(PokemonBattleActor(UUID.randomUUID(), BattlePokemon(Pokemon().initialize()), -1F)),
+                    BattleSide(PokemonBattleActor(UUID.randomUUID(), BattlePokemon(Pokemon().initialize()), -1F))
+                ).apply { mute = true }
+            }
+        }
+    }
+
+    fun getLevel(dimension: RegistryKey<World>): World? {
+        return if (isDedicatedServer) {
+            getServer()?.getWorld(dimension)
+        } else {
+            val mc = MinecraftClient.getInstance()
+            return mc.server?.getWorld(dimension) ?: mc.world
+        }
+    }
+
+    fun loadConfig() {
+        val configFile = File(CONFIG_PATH)
+        configFile.parentFile.mkdirs()
+
+        // Check config existence and load if it exists, otherwise create default.
+        if (configFile.exists()) {
+            try {
+                val fileReader = FileReader(configFile)
+                this.config = CobblemonConfig.GSON.fromJson(fileReader, CobblemonConfig::class.java)
+                fileReader.close()
+            } catch (exception: Exception) {
+                LOGGER.error("Failed to load the config! Using default config until the following has been addressed:")
+                this.config = CobblemonConfig()
+                exception.printStackTrace()
+            }
+
+            this.config::class.memberProperties.forEach {
+                // Member must have annotations and must be mutable
+                if (it.annotations.isEmpty() || it !is KMutableProperty<*>) return@forEach
+
+                var value = it.getter.call(config)
+                for (annotation in it.annotations) {
+                    when (annotation) {
+                        is IntConstraint -> {
+                            if (value !is Int) break
+                            value = value.coerceIn(annotation.min, annotation.max)
+                            it.setter.call(config, value)
+                        }
+                    }
+                }
+            }
+        } else {
+            this.config = CobblemonConfig()
+            this.saveConfig()
+        }
+
+        bestSpawner.loadConfig()
+        PokemonSpecies.observable.subscribe { starterConfig = this.loadStarterConfig() }
+    }
+
+    fun loadStarterConfig(): StarterConfig {
+        if (config.exportStarterConfig) {
+            val file = File("config/cobblemon/starters.json")
+            file.parentFile.mkdirs()
+            if (!file.exists()) {
+                val config = StarterConfig()
+                val pw = PrintWriter(file)
+                StarterConfig.GSON.toJson(config, pw)
+                pw.close()
+                return config
+            }
+            val reader = FileReader(file)
+            val config = StarterConfig.GSON.fromJson(reader, StarterConfig::class.java)
+            reader.close()
+            return config
+        } else {
+            return StarterConfig()
+        }
+    }
+
+    fun saveConfig() {
+        try {
+            val configFile = File(CONFIG_PATH)
+            val fileWriter = FileWriter(configFile)
+            // Put the config to json then flush the writer to commence writing.
+            CobblemonConfig.GSON.toJson(this.config, fileWriter)
+            fileWriter.flush()
+            fileWriter.close()
+        } catch (exception: Exception) {
+            LOGGER.error("Failed to save the config! Please consult the following stack trace:")
+            exception.printStackTrace()
+        }
+    }
+}
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2022 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.registry.CompletableRegistry
+import com.cobblemon.mod.common.world.block.entity.HealingMachineBlockEntity
+import com.cobblemon.mod.common.world.block.entity.PCBlockEntity
+import dev.architectury.registry.registries.RegistrySupplier
+import java.util.function.Supplier
+import net.minecraft.block.entity.BlockEntityType
+import net.minecraft.util.registry.Registry
+
+object CobblemonBlockEntities : CompletableRegistry<BlockEntityType<*>>(Registry.BLOCK_ENTITY_TYPE_KEY) {
+    private fun <T : BlockEntityType<*>> register(name: String, blockEntityType: Supplier<T>) : RegistrySupplier<T> {
+        return queue(name, blockEntityType)
+    }
+
+    val HEALING_MACHINE = com.cobblemon.mod.common.CobblemonBlockEntities.register("healing_machine") {
+        BlockEntityType.Builder.create(
+            ::HealingMachineBlockEntity,
+            CobblemonBlocks.HEALING_MACHINE.get()
+        ).build(null)
+    }
+    val PC = com.cobblemon.mod.common.CobblemonBlockEntities.register("pc") {
+        BlockEntityType.Builder.create(
+            ::PCBlockEntity,
+            CobblemonBlocks.PC.get()
+        ).build(null)
+    }
+}
@@ -0,0 +1,166 @@
+/*
+ * Copyright (C) 2022 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.apricorn.Apricorn
+import com.cobblemon.mod.common.registry.CompletableRegistry
+import com.cobblemon.mod.common.world.block.ApricornBlock
+import com.cobblemon.mod.common.world.block.ApricornSaplingBlock
+import com.cobblemon.mod.common.world.block.HealingMachineBlock
+import com.cobblemon.mod.common.world.block.PCBlock
+import dev.architectury.registry.registries.RegistrySupplier
+import net.minecraft.block.AbstractBlock
+import net.minecraft.block.Block
+import net.minecraft.block.BlockState
+import net.minecraft.block.Blocks
+import net.minecraft.block.DoorBlock
+import net.minecraft.block.FenceBlock
+import net.minecraft.block.FenceGateBlock
+import net.minecraft.block.LeavesBlock
+import net.minecraft.block.MapColor
+import net.minecraft.block.Material
+import net.minecraft.block.OreBlock
+import net.minecraft.block.PillarBlock
+import net.minecraft.block.PressurePlateBlock
+import net.minecraft.block.SlabBlock
+import net.minecraft.block.StairsBlock
+import net.minecraft.block.TrapdoorBlock
+import net.minecraft.block.WoodenButtonBlock
+import net.minecraft.entity.EntityType
+import net.minecraft.sound.BlockSoundGroup
+import net.minecraft.util.math.Direction
+import net.minecraft.util.math.intprovider.UniformIntProvider
+import net.minecraft.util.registry.Registry
+
+object CobblemonBlocks : CompletableRegistry<Block>(Registry.BLOCK_KEY) {
+    /**
+     * Evolution Ores
+     */
+
+    val DAWN_STONE_ORE = this.evolutionStoneOre("dawn_stone_ore")
+    val DUSK_STONE_ORE = this.evolutionStoneOre("dusk_stone_ore")
+    val FIRE_STONE_ORE = this.evolutionStoneOre("fire_stone_ore")
+    val ICE_STONE_ORE = this.evolutionStoneOre("ice_stone_ore")
+    val LEAF_STONE_ORE = this.evolutionStoneOre("leaf_stone_ore")
+    val MOON_STONE_ORE = this.evolutionStoneOre("moon_stone_ore")
+    val DRIPSTONE_MOON_STONE_ORE = this.evolutionStoneOre("dripstone_moon_stone_ore")
+    val SHINY_STONE_ORE = this.evolutionStoneOre("shiny_stone_ore")
+    val SUN_STONE_ORE = this.evolutionStoneOre("sun_stone_ore")
+    val THUNDER_STONE_ORE = this.evolutionStoneOre("thunder_stone_ore")
+    val WATER_STONE_ORE = this.evolutionStoneOre("water_stone_ore")
+
+    /**
+     * Deepslate separator
+     */
+
+    val DEEPSLATE_DAWN_STONE_ORE = this.deepslateEvolutionStoneOre("deepslate_dawn_stone_ore")
+    val DEEPSLATE_DUSK_STONE_ORE = this.deepslateEvolutionStoneOre("deepslate_dusk_stone_ore")
+    val DEEPSLATE_FIRE_STONE_ORE = this.deepslateEvolutionStoneOre("deepslate_fire_stone_ore")
+    val DEEPSLATE_ICE_STONE_ORE = this.deepslateEvolutionStoneOre("deepslate_ice_stone_ore")
+    val DEEPSLATE_LEAF_STONE_ORE = this.deepslateEvolutionStoneOre("deepslate_leaf_stone_ore")
+    val DEEPSLATE_MOON_STONE_ORE = this.deepslateEvolutionStoneOre("deepslate_moon_stone_ore")
+    val DEEPSLATE_SHINY_STONE_ORE = this.deepslateEvolutionStoneOre("deepslate_shiny_stone_ore")
+    val DEEPSLATE_SUN_STONE_ORE = this.deepslateEvolutionStoneOre("deepslate_sun_stone_ore")
+    val DEEPSLATE_THUNDER_STONE_ORE = this.deepslateEvolutionStoneOre("deepslate_thunder_stone_ore")
+    val DEEPSLATE_WATER_STONE_ORE = this.deepslateEvolutionStoneOre("deepslate_water_stone_ore")
+
+    /**
+     * Apricorns
+     */
+
+    val APRICORN_LOG = queue("apricorn_log") {
+        log(
+            MapColor.DIRT_BROWN,
+            MapColor.BROWN
+        )
+    }
+    val STRIPPED_APRICORN_LOG = queue("stripped_apricorn_log") {
+        log(
+            MapColor.DIRT_BROWN,
+            MapColor.DIRT_BROWN
+        )
+    }
+    val APRICORN_WOOD = queue("apricorn_wood") {
+        log(
+            MapColor.DIRT_BROWN,
+            MapColor.DIRT_BROWN
+        )
+    }
+    val STRIPPED_APRICORN_WOOD = queue("stripped_apricorn_wood") {
+        log(
+            MapColor.DIRT_BROWN,
+            MapColor.DIRT_BROWN
+        )
+    }
+    val APRICORN_PLANKS = queue("apricorn_planks") { Block(AbstractBlock.Settings.of(Material.WOOD, MapColor.DIRT_BROWN).strength(2.0f, 3.0f).sounds(BlockSoundGroup.WOOD)) }
+    val APRICORN_LEAVES = queue("apricorn_leaves") { com.cobblemon.mod.common.CobblemonBlocks.leaves(BlockSoundGroup.GRASS) }
+    val APRICORN_FENCE = queue("apricorn_fence") { FenceBlock(AbstractBlock.Settings.of(Material.WOOD, APRICORN_PLANKS.get().defaultMapColor).strength(2.0f, 3.0f).sounds(BlockSoundGroup.WOOD)) }
+    val APRICORN_FENCE_GATE = queue("apricorn_fence_gate") { FenceGateBlock(AbstractBlock.Settings.of(Material.WOOD, APRICORN_PLANKS.get().defaultMapColor).strength(2.0f, 3.0f).sounds(BlockSoundGroup.WOOD)) }
+    val APRICORN_BUTTON = queue("apricorn_button") { WoodenButtonBlock(AbstractBlock.Settings.of(Material.DECORATION).noCollision().strength(0.5f).sounds(BlockSoundGroup.WOOD)) }
+    val APRICORN_PRESSURE_PLATE = queue("apricorn_pressure_plate") { PressurePlateBlock(PressurePlateBlock.ActivationRule.EVERYTHING, AbstractBlock.Settings.of(Material.WOOD, APRICORN_PLANKS.get().defaultMapColor).noCollision().strength(0.5f).sounds(BlockSoundGroup.WOOD)) }
+    // Tag was removed be sure to add it back when implemented
+    //val APRICORN_SIGN = queue("apricorn_sign") { StandingSignBlock(AbstractBlock.Settings.of(Material.WOOD).noCollission().strength(1.0f).sounds(BlockSoundGroup.WOOD), APRICORN_WOOD_TYPE) }
+    //val APRICORN_WALL_SIGN = queue("apricorn_wall_sign") { WallSignBlock(AbstractBlock.Settings.of(Material.WOOD).noCollission().strength(1.0f).sounds(BlockSoundGroup.WOOD).dropsLike(APRICORN_SIGN), APRICORN_WOOD_TYPE) }
+    val APRICORN_SLAB = queue("apricorn_slab") { SlabBlock(AbstractBlock.Settings.of(Material.WOOD, MapColor.OAK_TAN).strength(2.0f, 3.0f).sounds(BlockSoundGroup.WOOD)) }
+    val APRICORN_STAIRS = queue("apricorn_stairs") { StairsBlock(
+        APRICORN_PLANKS.get().defaultState, AbstractBlock.Settings.copy(
+            APRICORN_PLANKS.get())) }
+    val APRICORN_DOOR = queue("apricorn_door") { DoorBlock(AbstractBlock.Settings.of(Material.WOOD, APRICORN_PLANKS.get().defaultMapColor).strength(3.0F).sounds(BlockSoundGroup.WOOD).nonOpaque()) }
+    val APRICORN_TRAPDOOR = queue("apricorn_trapdoor") { TrapdoorBlock(AbstractBlock.Settings.of(Material.WOOD, MapColor.OAK_TAN).strength(3.0F).sounds(BlockSoundGroup.WOOD).nonOpaque().allowsSpawning { _, _, _, _ -> false }) }
+
+    private val PLANT_PROPERTIES = AbstractBlock.Settings.of(Material.PLANT).noCollision().ticksRandomly().breakInstantly().sounds(BlockSoundGroup.GRASS)
+    val BLACK_APRICORN_SAPLING = queue("black_apricorn_sapling") { ApricornSaplingBlock(PLANT_PROPERTIES, Apricorn.BLACK) }
+    val BLUE_APRICORN_SAPLING = queue("blue_apricorn_sapling") { ApricornSaplingBlock(PLANT_PROPERTIES, Apricorn.BLUE) }
+    val GREEN_APRICORN_SAPLING = queue("green_apricorn_sapling") { ApricornSaplingBlock(PLANT_PROPERTIES, Apricorn.GREEN) }
+    val PINK_APRICORN_SAPLING = queue("pink_apricorn_sapling") { ApricornSaplingBlock(PLANT_PROPERTIES, Apricorn.PINK) }
+    val RED_APRICORN_SAPLING = queue("red_apricorn_sapling") { ApricornSaplingBlock(PLANT_PROPERTIES, Apricorn.RED) }
+    val WHITE_APRICORN_SAPLING = queue("white_apricorn_sapling") { ApricornSaplingBlock(PLANT_PROPERTIES, Apricorn.WHITE) }
+    val YELLOW_APRICORN_SAPLING = queue("yellow_apricorn_sapling") { ApricornSaplingBlock(PLANT_PROPERTIES, Apricorn.YELLOW) }
+
+    val BLACK_APRICORN = registerApricornBlock("black_apricorn", Apricorn.BLACK)
+    val BLUE_APRICORN = registerApricornBlock("blue_apricorn", Apricorn.BLUE)
+    val GREEN_APRICORN = registerApricornBlock("green_apricorn", Apricorn.GREEN)
+    val PINK_APRICORN = registerApricornBlock("pink_apricorn", Apricorn.PINK)
+    val RED_APRICORN = registerApricornBlock("red_apricorn", Apricorn.RED)
+    val WHITE_APRICORN = registerApricornBlock("white_apricorn", Apricorn.WHITE)
+    val YELLOW_APRICORN = registerApricornBlock("yellow_apricorn", Apricorn.YELLOW)
+
+    val HEALING_MACHINE = queue("healing_machine") { HealingMachineBlock(AbstractBlock.Settings.of(Material.METAL, MapColor.IRON_GRAY).sounds(BlockSoundGroup.METAL).strength(2f).nonOpaque()) }
+    val PC = queue("pc") { PCBlock(AbstractBlock.Settings.of(Material.METAL, MapColor.IRON_GRAY).sounds(BlockSoundGroup.METAL).strength(2F).nonOpaque()) }
+
+    private fun registerApricornBlock(id: String, apricorn: Apricorn): RegistrySupplier<ApricornBlock> {
+        return queue(id) { ApricornBlock(AbstractBlock.Settings.of(Material.PLANT).ticksRandomly().strength(0.2f, 3.0f).sounds(BlockSoundGroup.WOOD).nonOpaque(), apricorn) }
+    }
+
+    /**
+     * Helper method for creating logs
+     * copied over from Vanilla
+     */
+    private fun log(arg: MapColor, arg2: MapColor): PillarBlock {
+        return PillarBlock(AbstractBlock.Settings.of(Material.WOOD) { arg3: BlockState ->
+            if (arg3.get(PillarBlock.AXIS) === Direction.Axis.Y) arg else arg2
+        }.strength(2.0f).sounds(BlockSoundGroup.WOOD))
+    }
+
+    private fun evolutionStoneOre(name: String) = this.queue(name) { OreBlock(AbstractBlock.Settings.copy(Blocks.IRON_ORE), UniformIntProvider.create(1, 2)) }
+
+    private fun deepslateEvolutionStoneOre(name: String) = this.queue(name) { OreBlock(AbstractBlock.Settings.copy(Blocks.DEEPSLATE_IRON_ORE), UniformIntProvider.create(1, 2)) }
+
+    /**
+     * Helper method for creating leaves
+     * copied over from Vanilla
+     */
+    private fun leaves(sound: BlockSoundGroup): LeavesBlock {
+        return LeavesBlock(
+            AbstractBlock.Settings.of(Material.LEAVES).strength(0.2f).ticksRandomly().sounds(sound).nonOpaque()
+                .allowsSpawning { _, _, _, type -> type === EntityType.OCELOT || type === EntityType.PARROT }
+                .suffocates { _, _, _ -> false }
+                .blockVision { _, _, _ -> false })
+    }
+}
@@ -0,0 +1,17 @@
+/*
+ * Copyright (C) 2022 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 java.util.function.Supplier
+import net.minecraft.client.model.TexturedModelData
+import net.minecraft.client.render.entity.model.EntityModelLayer
+
+interface CobblemonClientImplementation {
+    fun registerLayer(modelLayer: EntityModelLayer, supplier: Supplier<TexturedModelData>)
+}
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2022 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.command.ChangeScaleAndSize
+import com.cobblemon.mod.common.command.CheckSpawnsCommand
+import com.cobblemon.mod.common.command.ClickTextCommand
+import com.cobblemon.mod.common.command.FriendshipCommand
+import com.cobblemon.mod.common.command.GetNBT
+import com.cobblemon.mod.common.command.GivePokemon
+import com.cobblemon.mod.common.command.HealPokemonCommand
+import com.cobblemon.mod.common.command.LevelUp
+import com.cobblemon.mod.common.command.OpenStarterScreenCommand
+import com.cobblemon.mod.common.command.PokemonEditCommand
+import com.cobblemon.mod.common.command.SpawnAllPokemon
+import com.cobblemon.mod.common.command.SpawnPokemon
+import com.cobblemon.mod.common.command.StopBattleCommand
+import com.cobblemon.mod.common.command.TakePokemon
+import com.cobblemon.mod.common.command.TeachCommand
+import com.cobblemon.mod.common.command.TestCommand
+import com.mojang.brigadier.CommandDispatcher
+import net.minecraft.command.CommandRegistryAccess
+import net.minecraft.server.command.CommandManager
+import net.minecraft.server.command.ServerCommandSource
+
+object CobblemonCommands {
+    fun register(dispatcher: CommandDispatcher<ServerCommandSource>, registry: CommandRegistryAccess, selection: CommandManager.RegistrationEnvironment) {
+        SpawnPokemon.register(dispatcher)
+        GivePokemon.register(dispatcher)
+        TakePokemon.register(dispatcher)
+        ChangeScaleAndSize.register(dispatcher)
+        TestCommand.register(dispatcher)
+        ClickTextCommand.register(dispatcher)
+        PokemonEditCommand.register(dispatcher)
+        TeachCommand.register(dispatcher)
+        LevelUp.register(dispatcher)
+        HealPokemonCommand.register(dispatcher)
+        StopBattleCommand.register(dispatcher)
+        CheckSpawnsCommand.register(dispatcher)
+        GetNBT.register(dispatcher)
+        OpenStarterScreenCommand.register(dispatcher)
+        SpawnAllPokemon.register(dispatcher)
+        FriendshipCommand.register(dispatcher)
+    }
+}
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2022 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common
+
+import net.minecraft.util.registry.RegistryEntry
+import net.minecraft.world.gen.feature.ConfiguredFeature
+import net.minecraft.world.gen.feature.ConfiguredFeatures
+import net.minecraft.world.gen.feature.SingleStateFeatureConfig
+
+object CobblemonConfiguredFeatures {
+    lateinit var BLACK_APRICORN_TREE: RegistryEntry<ConfiguredFeature<SingleStateFeatureConfig, *>>
+    lateinit var BLUE_APRICORN_TREE: RegistryEntry<ConfiguredFeature<SingleStateFeatureConfig, *>>
+    lateinit var GREEN_APRICORN_TREE: RegistryEntry<ConfiguredFeature<SingleStateFeatureConfig, *>>
+    lateinit var PINK_APRICORN_TREE: RegistryEntry<ConfiguredFeature<SingleStateFeatureConfig, *>>
+    lateinit var RED_APRICORN_TREE: RegistryEntry<ConfiguredFeature<SingleStateFeatureConfig, *>>
+    lateinit var WHITE_APRICORN_TREE: RegistryEntry<ConfiguredFeature<SingleStateFeatureConfig, *>>
+    lateinit var YELLOW_APRICORN_TREE: RegistryEntry<ConfiguredFeature<SingleStateFeatureConfig, *>>
+
+    fun register() {
+        BLACK_APRICORN_TREE = ConfiguredFeatures.register("black_apricorn_tree", CobblemonFeatures.APRICORN_TREE_FEATURE.get(), SingleStateFeatureConfig(
+            CobblemonBlocks.BLACK_APRICORN.get().defaultState))
+        BLUE_APRICORN_TREE = ConfiguredFeatures.register("blue_apricorn_tree", CobblemonFeatures.APRICORN_TREE_FEATURE.get(), SingleStateFeatureConfig(
+            CobblemonBlocks.BLUE_APRICORN.get().defaultState))
+        GREEN_APRICORN_TREE = ConfiguredFeatures.register("green_apricorn_tree", CobblemonFeatures.APRICORN_TREE_FEATURE.get(), SingleStateFeatureConfig(
+            CobblemonBlocks.GREEN_APRICORN.get().defaultState))
+        PINK_APRICORN_TREE = ConfiguredFeatures.register("pink_apricorn_tree", CobblemonFeatures.APRICORN_TREE_FEATURE.get(), SingleStateFeatureConfig(
+            CobblemonBlocks.PINK_APRICORN.get().defaultState))
+        RED_APRICORN_TREE = ConfiguredFeatures.register("red_apricorn_tree", CobblemonFeatures.APRICORN_TREE_FEATURE.get(), SingleStateFeatureConfig(
+            CobblemonBlocks.RED_APRICORN.get().defaultState))
+        WHITE_APRICORN_TREE = ConfiguredFeatures.register("white_apricorn_tree", CobblemonFeatures.APRICORN_TREE_FEATURE.get(), SingleStateFeatureConfig(
+            CobblemonBlocks.WHITE_APRICORN.get().defaultState))
+        YELLOW_APRICORN_TREE = ConfiguredFeatures.register("yellow_apricorn_tree", CobblemonFeatures.APRICORN_TREE_FEATURE.get(), SingleStateFeatureConfig(
+            CobblemonBlocks.YELLOW_APRICORN.get().defaultState))
+    }
+}
@@ -0,0 +1,70 @@
+/*
+ * Copyright (C) 2022 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.events.CobblemonEvents
+import com.cobblemon.mod.common.api.events.entity.EntityAttributeEvent
+import com.cobblemon.mod.common.api.pokeball.PokeBalls
+import com.cobblemon.mod.common.entity.pokeball.EmptyPokeBallEntity
+import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
+import com.cobblemon.mod.common.registry.CompletableRegistry
+import com.cobblemon.mod.common.util.cobblemonResource
+import dev.architectury.registry.level.entity.EntityAttributeRegistry
+import dev.architectury.registry.registries.RegistrySupplier
+import net.minecraft.entity.Entity
+import net.minecraft.entity.EntityType
+import net.minecraft.entity.LivingEntity
+import net.minecraft.entity.SpawnGroup
+import net.minecraft.entity.attribute.DefaultAttributeContainer
+import net.minecraft.entity.attribute.EntityAttributes
+import net.minecraft.util.registry.Registry
+
+object CobblemonEntities : CompletableRegistry<EntityType<*>>(Registry.ENTITY_TYPE_KEY) {
+    override fun register() {
+        super.register()
+
+        EntityAttributeRegistry.register(
+            { POKEMON.get() },
+            {
+                LivingEntity.createLivingAttributes()
+                    .add(EntityAttributes.GENERIC_FOLLOW_RANGE)
+                    .also { CobblemonEvents.ENTITY_ATTRIBUTE.post(EntityAttributeEvent(POKEMON.get(), it)) }
+            }
+        )
+    }
+    private fun <T : Entity> entity(
+        name: String,
+        entityTypeBuilder: EntityType.Builder<T>
+    ): RegistrySupplier<EntityType<T>> {
+        return queue(name) { entityTypeBuilder.build(cobblemonResource(name).toString()) }
+    }
+
+    private fun <T : LivingEntity> livingEntity(
+        name: String,
+        entityTypeBuilder: EntityType.Builder<T>
+    ): RegistrySupplier<EntityType<T>> {
+        return queue(name) { entityTypeBuilder.build(cobblemonResource("pokemon").toString()) }
+    }
+
+    val POKEMON = livingEntity(
+        name = "pokemon",
+        entityTypeBuilder = EntityType.Builder.create<PokemonEntity>(
+            { _, world -> PokemonEntity(world) },
+            SpawnGroup.CREATURE
+        )
+    )
+
+    val EMPTY_POKEBALL = entity(
+        name = "empty_pokeball",
+        entityTypeBuilder = EntityType.Builder.create<EmptyPokeBallEntity>(
+            { _, world -> EmptyPokeBallEntity(PokeBalls.POKE_BALL, world) },
+            SpawnGroup.MISC
+        )
+    )
+}
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2022 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.registry.CompletableRegistry
+import com.cobblemon.mod.common.world.feature.ApricornTreeFeature
+import dev.architectury.registry.registries.RegistrySupplier
+import java.util.function.Supplier
+import net.minecraft.util.registry.Registry
+import net.minecraft.world.gen.feature.Feature
+import net.minecraft.world.gen.feature.SingleStateFeatureConfig
+
+object CobblemonFeatures : CompletableRegistry<Feature<*>>(Registry.FEATURE_KEY) {
+    private fun <T : Feature<*>> register(name: String, feature: Supplier<T>) : RegistrySupplier<T> {
+        return queue(name, feature)
+    }
+
+    val APRICORN_TREE_FEATURE = register("apricorn_tree_feature") { ApricornTreeFeature(SingleStateFeatureConfig.CODEC) }
+}
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2022 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.net.NetworkPacket
+import net.minecraft.server.network.ServerPlayerEntity
+
+interface CobblemonImplementation {
+    fun isModInstalled(id: String): Boolean
+}
+
+interface NetworkDelegate {
+
+    fun sendPacketToPlayer(player: ServerPlayerEntity, packet: NetworkPacket)
+    fun sendPacketToServer(packet: NetworkPacket)
+    fun <T : NetworkPacket> buildMessage(
+        packetClass: Class<T>,
+        toServer: Boolean
+    ): CobblemonNetwork.PreparedMessage<T>
+}
@@ -0,0 +1,186 @@
+/*
+ * Copyright (C) 2022 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.pokeball.PokeBalls
+import com.cobblemon.mod.common.api.pokemon.stats.Stats
+import com.cobblemon.mod.common.item.ApricornItem
+import com.cobblemon.mod.common.item.CobblemonItem
+import com.cobblemon.mod.common.item.CobblemonItemGroups
+import com.cobblemon.mod.common.item.PokeBallItem
+import com.cobblemon.mod.common.item.interactive.CandyItem
+import com.cobblemon.mod.common.item.interactive.LinkCableItem
+import com.cobblemon.mod.common.item.interactive.VitaminItem
+import com.cobblemon.mod.common.pokeball.PokeBall
+import com.cobblemon.mod.common.registry.CompletableRegistry
+import dev.architectury.registry.registries.RegistrySupplier
+import net.minecraft.block.Block
+import net.minecraft.item.AliasedBlockItem
+import net.minecraft.item.BlockItem
+import net.minecraft.item.Item
+import net.minecraft.item.ItemGroup
+import net.minecraft.util.registry.Registry
+
+object CobblemonItems : CompletableRegistry<Item>(Registry.ITEM_KEY) {
+
+    private val pokeballs = mutableListOf<RegistrySupplier<PokeBallItem>>()
+
+    val POKE_BALL = pokeballItem(PokeBalls.POKE_BALL)
+    val CITRINE_BALL = pokeballItem(PokeBalls.CITRINE_BALL)
+    val VERDANT_BALL = pokeballItem(PokeBalls.VERDANT_BALL)
+    val AZURE_BALL = pokeballItem(PokeBalls.AZURE_BALL)
+    val ROSEATE_BALL = pokeballItem(PokeBalls.ROSEATE_BALL)
+    val SLATE_BALL = pokeballItem(PokeBalls.SLATE_BALL)
+    val PREMIER_BALL = pokeballItem(PokeBalls.PREMIER_BALL)
+    val GREAT_BALL = pokeballItem(PokeBalls.GREAT_BALL)
+    val ULTRA_BALL = pokeballItem(PokeBalls.ULTRA_BALL)
+    val SAFARI_BALL = pokeballItem(PokeBalls.SAFARI_BALL)
+    val FAST_BALL = pokeballItem(PokeBalls.FAST_BALL)
+    val LEVEL_BALL = pokeballItem(PokeBalls.LEVEL_BALL)
+    val LURE_BALL = pokeballItem(PokeBalls.LURE_BALL)
+    val HEAVY_BALL = pokeballItem(PokeBalls.HEAVY_BALL)
+    val LOVE_BALL = pokeballItem(PokeBalls.LOVE_BALL)
+    val FRIEND_BALL = pokeballItem(PokeBalls.FRIEND_BALL)
+    val MOON_BALL = pokeballItem(PokeBalls.MOON_BALL)
+    val SPORT_BALL = pokeballItem(PokeBalls.SPORT_BALL)
+    val PARK_BALL = pokeballItem(PokeBalls.PARK_BALL)
+    val NET_BALL = pokeballItem(PokeBalls.NET_BALL)
+    val DIVE_BALL = pokeballItem(PokeBalls.DIVE_BALL)
+    val NEST_BALL = pokeballItem(PokeBalls.NEST_BALL)
+    val REPEAT_BALL = pokeballItem(PokeBalls.REPEAT_BALL)
+    val TIMER_BALL = pokeballItem(PokeBalls.TIMER_BALL)
+    val LUXURY_BALL = pokeballItem(PokeBalls.LUXURY_BALL)
+    val DUSK_BALL = pokeballItem(PokeBalls.DUSK_BALL)
+    val HEAL_BALL = pokeballItem(PokeBalls.HEAL_BALL)
+    val QUICK_BALL = pokeballItem(PokeBalls.QUICK_BALL)
+    val DREAM_BALL = pokeballItem(PokeBalls.DREAM_BALL)
+    val BEAST_BALL = pokeballItem(PokeBalls.BEAST_BALL)
+    val MASTER_BALL = pokeballItem(PokeBalls.MASTER_BALL)
+    val CHERISH_BALL = pokeballItem(PokeBalls.CHERISH_BALL)
+
+    val RED_APRICORN = queue("red_apricorn") { ApricornItem(CobblemonBlocks.RED_APRICORN.get()) }
+    val YELLOW_APRICORN = queue("yellow_apricorn") { ApricornItem(CobblemonBlocks.YELLOW_APRICORN.get()) }
+    val GREEN_APRICORN = queue("green_apricorn") { ApricornItem(CobblemonBlocks.GREEN_APRICORN.get()) }
+    val BLUE_APRICORN = queue("blue_apricorn") { ApricornItem(CobblemonBlocks.BLUE_APRICORN.get()) }
+    val PINK_APRICORN = queue("pink_apricorn") { ApricornItem(CobblemonBlocks.PINK_APRICORN.get()) }
+    val BLACK_APRICORN = queue("black_apricorn") { ApricornItem(CobblemonBlocks.BLACK_APRICORN.get()) }
+    val WHITE_APRICORN = queue("white_apricorn") { ApricornItem(CobblemonBlocks.WHITE_APRICORN.get()) }
+
+    val RED_APRICORN_SEED = queue("red_apricorn_seed") { itemNameBlockItem(CobblemonBlocks.RED_APRICORN_SAPLING.get(), ItemGroup.MISC) }
+    val YELLOW_APRICORN_SEED = queue("yellow_apricorn_seed") { itemNameBlockItem(CobblemonBlocks.YELLOW_APRICORN_SAPLING.get(), ItemGroup.MISC) }
+    val GREEN_APRICORN_SEED = queue("green_apricorn_seed") { itemNameBlockItem(CobblemonBlocks.GREEN_APRICORN_SAPLING.get(), ItemGroup.MISC) }
+    val BLUE_APRICORN_SEED = queue("blue_apricorn_seed") { itemNameBlockItem(CobblemonBlocks.BLUE_APRICORN_SAPLING.get(), ItemGroup.MISC) }
+    val PINK_APRICORN_SEED = queue("pink_apricorn_seed") { itemNameBlockItem(CobblemonBlocks.PINK_APRICORN_SAPLING.get(), ItemGroup.MISC) }
+    val BLACK_APRICORN_SEED = queue("black_apricorn_seed") { itemNameBlockItem(CobblemonBlocks.BLACK_APRICORN_SAPLING.get(), ItemGroup.MISC) }
+    val WHITE_APRICORN_SEED = queue("white_apricorn_seed") { itemNameBlockItem(CobblemonBlocks.WHITE_APRICORN_SAPLING.get(), ItemGroup.MISC) }
+
+    val APRICORN_LOG = queue("apricorn_log") { blockItem(CobblemonBlocks.APRICORN_LOG.get(), ItemGroup.BUILDING_BLOCKS) }
+    val STRIPPED_APRICORN_LOG = queue("stripped_apricorn_log") { blockItem(CobblemonBlocks.STRIPPED_APRICORN_LOG.get(), ItemGroup.BUILDING_BLOCKS) }
+    val APRICORN_WOOD = queue("apricorn_wood") { blockItem(CobblemonBlocks.APRICORN_WOOD.get(), ItemGroup.BUILDING_BLOCKS) }
+    val STRIPPED_APRICORN_WOOD = queue("stripped_apricorn_wood") { blockItem(CobblemonBlocks.STRIPPED_APRICORN_WOOD.get(), ItemGroup.BUILDING_BLOCKS) }
+    val APRICORN_PLANKS = queue("apricorn_planks") { blockItem(CobblemonBlocks.APRICORN_PLANKS.get(), ItemGroup.BUILDING_BLOCKS) }
+    val APRICORN_LEAVES = queue("apricorn_leaves") { blockItem(CobblemonBlocks.APRICORN_LEAVES.get(), ItemGroup.BUILDING_BLOCKS) }
+
+    val APRICORN_DOOR = queue("apricorn_door") { blockItem(CobblemonBlocks.APRICORN_DOOR.get(), ItemGroup.REDSTONE) }
+    val APRICORN_TRAPDOOR = queue("apricorn_trapdoor") { blockItem(CobblemonBlocks.APRICORN_TRAPDOOR.get(), ItemGroup.REDSTONE) }
+    val APRICORN_FENCE = queue("apricorn_fence") { blockItem(CobblemonBlocks.APRICORN_FENCE.get(), ItemGroup.DECORATIONS) }
+    val APRICORN_FENCE_GATE = queue("apricorn_fence_gate") { blockItem(CobblemonBlocks.APRICORN_FENCE_GATE.get(), ItemGroup.REDSTONE) }
+    val APRICORN_BUTTON = queue("apricorn_button") { blockItem(CobblemonBlocks.APRICORN_BUTTON.get(), ItemGroup.REDSTONE) }
+    val APRICORN_PRESSURE_PLATE = queue("apricorn_pressure_plate") { blockItem(CobblemonBlocks.APRICORN_PRESSURE_PLATE.get(), ItemGroup.REDSTONE) }
+    //val APRICORN_SIGN = queue("apricorn_sign", SignItem(Item.Properties().stacksTo(16).tab(CreativeModeTab.TAB_DECORATIONS), CobblemonBlocks.APRICORN_SIGN, CobblemonBlocks.APRICORN_WALL_SIGN))
+    val APRICORN_SLAB = queue("apricorn_slab") { blockItem(CobblemonBlocks.APRICORN_SLAB.get(), ItemGroup.BUILDING_BLOCKS) }
+    val APRICORN_STAIRS = queue("apricorn_stairs") { blockItem(CobblemonBlocks.APRICORN_STAIRS.get(), ItemGroup.BUILDING_BLOCKS) }
+
+    val HEALING_MACHINE = queue("healing_machine") { blockItem(CobblemonBlocks.HEALING_MACHINE.get(), ItemGroup.REDSTONE) }
+    val PC = queue("pc") { blockItem(CobblemonBlocks.PC.get(), ItemGroup.REDSTONE) }
+
+    // Evolution items
+    val LINK_CABLE = queue("link_cable") { LinkCableItem() }
+    val KINGS_ROCK = queue("kings_rock") { evolutionItem() }
+    val METAL_COAT = queue("metal_coat") { evolutionItem() }
+    val BLACK_AUGURITE = queue("black_augurite") { evolutionItem() }
+    val PROTECTOR = queue("protector") { evolutionItem() }
+    val OVAL_STONE = queue("oval_stone") { evolutionItem() }
+    val DRAGON_SCALE = queue("dragon_scale") { evolutionItem() }
+    val ELECTIRIZER = queue("electirizer") { evolutionItem() }
+    val MAGMARIZER = queue("magmarizer") { evolutionItem() }
+    val UPGRADE = queue("upgrade") { evolutionItem() }
+    val DUBIOUS_DISC = queue("dubious_disc") { evolutionItem() }
+
+    // Medicine
+    val RARE_CANDY = queue("rare_candy") { CandyItem { _, pokemon -> pokemon.getExperienceToNextLevel() } }
+    val EXPERIENCE_CANDY_XS = queue("exp_candy_xs") { CandyItem { _, _ -> CandyItem.DEFAULT_XS_CANDY_YIELD } }
+    val EXPERIENCE_CANDY_S = queue("exp_candy_s") { CandyItem { _, _ -> CandyItem.DEFAULT_S_CANDY_YIELD } }
+    val EXPERIENCE_CANDY_M = queue("exp_candy_m") { CandyItem { _, _ -> CandyItem.DEFAULT_M_CANDY_YIELD } }
+    val EXPERIENCE_CANDY_L = queue("exp_candy_l") { CandyItem { _, _ -> CandyItem.DEFAULT_L_CANDY_YIELD } }
+    val EXPERIENCE_CANDY_XL = queue("exp_candy_xl") { CandyItem { _, _ -> CandyItem.DEFAULT_XL_CANDY_YIELD } }
+    val CALCIUM = queue("calcium") { VitaminItem(Stats.SPECIAL_ATTACK) }
+    val CARBOS = queue("carbos") { VitaminItem(Stats.SPEED) }
+    val HP_UP = queue("hp_up") { VitaminItem(Stats.HP) }
+    val IRON = queue("iron") { VitaminItem(Stats.DEFENCE) }
+    val PROTEIN = queue("protein") { VitaminItem(Stats.ATTACK) }
+    val ZINC = queue("zinc") { VitaminItem(Stats.SPECIAL_DEFENCE) }
+
+    /**
+     * Evolution Ores and Stones
+     */
+    val DAWN_STONE_ORE = queue("dawn_stone_ore") { blockItem(CobblemonBlocks.DAWN_STONE_ORE.get(), ItemGroup.BUILDING_BLOCKS) }
+    val DUSK_STONE_ORE = queue("dusk_stone_ore") { blockItem(CobblemonBlocks.DUSK_STONE_ORE.get(), ItemGroup.BUILDING_BLOCKS) }
+    val FIRE_STONE_ORE = queue("fire_stone_ore") { blockItem(CobblemonBlocks.FIRE_STONE_ORE.get(), ItemGroup.BUILDING_BLOCKS) }
+    val ICE_STONE_ORE = queue("ice_stone_ore") { blockItem(CobblemonBlocks.ICE_STONE_ORE.get(), ItemGroup.BUILDING_BLOCKS) }
+    val LEAF_STONE_ORE = queue("leaf_stone_ore") { blockItem(CobblemonBlocks.LEAF_STONE_ORE.get(), ItemGroup.BUILDING_BLOCKS) }
+    val MOON_STONE_ORE = queue("moon_stone_ore") { blockItem(CobblemonBlocks.MOON_STONE_ORE.get(), ItemGroup.BUILDING_BLOCKS) }
+    val SHINY_STONE_ORE = queue("shiny_stone_ore") { blockItem(CobblemonBlocks.SHINY_STONE_ORE.get(), ItemGroup.BUILDING_BLOCKS) }
+    val SUN_STONE_ORE = queue("sun_stone_ore") { blockItem(CobblemonBlocks.SUN_STONE_ORE.get(), ItemGroup.BUILDING_BLOCKS) }
+    val THUNDER_STONE_ORE = queue("thunder_stone_ore") { blockItem(CobblemonBlocks.THUNDER_STONE_ORE.get(), ItemGroup.BUILDING_BLOCKS) }
+    val WATER_STONE_ORE = queue("water_stone_ore") { blockItem(CobblemonBlocks.WATER_STONE_ORE.get(), ItemGroup.BUILDING_BLOCKS) }
+    val DEEPSLATE_DAWN_STONE_ORE = queue("deepslate_dawn_stone_ore") { blockItem(CobblemonBlocks.DEEPSLATE_DAWN_STONE_ORE.get(), ItemGroup.BUILDING_BLOCKS) }
+    val DEEPSLATE_DUSK_STONE_ORE = queue("deepslate_dusk_stone_ore") { blockItem(CobblemonBlocks.DEEPSLATE_DUSK_STONE_ORE.get(), ItemGroup.BUILDING_BLOCKS) }
+    val DEEPSLATE_FIRE_STONE_ORE = queue("deepslate_fire_stone_ore") { blockItem(CobblemonBlocks.DEEPSLATE_FIRE_STONE_ORE.get(), ItemGroup.BUILDING_BLOCKS) }
+    val DEEPSLATE_ICE_STONE_ORE = queue("deepslate_ice_stone_ore") { blockItem(CobblemonBlocks.DEEPSLATE_ICE_STONE_ORE.get(), ItemGroup.BUILDING_BLOCKS) }
+    val DEEPSLATE_LEAF_STONE_ORE = queue("deepslate_leaf_stone_ore") { blockItem(CobblemonBlocks.DEEPSLATE_LEAF_STONE_ORE.get(), ItemGroup.BUILDING_BLOCKS) }
+    val DEEPSLATE_MOON_STONE_ORE = queue("deepslate_moon_stone_ore") { blockItem(CobblemonBlocks.DEEPSLATE_MOON_STONE_ORE.get(), ItemGroup.BUILDING_BLOCKS) }
+    val DEEPSLATE_SHINY_STONE_ORE = queue("deepslate_shiny_stone_ore") { blockItem(CobblemonBlocks.DEEPSLATE_SHINY_STONE_ORE.get(), ItemGroup.BUILDING_BLOCKS) }
+    val DEEPSLATE_SUN_STONE_ORE = queue("deepslate_sun_stone_ore") { blockItem(CobblemonBlocks.DEEPSLATE_SUN_STONE_ORE.get(), ItemGroup.BUILDING_BLOCKS) }
+    val DEEPSLATE_THUNDER_STONE_ORE = queue("deepslate_thunder_stone_ore") { blockItem(CobblemonBlocks.DEEPSLATE_THUNDER_STONE_ORE.get(), ItemGroup.BUILDING_BLOCKS) }
+    val DEEPSLATE_WATER_STONE_ORE = queue("deepslate_water_stone_ore") { blockItem(CobblemonBlocks.DEEPSLATE_WATER_STONE_ORE.get(), ItemGroup.BUILDING_BLOCKS) }
+    val DRIPSTONE_MOON_STONE_ORE = queue("dripstone_moon_stone_ore") { blockItem(CobblemonBlocks.DRIPSTONE_MOON_STONE_ORE.get(), ItemGroup.BUILDING_BLOCKS) }
+    val DAWN_STONE = queue("dawn_stone") { evolutionItem() }
+    val DUSK_STONE = queue("dusk_stone") { evolutionItem() }
+    val FIRE_STONE = queue("fire_stone") { evolutionItem() }
+    val ICE_STONE = queue("ice_stone") { evolutionItem() }
+    val LEAF_STONE = queue("leaf_stone") { evolutionItem() }
+    val MOON_STONE = queue("moon_stone") { evolutionItem() }
+    val SHINY_STONE = queue("shiny_stone") { evolutionItem() }
+    val SUN_STONE = queue("sun_stone") { evolutionItem() }
+    val THUNDER_STONE = queue("thunder_stone") { evolutionItem() }
+    val WATER_STONE = queue("water_stone") { evolutionItem() }
+
+    fun pokeballs(): List<RegistrySupplier<PokeBallItem>> = this.pokeballs
+
+    private fun blockItem(block: Block, tab: ItemGroup) : BlockItem {
+        return BlockItem(block, Item.Settings().group(tab))
+    }
+
+    private fun itemNameBlockItem(block: Block, tab: ItemGroup) : BlockItem {
+        return AliasedBlockItem(block, Item.Settings().group(tab))
+    }
+
+    private fun evolutionItem(): CobblemonItem {
+        return CobblemonItem(Item.Settings().group(CobblemonItemGroups.EVOLUTION_ITEM_GROUP))
+    }
+
+    private fun pokeballItem(pokeBall: PokeBall): RegistrySupplier<PokeBallItem> {
+        val supplier = this.queue(pokeBall.name.path) { PokeBallItem(pokeBall) }
+        pokeBall.itemSupplier = supplier
+        this.pokeballs.add(supplier)
+        return supplier
+    }
+
+}
@@ -0,0 +1,261 @@
+/*
+ * Copyright (C) 2022 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.net.messages.client.battle.BattlePersistentStatusPacket
+import com.cobblemon.mod.common.api.events.CobblemonEvents
+import com.cobblemon.mod.common.api.events.net.MessageBuiltEvent
+import com.cobblemon.mod.common.api.net.NetworkPacket
+import com.cobblemon.mod.common.net.PacketHandler
+import com.cobblemon.mod.common.net.messages.client.battle.BattleApplyCaptureResponsePacket
+import com.cobblemon.mod.common.net.messages.client.battle.BattleCaptureEndPacket
+import com.cobblemon.mod.common.net.messages.client.battle.BattleCaptureShakePacket
+import com.cobblemon.mod.common.net.messages.client.battle.BattleCaptureStartPacket
+import com.cobblemon.mod.common.net.messages.client.battle.BattleEndPacket
+import com.cobblemon.mod.common.net.messages.client.battle.BattleFaintPacket
+import com.cobblemon.mod.common.net.messages.client.battle.BattleHealthChangePacket
+import com.cobblemon.mod.common.net.messages.client.battle.BattleInitializePacket
+import com.cobblemon.mod.common.net.messages.client.battle.BattleMakeChoicePacket
+import com.cobblemon.mod.common.net.messages.client.battle.BattleMessagePacket
+import com.cobblemon.mod.common.net.messages.client.battle.BattleQueueRequestPacket
+import com.cobblemon.mod.common.net.messages.client.battle.BattleSetTeamPokemonPacket
+import com.cobblemon.mod.common.net.messages.client.battle.BattleSwitchPokemonPacket
+import com.cobblemon.mod.common.net.messages.client.battle.BattleUpdateTeamPokemonPacket
+import com.cobblemon.mod.common.net.messages.client.battle.ChallengeNotificationPacket
+import com.cobblemon.mod.common.net.messages.client.data.AbilityRegistrySyncPacket
+import com.cobblemon.mod.common.net.messages.client.data.MovesRegistrySyncPacket
+import com.cobblemon.mod.common.net.messages.client.data.PropertiesCompletionRegistrySyncPacket
+import com.cobblemon.mod.common.net.messages.client.data.SpeciesRegistrySyncPacket
+import com.cobblemon.mod.common.net.messages.client.pokemon.update.AbilityUpdatePacket
+import com.cobblemon.mod.common.net.messages.client.pokemon.update.AspectsUpdatePacket
+import com.cobblemon.mod.common.net.messages.client.pokemon.update.BenchedMovesUpdatePacket
+import com.cobblemon.mod.common.net.messages.client.pokemon.update.CaughtBallUpdatePacket
+import com.cobblemon.mod.common.net.messages.client.pokemon.update.EVsUpdatePacket
+import com.cobblemon.mod.common.net.messages.client.pokemon.update.ExperienceUpdatePacket
+import com.cobblemon.mod.common.net.messages.client.pokemon.update.FriendshipUpdatePacket
+import com.cobblemon.mod.common.net.messages.client.pokemon.update.GenderUpdatePacket
+import com.cobblemon.mod.common.net.messages.client.pokemon.update.HealthUpdatePacket
+import com.cobblemon.mod.common.net.messages.client.pokemon.update.IVsUpdatePacket
+import com.cobblemon.mod.common.net.messages.client.pokemon.update.MoveSetUpdatePacket
+import com.cobblemon.mod.common.net.messages.client.pokemon.update.NatureUpdatePacket
+import com.cobblemon.mod.common.net.messages.client.pokemon.update.PokemonStateUpdatePacket
+import com.cobblemon.mod.common.net.messages.client.pokemon.update.ShinyUpdatePacket
+import com.cobblemon.mod.common.net.messages.client.pokemon.update.SpeciesUpdatePacket
+import com.cobblemon.mod.common.net.messages.client.pokemon.update.StatusUpdatePacket
+import com.cobblemon.mod.common.net.messages.client.pokemon.update.evolution.AddEvolutionPacket
+import com.cobblemon.mod.common.net.messages.client.pokemon.update.evolution.ClearEvolutionsPacket
+import com.cobblemon.mod.common.net.messages.client.pokemon.update.evolution.RemoveEvolutionPacket
+import com.cobblemon.mod.common.net.messages.client.settings.ServerSettingsPacket
+import com.cobblemon.mod.common.net.messages.client.sound.UnvalidatedPlaySoundS2CPacket
+import com.cobblemon.mod.common.net.messages.client.starter.OpenStarterUIPacket
+import com.cobblemon.mod.common.net.messages.client.starter.SetClientPlayerDataPacket
+import com.cobblemon.mod.common.net.messages.client.storage.RemoveClientPokemonPacket
+import com.cobblemon.mod.common.net.messages.client.storage.SwapClientPokemonPacket
+import com.cobblemon.mod.common.net.messages.client.storage.party.InitializePartyPacket
+import com.cobblemon.mod.common.net.messages.client.storage.party.MoveClientPartyPokemonPacket
+import com.cobblemon.mod.common.net.messages.client.storage.party.SetPartyPokemonPacket
+import com.cobblemon.mod.common.net.messages.client.storage.party.SetPartyReferencePacket
+import com.cobblemon.mod.common.net.messages.client.storage.pc.ClosePCPacket
+import com.cobblemon.mod.common.net.messages.client.storage.pc.InitializePCPacket
+import com.cobblemon.mod.common.net.messages.client.storage.pc.MoveClientPCPokemonPacket
+import com.cobblemon.mod.common.net.messages.client.storage.pc.OpenPCPacket
+import com.cobblemon.mod.common.net.messages.client.storage.pc.SetPCBoxPokemonPacket
+import com.cobblemon.mod.common.net.messages.client.storage.pc.SetPCPokemonPacket
+import com.cobblemon.mod.common.net.messages.client.ui.SummaryUIPacket
+import com.cobblemon.mod.common.net.messages.server.BattleChallengePacket
+import com.cobblemon.mod.common.net.messages.server.BenchMovePacket
+import com.cobblemon.mod.common.net.messages.server.RequestMoveSwapPacket
+import com.cobblemon.mod.common.net.messages.server.SelectStarterPacket
+import com.cobblemon.mod.common.net.messages.server.SendOutPokemonPacket
+import com.cobblemon.mod.common.net.messages.server.battle.BattleSelectActionsPacket
+import com.cobblemon.mod.common.net.messages.server.pokemon.update.evolution.AcceptEvolutionPacket
+import com.cobblemon.mod.common.net.messages.server.starter.RequestStarterScreenPacket
+import com.cobblemon.mod.common.net.messages.server.storage.SwapPCPartyPokemonPacket
+import com.cobblemon.mod.common.net.messages.server.storage.party.MovePartyPokemonPacket
+import com.cobblemon.mod.common.net.messages.server.storage.party.ReleasePartyPokemonPacket
+import com.cobblemon.mod.common.net.messages.server.storage.party.SwapPartyPokemonPacket
+import com.cobblemon.mod.common.net.messages.server.storage.pc.MovePCPokemonPacket
+import com.cobblemon.mod.common.net.messages.server.storage.pc.MovePCPokemonToPartyPacket
+import com.cobblemon.mod.common.net.messages.server.storage.pc.MovePartyPokemonToPCPacket
+import com.cobblemon.mod.common.net.messages.server.storage.pc.ReleasePCPokemonPacket
+import com.cobblemon.mod.common.net.messages.server.storage.pc.SwapPCPokemonPacket
+import com.cobblemon.mod.common.util.getServer
+import java.util.concurrent.CompletableFuture
+import net.minecraft.server.network.ServerPlayerEntity
+
+/**
+ * Registers Cobblemon packets. Packet handlers are set up on handling the [MessageBuiltEvent] dispatched from here.
+ *
+ * This class also contains short functions for dispatching our packets to a player, all players, or to the entire server.
+ *
+ * @author Hiroku
+ * @since November 27th, 2021
+ */
+object CobblemonNetwork {
+    const val PROTOCOL_VERSION = "1"
+
+    var clientHandlersRegistered = CompletableFuture<Unit>()
+    var serverHandlersRegistered = CompletableFuture<Unit>()
+
+    init {
+        clientHandlersRegistered.runAfterBoth(serverHandlersRegistered) { register() }
+    }
+
+    lateinit var networkDelegate: NetworkDelegate
+
+
+    fun ServerPlayerEntity.sendPacket(packet: NetworkPacket) = sendToPlayer(this, packet)
+    fun sendToPlayer(player: ServerPlayerEntity, packet: NetworkPacket) = networkDelegate.sendPacketToPlayer(player, packet)
+    fun sendToServer(packet: NetworkPacket) = networkDelegate.sendPacketToServer(packet)
+    fun sendToAllPlayers(packet: NetworkPacket) = sendToPlayers(getServer()!!.playerManager.playerList, packet)
+    fun sendToPlayers(players: Iterable<ServerPlayerEntity>, packet: NetworkPacket) = players.forEach { sendToPlayer(it, packet) }
+
+    interface PreparedMessage<T : NetworkPacket> {
+        fun registerMessage()
+        fun registerHandler(handler: PacketHandler<T>)
+    }
+
+    interface NetworkContext {
+        val player: ServerPlayerEntity?
+    }
+
+
+    fun register() {
+        // Don't forget to register handlers in either ClientPacketRegistrar or ServerPacketRegistrar!
+
+        /**
+         * Client Packets
+         */
+
+        // Pokemon Update Packets
+        buildClientMessage<FriendshipUpdatePacket>()
+        buildClientMessage<MoveSetUpdatePacket>()
+        buildClientMessage<NatureUpdatePacket>()
+        buildClientMessage<ShinyUpdatePacket>()
+        buildClientMessage<SpeciesUpdatePacket>()
+        buildClientMessage<HealthUpdatePacket>()
+        buildClientMessage<ExperienceUpdatePacket>()
+        buildClientMessage<StatusUpdatePacket>()
+        buildClientMessage<CaughtBallUpdatePacket>()
+        buildClientMessage<BenchedMovesUpdatePacket>()
+        buildClientMessage<GenderUpdatePacket>()
+        buildClientMessage<AspectsUpdatePacket>()
+        buildClientMessage<AbilityUpdatePacket>()
+        buildClientMessage<EVsUpdatePacket>()
+        buildClientMessage<IVsUpdatePacket>()
+
+        // Evolution start
+        buildClientMessage<AddEvolutionPacket>()
+        buildClientMessage<ClearEvolutionsPacket>()
+        buildClientMessage<RemoveEvolutionPacket>()
+        // Evolution End
+
+        buildClientMessage<PokemonStateUpdatePacket>()
+
+        // Storage Packets
+        buildClientMessage<InitializePartyPacket>()
+        buildClientMessage<SetPartyPokemonPacket>()
+        buildClientMessage<MoveClientPartyPokemonPacket>()
+        buildClientMessage<SetPartyReferencePacket>()
+
+        buildClientMessage<InitializePCPacket>()
+        buildClientMessage<MoveClientPCPokemonPacket>()
+        buildClientMessage<SetPCBoxPokemonPacket>()
+        buildClientMessage<SetPCPokemonPacket>()
+        buildClientMessage<OpenPCPacket>()
+        buildClientMessage<ClosePCPacket>()
+
+        buildClientMessage<SwapClientPokemonPacket>()
+        buildClientMessage<RemoveClientPokemonPacket>()
+
+        // UI Packets
+        buildClientMessage<SummaryUIPacket>()
+
+        // Starter packets
+        buildClientMessage<OpenStarterUIPacket>()
+        buildClientMessage<SetClientPlayerDataPacket>()
+
+        // Battle packets
+        buildClientMessage<BattleEndPacket>()
+        buildClientMessage<BattleInitializePacket>()
+        buildClientMessage<BattleQueueRequestPacket>()
+        buildClientMessage<BattleFaintPacket>()
+        buildClientMessage<BattleMakeChoicePacket>()
+        buildClientMessage<BattleHealthChangePacket>()
+        buildClientMessage<BattleSetTeamPokemonPacket>()
+        buildClientMessage<BattleSwitchPokemonPacket>()
+        buildClientMessage<BattleMessagePacket>()
+        buildClientMessage<BattleCaptureStartPacket>()
+        buildClientMessage<BattleCaptureEndPacket>()
+        buildClientMessage<BattleCaptureShakePacket>()
+        buildClientMessage<BattleApplyCaptureResponsePacket>()
+        buildClientMessage<ChallengeNotificationPacket>()
+        buildClientMessage<BattleUpdateTeamPokemonPacket>()
+        buildClientMessage<BattlePersistentStatusPacket>()
+
+        // Settings packets
+        buildClientMessage<ServerSettingsPacket>()
+
+        // Data registries
+        buildClientMessage<AbilityRegistrySyncPacket>()
+        buildClientMessage<MovesRegistrySyncPacket>()
+        buildClientMessage<SpeciesRegistrySyncPacket>()
+        buildClientMessage<PropertiesCompletionRegistrySyncPacket>()
+
+        // Hax
+        buildClientMessage<UnvalidatedPlaySoundS2CPacket>()
+
+        /**
+         * Server Packets
+         */
+
+        // Pokemon Update Packets
+        // Evolution start
+        buildServerMessage<AcceptEvolutionPacket>()
+        // Evolution End
+
+        // Storage Packets
+        buildServerMessage<SendOutPokemonPacket>()
+        buildServerMessage<RequestMoveSwapPacket>()
+        buildServerMessage<BenchMovePacket>()
+        buildServerMessage<BattleChallengePacket>()
+
+        buildServerMessage<MovePCPokemonToPartyPacket>()
+        buildServerMessage<MovePartyPokemonToPCPacket>()
+        buildServerMessage<ReleasePartyPokemonPacket>()
+        buildServerMessage<ReleasePCPokemonPacket>()
+
+        // Starter packets
+        buildServerMessage<SelectStarterPacket>()
+        buildServerMessage<RequestStarterScreenPacket>()
+
+        buildServerMessage<SwapPCPokemonPacket>()
+        buildServerMessage<SwapPartyPokemonPacket>()
+
+        buildServerMessage<MovePCPokemonPacket>()
+        buildServerMessage<MovePartyPokemonPacket>()
+
+        buildServerMessage<SwapPCPartyPokemonPacket>()
+
+        // Battle packets
+        buildServerMessage<BattleSelectActionsPacket>()
+    }
+
+    private inline fun <reified P : NetworkPacket> buildClientMessage() =
+        buildMessage<P>(toServer = false)
+    private inline fun <reified P : NetworkPacket> buildServerMessage() =
+        buildMessage<P>(toServer = true)
+
+    private inline fun <reified P : NetworkPacket> buildMessage(toServer: Boolean) {
+        val message = networkDelegate.buildMessage(P::class.java, toServer)
+        // Gives client or server the chance to attach its packet handler
+        CobblemonEvents.MESSAGE_BUILT.post(MessageBuiltEvent(P::class.java, toServer, message))
+        message.registerMessage()
+    }
+}
@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2022 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.util.cobblemonResource
+import dev.architectury.registry.level.biome.BiomeModifications
+import net.minecraft.util.registry.RegistryEntry
+import net.minecraft.util.registry.RegistryEntryList
+import net.minecraft.world.gen.GenerationStep
+import net.minecraft.world.gen.feature.ConfiguredFeatures
+import net.minecraft.world.gen.feature.Feature
+import net.minecraft.world.gen.feature.PlacedFeature
+import net.minecraft.world.gen.feature.PlacedFeatures
+import net.minecraft.world.gen.feature.SimpleRandomFeatureConfig
+import net.minecraft.world.gen.feature.VegetationPlacedFeatures
+import net.minecraft.world.gen.placementmodifier.RarityFilterPlacementModifier
+
+object CobblemonPlacements {
+
+    lateinit var BLACK_APRICORN_TREE: RegistryEntry<PlacedFeature>
+    lateinit var BLUE_APRICORN_TREE: RegistryEntry<PlacedFeature>
+    lateinit var GREEN_APRICORN_TREE: RegistryEntry<PlacedFeature>
+    lateinit var PINK_APRICORN_TREE: RegistryEntry<PlacedFeature>
+    lateinit var RED_APRICORN_TREE: RegistryEntry<PlacedFeature>
+    lateinit var WHITE_APRICORN_TREE: RegistryEntry<PlacedFeature>
+    lateinit var YELLOW_APRICORN_TREE: RegistryEntry<PlacedFeature>
+
+    lateinit var APRICORN_TREES: RegistryEntry<PlacedFeature>
+
+    fun register() {
+        BLACK_APRICORN_TREE = PlacedFeatures.register(cobblemonResource("black_apricorn_tree").toString(), CobblemonConfiguredFeatures.BLACK_APRICORN_TREE, PlacedFeatures.wouldSurvive(
+            CobblemonBlocks.BLACK_APRICORN_SAPLING.get()))
+        BLUE_APRICORN_TREE = PlacedFeatures.register(cobblemonResource("blue_apricorn_tree").toString(), CobblemonConfiguredFeatures.BLUE_APRICORN_TREE, PlacedFeatures.wouldSurvive(
+            CobblemonBlocks.BLUE_APRICORN_SAPLING.get()))
+        GREEN_APRICORN_TREE = PlacedFeatures.register(cobblemonResource("green_apricorn_tree").toString(), CobblemonConfiguredFeatures.GREEN_APRICORN_TREE, PlacedFeatures.wouldSurvive(
+            CobblemonBlocks.GREEN_APRICORN_SAPLING.get()))
+        PINK_APRICORN_TREE = PlacedFeatures.register(cobblemonResource("pink_apricorn_tree").toString(), CobblemonConfiguredFeatures.PINK_APRICORN_TREE, PlacedFeatures.wouldSurvive(
+            CobblemonBlocks.PINK_APRICORN_SAPLING.get()))
+        RED_APRICORN_TREE = PlacedFeatures.register(cobblemonResource("red_apricorn_tree").toString(), CobblemonConfiguredFeatures.RED_APRICORN_TREE, PlacedFeatures.wouldSurvive(
+            CobblemonBlocks.RED_APRICORN_SAPLING.get()))
+        WHITE_APRICORN_TREE = PlacedFeatures.register(cobblemonResource("white_apricorn_tree").toString(), CobblemonConfiguredFeatures.WHITE_APRICORN_TREE, PlacedFeatures.wouldSurvive(
+            CobblemonBlocks.WHITE_APRICORN_SAPLING.get()))
+        YELLOW_APRICORN_TREE = PlacedFeatures.register(cobblemonResource("yellow_apricorn_tree").toString(), CobblemonConfiguredFeatures.YELLOW_APRICORN_TREE, PlacedFeatures.wouldSurvive(
+            CobblemonBlocks.YELLOW_APRICORN_SAPLING.get()))
+
+        val apricornTreeVariety = ConfiguredFeatures.register(
+            cobblemonResource("apricorn_trees").toString(), Feature.SIMPLE_RANDOM_SELECTOR, SimpleRandomFeatureConfig(
+                RegistryEntryList.of(
+                    BLACK_APRICORN_TREE,
+                    BLUE_APRICORN_TREE,
+                    GREEN_APRICORN_TREE,
+                    PINK_APRICORN_TREE,
+                    RED_APRICORN_TREE,
+                    WHITE_APRICORN_TREE,
+                    YELLOW_APRICORN_TREE
+                )
+            )
+        )
+
+        APRICORN_TREES = PlacedFeatures.register(cobblemonResource("apricorn_trees").toString(), apricornTreeVariety, VegetationPlacedFeatures.modifiers(RarityFilterPlacementModifier.of(8)))
+
+        BiomeModifications.addProperties({ context -> true}, { context, properties ->
+            properties.generationProperties.addFeature(GenerationStep.Feature.VEGETAL_DECORATION, APRICORN_TREES)
+        })
+    }
+
+}
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2022 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.registry.CompletableRegistry
+import com.cobblemon.mod.common.util.cobblemonResource
+import net.minecraft.sound.SoundEvent
+import net.minecraft.util.registry.Registry
+
+object CobblemonSounds : CompletableRegistry<SoundEvent>(Registry.SOUND_EVENT_KEY) {
+    private fun queue(name: String) = queue(name) { SoundEvent(cobblemonResource(name)) }
+
+    val GUI_CLICK = queue("gui.click")
+
+    val PC_ON = queue("pc.on")
+    val PC_OFF = queue("pc.off")
+    val PC_GRAB = queue("pc.grab")
+    val PC_DROP = queue("pc.drop")
+    val PC_RELEASE = queue("pc.release")
+
+    val POKE_BALL_CAPTURE_STARTED = queue("poke_ball.capture_started")
+    val POKE_BALL_CAPTURE_SUCCEEDED = queue("poke_ball.capture_succeeded")
+    val POKE_BALL_SHAKE = queue("poke_ball.shake")
+    val POKE_BALL_OPEN = queue("poke_ball.open")
+    val POKE_BALL_HIT = queue("poke_ball.hit")
+    val POKE_BALL_SEND_OUT = queue("poke_ball.send_out")
+    val POKE_BALL_RECALL = queue("poke_ball.recall")
+
+    val ITEM_USE = queue("item.use")
+}
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2022 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.advancement
+
+import com.cobblemon.mod.common.advancement.criterion.CaughtPokemonCriterionCondition
+import com.cobblemon.mod.common.advancement.criterion.PickStarterCriterionCondition
+import com.cobblemon.mod.common.advancement.criterion.SimpleCountableCriterionCondition
+import com.cobblemon.mod.common.advancement.criterion.SimpleCriterionTrigger
+import com.cobblemon.mod.common.util.cobblemonResource
+import net.minecraft.advancement.criterion.Criteria
+
+/**
+ * Contains all the advancement criteria in Cobblemon.
+ *
+ * @author Licious
+ * @since October 26th, 2022
+ */
+object CobblemonCriteria {
+    val PICK_STARTER = Criteria.register(
+        SimpleCriterionTrigger(
+            cobblemonResource("pick_starter"),
+            PickStarterCriterionCondition::class.java
+        )
+    )
+    val CATCH_POKEMON = Criteria.register(
+        SimpleCriterionTrigger(
+            cobblemonResource("catch_pokemon"),
+            CaughtPokemonCriterionCondition::class.java
+        )
+    )
+    val CATCH_SHINY_POKEMON = Criteria.register(
+        SimpleCriterionTrigger(
+            cobblemonResource("catch_shiny_pokemon"),
+            SimpleCountableCriterionCondition::class.java
+        )
+    )
+    val EGG_HATCH = Criteria.register(
+        SimpleCriterionTrigger(
+            cobblemonResource("eggs_hatched"),
+            SimpleCountableCriterionCondition::class.java
+        )
+    )
+    val EVOLVE_POKEMON = Criteria.register(
+        SimpleCriterionTrigger(
+            cobblemonResource("pokemon_evolved"),
+            SimpleCountableCriterionCondition::class.java
+        )
+    )
+    val WIN_BATTLE = Criteria.register(
+        SimpleCriterionTrigger(
+            cobblemonResource("battles_won"),
+            SimpleCountableCriterionCondition::class.java
+        )
+    )
+}
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2022 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.advancement.criterion
+
+import com.google.gson.JsonObject
+import net.minecraft.predicate.entity.EntityPredicate.Extended
+import net.minecraft.server.network.ServerPlayerEntity
+import net.minecraft.util.Identifier
+
+/**
+ * A context that is used when you require a [CountableContext] along with some type string.
+ *
+ * @author Hiroku
+ * @since November 4th, 2022
+ */
+open class CountablePokemonTypeContext(times: Int, var type: String) : CountableContext(times)
+
+class CaughtPokemonCriterionCondition(id: Identifier, entity: Extended) : CountableCriterionCondition<CountablePokemonTypeContext>(id, entity) {
+    var type = "any"
+    override fun toJson(json: JsonObject) {
+        super.toJson(json)
+        json.addProperty("type", type)
+    }
+
+    override fun fromJson(json: JsonObject) {
+        super.fromJson(json)
+        type = json.get("type")?.asString ?: "any"
+    }
+
+    override fun matches(player: ServerPlayerEntity, context: CountablePokemonTypeContext): Boolean {
+        return super.matches(player, context) && context.type == type
+    }
+}
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2022 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.advancement.criterion
+
+import com.google.gson.JsonObject
+import net.minecraft.predicate.entity.EntityPredicate.Extended
+import net.minecraft.server.network.ServerPlayerEntity
+import net.minecraft.util.Identifier
+
+/**
+ * A type of advancement criterion condition that requires some number of completions. This can be extended to add
+ * more conditions than just the count.
+ *
+ * @author Hiroku
+ * @since November 4th, 2022
+ */
+abstract class CountableCriterionCondition<T : CountableContext>(id: Identifier, entity: Extended) : SimpleCriterionCondition<T>(id, entity) {
+    var count = 0
+    override fun fromJson(json: JsonObject) {
+        count = json.get("count")?.asInt ?: 0
+    }
+
+    override fun toJson(json: JsonObject) {
+        json.addProperty("count", count)
+    }
+
+    override fun matches(player: ServerPlayerEntity, context: T) = context.times >= count
+}
+
+/**
+ * A concrete subclass of [CountableCriterionCondition] so that you can have advancements that really just need the
+ * count and nothing else.
+ *
+ * This is just a quirk of using generics like this, don't worry about it. The criterion conditions that get used must
+ * not be generic typed.
+ *
+ * @author Hiroku
+ * @since November 4th, 2022
+ */
+class SimpleCountableCriterionCondition(id: Identifier, entity: Extended) : CountableCriterionCondition<CountableContext>(id, entity)
+fun SimpleCriterionTrigger<CountableContext, SimpleCountableCriterionCondition>.trigger(player: ServerPlayerEntity, times: Int) = trigger(player, CountableContext(times))
+
+/**
+ * Some type of context that has a count associated with it, representing how many times the trigger has occurred.
+ *
+ * @author Hiroku
+ * @since November 4th, 2022
+ */
+open class CountableContext(var times: Int)
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2022 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.advancement.criterion
+
+import com.cobblemon.mod.common.api.pokemon.PokemonProperties
+import com.cobblemon.mod.common.pokemon.Pokemon
+import com.google.gson.JsonObject
+import net.minecraft.predicate.entity.EntityPredicate.Extended
+import net.minecraft.server.network.ServerPlayerEntity
+import net.minecraft.util.Identifier
+
+/**
+ * A criteria that is triggered when a player picks a starter.
+ *
+ * @author Licious, Hiroku
+ * @since October 26th, 2022
+ */
+class PickStarterCriterionCondition(id: Identifier, entity: Extended) : SimpleCriterionCondition<Pokemon>(id, entity) {
+    var properties = PokemonProperties()
+    override fun toJson(json: JsonObject) {
+        json.addProperty("properties", properties.originalString)
+    }
+
+    override fun fromJson(json: JsonObject) {
+        properties = PokemonProperties.parse(json.get("properties")?.asString ?: "")
+    }
+
+    override fun matches(player: ServerPlayerEntity, context: Pokemon) = properties.matches(context)
+}
@@ -0,0 +1,67 @@
+/*
+ * Copyright (C) 2022 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.advancement.criterion
+
+import com.google.gson.JsonObject
+import net.minecraft.advancement.criterion.AbstractCriterion
+import net.minecraft.advancement.criterion.AbstractCriterionConditions
+import net.minecraft.predicate.entity.AdvancementEntityPredicateDeserializer
+import net.minecraft.predicate.entity.AdvancementEntityPredicateSerializer
+import net.minecraft.predicate.entity.EntityPredicate.Extended
+import net.minecraft.server.network.ServerPlayerEntity
+import net.minecraft.util.Identifier
+
+/**
+ * A wrapping around the AbstractCriterion system of Minecraft. This allows the same base class to be used
+ * for all advancements by wrapping the advancement-specific contextual data in the generic T, the instance of
+ * the advancement conditions in the generic C, and allowing the condition to do all serialization, deserialization,
+ * and matching of context against conditions.
+ *
+ * @author Hiroku
+ * @since November 4th, 2022
+ */
+open class SimpleCriterionTrigger<T, C : SimpleCriterionCondition<T>>(
+    val _id: Identifier,
+    val criterionClass: Class<C>
+) : AbstractCriterion<C>() {
+    override fun getId() = _id
+    fun trigger(player: ServerPlayerEntity, context: T) = this.trigger(player) { it.matches(player, context) }
+    override fun conditionsFromJson(
+        obj: JsonObject,
+        playerPredicate: Extended,
+        predicateDeserializer: AdvancementEntityPredicateDeserializer
+    ): C {
+        val instance = criterionClass.getConstructor(Identifier::class.java, Extended::class.java).newInstance(id, playerPredicate)
+        instance.fromJson(obj)
+        return instance
+    }
+}
+
+/**
+ * The base of the conditions for Cobblemon's wrapping around Minecraft advancements. This is parameterized by whatever
+ * contextual information this condition needs to be checked, and must handle serialization and deserialization from JSON.
+ *
+ * @author Hiroku
+ * @since November 4th, 2022
+ */
+abstract class SimpleCriterionCondition<T>(
+    id: Identifier,
+    entity: Extended
+): AbstractCriterionConditions(id, entity) {
+    override fun toJson(predicateSerializer: AdvancementEntityPredicateSerializer): JsonObject {
+        val json = super.toJson(predicateSerializer)
+        toJson(json)
+        return json
+    }
+
+    abstract fun toJson(json: JsonObject)
+    abstract fun fromJson(json: JsonObject)
+
+    abstract fun matches(player: ServerPlayerEntity, context: T): Boolean
+}
@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2022 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api
+
+/**
+ * A curve of experience that maps to levels. This is generally a discretized polynomial equation
+ * that takes a level as x and returns the amount of experience required to reach it as y.
+ *
+ * Some curves are too complicated to invert. Implementations can use [CachedLevelThresholds] to
+ * workaround this issue.
+ *
+ * @author Hiroku
+ * @since March 21st, 2022
+ */
+interface LevelCurve {
+    fun getExperience(level: Int): Int
+    fun getLevel(experience: Int): Int
+}
+
+/**
+ * A collection of thresholds for what levels require in terms of
+ * experience. This is a caching mechanism so that a complicated
+ * experience-to-level polynomial can be inverted.
+ *
+ * @author Hiroku
+ * @since March 21st, 2022
+ */
+class CachedLevelThresholds(
+    val levelLimit: Int = 1000,
+    val experienceToLevel: (Int) -> Int
+) {
+    val savedThresholds = mutableListOf<Int>()
+    fun getLevel(experience: Int): Int {
+        var level = 1
+        while (level <= savedThresholds.size) {
+            val threshold = savedThresholds[level - 1]
+            if (experience < threshold) {
+                return level - 1
+            }
+            level++
+        }
+        while (level < levelLimit) {
+            val threshold = experienceToLevel(level)
+            savedThresholds.add(threshold)
+            if (experience < threshold) {
+                return level - 1
+            }
+            level++
+        }
+        return 1
+    }
+}
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2022 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api
+
+import com.cobblemon.mod.common.Cobblemon
+
+/**
+ * Something that depends on some installed mod conditions.
+ *
+ * @author Hiroku
+ * @since July 8th, 2022
+ */
+interface ModDependant {
+    var neededInstalledMods: List<String>
+    var neededUninstalledMods: List<String>
+
+    fun isModDependencySatisfied(): Boolean {
+        return if (neededInstalledMods.isNotEmpty() && neededInstalledMods.any { !Cobblemon.implementation.isModInstalled(it) }) {
+            false
+        } else if (neededUninstalledMods.isNotEmpty() && neededUninstalledMods.any { Cobblemon.implementation.isModInstalled(it) }) {
+            false
+        } else {
+            true
+        }
+    }
+}
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2022 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api
+
+/**
+ * Functions like a list which is ordered by [Priority]. Within each category of priority,
+ * order is first-come-first-served. Having the same value in multiple priorities is possible
+ * but can cause stickiness.
+ *
+ * @author Hiroku
+ * @since February 18th, 2022
+ */
+open class PrioritizedList<T> : Iterable<T> {
+    protected val priorityMap = mutableMapOf<Priority, MutableList<T>>()
+    protected val ordered = mutableListOf<T>()
+
+    val mapping: Map<Priority, List<T>>
+        get() = priorityMap.toMap()
+
+    private fun reorder() {
+        ordered.clear()
+        Priority.values().forEach {
+            priorityMap[it]?.let { ordered.addAll(it) }
+        }
+    }
+
+    fun add(priority: Priority, value: T) {
+        priorityMap.putIfAbsent(priority, mutableListOf())
+        priorityMap[priority]?.add(value)
+        reorder()
+    }
+
+    fun remove(value: T) {
+        priorityMap.values.forEach { it.remove(value) }
+        reorder()
+    }
+
+    fun remove(priority: Priority, value: T) {
+        priorityMap[priority]?.remove(value)
+        reorder()
+    }
+
+    fun clear() {
+        priorityMap.clear()
+        ordered.clear()
+    }
+
+    fun isEmpty() = ordered.isEmpty()
+
+    override fun iterator() = ordered.iterator()
+}
@@ -0,0 +1,17 @@
+/*
+ * Copyright (C) 2022 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api
+
+enum class Priority {
+    HIGHEST,
+    HIGH,
+    NORMAL,
+    LOW,
+    LOWEST
+}
@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2022 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api
+
+import com.cobblemon.mod.common.pokemon.feature.CobblemonSeason
+import net.minecraft.util.math.BlockPos
+import net.minecraft.world.WorldAccess
+
+/**
+ * Figures out what season it is at a particular position. Season is just a general approximation
+ * used for things like Deerling variations.
+ *
+ * @author Hiroku
+ * @since November 25th, 2022
+ */
+fun interface SeasonResolver {
+    operator fun invoke(world: WorldAccess, pos: BlockPos): CobblemonSeason?
+}
@@ -0,0 +1,87 @@
+/*
+ * Copyright (C) 2022 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.abilities
+
+import com.cobblemon.mod.common.Cobblemon
+import com.cobblemon.mod.common.api.data.JsonDataRegistry
+import com.cobblemon.mod.common.api.reactive.SimpleObservable
+import com.cobblemon.mod.common.net.messages.client.data.AbilityRegistrySyncPacket
+import com.cobblemon.mod.common.pokemon.abilities.HiddenAbilityType
+import com.cobblemon.mod.common.util.asTranslated
+import com.cobblemon.mod.common.util.cobblemonResource
+import com.google.gson.Gson
+import com.google.gson.GsonBuilder
+import com.google.gson.JsonDeserializationContext
+import com.google.gson.JsonDeserializer
+import com.google.gson.JsonElement
+import com.google.gson.reflect.TypeToken
+import java.lang.reflect.Type
+import net.minecraft.resource.ResourceType
+import net.minecraft.server.network.ServerPlayerEntity
+import net.minecraft.text.MutableText
+import net.minecraft.util.Identifier
+
+/**
+ * Registry for all known Abilities
+ */
+object Abilities : JsonDataRegistry<AbilityTemplate> {
+    override val id = cobblemonResource("abilities")
+    override val type = ResourceType.SERVER_DATA
+    override val observable = SimpleObservable<Abilities>()
+    override val typeToken: TypeToken<AbilityTemplate> = TypeToken.get(AbilityTemplate::class.java)
+    override val resourcePath = "abilities"
+    override val gson: Gson = GsonBuilder()
+        .disableHtmlEscaping()
+        .setLenient()
+        .setPrettyPrinting()
+        .registerTypeAdapter(MutableText::class.java, MutableTextAdapter)
+        .create()
+
+    val DUMMY = AbilityTemplate(name = "dummy")
+
+    private val allAbilities = mutableListOf<AbilityTemplate>()
+    private val abilityMap = mutableMapOf<String, AbilityTemplate>()
+
+    object MutableTextAdapter : JsonDeserializer<MutableText> {
+        override fun deserialize(json: JsonElement, type: Type, ctx: JsonDeserializationContext) = json.asString.asTranslated()
+    }
+
+    override fun reload(data: Map<Identifier, AbilityTemplate>) {
+        PotentialAbility.types.clear()
+        PotentialAbility.types.add(CommonAbilityType)
+        PotentialAbility.types.add(HiddenAbilityType)
+
+        allAbilities.clear()
+        abilityMap.clear()
+
+        data.forEach { (identifier, abilityTemplate) ->
+            allAbilities.add(abilityTemplate)
+            abilityMap[identifier.path] = abilityTemplate
+        }
+
+        Cobblemon.LOGGER.info("Loaded {} abilities", this.allAbilities.size)
+        this.observable.emit(this)
+    }
+
+    override fun sync(player: ServerPlayerEntity) {
+        AbilityRegistrySyncPacket(all()).sendToPlayer(player)
+    }
+
+    fun register(ability: AbilityTemplate): AbilityTemplate {
+        abilityMap[ability.name.lowercase()] = ability
+        allAbilities.add(ability)
+        return ability
+    }
+
+    fun all() = allAbilities.toList()
+    fun first() = allAbilities.first()
+    fun get(name: String) = abilityMap[name.lowercase()]
+    fun getOrException(name: String) = get(name) ?: throw IllegalArgumentException("Unable to find ability of name: $name")
+    fun count() = allAbilities.size
+}
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2022 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.abilities
+
+import com.cobblemon.mod.common.util.DataKeys
+import com.google.gson.JsonObject
+import net.minecraft.nbt.NbtCompound
+import net.minecraft.text.MutableText
+
+/**
+ * Representing an Ability with all its attributes
+ *
+ * Can be extended to allow for custom attributes (be sure to overwrite the load and save methods)
+ *
+ * @author Qu
+ * @since January 9th, 2022
+ */
+open class Ability internal constructor(var template: AbilityTemplate, var forced: Boolean) {
+
+    val name: String
+        get() = template.name
+
+    val displayName: String
+        get() = template.displayName
+
+    val description: String
+        get() = template.description
+
+    open fun saveToNBT(nbt: NbtCompound): NbtCompound {
+        nbt.putString(DataKeys.POKEMON_ABILITY_NAME, name)
+        nbt.putBoolean(DataKeys.POKEMON_ABILITY_FORCED, forced)
+        return nbt
+    }
+
+    open fun saveToJSON(json: JsonObject): JsonObject {
+        json.addProperty(DataKeys.POKEMON_ABILITY_NAME, name)
+        json.addProperty(DataKeys.POKEMON_ABILITY_FORCED, forced)
+        return json
+    }
+
+    open fun loadFromNBT(nbt: NbtCompound): Ability {
+        forced = nbt.getBoolean(DataKeys.POKEMON_ABILITY_FORCED)
+        return this
+    }
+    open fun loadFromJSON(json: JsonObject): Ability {
+        forced = json.get(DataKeys.POKEMON_ABILITY_FORCED)?.asBoolean ?: false
+        return this
+    }
+}
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2022 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.abilities
+
+import com.cobblemon.mod.common.Cobblemon.LOGGER
+import com.cobblemon.mod.common.api.PrioritizedList
+import com.cobblemon.mod.common.api.Priority
+import com.cobblemon.mod.common.pokemon.Species
+
+/**
+ * A pool of potential abilities, as a [PrioritizedList]. The added logic of this subclass
+ * is that it has selection logic. Given a species and a set of aspects, it will go through
+ * each priority group, and if it can then it will pick from that group and return it.
+ *
+ * @author Hiroku
+ * @since July 28th, 2022
+ */
+open class AbilityPool : PrioritizedList<PotentialAbility>() {
+    fun select(species: Species, aspects: Set<String>): Ability {
+        for (priority in Priority.values()) {
+            val potentialAbilities = priorityMap[priority]?.filter { it.isSatisfiedBy(aspects) } ?: continue
+            if (potentialAbilities.isNotEmpty()) {
+                return potentialAbilities.random().template.create()
+            }
+        }
+
+        LOGGER.error("Unable to select an ability from the pool for $species and aspects: ${aspects.joinToString()}")
+        return Abilities.first().create()
+    }
+}
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2022 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.abilities
+
+import com.google.gson.JsonObject
+import net.minecraft.nbt.NbtCompound
+
+/**
+ * This represents the base of an Ability.
+ * To build an Ability you MUST use its template.
+ *
+ * @param name: The English name used to load / find it (spaces -> _)
+ */
+class AbilityTemplate(
+    val name: String = "",
+    var builder: (AbilityTemplate, forced: Boolean) -> Ability = { template, forced -> Ability(template, forced) },
+    val displayName: String = "cobblemon.ability.$name",
+    val description: String = "cobblemon.ability.$name.desc"
+) {
+    /**
+     * Returns the Ability or if applicable the extension connected to this template
+     */
+    fun create(forced: Boolean = false) = builder(this, forced)
+
+
+    /**
+     * Returns the Ability and loads the given NBT Tag into it.
+     *
+     * Ability extensions need to write and read their needed data from here.
+     */
+    fun create(nbt: NbtCompound) = create().loadFromNBT(nbt)
+
+    /**
+     * Returns the Ability and loads the given JSON object into it.
+     *
+     * Ability extensions need to write and read their needed data from here.
+     */
+    fun create(json: JsonObject) = create().loadFromJSON(json)
+}
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2022 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.abilities
+
+import com.cobblemon.mod.common.api.Priority
+import com.google.gson.JsonElement
+
+interface PotentialAbilityType<T : PotentialAbility> {
+    fun parseFromJSON(element: JsonElement): T?
+}
+
+/**
+ * An ability on a species that may or may not be available for a specific instance of the species.
+ *
+ * Controls whether a Pokémon can learn an ability.
+ *
+ * @author Hiroku
+ * @since July 27th, 2022
+ */
+interface PotentialAbility {
+    val template: AbilityTemplate
+    val priority: Priority
+    val type: PotentialAbilityType<*>
+    fun isSatisfiedBy(aspects: Set<String>): Boolean
+    companion object {
+        val types = mutableListOf<PotentialAbilityType<*>>()
+    }
+}
+
+object CommonAbilityType : PotentialAbilityType<CommonAbility> {
+    override fun parseFromJSON(element: JsonElement): CommonAbility? {
+        val str = if (element.isJsonPrimitive) element.asString else null
+        return str?.let {
+            val ability = Abilities.get(it)
+            if (ability != null) {
+                return@let CommonAbility(ability)
+            } else {
+                return@let null
+            }
+        }
+    }
+}
+
+open class CommonAbility(override val template: AbilityTemplate) : PotentialAbility {
+    override val priority = Priority.LOWEST
+    override val type = CommonAbilityType
+    override fun isSatisfiedBy(aspects: Set<String>) = true
+}
+
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2022 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.ai
+
+import com.cobblemon.mod.common.api.serialization.StringIdentifiedObjectAdapter
+import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
+import net.minecraft.entity.ai.TargetPredicate
+import net.minecraft.util.math.Box
+
+/**
+ * How deeply a Pokémon sleeps. This takes the current situation and decides if a Pokémon should fall asleep or wake.
+ *
+ * A depth should be registered by name in [SleepDepth.depths].
+ *
+ * @author Hiroku
+ * @since July 17th, 2022
+ */
+interface SleepDepth {
+    companion object {
+        val comatose = object : SleepDepth {
+            override fun canSleep(pokemonEntity: PokemonEntity) = true
+            override fun shouldWake(pokemonEntity: PokemonEntity) = true
+        }
+
+        val normal = object : SleepDepth {
+            override fun canSleep(pokemonEntity: PokemonEntity): Boolean {
+                return pokemonEntity.world.getPlayers(TargetPredicate.createNonAttackable(), pokemonEntity, Box.of(pokemonEntity.pos, 16.0, 16.0, 16.0)).isEmpty()
+            }
+
+            override fun shouldWake(pokemonEntity: PokemonEntity): Boolean {
+                val nearbyPlayers = pokemonEntity.world.getPlayers(TargetPredicate.createNonAttackable(), pokemonEntity, Box.of(pokemonEntity.pos, 16.0, 16.0, 16.0))
+                return nearbyPlayers.none { !it.isSneaking }
+            }
+        }
+
+        val depths = mutableMapOf(
+            "comatose" to comatose,
+            "normal" to normal
+        )
+        val adapter = StringIdentifiedObjectAdapter { depths[it] ?: throw IllegalArgumentException("Unknown sleep depth: $it") }
+    }
+
+    fun canSleep(pokemonEntity: PokemonEntity): Boolean
+    fun shouldWake(pokemonEntity: PokemonEntity): Boolean
+}
@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) 2022 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.apricorn
+
+import com.cobblemon.mod.common.CobblemonBlocks
+import com.cobblemon.mod.common.CobblemonItems
+import com.cobblemon.mod.common.item.ApricornItem
+import com.cobblemon.mod.common.world.block.ApricornBlock
+import com.cobblemon.mod.common.world.block.ApricornSaplingBlock
+import net.minecraft.item.BlockItem
+
+/**
+ * Contains the different Apricorn variants and util methods to get their item, block, seedling and sapling form.
+ *
+ * @author Licious
+ * @since October 29th, 2022
+ */
+enum class Apricorn {
+
+    BLACK,
+    BLUE,
+    GREEN,
+    PINK,
+    RED,
+    WHITE,
+    YELLOW;
+
+    fun item(): ApricornItem = when(this) {
+        BLACK -> CobblemonItems.BLACK_APRICORN.get()
+        BLUE -> CobblemonItems.BLUE_APRICORN.get()
+        GREEN -> CobblemonItems.GREEN_APRICORN.get()
+        PINK -> CobblemonItems.PINK_APRICORN.get()
+        RED -> CobblemonItems.RED_APRICORN.get()
+        WHITE -> CobblemonItems.WHITE_APRICORN.get()
+        YELLOW -> CobblemonItems.YELLOW_APRICORN.get()
+    }
+
+    fun seed(): BlockItem = when(this) {
+        BLACK -> CobblemonItems.BLACK_APRICORN_SEED.get()
+        BLUE -> CobblemonItems.BLUE_APRICORN_SEED.get()
+        GREEN -> CobblemonItems.GREEN_APRICORN_SEED.get()
+        PINK -> CobblemonItems.PINK_APRICORN_SEED.get()
+        RED -> CobblemonItems.RED_APRICORN_SEED.get()
+        WHITE -> CobblemonItems.WHITE_APRICORN_SEED.get()
+        YELLOW -> CobblemonItems.YELLOW_APRICORN_SEED.get()
+    }
+
+    fun block(): ApricornBlock = when(this) {
+        BLACK -> CobblemonBlocks.BLACK_APRICORN.get()
+        BLUE -> CobblemonBlocks.BLUE_APRICORN.get()
+        GREEN -> CobblemonBlocks.GREEN_APRICORN.get()
+        PINK -> CobblemonBlocks.PINK_APRICORN.get()
+        RED -> CobblemonBlocks.RED_APRICORN.get()
+        WHITE -> CobblemonBlocks.WHITE_APRICORN.get()
+        YELLOW -> CobblemonBlocks.YELLOW_APRICORN.get()
+    }
+
+    fun sapling(): ApricornSaplingBlock = when(this) {
+        BLACK -> CobblemonBlocks.BLACK_APRICORN_SAPLING.get()
+        BLUE -> CobblemonBlocks.BLUE_APRICORN_SAPLING.get()
+        GREEN -> CobblemonBlocks.GREEN_APRICORN_SAPLING.get()
+        PINK -> CobblemonBlocks.PINK_APRICORN_SAPLING.get()
+        RED -> CobblemonBlocks.RED_APRICORN_SAPLING.get()
+        WHITE -> CobblemonBlocks.WHITE_APRICORN_SAPLING.get()
+        YELLOW -> CobblemonBlocks.YELLOW_APRICORN_SAPLING.get()
+    }
+
+}
@@ -0,0 +1,82 @@
+/*
+ * Copyright (C) 2022 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.asset
+
+import com.cobblemon.mod.common.Cobblemon
+import com.cobblemon.mod.common.Cobblemon.LOGGER
+import com.cobblemon.mod.common.util.fromJson
+import com.google.gson.Gson
+import com.google.gson.GsonBuilder
+import com.google.gson.JsonArray
+import java.io.File
+import java.io.InputStreamReader
+import java.io.PrintWriter
+
+/**
+ * A utility object for managing the "manifest" based assets. A JSON in a directory named _MANIFEST.json
+ * is a list of all of the files in the folder that should be loaded.
+ *
+ * Rationale: On Forge this is completely unneeded, but the Fabric class loader is either bugged or
+ * designed in such a way that targeting a folder for an asset load returns a URI that cannot be converted
+ * into a path (which would then be used for file walking). As a result, arbitrarily loading all files in
+ * a folder is either not possible in Fabric or I don't know what trickery is required. A manifest means there
+ * will not be a blind searching for JSONs and in future enables us to make the manifest potentially compress
+ * all the JSONs into itself to speed up load times internally.
+ *
+ * @author Hiroku
+ * @since April 1st, 2022.
+ */
+object JsonManifestWalker {
+    /**
+     * Builds a manifest at [manifestPath] using the files inside the same folder.
+     *
+     * This is for internal use though we could make this more normalized later.
+     */
+    internal fun build(manifestPath: String) {
+        val file = File(manifestPath)
+        file.createNewFile()
+        val folder = file.parentFile
+        folder.mkdir()
+        val members = folder.listFiles { f: File -> f.extension == "json" && f.nameWithoutExtension != "_MANIFEST" }
+        val jsonArray = JsonArray()
+        members.forEach {
+            jsonArray.add(it.relativeTo(folder).toString())
+        }
+        val pw = PrintWriter(file)
+        GsonBuilder().setPrettyPrinting().create().toJson(jsonArray, pw)
+        pw.flush()
+        pw.close()
+    }
+
+    /**
+     * Loads the given manifest and all the files it references.
+     */
+    fun <T> load(clazz: Class<T>, folder: String, gson: Gson): List<T> {
+        val manifestPath = "/assets/${Cobblemon.MODID}/$folder/_MANIFEST.json"
+        val manifest = Cobblemon::class.java.getResourceAsStream(manifestPath)!!
+        val folderPath = manifestPath.substringBeforeLast("/")
+        val list = mutableListOf<T>()
+        val array = gson.fromJson<JsonArray>(InputStreamReader(manifest))
+        array.forEach {
+            val path = it.asString
+            val stream = Cobblemon.javaClass.getResourceAsStream("$folderPath/$path") ?: run {
+                LOGGER.error("manifest contains element $path which was not found.")
+                return@forEach
+            }
+            try {
+                list.add(gson.fromJson(InputStreamReader(stream), clazz))
+            } catch (exception: Exception) {
+                LOGGER.error("Issue loading manifest component: $path")
+                exception.printStackTrace()
+            }
+        }
+
+        return list
+    }
+}
@@ -0,0 +1,285 @@
+/*
+ * Copyright (C) 2022 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.battles.model
+
+import com.cobblemon.mod.common.Cobblemon
+import com.cobblemon.mod.common.Cobblemon.LOGGER
+import com.cobblemon.mod.common.CobblemonNetwork
+import com.cobblemon.mod.common.api.battles.model.actor.ActorType
+import com.cobblemon.mod.common.api.battles.model.actor.BattleActor
+import com.cobblemon.mod.common.api.battles.model.actor.EntityBackedBattleActor
+import com.cobblemon.mod.common.api.battles.model.actor.FleeableBattleActor
+import com.cobblemon.mod.common.api.net.NetworkPacket
+import com.cobblemon.mod.common.api.text.yellow
+import com.cobblemon.mod.common.battles.ActiveBattlePokemon
+import com.cobblemon.mod.common.battles.BattleCaptureAction
+import com.cobblemon.mod.common.battles.BattleFormat
+import com.cobblemon.mod.common.battles.BattleRegistry
+import com.cobblemon.mod.common.battles.BattleSide
+import com.cobblemon.mod.common.battles.dispatch.BattleDispatch
+import com.cobblemon.mod.common.battles.dispatch.DispatchResult
+import com.cobblemon.mod.common.battles.dispatch.GO
+import com.cobblemon.mod.common.battles.runner.GraalShowdown
+import com.cobblemon.mod.common.net.messages.client.battle.BattleEndPacket
+import com.cobblemon.mod.common.pokemon.feature.BattleCriticalHitsFeature
+import com.cobblemon.mod.common.util.battleLang
+import com.cobblemon.mod.common.util.getPlayer
+import java.util.UUID
+import java.util.concurrent.ConcurrentLinkedQueue
+import net.minecraft.text.Text
+
+/**
+ * Individual battle instance
+ *
+ * @since January 16th, 2022
+ * @author Deltric, Hiroku
+ */
+open class PokemonBattle(
+    val format: BattleFormat,
+    val side1: BattleSide,
+    val side2: BattleSide
+) {
+    /** Whether or not logging will be silenced for this battle. */
+    var mute = true
+
+    init {
+        side1.battle = this
+        side2.battle = this
+        this.actors.forEach { actor ->
+            actor.pokemonList.forEach { battlePokemon ->
+                battlePokemon.effectedPokemon.getFeature<BattleCriticalHitsFeature>(BattleCriticalHitsFeature.ID)?.reset()
+            }
+        }
+    }
+
+    val sides: Iterable<BattleSide>
+        get() = listOf(side1, side2)
+    val actors: Iterable<BattleActor>
+        get() = sides.flatMap { it.actors.toList() }
+    val activePokemon: Iterable<ActiveBattlePokemon>
+        get() = actors.flatMap { it.activePokemon }
+    val playerUUIDs: Iterable<UUID>
+        get() = actors.flatMap { it.getPlayerUUIDs() }
+    val players = playerUUIDs.mapNotNull { it.getPlayer() }
+    val spectators = mutableListOf<UUID>()
+
+    val battleId = UUID.randomUUID()
+
+    val showdownMessages = mutableListOf<String>()
+    var started = false
+    var ended = false
+    // TEMP battle showcase stuff
+    var announcingRules = false
+    var turn: Int = 1
+        private set
+
+
+    var dispatchResult = GO
+    val dispatches = ConcurrentLinkedQueue<BattleDispatch>()
+
+    val captureActions = mutableListOf<BattleCaptureAction>()
+
+    /** Whether or not there is one side with at least one player, and the other only has wild Pokémon. */
+    val isPvW: Boolean
+        get() {
+            val playerSide = sides.find { it.actors.any { it.type == ActorType.PLAYER } } ?: return false
+            if (playerSide.actors.any { it.type != ActorType.PLAYER }) {
+                return false
+            }
+            val otherSide = sides.find { it != playerSide }!!
+            return otherSide.actors.all { it.type == ActorType.WILD }
+        }
+
+    /** Whether or not there are player actors on both sides. */
+    val isPvP: Boolean
+        get() = sides.all { it.actors.any { it.type == ActorType.PLAYER } }
+
+    /** Whether or not there is one player side and one NPC side. The opposite side to the player must all be NPCs. */
+    val isPvN: Boolean
+        get() {
+            val playerSide = sides.find { it.actors.any { it.type == ActorType.PLAYER } } ?: return false
+            if (playerSide.actors.any { it.type != ActorType.PLAYER }) {
+                return false
+            }
+            val otherSide = sides.find { it != playerSide }!!
+            return otherSide.actors.all { it.type == ActorType.NPC }
+        }
+
+    /**
+     * Gets an actor by their showdown id
+     * @return the actor if found otherwise null
+     */
+    fun getActor(showdownId: String) : BattleActor? {
+        return actors.find { actor -> actor.showdownId == showdownId }
+    }
+
+    /**
+     * Gets an actor by their game id
+     * @return the actor if found otherwise null
+     */
+    fun getActor(actorId: UUID) : BattleActor? {
+        return actors.find { actor -> actor.uuid == actorId }
+    }
+
+    /**
+     * Gets a BattleActor and an [ActiveBattlePokemon] from a pnx key, e.g. p2a
+     *
+     * Returns null if either the pn or x is invalid.
+     */
+    fun getActorAndActiveSlotFromPNX(pnx: String): Pair<BattleActor, ActiveBattlePokemon> {
+        val actor = actors.find { it.showdownId == pnx.substring(0, 2) }
+            ?: throw IllegalStateException("Invalid pnx: $pnx - unknown actor")
+        val letter = pnx[2]
+        val pokemon = actor.getSide().activePokemon.find { it.getLetter() == letter }
+            ?: throw IllegalStateException("Invalid pnx: $pnx - unknown pokemon")
+        return actor to pokemon
+    }
+
+    fun broadcastChatMessage(component: Text) {
+        return actors.forEach { it.sendMessage(component) }
+    }
+
+    fun writeShowdownAction(vararg messages: String) {
+        log(messages.joinToString("\n"))
+        GraalShowdown.sendToShowdown(battleId, messages.toList().toTypedArray())
+    }
+
+    fun turn(newTurnNumber: Int) {
+        actors.forEach { it.turn() }
+        for (side in sides) {
+            val opposite = side.getOppositeSide()
+            side.activePokemon.forEach {
+                val battlePokemon = it.battlePokemon ?: return@forEach
+                battlePokemon.facedOpponents.addAll(opposite.activePokemon.mapNotNull { it.battlePokemon })
+            }
+        }
+        this.turn = newTurnNumber
+    }
+
+    fun end() {
+        ended = true
+        for (actor in actors) {
+            for (pokemon in actor.pokemonList.filter { it.health > 0 }) {
+                if (pokemon.facedOpponents.isNotEmpty() /* TODO exp share held item check */) {
+                    val experience = Cobblemon.experienceCalculator.calculate(pokemon)
+                    if (experience > 0) {
+                        actor.awardExperience(pokemon, (experience * Cobblemon.config.experienceMultiplier).toInt())
+                    }
+                    Cobblemon.evYieldCalculator.calculate(pokemon).forEach { (stat, amount) ->
+                        pokemon.originalPokemon.evs.add(stat, amount)
+                    }
+                }
+            }
+        }
+        sendUpdate(BattleEndPacket())
+        BattleRegistry.closeBattle(this)
+    }
+
+    fun finishCaptureAction(captureAction: BattleCaptureAction) {
+        captureActions.remove(captureAction)
+        checkForInputDispatch()
+    }
+
+    fun log(message: String = "") {
+        if (!mute) {
+            LOGGER.info(message)
+        }
+    }
+
+    fun sendUpdate(packet: NetworkPacket) {
+        actors.forEach { it.sendUpdate(packet) }
+        sendSpectatorUpdate(packet)
+    }
+
+    fun sendToActors(packet: NetworkPacket) {
+        CobblemonNetwork.sendToPlayers(actors.flatMap { it.getPlayerUUIDs().mapNotNull { it.getPlayer() } }, packet)
+    }
+
+    fun sendSplitUpdate(privateActor: BattleActor, publicPacket: NetworkPacket, privatePacket: NetworkPacket) {
+        actors.forEach {  it.sendUpdate(if (it == privateActor) privatePacket else publicPacket) }
+        sendSpectatorUpdate(publicPacket)
+    }
+
+    fun sendSpectatorUpdate(packet: NetworkPacket) {
+        CobblemonNetwork.sendToPlayers(spectators.mapNotNull { it.getPlayer() }, packet)
+    }
+
+    fun dispatch(dispatcher: () -> DispatchResult) {
+        dispatches.add(BattleDispatch { dispatcher() })
+    }
+
+    fun dispatchGo(dispatcher: () -> Unit) {
+        dispatch {
+            dispatcher()
+            GO
+        }
+    }
+
+    fun dispatchInsert(dispatcher: () -> Iterable<BattleDispatch>) {
+        dispatch {
+            val newDispatches = dispatcher()
+            val previousDispatches = dispatches.toList()
+            dispatches.clear()
+            dispatches.addAll(newDispatches)
+            dispatches.addAll(previousDispatches)
+            GO
+        }
+    }
+
+    fun dispatch(dispatcher: BattleDispatch) {
+        dispatches.add(dispatcher)
+    }
+
+    fun tick() {
+        while (dispatchResult.canProceed()) {
+            val dispatch = dispatches.poll() ?: break
+            dispatchResult = dispatch(this)
+        }
+
+        if (started && isPvW && !ended) {
+            checkFlee()
+        }
+    }
+
+    open fun checkFlee() {
+        // Do we check the player's pokemon being nearby or the player themselves? Player themselves because pokemon could be stuck together in a pit
+        val wildPokemonOutOfRange = actors
+            .filterIsInstance<FleeableBattleActor>()
+            .filter { it.getWorldAndPosition() != null }
+            .none { pokemonActor ->
+                val (world, pos) = pokemonActor.getWorldAndPosition()!!
+                val nearestPlayerActorDistance = actors
+                    .filter { it.type == ActorType.PLAYER }
+                    .filterIsInstance<EntityBackedBattleActor<*>>()
+                    .mapNotNull { it.entity }
+                    .filter { it.world == world }
+                    .minOfOrNull { pos.distanceTo(it.pos) }
+
+                nearestPlayerActorDistance != null && nearestPlayerActorDistance < pokemonActor.fleeDistance
+            }
+
+        if (wildPokemonOutOfRange) {
+            actors.filterIsInstance<EntityBackedBattleActor<*>>().mapNotNull { it.entity }.forEach { it.sendMessage(battleLang("flee").yellow()) }
+            stop()
+        }
+    }
+
+    fun stop() {
+        end()
+        writeShowdownAction(">forcetie") // This will terminate the Showdown connection
+    }
+
+    fun checkForInputDispatch() {
+        val readyToInput = actors.any { !it.mustChoose && it.responses.isNotEmpty() } && actors.none { it.mustChoose }
+        if (readyToInput && captureActions.isEmpty()) {
+            actors.filter { it.responses.isNotEmpty() }.forEach { it.writeShowdownResponse() }
+            actors.forEach { it.responses.clear() ; it.request = null }
+        }
+    }
+}
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2022 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.battles.model.actor
+
+import com.cobblemon.mod.common.api.battles.model.ai.BattleAI
+import com.cobblemon.mod.common.api.net.NetworkPacket
+import com.cobblemon.mod.common.battles.pokemon.BattlePokemon
+import com.cobblemon.mod.common.net.messages.client.battle.BattleMakeChoicePacket
+import java.util.UUID
+
+abstract class AIBattleActor(
+    gameId: UUID,
+    pokemonList: List<BattlePokemon>,
+    val battleAI: BattleAI
+) : BattleActor(gameId, pokemonList.toMutableList()) {
+    override fun sendUpdate(packet: NetworkPacket) {
+        super.sendUpdate(packet)
+
+        if (packet is BattleMakeChoicePacket) {
+            setActionResponses(request!!.iterate(this.activePokemon, battleAI::choose) )
+        }
+    }
+}
@@ -0,0 +1,21 @@
+/*
+ * Copyright (C) 2022 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.battles.model.actor
+
+/**
+ * The type of actor it is. This is used for defining PvP, PvW, etc.
+ *
+ * @author Hiroku
+ * @since July 1st, 2022
+ */
+enum class ActorType {
+    WILD,
+    PLAYER,
+    NPC
+}
@@ -0,0 +1,123 @@
+/*
+ * Copyright (C) 2022 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.battles.model.actor
+
+import com.cobblemon.mod.common.api.battles.model.PokemonBattle
+import com.cobblemon.mod.common.api.net.NetworkPacket
+import com.cobblemon.mod.common.battles.ActiveBattlePokemon
+import com.cobblemon.mod.common.battles.BallActionResponse
+import com.cobblemon.mod.common.battles.ShowdownActionRequest
+import com.cobblemon.mod.common.battles.ShowdownActionResponse
+import com.cobblemon.mod.common.battles.pokemon.BattlePokemon
+import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
+import com.cobblemon.mod.common.exception.IllegalActionChoiceException
+import com.cobblemon.mod.common.net.messages.client.battle.BattleMakeChoicePacket
+import com.cobblemon.mod.common.net.messages.client.battle.BattleMessagePacket
+import java.util.UUID
+import net.minecraft.server.network.ServerPlayerEntity
+import net.minecraft.text.MutableText
+import net.minecraft.text.Text
+
+abstract class BattleActor(
+    val uuid: UUID,
+    val pokemonList: MutableList<BattlePokemon>
+) {
+    init {
+        pokemonList.forEach { it.actor = this }
+    }
+
+    lateinit var showdownId: String
+    lateinit var battle: PokemonBattle
+
+    val activePokemon = mutableListOf<ActiveBattlePokemon>()
+    var canDynamax = false
+
+    var request: ShowdownActionRequest? = null
+    var responses = mutableListOf<ShowdownActionResponse>()
+    var expectingCaptureActions = 0
+    var mustChoose = false
+
+    abstract val type: ActorType
+
+    fun getSide() = if (this in battle.side1.actors) battle.side1 else battle.side2
+    open fun getPlayerUUIDs(): Iterable<UUID> = emptyList()
+
+    open fun isForPlayer(serverPlayerEntity: ServerPlayerEntity) = serverPlayerEntity.uuid in getPlayerUUIDs()
+    open fun isForPokemon(pokemonEntity: PokemonEntity) = activePokemon.any { it.battlePokemon?.effectedPokemon?.entity == pokemonEntity }
+
+    fun turn() {
+        val request = request ?: return
+        responses.clear()
+        mustChoose = true
+        sendUpdate(BattleMakeChoicePacket())
+
+        val requestActive = request.active
+        if (requestActive == null || requestActive.isEmpty() || request.wait) {
+            this.request = null
+            expectingCaptureActions = 0
+            return
+        }
+    }
+
+    fun upkeep() {
+        val request = request ?: return
+        val forceSwitchPokemon = request.forceSwitch.mapIndexedNotNull { index, b -> if (b) activePokemon[index] else null }
+        if (forceSwitchPokemon.isEmpty()) {
+            return
+        }
+
+        sendUpdate(BattleMakeChoicePacket())
+        mustChoose = true
+    }
+
+    fun setActionResponses(responses: List<ShowdownActionResponse>) {
+        val request = request ?: return
+        val originalCaptureActions = expectingCaptureActions
+        responses.forEachIndexed { index, response ->
+            val activeBattlePokemon = activePokemon.let { if (it.size > index) it[index] else return }
+            val showdownMoveSet = request.active?.let { if (it.size > index) it[index] else null }
+            val forceSwitch = request.forceSwitch.let { if (it.size > index) it[index] else false }
+            if (!response.isValid(activeBattlePokemon, showdownMoveSet, forceSwitch)) {
+                expectingCaptureActions = originalCaptureActions
+                throw IllegalActionChoiceException(this, "Invalid action choice for ${activeBattlePokemon.battlePokemon!!.getName().string}: $response")
+            } else if (response is BallActionResponse) {
+                expectingCaptureActions--
+            }
+            this.responses.add(response)
+        }
+        if (expectingCaptureActions > 0) {
+            throw IllegalActionChoiceException(this, "Invalid action choice: a capture was expected. Are you hacking me?")
+        }
+        expectingCaptureActions = originalCaptureActions
+        mustChoose = false
+        battle.checkForInputDispatch()
+    }
+
+    fun writeShowdownResponse() {
+        val showdownMessages = mutableListOf<String>()
+        var index = 0
+        request!!.iterate(activePokemon) { activeBattlePokemon, showdownMoveSet, forceSwitch ->
+//            if (!activeBattlePokemon.isGone() && (activeBattlePokemon.isAlive() || forceSwitch)) {
+                showdownMessages.add(responses[index].toShowdownString(activeBattlePokemon, showdownMoveSet))
+//            }
+            index++
+        }
+        responses.clear()
+        request = null
+        expectingCaptureActions = 0
+        battle.writeShowdownAction(">$showdownId ${showdownMessages.joinToString()}")
+    }
+
+    abstract fun getName(): MutableText
+    open fun sendMessage(component: Text) {
+        sendUpdate(BattleMessagePacket(component))
+    }
+    open fun awardExperience(battlePokemon: BattlePokemon, experience: Int) {}
+    open fun sendUpdate(packet: NetworkPacket) {}
+}
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2022 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.battles.model.actor
+
+import net.minecraft.entity.LivingEntity
+
+/**
+ * Allows a [BattleActor] to attach a [LivingEntity] to itself.
+ *
+ * @param T The type of [LivingEntity].
+ */
+interface EntityBackedBattleActor<T : LivingEntity> {
+
+    /**
+     * The [LivingEntity] attached to the [BattleActor].
+     */
+    val entity: T?
+
+}
@@ -0,0 +1,17 @@
+/*
+ * Copyright (C) 2022 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.battles.model.actor
+
+import net.minecraft.server.world.ServerWorld
+import net.minecraft.util.math.Vec3d
+
+interface FleeableBattleActor {
+    val fleeDistance: Float
+    fun getWorldAndPosition(): Pair<ServerWorld, Vec3d>?
+}
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2022 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.battles.model.ai
+
+import com.cobblemon.mod.common.battles.ActiveBattlePokemon
+import com.cobblemon.mod.common.battles.ShowdownActionResponse
+import com.cobblemon.mod.common.battles.ShowdownMoveset
+
+/**
+ * Interface for an actors battle AI
+ *
+ * @since January 16th, 2022
+ * @author Deltric
+ */
+interface BattleAI {
+    /**
+     * Requests that the AI choose an action for the given Pokémon
+     * @param activeBattlePokemon The Pokémon slot that is choosing an action
+     * @param moveset The [ShowdownMoveset] for this slot. This can be null if [forceSwitch] is true. Otherwise it is the available move information from Showdown.
+     * @param forceSwitch Whether or not this is a force switch situation.
+     * @return the action response
+     */
+    fun choose(activeBattlePokemon: ActiveBattlePokemon, moveset: ShowdownMoveset?, forceSwitch: Boolean): ShowdownActionResponse
+}
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2022 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.conditional
+
+import com.google.gson.JsonDeserializationContext
+import com.google.gson.JsonDeserializer
+import com.google.gson.JsonElement
+import java.lang.reflect.Type
+
+/**
+ * Adapter for [RegistryLikeCondition]s. Its logic is that the implementation of this adapter must
+ * provide a list of resolvers, and the deserializer will find the first resolver that returns a non-null
+ * value for the [JsonElement].
+ *
+ * @author Hiroku
+ * @since July 17th, 2022
+ */
+interface RegistryLikeAdapter<B> : JsonDeserializer<RegistryLikeCondition<B>> {
+    val registryLikeConditions: MutableList<(JsonElement) -> RegistryLikeCondition<B>?>
+
+    override fun deserialize(json: JsonElement, type: Type, ctx: JsonDeserializationContext): RegistryLikeCondition<B> {
+        return registryLikeConditions.firstNotNullOfOrNull { it(json) }
+            ?: throw IllegalArgumentException("Unable to deserialize $json")
+    }
+}
@@ -0,0 +1,21 @@
+/*
+ * Copyright (C) 2022 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.conditional
+
+import net.minecraft.util.registry.Registry
+
+/**
+ * A condition which applies to an entry in some [Registry].
+ *
+ * @author Hiroku
+ * @since July 16th, 2022
+ */
+interface RegistryLikeCondition<T> {
+    fun fits(t: T, registry: Registry<T>): Boolean
+}
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2022 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.conditional
+
+import com.google.gson.JsonElement
+import net.minecraft.util.Identifier
+import net.minecraft.util.registry.Registry
+
+/**
+ * A condition for some registry type which asserts that the entry must have the given [Identifier].
+ *
+ * @author Hiroku
+ * @since July 16th, 2022
+ */
+open class RegistryLikeIdentifierCondition<T>(val identifier: Identifier) : RegistryLikeCondition<T> {
+    companion object {
+        fun <T> resolver(
+            constructor: (Identifier) -> RegistryLikeIdentifierCondition<T>
+        ): (JsonElement) -> RegistryLikeIdentifierCondition<T>? = { constructor(Identifier(it.asString)) }
+    }
+    override fun fits(t: T, registry: Registry<T>) = registry.getId(t) == identifier
+}
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2022 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.conditional
+
+import com.google.gson.JsonElement
+import net.minecraft.tag.TagKey
+import net.minecraft.util.Identifier
+import net.minecraft.util.registry.Registry
+import net.minecraft.util.registry.RegistryKey
+
+/**
+ * A condition for some registry type that asserts that the entry must be inside the given [TagKey]. This is presented
+ * in JSONs as an identifier prefixed with a hash.
+ *
+ * @author Hiroku
+ * @since July 16th, 2022
+ */
+open class RegistryLikeTagCondition<T>(val tag: TagKey<T>) : RegistryLikeCondition<T> {
+
+    companion object {
+        const val PREFIX = "#"
+        fun <T> resolver(
+            registryKey: RegistryKey<Registry<T>>,
+            constructor: (TagKey<T>) -> RegistryLikeTagCondition<T>
+        ): (JsonElement) -> RegistryLikeTagCondition<T>? = {
+            val firstSymbol = it.asString.substring(0, 1)
+            if (firstSymbol == PREFIX) {
+                val identifier = Identifier(it.asString.substring(1))
+                constructor(TagKey.of(registryKey, identifier))
+            } else {
+                null
+            }
+        }
+    }
+
+    override fun fits(t: T, registry: Registry<T>): Boolean {
+        val registryHasTag = registry.containsTag(tag)
+        if (!registryHasTag) {
+//            LOGGER.warn("No tag in registry: ${tag.id}")
+            return false
+        }
+
+        return registry.getKey(t)
+            .flatMap(registry::getEntry)
+            .map { entry -> entry.isIn(tag) }
+            .orElse(false)
+    }
+}
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2022 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.data
+
+import com.cobblemon.mod.common.api.net.Decodable
+import com.cobblemon.mod.common.api.net.Encodable
+
+/**
+ * Represents an object that will possibly be synchronized to the client during datapack synchronization.
+ *
+ * @param T The type of the object being synchronized.
+ *
+ * @author Licious
+ * @since October 14th, 2022
+ */
+interface ClientDataSynchronizer<T> : Decodable, Encodable {
+
+    /**
+     * Compares an object of type [T] with this instance to see if synchronization is necessary.
+     *
+     * @param other The other instance of type [T].
+     * @return If synchronization is necessary.
+     */
+    fun shouldSynchronize(other: T): Boolean
+
+}
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2022 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.data
+
+import net.minecraft.server.network.ServerPlayerEntity
+import net.minecraft.util.Identifier
+
+/**
+ * Provides a general listener for resource and data pack updates notifying the [DataRegistry] listening.
+ *
+ * @author Licious
+ * @since August 5th, 2022
+ */
+interface DataProvider {
+
+    /**
+     * Registers a [DataRegistry] to listen for updates.
+     * The updates will automatically happen on the correct sides based on [DataRegistry.type].
+     *
+     * @param registry The [DataRegistry] being registered.
+     */
+    fun <T : DataRegistry> register(registry: T): T
+
+    /**
+     * Attempts to find a [DataRegistry] with the given [Identifier].
+     * See [DataRegistry.id].
+     *
+     * @param registryIdentifier The [Identifier]
+     * @return The [DataRegistry] if existing.
+     */
+    fun fromIdentifier(registryIdentifier: Identifier): DataRegistry?
+
+    /**
+     * Syncs all of [DataRegistry]s in this provider to a player when requested from the server.
+     * This should not be invoked in a single player game instance, the default implementation already makes this check.
+     *
+     * @param player The [ServerPlayerEntity] being synchronized to the server.
+     */
+    fun sync(player: ServerPlayerEntity)
+
+    fun doAfterSync(player: ServerPlayerEntity, action: () -> Unit)
+}
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2022 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.data
+
+import com.cobblemon.mod.common.api.reactive.SimpleObservable
+import net.minecraft.resource.ResourceManager
+import net.minecraft.resource.ResourceType
+import net.minecraft.server.network.ServerPlayerEntity
+import net.minecraft.util.Identifier
+
+/**
+ * A registry with data provided by a resource or data pack.
+ *
+ * @author Licious
+ * @since August 1st, 2022
+ */
+interface DataRegistry {
+
+    /**
+     * The unique [Identifier] of this registry.
+     */
+    val id: Identifier
+
+    /**
+     * The expected [ResourceType].
+     */
+    val type: ResourceType
+
+    /**
+     * An observable that emits whenever this registry has finished reloading.
+     */
+    val observable: SimpleObservable<out DataRegistry>
+
+    /**
+     * Reloads this registry.
+     *
+     * @param manager The newly updated [ResourceManager]
+     */
+    fun reload(manager: ResourceManager)
+
+    /**
+     * Syncs this registry to a player when requested by the server.
+     *
+     * @param player The [ServerPlayerEntity] being synchronized to the server.
+     */
+    fun sync(player: ServerPlayerEntity)
+
+}
@@ -0,0 +1,75 @@
+/*
+ * Copyright (C) 2022 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.data
+
+import com.cobblemon.mod.common.util.endsWith
+import com.google.gson.Gson
+import com.google.gson.reflect.TypeToken
+import java.io.File
+import java.nio.file.Path
+import java.util.concurrent.ExecutionException
+import kotlin.io.path.pathString
+import net.minecraft.resource.ResourceManager
+import net.minecraft.util.Identifier
+
+/**
+ * A [DataRegistry] that consumes JSON files.
+ * Every deserialized instance is attached to an [Identifier].
+ * For example a file under data/mymod/[resourcePath]/entry.json would be backed by the identifier modid:entry.
+ *
+ * @param T The type of the data consumed by this registry.
+ *
+ * @author Licious
+ * @since August 5th, 2022
+ */
+interface JsonDataRegistry<T> : DataRegistry {
+
+    /**
+     * The [Gson] used to deserialize the data this registry will consume.
+     */
+    val gson: Gson
+
+    /**
+     * The [TypeToken] of type [T].
+     */
+    val typeToken: TypeToken<T>
+
+    /**
+     * The folder location for the data this registry will consume.
+     */
+    val resourcePath: String
+
+    override fun reload(manager: ResourceManager) {
+        val data = hashMapOf<Identifier, T>()
+        manager.findResources(this.resourcePath) { path -> path.endsWith(JSON_EXTENSION) }.forEach { (identifier, resource) ->
+            resource.inputStream.use { stream ->
+                stream.bufferedReader().use { reader ->
+                    val resolvedIdentifier = Identifier(identifier.namespace, File(identifier.path).nameWithoutExtension)
+                    try {
+                        data[resolvedIdentifier] = this.gson.fromJson(reader, this.typeToken.type)
+                    } catch (exception: Exception) {
+                        throw ExecutionException("Error loading JSON for data: $identifier", exception)
+                    }
+                }
+            }
+        }
+        this.reload(data)
+    }
+
+    /**
+     * Reloads this registry from the deserialized data.
+     *
+     * @param data A map of the data associating an instance to the respective identifier from the [ResourceManager].
+     */
+    fun reload(data: Map<Identifier, T>)
+
+    companion object {
+        private const val JSON_EXTENSION = ".json"
+    }
+}
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2022 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.drop
+
+import com.cobblemon.mod.common.util.substitute
+import net.minecraft.entity.LivingEntity
+import net.minecraft.server.network.ServerPlayerEntity
+import net.minecraft.server.world.ServerWorld
+import net.minecraft.util.math.Vec3d
+
+/**
+ * A drop entry which 'drops' by running a command. The command supports the following placeholders:
+ * {{player}} - the player name.
+ * {{world}} - the identifier for the world it's being 'dropped', such as minecraft:the_overworld
+ * {{x}} - The decimal x coordinate of where it's being 'dropped'.
+ * {{y}} - The decimal y coordinate of where it's being 'dropped'.
+ * {{z}} - The decimal z coordinate of where it's being 'dropped'.
+ *
+ * If [requiresPlayer] is true, then it will not be able to drop without a player being the cause of the drop.
+ *
+ * @author Hiroku
+ * @since July 24th, 2022
+ */
+class CommandDropEntry : DropEntry {
+    val requiresPlayer = true
+    val command = ""
+    override val percentage = 100F
+    override val quantity = 1
+    override val maxSelectableTimes = 1
+
+    override fun drop(entity: LivingEntity?, world: ServerWorld, pos: Vec3d, player: ServerPlayerEntity?) {
+        if (requiresPlayer && player == null) {
+            return
+        }
+
+        world.server.commandManager.executeWithPrefix(
+            world.server.commandSource,
+            command.substitute("player", player?.name?.string ?: "")
+                .substitute("world", world.registryKey.value)
+                .substitute("x", pos.x)
+                .substitute("y", pos.y)
+                .substitute("z", pos.z)
+        )
+    }
+}
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2022 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.drop
+
+import net.minecraft.entity.LivingEntity
+import net.minecraft.server.network.ServerPlayerEntity
+import net.minecraft.server.world.ServerWorld
+import net.minecraft.util.math.Vec3d
+
+/**
+ * Something that can be dropped from a [DropTable]. This does not strictly need to be an item.
+ *
+ * A new [DropEntry] subclass should be registered using [DropEntry.register].
+ *
+ * @author Hiroku
+ * @since July 24th, 2022
+ */
+interface DropEntry {
+    companion object {
+        val entryTypes = mutableMapOf<String, Class<out DropEntry>>()
+        var defaultType: Class<out DropEntry>? = null
+        fun getByName(name: String) = entryTypes[name]
+        fun <T : DropEntry> register(name: String, clazz: Class<T>, isDefault: Boolean = false) {
+            entryTypes[name] = clazz
+            if (isDefault) {
+                defaultType = clazz
+            }
+        }
+    }
+
+    /**
+     * The percentage chance of it being selected. If this value is 100, it is treated as guaranteed according to the
+     * logic outline for [DropTable]. Other than that, a higher weight value means the drop entry will be more likely
+     * to be dropped.
+     */
+    val percentage: Float
+    /**
+     * The drop's quantity when doing selection from the [DropTable]. See the drop table documentation for more on how
+     * this works.
+     */
+    val quantity: Int
+    /**
+     * The maximum number of times the item can be selected drop the [DropTable]. In most cases this will just be 1,
+     * meaning that the item, once picked, cannot be picked again. A larger value will allow the same [DropEntry] from
+     * appearing multiple times in a drop action.
+     */
+    val maxSelectableTimes: Int
+    /** The logic to use to actually drop the thing. */
+    fun drop(entity: LivingEntity?, world: ServerWorld, pos: Vec3d, player: ServerPlayerEntity?)
+}
@@ -0,0 +1,96 @@
+/*
+ * Copyright (C) 2022 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.drop
+
+import com.cobblemon.mod.common.api.events.CobblemonEvents.LOOT_DROPPED
+import com.cobblemon.mod.common.api.events.drops.LootDroppedEvent
+import kotlin.random.Random
+import net.minecraft.entity.LivingEntity
+import net.minecraft.server.network.ServerPlayerEntity
+import net.minecraft.server.world.ServerWorld
+import net.minecraft.util.math.Vec3d
+
+/**
+ * A table of drops that can produce a list of [DropEntry]. You can produce a drop list from [getDrops] to
+ * then handle the drops yourself, or make it select and perform the drop by running [drop].
+ *
+ * A drop table is defined by its [entries], and by the [amount] range which act as the default constraint around the
+ * total dropped quantity. These are only defaults, as both [getDrops] and [drop] allow the range to be overwritten.
+ * These amounts are based on [DropEntry.quantity]. In some cases a single entry can be worth multiple. An example of
+ * this is an item drop which drops 3 of an item. While it may only be 1 entry, it is considered 3 drops.
+ *
+ * A drop can be guaranteed by having a [DropEntry.percentage] of 100. This will still obey the rules around how many
+ * times it can be repeated and not being selected if its quantity would exceed the amount that has been chosen for
+ * the drop. For example, a 5 item drop for a drop action maxed out at 3 will never be selected even if the 5 item drop
+ * was marked as a guaranteed entry.
+ *
+ * @author Hiroku
+ * @since July 24th, 2022
+ */
+class DropTable {
+    /** All [DropEntry] values in the drop table. */
+    val entries = mutableListOf<DropEntry>()
+    /** The default range of values which might be selected to decide the 'quantity' of drops for a drop attempt. */
+    val amount = 1..1
+
+    /**
+     * Gets a drop list from this table as a list of [DropEntry]. You can specify the range of drop quantity totals
+     * that will be possible, or if you leave it blank it will use [DropTable.amount].
+     */
+    fun getDrops(amount: IntRange = this.amount): List<DropEntry> {
+        val chosenAmount = amount.random()
+        val possibleDrops = entries.filter { it.quantity <= chosenAmount }.toMutableList()
+
+        if (possibleDrops.isEmpty()) {
+            return emptyList()
+        }
+
+        val drops = mutableListOf<DropEntry>()
+        var dropCount = 0
+
+        do {
+            val drop = possibleDrops.firstOrNull { Random.Default.nextFloat() * 100F < it.percentage }
+
+            if (drop == null) {
+                // That counts as a drop in the eyes of the law, otherwise we'd be looping all week and percentages won't mean squat.
+                dropCount++
+                continue
+            }
+
+            drops.add(drop)
+            dropCount += drop.quantity
+            val remaining = chosenAmount - dropCount
+            possibleDrops.removeIf { (it == drop && it.maxSelectableTimes <= drops.count { it == drop }) || it.quantity > remaining }
+        } while (dropCount < chosenAmount && possibleDrops.isNotEmpty())
+
+        return drops
+    }
+
+    /**
+     * Performs a drop, including posting the [LootDroppedEvent]. The entity that is dropping it and the player that caused
+     * the drop are both optional, but in some cases a drop will only be possible when these fields are non-null. A
+     * command drop that needs the player for its command will do nothing when it is dropped without a player cause.
+     *
+     * The amount of drop entries that are possible can be changed from the [amount] parameter, and if left blank it
+     * will fall back to the [DropTable.amount] range.
+     */
+    fun drop(
+        entity: LivingEntity?,
+        world: ServerWorld,
+        pos: Vec3d,
+        player: ServerPlayerEntity?,
+        amount: IntRange = this.amount
+    ) {
+        val drops = getDrops(amount).toMutableList()
+        LOOT_DROPPED.postThen(
+            event = LootDroppedEvent(this, player, entity, drops),
+            ifSucceeded = { it.drops.forEach { it.drop(entity, world, pos, player) } }
+        )
+    }
+}
@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) 2022 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.drop
+
+import com.cobblemon.mod.common.Cobblemon
+import com.cobblemon.mod.common.Cobblemon.LOGGER
+import com.cobblemon.mod.common.api.text.green
+import com.cobblemon.mod.common.api.text.red
+import com.cobblemon.mod.common.util.lang
+import com.cobblemon.mod.common.util.toBlockPos
+import net.minecraft.block.Blocks
+import net.minecraft.entity.ItemEntity
+import net.minecraft.entity.LivingEntity
+import net.minecraft.item.ItemStack
+import net.minecraft.nbt.NbtCompound
+import net.minecraft.server.network.ServerPlayerEntity
+import net.minecraft.server.world.ServerWorld
+import net.minecraft.util.Identifier
+import net.minecraft.util.math.Vec3d
+import net.minecraft.util.registry.Registry
+
+/**
+ * A drop that is an actual item.
+ *
+ * @author Hiroku
+ * @since July 24th, 2022
+ */
+class ItemDropEntry : DropEntry {
+    override val percentage = 100F
+    override val quantity = 1
+    val quantityRange: IntRange? = null
+    override val maxSelectableTimes = 1
+    val dropMethod: ItemDropMethod? = null
+    val item = Identifier("minecraft:fish")
+    val nbt: NbtCompound? = null
+
+    override fun drop(entity: LivingEntity?, world: ServerWorld, pos: Vec3d, player: ServerPlayerEntity?) {
+        val item = world.registryManager.get(Registry.ITEM_KEY).get(item) ?: return LOGGER.error("Unable to load drop item: $item")
+        val stack = ItemStack(item, quantityRange?.random() ?: quantity)
+        val inLava = world.getBlockState(pos.toBlockPos()).block == Blocks.LAVA
+        val dropMethod = (dropMethod ?: Cobblemon.config.defaultDropItemMethod).let {
+            if (inLava) {
+                ItemDropMethod.TO_INVENTORY
+            } else {
+                it
+            }
+        }
+        nbt?.let { stack.nbt = it }
+
+        if (dropMethod == ItemDropMethod.ON_PLAYER && player != null) {
+            world.spawnEntity(ItemEntity(player.world, player.x, player.y, player.z, stack))
+        } else if (dropMethod == ItemDropMethod.TO_INVENTORY && player != null) {
+            val name = stack.name
+            val count = stack.count
+            val succeeded = player.giveItemStack(stack)
+            if (Cobblemon.config.announceDropItems) {
+                player.sendMessage(
+                    if (succeeded) lang("drop.item.inventory", count, name.copy().green())
+                    else lang("drop.item.full", name).red()
+                )
+            }
+        } else if (dropMethod == ItemDropMethod.ON_ENTITY && entity != null) {
+            world.spawnEntity(ItemEntity(entity.world, entity.x, entity.y, entity.z, stack))
+        } else {
+            world.spawnEntity(ItemEntity(world, pos.x, pos.y, pos.z, stack))
+        }
+    }
+}
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2022 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.drop
+
+import com.cobblemon.mod.common.api.serialization.StringIdentifiedObjectAdapter
+
+/**
+ * The way an item will be dropped.
+ *
+ * @author Hiroku
+ * @since July 25th, 2022
+ */
+enum class ItemDropMethod(val methodName: String) {
+    /** Drops the item on the entity that is dying, if it exists. If not, drops at the position parsed into drops. */
+    ON_ENTITY("on-entity"),
+    /** Drops the item on the player that caused the drop, if they exist. If not, drops at the position parsed into drops. */
+    ON_PLAYER("on-player"),
+    /**
+     * Puts the item in the player's inventory or drops it on the ground if the inventory is full. If the player that
+     * caused the drop doesn't exist, it drops at the position parsed into drops.
+     */
+    TO_INVENTORY("to-inventory");
+
+    companion object {
+        val adapter = StringIdentifiedObjectAdapter { str -> values().firstOrNull { it.methodName == str } }
+    }
+}
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2022 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.entity
+
+import net.minecraft.entity.Entity
+
+/**
+ * Represents a logical despawner for some type of entity. It decides whether an entity should be despawned over time.
+ *
+ * @author Hiroku
+ * @since March 19th, 2022
+ */
+interface Despawner<T : Entity> {
+    fun beginTracking(entity: T)
+    fun shouldDespawn(entity: T): Boolean
+}
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2022 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.entity
+
+import com.google.gson.JsonDeserializationContext
+import com.google.gson.JsonDeserializer
+import com.google.gson.JsonElement
+import com.google.gson.JsonObject
+import com.google.gson.JsonSerializationContext
+import com.google.gson.JsonSerializer
+import java.lang.reflect.Type
+import net.minecraft.entity.EntityDimensions
+
+/**
+ * An adapter for [EntityDimensions]. This isn't technically needed on newer versions of Gson because
+ * they're actually pretty clever now, but Minecraft still is still packing the old version.
+ *
+ * @author Hiroku
+ * @since April 4th, 2022
+ */
+object EntityDimensionsAdapter : JsonSerializer<EntityDimensions>, JsonDeserializer<EntityDimensions> {
+    const val WIDTH = "width"
+    const val HEIGHT = "height"
+
+    override fun serialize(dimensions: EntityDimensions, type: Type, ctx: JsonSerializationContext): JsonElement {
+        val json = JsonObject()
+        json.addProperty(WIDTH, dimensions.width)
+        json.addProperty(HEIGHT, dimensions.height)
+        return json
+    }
+
+    override fun deserialize(json: JsonElement, type: Type, ctx: JsonDeserializationContext): EntityDimensions {
+        json as JsonObject
+        return EntityDimensions(json.get(WIDTH).asFloat, json.get(HEIGHT).asFloat, false)
+    }
+}
@@ -0,0 +1,19 @@
+/*
+ * Copyright (C) 2022 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.entity
+
+import net.minecraft.entity.Entity
+
+/**
+ * Represents a delegation of a portion of an entity's logic to a particular side.
+ */
+interface EntitySideDelegate<T : Entity> {
+    fun initialize(entity: T) {}
+    fun tick(entity: T) {}
+}
@@ -0,0 +1,19 @@
+/*
+ * Copyright (C) 2022 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.entity
+
+import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
+import com.cobblemon.mod.common.pokemon.Pokemon
+import net.minecraft.entity.damage.DamageSource
+
+interface PokemonSideDelegate : EntitySideDelegate<PokemonEntity> {
+    fun changePokemon(pokemon: Pokemon)
+    fun drop(source: DamageSource?) {}
+    fun updatePostDeath() {}
+}
@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2022 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.events
+
+/**
+ * Something that can be canceled. This is a highly complex class and should only be read by professional engineers.
+ *
+ * @author Hiroku
+ * @since February 18th, 2022
+ */
+abstract class Cancelable {
+    var isCanceled: Boolean = false
+        private set
+
+    fun cancel() {
+        isCanceled = true
+    }
+}
@@ -0,0 +1,82 @@
+/*
+ * Copyright (C) 2022 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.events
+
+import com.cobblemon.mod.common.api.events.battles.BattleVictoryEvent
+import com.cobblemon.mod.common.api.events.drops.LootDroppedEvent
+import com.cobblemon.mod.common.api.events.entity.EntityAttributeEvent
+import com.cobblemon.mod.common.api.events.net.MessageBuiltEvent
+import com.cobblemon.mod.common.api.events.pokemon.ExperienceGainedPostEvent
+import com.cobblemon.mod.common.api.events.pokemon.ExperienceGainedPreEvent
+import com.cobblemon.mod.common.api.events.pokemon.FriendshipUpdatedEvent
+import com.cobblemon.mod.common.api.events.pokemon.LevelUpEvent
+import com.cobblemon.mod.common.api.events.pokemon.PokemonCapturedEvent
+import com.cobblemon.mod.common.api.events.pokemon.PokemonFaintedEvent
+import com.cobblemon.mod.common.api.events.pokemon.ShoulderMountEvent
+import com.cobblemon.mod.common.api.events.pokemon.evolution.EvolutionAcceptedEvent
+import com.cobblemon.mod.common.api.events.pokemon.evolution.EvolutionCompleteEvent
+import com.cobblemon.mod.common.api.events.pokemon.evolution.EvolutionDisplayEvent
+import com.cobblemon.mod.common.api.events.pokemon.interaction.ExperienceCandyUseEvent
+import com.cobblemon.mod.common.api.events.starter.StarterChosenEvent
+import com.cobblemon.mod.common.api.reactive.CancelableObservable
+import com.cobblemon.mod.common.api.reactive.EventObservable
+import com.cobblemon.mod.common.api.reactive.SimpleObservable
+import com.cobblemon.mod.common.util.asObservable
+import com.cobblemon.mod.common.util.asServerObservable
+import com.cobblemon.mod.common.util.asTickObservable
+import dev.architectury.event.EventResult
+import dev.architectury.event.events.common.EntityEvent
+import dev.architectury.event.events.common.EntityEvent.LivingDeath
+import dev.architectury.event.events.common.LifecycleEvent
+import dev.architectury.event.events.common.PlayerEvent
+import dev.architectury.event.events.common.PlayerEvent.PlayerJoin
+import dev.architectury.event.events.common.PlayerEvent.PlayerQuit
+import dev.architectury.event.events.common.TickEvent
+import net.minecraft.entity.LivingEntity
+import net.minecraft.server.network.ServerPlayerEntity
+
+object CobblemonEvents {
+    val MESSAGE_BUILT = EventObservable<MessageBuiltEvent<*>>()
+    val DATA_SYNCHRONIZED = SimpleObservable<ServerPlayerEntity>()
+    val ENTITY_ATTRIBUTE = EventObservable<EntityAttributeEvent>()
+    val SHOULDER_MOUNT = CancelableObservable<ShoulderMountEvent>()
+    val FRIENDSHIP_UPDATED = EventObservable<FriendshipUpdatedEvent>()
+    val POKEMON_FAINTED = EventObservable<PokemonFaintedEvent>()
+    val EVOLUTION_ACCEPTED = CancelableObservable<EvolutionAcceptedEvent>()
+    val EVOLUTION_DISPLAY = EventObservable<EvolutionDisplayEvent>()
+    val EVOLUTION_COMPLETE = EventObservable<EvolutionCompleteEvent>()
+
+    val POKEMON_CAPTURED = EventObservable<PokemonCapturedEvent>()
+//    val EGG_HATCH = EventObservable<HatchEggEvent>()
+    val BATTLE_VICTORY = EventObservable<BattleVictoryEvent>()
+
+    val LEVEL_UP_EVENT = EventObservable<LevelUpEvent>()
+
+    val EXPERIENCE_GAINED_EVENT_PRE = CancelableObservable<ExperienceGainedPreEvent>()
+    val EXPERIENCE_GAINED_EVENT_POST = EventObservable<ExperienceGainedPostEvent>()
+    val EXPERIENCE_CANDY_USE_PRE = CancelableObservable<ExperienceCandyUseEvent.Pre>()
+    val EXPERIENCE_CANDY_USE_POST = EventObservable<ExperienceCandyUseEvent.Post>()
+
+    val LOOT_DROPPED = CancelableObservable<LootDroppedEvent>()
+    val STARTER_CHOSEN = CancelableObservable<StarterChosenEvent>()
+
+    val SERVER_STARTING = LifecycleEvent.SERVER_STARTING.asServerObservable()
+    val SERVER_STOPPING = LifecycleEvent.SERVER_STOPPING.asServerObservable()
+
+    val SERVER_STARTED = LifecycleEvent.SERVER_STARTED.asServerObservable()
+    val SERVER_STOPPED = LifecycleEvent.SERVER_STOPPED.asServerObservable()
+
+    val TICK_PRE = TickEvent.SERVER_PRE.asTickObservable()
+    val TICK_POST = TickEvent.SERVER_POST.asTickObservable()
+
+    val PLAYER_JOIN = PlayerEvent.PLAYER_JOIN.asObservable<PlayerJoin, ServerPlayerEntity> { obs -> PlayerJoin { obs.emit(it) } }
+    val PLAYER_QUIT = PlayerEvent.PLAYER_QUIT.asObservable<PlayerQuit, ServerPlayerEntity> { obs -> PlayerQuit { obs.emit(it) } }
+
+    val LIVING_DEATH = EntityEvent.LIVING_DEATH.asObservable<LivingDeath, LivingEntity> { obs -> LivingDeath { entity, source -> obs.emit(entity); EventResult.pass() } }
+}
@@ -0,0 +1,23 @@
+/*
+ * Copyright (C) 2022 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.events.battles
+
+import com.cobblemon.mod.common.api.battles.model.PokemonBattle
+import com.cobblemon.mod.common.api.battles.model.actor.BattleActor
+
+/**
+ * Event fired when a battle is won by some number of [BattleActor]s.
+ *
+ * @author MoeBoy76
+ * @since November 3rd, 2022
+ */
+data class BattleVictoryEvent (
+    val battle: PokemonBattle,
+    val winners : List<BattleActor>
+)
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2022 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.events.drops
+
+import com.cobblemon.mod.common.api.drop.DropEntry
+import com.cobblemon.mod.common.api.drop.DropTable
+import com.cobblemon.mod.common.api.events.Cancelable
+import com.cobblemon.mod.common.api.events.CobblemonEvents
+import net.minecraft.entity.LivingEntity
+import net.minecraft.server.network.ServerPlayerEntity
+
+/**
+ * Cancelable event posted to [CobblemonEvents.LOOT_DROPPED] when a [DropTable] is used to drop items. This
+ * event is posted prior to the drops being performed, but after a drop list has been chosen.
+ *
+ * If the event is cancelled, nothing will be dropped. The final drop list that will be used can
+ * be modified from [drops].
+ *
+ * @param table The [DropTable] that was used for the calculation.
+ * @param player The player that is being targeted for the drop actions. This can be null if, for
+ *               example, an entity dies and causes drops, but it died from falling.
+ * @param entity The entity that is dropping the items, if relevant. In some cases a drop table
+ *               could be used without an associated entity.
+ * @param drops The [DropEntry] list that will be dropped. You can adjust this list, both to add and
+ *               remove, and the final value of this list will be used for the drop action.
+ *
+ * @author Hiroku
+ * @since July 24th, 2022
+ */
+class LootDroppedEvent(
+    val table: DropTable,
+    val player: ServerPlayerEntity?,
+    val entity: LivingEntity?,
+    val drops: MutableList<DropEntry>
+) : Cancelable()
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2022 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.events.entity
+
+import net.minecraft.entity.EntityType
+import net.minecraft.entity.attribute.DefaultAttributeContainer
+
+/**
+ * Event fired when we're registering entity attributes. This is really just a hack to get
+ * attributes working on the Forge side because I'm a dumbass and have no idea how to fix
+ * it properly.
+ *
+ * @author Hiroku
+ * @since February 20th, 2022
+ */
+class EntityAttributeEvent(val entityType: EntityType<*>, val attributeSupplier: DefaultAttributeContainer.Builder)
@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2022 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.events.net
+
+import com.cobblemon.mod.common.CobblemonNetwork
+import com.cobblemon.mod.common.api.net.NetworkPacket
+
+/**
+ * Fired when a new packet is being initialized and a handler should be applied. Internal use only!
+ *
+ * @author Hiroku
+ * @since November 27th, 2021
+ */
+class MessageBuiltEvent<T : NetworkPacket>(
+    val clazz: Class<T>,
+    val isToServer: Boolean,
+    val messageBuilder: CobblemonNetwork.PreparedMessage<T>
+)
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2022 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.events.pokemon
+
+import com.cobblemon.mod.common.api.events.Cancelable
+import com.cobblemon.mod.common.api.moves.MoveTemplate
+import com.cobblemon.mod.common.api.pokemon.experience.ExperienceSource
+import com.cobblemon.mod.common.pokemon.Pokemon
+
+/**
+ * Event fired when experience is about to be gained. Cancelling this event prevents
+ * any experience being added, and the amount of experience cna be hcanged from [experience].
+ *
+ * @author Hiroku
+ * @since August 5th, 2022
+ */
+class ExperienceGainedPreEvent(
+    val pokemon: Pokemon,
+    val source: ExperienceSource,
+    var experience: Int
+) : Cancelable()
+
+/**
+ * Event fired when experience has been gained. Information about whether it leveled up or not is
+ * available.
+ *
+ * @author Hiroku
+ * @since August 5th, 2022
+ */
+class ExperienceGainedPostEvent(
+    val pokemon: Pokemon,
+    val source: ExperienceSource,
+    val experience: Int,
+    val previousLevel: Int,
+    val currentLevel: Int,
+    val learnedMoves: MutableSet<MoveTemplate>
+)
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2022 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.events.pokemon
+
+import com.cobblemon.mod.common.pokemon.Pokemon
+
+/**
+ * Event that is fired when a player owned Pokémon has its happiness changed
+ *
+ * @author Blue
+ * @since 2022-02-08
+ */
+data class FriendshipUpdatedEvent(
+    val pokemon: Pokemon,
+    var newFriendship: Int
+)
@@ -0,0 +1,14 @@
+/*
+ * Copyright (C) 2022 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.events.pokemon
+
+//data class HatchEggEvent (
+//    val pokemon: Pokemon,
+//    val player: ServerPlayerEntity
+//)
@@ -0,0 +1,19 @@
+/*
+ * Copyright (C) 2022 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.events.pokemon
+
+import com.cobblemon.mod.common.pokemon.Pokemon
+
+/**
+ * Event fired when a Pokémon levels up. The new level that it will reach is changeable.
+ *
+ * @author Hiroku
+ * @since August 5th, 2022
+ */
+class LevelUpEvent(val pokemon: Pokemon, val oldLevel: Int, var newLevel: Int)
@@ -0,0 +1,17 @@
+/*
+ * Copyright (C) 2022 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.events.pokemon
+
+import com.cobblemon.mod.common.pokemon.Pokemon
+import net.minecraft.server.network.ServerPlayerEntity
+
+data class PokemonCapturedEvent (
+    val pokemon: Pokemon,
+    val player: ServerPlayerEntity
+)
@@ -0,0 +1,19 @@
+/*
+ * Copyright (C) 2022 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.events.pokemon
+
+import com.cobblemon.mod.common.pokemon.Pokemon
+
+/**
+ * Event that is fired when a Pokémon has fainted
+ */
+data class PokemonFaintedEvent(
+    val pokemon: Pokemon,
+    var faintedTimer: Int
+)
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2022 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.events.pokemon
+
+import com.cobblemon.mod.common.api.events.Cancelable
+import com.cobblemon.mod.common.pokemon.Pokemon
+import net.minecraft.server.network.ServerPlayerEntity
+
+/**
+ * Event that is fired when a Player mounts a Pokemon to a shoulder
+ *
+ * @author Qu
+ * @since 2022-01-26
+ */
+data class ShoulderMountEvent(
+    val player: ServerPlayerEntity,
+    val pokemon: Pokemon,
+    val isLeft: Boolean
+) : Cancelable()
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2022 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.events.pokemon.evolution
+
+import com.cobblemon.mod.common.api.events.Cancelable
+import com.cobblemon.mod.common.api.pokemon.evolution.Evolution
+import com.cobblemon.mod.common.pokemon.Pokemon
+
+/**
+ * Fired when an evolution is accepted.
+ * Canceling will not notify users nor remove the evolution from the pending list.
+ *
+ * @param pokemon The [Pokemon] about to evolve.
+ * @param evolution The [Evolution] being used.
+ *
+ * @author Licious
+ * @since April 28th, 2022
+ */
+data class EvolutionAcceptedEvent(
+    val pokemon: Pokemon,
+    val evolution: Evolution
+) : Cancelable()
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2022 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.events.pokemon.evolution
+
+import com.cobblemon.mod.common.api.pokemon.evolution.Evolution
+import com.cobblemon.mod.common.pokemon.Pokemon
+
+/**
+ * Fired after an evolution finishes.
+ *
+ * @param pokemon The [Pokemon] resulting from the evolution.
+ * @param evolution The [Evolution] that was used.
+ *
+ * @author Licious
+ * @since October 2nd, 2022
+ */
+data class EvolutionCompleteEvent(
+    val pokemon: Pokemon,
+    val evolution: Evolution
+)
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2022 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.events.pokemon.evolution
+
+import com.cobblemon.mod.common.api.pokemon.evolution.Evolution
+import com.cobblemon.mod.common.api.pokemon.evolution.EvolutionDisplay
+import com.cobblemon.mod.common.pokemon.Pokemon
+
+/**
+ * Fired before an evolution is sent to clients.
+ * Any modification made to the [pokemon] will reflect in their display.
+ * For modifications on the actual output when they accept it modify the [Evolution.result].
+ *
+ * @param pokemon The [Pokemon] that will evolve if this proposition is accepted.
+ * @param display The current [EvolutionDisplay] the client will see.
+ * @param evolution The [Evolution] being used.
+ *
+ * @author Licious
+ * @since May 3rd, 2022
+ */
+data class EvolutionDisplayEvent(
+    val pokemon: Pokemon,
+    var display: EvolutionDisplay,
+    val evolution: Evolution
+)
@@ -0,0 +1,89 @@
+/*
+ * Copyright (C) 2022 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.events.pokemon.interaction
+
+import com.cobblemon.mod.common.api.events.Cancelable
+import com.cobblemon.mod.common.api.events.CobblemonEvents
+import com.cobblemon.mod.common.item.interactive.CandyItem
+import com.cobblemon.mod.common.pokemon.AddExperienceResult
+import com.cobblemon.mod.common.pokemon.Pokemon
+import net.minecraft.server.network.ServerPlayerEntity
+
+/**
+ * The base of the [CandyItem] related events.
+ * For the generic experience gain event see [CobblemonEvents.EXPERIENCE_GAINED_EVENT_PRE] and [CobblemonEvents.EXPERIENCE_GAINED_EVENT_POST]
+ *
+ * @author Licious
+ * @since May 5th, 2022
+ */
+interface ExperienceCandyUseEvent {
+
+    /**
+     * The [ServerPlayerEntity] that fired the interaction.
+     */
+    val player: ServerPlayerEntity
+
+    /**
+     * The [Pokemon] being targeted.
+     */
+    val pokemon: Pokemon
+
+    /**
+     * item The [CandyItem] variant being used.
+     */
+    val item: CandyItem
+
+    /**
+     * Fired when a player attempts to use an experience candy on a Pokémon.
+     * Canceling this event will prevent the consumption of the item and the experience yield.
+     * For the event that is fired after all the calculations took place see [ExperienceCandyUseEvent.Post].
+     *
+     * @property baseExperienceYield The default amount of experience the [pokemon] would earn.
+     * @property experienceYield The current amount of experience the [pokemon] will earn.
+     */
+    class Pre(
+        override val player: ServerPlayerEntity,
+        override val pokemon: Pokemon,
+        override val item: CandyItem,
+        val baseExperienceYield: Int,
+        var experienceYield: Int
+    ) : ExperienceCandyUseEvent, Cancelable()
+
+    /**
+     * Fired after a player used an experience candy on Pokémon and the experience yield was processed.
+     *
+     * @property experienceResult The resulting [AddExperienceResult] of the interaction.
+     */
+    class Post(
+        override val player: ServerPlayerEntity,
+        override val pokemon: Pokemon,
+        override val item: CandyItem,
+        val experienceResult: AddExperienceResult
+    ) : ExperienceCandyUseEvent {
+
+        /**
+         * Checks if the candy use resulted in any experience gain.
+         * This will nearly always be true unless the Pokémon is at level cap.
+         * This does not confirm the candy was consumed as the player may be in creative mode for that use [wasCandyConsumed].
+         *
+         * @return If any experience was gained from the candy.
+         */
+        fun wasExperienceGiven() = this.experienceResult.experienceAdded > 0
+
+        /**
+         * Checks if the candy use resulted in any experience gain and if it was consumed.
+         * This will nearly always be true unless the Pokémon is at level cap and/or the player is in creative mode.
+         * If you just want to know if the candy yielded experience use [wasExperienceGiven].
+         *
+         * @return If any experience was gained from the candy and if it was consumed.
+         */
+        fun wasCandyConsumed() = this.experienceResult.experienceAdded > 0 && !player.isCreative
+    }
+
+}
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1,2 @@`

				`const val ACCESS_WIDENER = "src/main/resources/cobblemon-common.accesswidener"`