run button works

2026-10-23 07:36:25 -04:00 · 2024-02-28 19:07:26 -05:00
4401 changed files with 27219 additions and 356481 deletions
@@ -1,6 +1,5 @@
 # Changelog
 ## [1.5.0](#1-5-0)
-
 ### Additions
 - Added over (number here) ruin structures, where you can find Pokémon-themed Armor Trims and Pottery Sherds, Tumblestones, and more.
 - Added (number here) fossil structures, where you can brush Suspicious Sand/Gravel for Fossils.
@@ -15,179 +14,23 @@
 - Added the hidden "True Vivillionaire" advancement.
 - The "Poké Ball" Vivillon variant is now obtainable by evolving a Spewpa after obtaining the "Aspiring Vivillionaire" advancement.
 - Added dynamic lighting support for any Species or Forms when using [LambDynamicLights](https://modrinth.com/mod/lambdynamiclights) or [Dynamic Lights Reforged](https://www.curseforge.com/minecraft/mc-mods/dynamiclights-reforged), at this time we don't ship with any defaults for this feature but addon creators can make use of this feature.
- Added a Display Case block! Use it to display your archaeological findings, or other items.
 - Added 6 Pokémon-themed Pottery Sherds, obtained from ruin structures.
 - Added a Pokémon-themed armor trim, obtained from ruin structures.
 - You can now find Nether Fire Stone Ore in, surprisingly, the Nether.
- You'll also find Terracotta Sun Stone Ore in Badlands biomes.
 - Added effects for many Poké Balls when sending out Pokémon or capturing.
 - Added a new send-out ball toss animation that showcases the ball used for the Pokémon.
 - Added simple move animations for Pokémon in battle with a proof of concept for more complicated animations.
 - Added the EV Boosting Feathers.
 - Added Type Gems. 
 - Added various new tags for searchability and better compatibility.
- Added the [Ability Capsule](https://bulbapedia.bulbagarden.net/wiki/Ability_Capsule) and [Patch](https://bulbapedia.bulbagarden.net/wiki/Ability_Patch), these have no acquisition method for now and only work as intended with the traditional ability format of 1 to 2 common abilities and 1 hidden ability.
 - Added Gilded Chests, available in all Apricorn colors.
 - Added Relic Coins, Relic Coin Pouches, and Relic Coin Sacks.
- Added various new tags for searchability and better compatibility. 
- Added Type Gems. These items hold no functionality for now. Start collecting though...
- Added 6 custom Pottery Sherds, obtained from ruin structures.
- Added cries to Meowth, Alolan Meowth, Galaraian Meowth,
- Completed the advancement for placing a Tumblestone near Lava or Magma to make it grow.
- Added new held items: Ability Shield, Absorb Bulb, Air Balloon, Binding Band, Blunder Policy, Cell Battery, Covert Cloak, Damp Rock, Eject Button, Eviolite, Expert Belt, Float Stone, Focus Sash, Heat Rock, Icy Rock, Iron Ball, Light Ball, Loaded Dice, Red Card, Shell Bell, Sticky Barb, Smooth Rock, Soothe Bell and Weakness Policy.
- Added Hisui starters to the starter selection menu.
- Added bubble quirk to Krabby that only play during clear sunset's.
-
-### Pokémon Added
-#### Gen 2
- Sentret
- Furret
- Qwilfish
- Heracross
- Skarmory
- Larvitar
- Pupitar
- Tyranitar
-
-#### Gen 3
- Lileep
- Cradily
- Anorith
- Armaldo
- Tropius
- Roselia
- Aron
- Lairon
- Aggron
- Solrock
- Lunatone
- Makuhita
- Hariyama
- Trapinch
- Vibrava
- Flygon
-
-#### Gen 4
- Shieldon
- Bastiodon
- Cranidos
- Rampardos
- Budew
- Roserade
- Hippopotas
- Hippowdon
-
-#### Gen 5
- Tirtouga
- Carracosta
- Archen
- Archeops
- Zorua
- Zoroark
- Petilil
- Lilligant
- Darumaka
- Darmanitan
- Woobat
- Swoobat
- Sandile
- Krokorok
- Krookodile
- Frillish
- Jellicent
- Cubchoo
- Beartic
- Deino
- Zweilous
- Hydreigon
- Larvesta
- Volcarona
- Alomomola
- Ferroseed
- Ferrothorn
-
-#### Gen 6
- Tyrunt
- Tyrantrum
- Amaura
- Aurorus
- Goomy
- Sliggoo
- Goodra
- Carbink
- Flabébé
- Floette
- Florges
- Klefki
-
-#### Gen 7
- Turtonator
- Fomantis
- Lurantis
- Salandit
- Salazzle
- Jangmo-o
- Hakamo-o
- Kommo-o
- Alolan Diglett
- Alolan Dugtrio
-
-#### Gen 8
- Gossifleur
- Eldegoss
- Arctozolt
- Arctovish
- Dracozolt
- Dracovish
- Basculegion
- Hisuian Decidueye
- Hisuian Typhlosion
- Hisuian Samurott
- Hisuian Lilligant
- Hisuian Sliggoo
- Hisuian Goodra
- Hisuian Zorua
- Hisuian Zoroark
- Hisuian Voltorb
- Hisuian Electrode
- Hisuian Qwilfish
- Overqwil
- Hisuian Sneasel
- Sneasler
- Stonjourner
- Cufant
- Copperajah
- Dreepy
- Drakloak
- Dragapult
- Hisuian Sliggoo
- Hisuian Goodra
- Impidimp
- Morgrem
- Grimmsnarl
-
-#### Gen 9
- Gimmighoul
+- Added Gimmighoul.
  - Using Relic Coins, you can increase Gimmighoul's Coin Stash. Upon reaching 999, it can be evolved into Gholdengo.
  - Additionally, if you give Gimmighoul a Netherite Scrap, you can increase its Netherite Stash. Who knows what might happen if it fills up?
- Gholdengo
-
-#### Cobblemon Exclusive's
- Hisui Bias Rowlet
- Hisui Bias Dartrix
- Hisui Bias Cyndaquil
- Hisui Bias Quilava
- Hisui Bias Oshawott
- Hisui Bias Dewott
- Hisui Bias Goomy
- Hisui Bias Petilil
-

 ### Changes
- Alolan Pikachu and Exeggcute changed to Alola bias.
 - Pokémon now transition more smoothly between different poses.
- Updated models for Mimikyu, Alcremie, Squirtle, Wartortle, Blastoise, Pidgey, Pidgeotto, Pidgeot, Omanyte, Omastar, Growlithe, Arcanine, Nidoran Male, Nidoran Female, Lapras, Swinub, Piloswine, Basculin, Rowlet, Dartrix, Decidueye, Kabuto, Kabutops, Piplup, Prinplup, Elekid, Electabuzz, Cubone, Marowak, Paras, Mawile, Drifloon, Drifblim, Venonat, Venomoth, Yanma, Yanmega, Psyduck, Dusknoir, Diglett, Dugtrio, Natu, Xatu, Oshawott, Samurott, Torchic, Grovyle, Sceptile, Sizzlipede, and Raboot.
- Updated animations for Squirtle, Wartortle, Blastoise, Pidgey, Pidgeotto, Diglett, Dugtrio, Magikarp, Dragonite, Omanyte, Omastar, Kabuto, Pinsir, Chinchou, Lanturn, Ralts, Kirlia, Gardevoir, Gallade, Buizel, Garchomp, Pumpkaboo, Falinks, Lechonk, Litwick, Lampent, Chandelure, Carnivine, Galarian Meowth, Galarian Rapidash, Venonat, Venomoth, Phanphy, Donphan, Dratini, Dragonair, Happiny, Chansey, Blissey, Volbeat, Illumise, Numel, Sizzlipede, Centiskorch, Obstagoon, Timburr, Gurdurr, Conkeldurr, Drifloon, and Drifblim.
 - Added more held items to the held item tag, and Metal Coat to the held item tab.
 - Added all ores to the modloader ore tags, and added tags for each ore type to the mod (both blocks and items).
 - Changed the Destiny Knot to be crafted with a Ghast Tear, rather than a diamond.
@@ -198,18 +41,9 @@
 - Apricorn Sprouts can now be planted directly on Apricorn leaves to create a new Apricorn of the same color.
 - Added tooltips to interaction GUIs to make it clearer what they do.
 - Poké Ball recipes now use tags for their center ingredient, rather than specificied Copper Ingot, Iron Ingot, Gold Ingot, and Diamond, allowing for further datapack customisation.
- Starter Toast now closes once corresponding button is pressed once.
- Moved some items in the vanilla Food & Drinks category.
- Stacked Cobblemon Potion Bases can now be quick moved into Brewing Stands.
- Changed Healer recipe to swap the Max Revive for a Revive.
- Upped the rate that Gastly drop Ghast Tears from 2.5% to 5%.
- Pokémon with a low Blaze Powder drop chance now drop it more frequently in the Nether.
- Reorganised a few advancements.
- Pokémon entity shadows now scale when the Pokémon is being sent out or recalled.
- Remade Torkoal particles, now they only appear when in battle.
+- Using the run button in battle will now actually flee the battle.

 ### Fixes
- Resized Snorlax
 - Re-added the recipe for the Iron Vitamin.
 - Cleaned up empty evolutions declaration in species files (no, I'm not listing all 169 by name).
 - Fixed Exeggcute not being able to evolve.
@@ -224,13 +58,10 @@
 - Fixed very many issues with Bedrock particle effects.
 - Fixed Arbok patterns not being as specific in spawning as they were intended.
 - Fixed Pokémon not avoiding danger at all when pathfinding. 
- Fixed Pokémon pathing over snow layers and carpets.
 - Fixed Sobble line not being able to swim or breathe underwater.
 - Fixed incompatibility with [Just Enough Resources](https://modrinth.com/mod/just-enough-resources-jer).
 - Fixed incompatibility with [Visual Overhaul](https://modrinth.com/mod/visual-overhaul).
 - Fixed an issue that allowed Pokemon to spawn on rails.
- Fixed the data set on Pokémon when abilities are given via properties such as in ``/spawnpokemon``.
- Fixed sometimes Pokémon losing hidden abilities when evolving, this fix will only take effect to newly created Pokémon.

 ### Developer
 - Significantly changed the way properties in PokemonEntity work. This could break some plugins (not in a big way, but changes will be needed).
@@ -243,13 +74,6 @@
 - Added the ``HeldItemEvent``, this comes with 2 implementation ``HeldItemEvent.Pre`` and ``HeldItemEvent.Post``. 
 - API to support dynamic lighting in any mod that implements this feature has been added to all Species & Forms, see LightingData class for details.
 - Added a Mixin for the BrewingStandScreenHandler to fix the incorrect handling of quickMove in Fabric.
- Corrections to the ability implementation have been made that make ``Ability.forced`` function as intended and never reroll an ability for a Pokémon, please check your implementations to ensure the corrected behavior is intended for your use case.
- ``Pokemon.ability`` no longer has a public setter, please migrate to using ``Pokemon#updateAbility``, this handles the ability coordinate storage for you when necessary.
- ``Ability.forced``, ``Ability.index`` and ``Ability.priority`` have all had their setters internalized, there is no longer any need to manually adjust these migrate to the method mentioned above to handle that process for you.
- ``AbilityChanger`` has been added to API alongside some implementations, this is subject to change as the ability capsule and patch currently only expect the traditional behaviour in the Pokémon games of 1 to 2 regular abilities and 1 hidden.
- ``Pokemon#rollAbility`` has been added, this rerolls a legal ability for the Pokémon.
- `docs/cobblemon-tags` tags and spawn-presets can now be auto-generated from the current tags in the cobblemon mod with the `generateSpawnPresetList.py` and `generateTagList.py` scripts.
- `public_spawns_to_json.py` script has been added to give the powerful spawn.json generator a simplistic UI.

 ### Datapack & Resourcepack Creators
 - The maximum amount of fossils that can fit in the Fossil Analyzer can be adjusted in the config.
@@ -284,8 +108,6 @@
 }
 ```
 - Following up on this change ``light_source`` was removed as a possible shoulder effect due to becoming unnecessary and never having had a default implementation.
- Added the item tag ``cobblemon:ability_changers``, contains the ``cobblemon:ability_capsule`` & ``cobblemon:ability_patch`` by default.
- Added the item tag ``cobblemon:held/is_friendship_booster``, allows items to give the Soothe Bell effect of a boost of 1.5x Friendship gained, contains ``cobblemon:soothe_bell`` by default.

 ## [1.4.1 (December 23rd, 2023)](#1-4-1)

@@ -1221,4 +1043,4 @@ Thank you so much to all of our community translators that bring the mod to the
 - Added species, ability, and move translations for `ko_ko`, `jp_jp`, `fr_fr`, `es_es`, `it_it`, and `zh_cn`.

 ## [1.0.0 (November 12th, 2022)](#1-0-0)
- Initial release.
+- Initial release.
@@ -15,7 +15,4 @@ dependencies {
    implementation(libs.shadow)
    implementation(libs.loom)
    implementation(libs.architecturyPlugin)
-
-    implementation(libs.blossom)
-    implementation(libs.ideaExt)
 }
@@ -1,6 +1,3 @@
-import extensions.VersionType
-import extensions.writeVersion
-
 plugins {
    java
    `java-library`
@@ -34,7 +31,7 @@ publishing {

            groupId = "com.cobblemon"
            artifactId = project.findProperty("maven.artifactId")?.toString() ?: project.name
-            version = project.writeVersion(VersionType.PUBLISHING)
+            version = rootProject.version.toString()
        }
    }
 }
@@ -1,24 +0,0 @@
-package extensions
-
-import org.gradle.api.Project
-
-fun Project.version(): String {
-    return rootProject.property("mod_version").toString()
-}
-
-fun Project.isSnapshot(): Boolean {
-    return rootProject.property("snapshot") == "true"
-}
-
-fun Project.writeVersion(type: VersionType = VersionType.FULL): String {
-    val version = "${rootProject.property("mod_version")}+${rootProject.property("mc_version")}"
-    return when (type) {
-        VersionType.PUBLISHING -> if(this.isSnapshot()) "$version-SNAPSHOT" else version
-        VersionType.FULL -> if(this.isSnapshot()) rootProject.version.toString() else version
-    }
-}
-
-enum class VersionType {
-    PUBLISHING,
-    FULL
-}
@@ -9,5 +9,5 @@ version = "${project.property("mod_version")}+${project.property("mc_version")}"

 val isSnapshot = project.property("snapshot")?.equals("true") ?: false
 if (isSnapshot) {
-    version = "$version-${versioning.info.branch}-${versioning.info.build}"
-}
+    version = "$version-SNAPSHOT-${versioning.info.branch}-${versioning.info.build}"
+}
@@ -1,9 +1,3 @@
-import extensions.isSnapshot
-import extensions.version
-import java.time.OffsetDateTime
-import java.time.ZoneOffset
-import java.time.format.DateTimeFormatter
-
 /*
 *
 *  * Copyright (C) 2023 Cobblemon Contributors
@@ -17,10 +11,6 @@ import java.time.format.DateTimeFormatter
 plugins {
    id("cobblemon.base-conventions")
    id("cobblemon.publish-conventions")
-
-    id("net.kyori.blossom")
-    id("org.jetbrains.gradle.plugin.idea-ext")
-    id ("net.nemerosa.versioning") version "2.8.2"
 }

 architectury {
@@ -54,7 +44,8 @@ dependencies {
    modCompileOnly(libs.mongoDriverCore)
    modCompileOnly(libs.mongoDriverSync)

-    testImplementation(libs.fabricJunit)
+    testRuntimeOnly(libs.junitEngine)
+    testImplementation(libs.junitApi)
    testImplementation(libs.junitParams)
    testImplementation(libs.mockito)
    testImplementation(libs.mockk)
@@ -68,34 +59,3 @@ tasks.withType<Test> {
        setExceptionFormat("full")
    }
 }
-
-sourceSets {
-    main {
-        blossom {
-            kotlinSources {
-                fun generateLicenseHeader() : String {
-                    val builder = StringBuilder()
-                    builder.append("/*\n")
-                    rootProject.file("HEADER").forEachLine {
-                        if(it.isEmpty()) {
-                            builder.append(" *").append("\n")
-                        } else {
-                            builder.append(" * ").append(it).append("\n")
-                        }
-                    }
-
-                    return builder.append(" */").append("\n").toString()
-                }
-
-                property("license", generateLicenseHeader())
-                property("modid", "cobblemon")
-                property("version", project.version())
-                property("isSnapshot", if(rootProject.isSnapshot()) "true" else "false")
-                property("gitCommit", versioning.info.commit)
-                property("branch", versioning.info.branch)
-                System.getProperty("buildNumber")?.let { property("buildNumber", it) }
-                property("timestamp", OffsetDateTime.now(ZoneOffset.UTC).format(DateTimeFormatter.ofPattern("MM/dd/yyyy hh:mm:ss")) + " UTC")
-            }
-        }
-    }
-}
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.mixin;
-
-import com.cobblemon.mod.common.CobblemonBuildDetails;
-import net.minecraft.util.crash.CrashReport;
-import net.minecraft.util.crash.CrashReportSection;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-@Mixin(CrashReport.class)
-public final class CrashReportMixin {
-
-    @Inject(method = "addStackTrace", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/SystemDetails;writeTo(Ljava/lang/StringBuilder;)V"))
-    public void cobblemon$printCobblemonDetails(StringBuilder builder, CallbackInfo callback) {
-        CrashReportSection cobblemon = new CrashReportSection("Cobblemon");
-        cobblemon.add("Version", CobblemonBuildDetails.VERSION);
-        cobblemon.add("Is Snapshot", CobblemonBuildDetails.SNAPSHOT);
-        cobblemon.add("Git Commit", CobblemonBuildDetails.INSTANCE.smallCommitHash() + " (" + "https://gitlab.com/cable-mc/cobblemon/-/commit/" + CobblemonBuildDetails.GIT_COMMIT + ")");
-        cobblemon.add("Branch", CobblemonBuildDetails.BRANCH);
-        cobblemon.add("Timestamp", CobblemonBuildDetails.TIMESTAMP);
-
-        cobblemon.addStackTrace(builder);
-        builder.append("\n\n");
-    }
-
-}
@@ -9,23 +9,18 @@
 package com.cobblemon.mod.common.mixin;

 import com.cobblemon.mod.common.CobblemonItems;
-import net.minecraft.entity.EquipmentSlot;
 import net.minecraft.entity.mob.PiglinEntity;
+import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.Redirect;

@Mixin(PiglinEntity.class)
-public abstract class PiglinEntityMixin  {
-    @Inject(method = "equipToOffHand", at = @At(value = "HEAD"), cancellable = true)
-    public void cobblemon$isValidBarteringItem(ItemStack stack, CallbackInfo ci) {
-        PiglinEntity entity = (PiglinEntity)(Object) this;
-        if (stack.isOf(CobblemonItems.RELIC_COIN_POUCH)) {
-            entity.equipStack(EquipmentSlot.OFFHAND, stack);
-            entity.updateDropChances(EquipmentSlot.OFFHAND);
-            ci.cancel();
-        }
+public class PiglinEntityMixin  {
+    @Redirect(method = "equipToOffHand", at = @At(value = "INVOKE", target = "Lnet/minecraft/item/ItemStack;isOf(Lnet/minecraft/item/Item;)Z"))
+    public boolean cobblemon$isValidBarteringItem(ItemStack stack, Item item) {
+        //TODO: Make a tag?
+        return stack.isOf(item) || stack.isOf(CobblemonItems.RELIC_COIN_POUCH);
    }
 }
@@ -1,18 +0,0 @@
-{{ license }}
-
-package com.cobblemon.mod.common
-
-object CobblemonBuildDetails {
-
-    const val MOD_ID = "{{ modid }}"
-    const val VERSION = "{{ version }}"
-    const val SNAPSHOT = {{ isSnapshot }}
-
-    const val GIT_COMMIT = "{{ gitCommit | default("Not Specified") }}"
-    const val BRANCH = "{{ branch | default("Not Specified") }}"
-    const val TIMESTAMP = "{{ timestamp }}"
-
-    fun smallCommitHash(): String {
-        return this.GIT_COMMIT.substring(0, 7)
-    }
-}
@@ -8,7 +8,6 @@

 package com.cobblemon.mod.common

-import com.cobblemon.mod.common.CobblemonBuildDetails.smallCommitHash
 import com.cobblemon.mod.common.advancement.CobblemonCriteria
 import com.cobblemon.mod.common.advancement.criterion.EvolvePokemonContext
 import com.cobblemon.mod.common.api.Priority
@@ -17,10 +16,10 @@ 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
 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.HELD_ITEM_UPDATED
 import com.cobblemon.mod.common.api.events.CobblemonEvents.LEVEL_UP_EVENT
 import com.cobblemon.mod.common.api.events.CobblemonEvents.POKEMON_CAPTURED
 import com.cobblemon.mod.common.api.events.CobblemonEvents.TRADE_COMPLETED
@@ -36,10 +35,7 @@ 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.IntSpeciesFeatureProvider
-import com.cobblemon.mod.common.api.pokemon.feature.SpeciesFeatures
+import com.cobblemon.mod.common.api.pokemon.feature.*
 import com.cobblemon.mod.common.api.pokemon.helditem.HeldItemProvider
 import com.cobblemon.mod.common.api.pokemon.stats.EvCalculator
 import com.cobblemon.mod.common.api.pokemon.stats.Generation8EvCalculator
@@ -66,7 +62,6 @@ import com.cobblemon.mod.common.api.storage.player.PlayerDataStoreManager
 import com.cobblemon.mod.common.api.storage.player.factory.JsonPlayerDataStoreFactory
 import com.cobblemon.mod.common.api.storage.player.factory.MongoPlayerDataStoreFactory
 import com.cobblemon.mod.common.api.tags.CobblemonEntityTypeTags
-import com.cobblemon.mod.common.api.tags.CobblemonItemTags
 import com.cobblemon.mod.common.battles.BagItems
 import com.cobblemon.mod.common.battles.BattleFormat
 import com.cobblemon.mod.common.battles.BattleRegistry
@@ -98,6 +93,7 @@ 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.TagSeasonResolver
 import com.cobblemon.mod.common.pokemon.helditem.CobblemonHeldItemManager
+import com.cobblemon.mod.common.pokemon.misc.GimmighoulStashHandler
 import com.cobblemon.mod.common.pokemon.properties.HiddenAbilityPropertyType
 import com.cobblemon.mod.common.pokemon.properties.UncatchableProperty
 import com.cobblemon.mod.common.pokemon.properties.tags.PokemonFlagProperty
@@ -119,32 +115,31 @@ import com.mongodb.ConnectionString
 import com.mongodb.MongoClientSettings
 import com.mongodb.client.MongoClient
 import com.mongodb.client.MongoClients
+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.full.memberProperties
+import kotlin.reflect.jvm.isAccessible
+import kotlin.reflect.jvm.javaField
 import net.minecraft.client.MinecraftClient
 import net.minecraft.command.argument.serialize.ConstantArgumentSerializer
 import net.minecraft.entity.data.TrackedDataHandlerRegistry
 import net.minecraft.item.Items
 import net.minecraft.item.NameTagItem
 import net.minecraft.registry.RegistryKey
+import net.minecraft.sound.SoundCategory
 import net.minecraft.util.WorldSavePath
 import net.minecraft.world.World
 import org.apache.logging.log4j.LogManager
-import org.apache.logging.log4j.Logger
-import java.io.File
-import java.io.FileReader
-import java.io.FileWriter
-import java.io.PrintWriter
-import java.util.*
-import kotlin.properties.Delegates
-import kotlin.reflect.full.memberProperties
-import kotlin.reflect.jvm.isAccessible
-import kotlin.reflect.jvm.javaField
-import kotlin.math.roundToInt

 object Cobblemon {
    const val MODID = "cobblemon"
    const val VERSION = "1.4.0"
    const val CONFIG_PATH = "config/$MODID/main.json"
-    val LOGGER: Logger = LogManager.getLogger()
+    val LOGGER = LogManager.getLogger()

    lateinit var implementation: CobblemonImplementation
    @Deprecated("This field is now a config value", ReplaceWith("Cobblemon.config.captureCalculator"))
@@ -174,14 +169,6 @@ object Cobblemon {

    fun preInitialize(implementation: CobblemonImplementation) {
        this.implementation = implementation
-
-        this.LOGGER.info("Launching Cobblemon ${CobblemonBuildDetails.VERSION}${if(CobblemonBuildDetails.SNAPSHOT) "-SNAPSHOT" else ""} ")
-        if(CobblemonBuildDetails.SNAPSHOT) {
-            this.LOGGER.info("  - Git Commit: ${smallCommitHash()} (https://gitlab.com/cable-mc/cobblemon/-/commit/${CobblemonBuildDetails.GIT_COMMIT})")
-            this.LOGGER.info("  - Branch: ${CobblemonBuildDetails.BRANCH}")
-            this.LOGGER.info("  - Timestamp: ${CobblemonBuildDetails.TIMESTAMP}")
-        }
-
        implementation.registerPermissionValidator()
        implementation.registerSoundEvents()
        implementation.registerBlocks()
@@ -244,9 +231,6 @@ object Cobblemon {
            }
        }

-        // Register the grow_tumblestone advancement
-        PlatformEvents.RIGHT_CLICK_BLOCK.subscribe { AdvancementHandler.onTumbleStonePlaced(it) }
-
        PlatformEvents.CHANGE_DIMENSION.subscribe {
            it.player.party().forEach { pokemon -> pokemon.entity?.recallWithAnimation() }
        }
@@ -256,16 +240,6 @@ object Cobblemon {
        TrackedDataHandlerRegistry.register(PoseTypeDataSerializer)
        TrackedDataHandlerRegistry.register(IdentifierDataSerializer)

-        // Lowest priority because this applies after luxury ball bonus as of gen 4
-        CobblemonEvents.FRIENDSHIP_UPDATED.subscribe(Priority.LOWEST) { event ->
-            var increment = (event.newFriendship - event.pokemon.friendship).toFloat()
-            // Our Luxury ball spec is diff from official, but we will still assume these stack
-            if (event.pokemon.heldItemNoCopy().isIn(CobblemonItemTags.IS_FRIENDSHIP_BOOSTER)) {
-                increment += increment * 0.5F
-            }
-            event.newFriendship = event.pokemon.friendship + increment.roundToInt()
-        }
-
        HeldItemProvider.register(CobblemonHeldItemManager, Priority.LOWEST)
    }

@@ -17,7 +17,6 @@ import com.cobblemon.mod.common.block.entity.FossilMultiblockEntity
 import com.cobblemon.mod.common.block.entity.RestorationTankBlockEntity
 import com.cobblemon.mod.common.block.multiblock.FossilMultiblockBuilder
 import com.cobblemon.mod.common.block.entity.*
-import com.cobblemon.mod.common.block.entity.DisplayCaseBlockEntity
 import com.cobblemon.mod.common.platform.PlatformRegistry
 import net.minecraft.block.entity.BlockEntityType
 import net.minecraft.registry.Registries
@@ -78,9 +77,4 @@ object CobblemonBlockEntities : PlatformRegistry<Registry<BlockEntityType<*>>, R
            CobblemonBlocks.FOSSIL_ANALYZER
        ).build(null)
    )
-
-    @JvmField
-    val DISPLAY_CASE: BlockEntityType<DisplayCaseBlockEntity> = this.create("display_case",
-        BlockEntityType.Builder.create(::DisplayCaseBlockEntity, CobblemonBlocks.DISPLAY_CASE).build(null)
-    )
 }
@@ -72,8 +72,6 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, RegistryKey<Registry<
    @JvmField
    val SUN_STONE_ORE = evolutionStoneOre("sun_stone_ore")
    @JvmField
-    val TERRACOTTA_SUN_STONE_ORE = evolutionStoneOre("terracotta_sun_stone_ore")
-    @JvmField
    val THUNDER_STONE_ORE = evolutionStoneOre("thunder_stone_ore")
    @JvmField
    val WATER_STONE_ORE = evolutionStoneOre("water_stone_ore")
@@ -160,7 +158,7 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, RegistryKey<Registry<
    @JvmField
    val BIG_ROOT = this.create("big_root", BigRootBlock(AbstractBlock.Settings.create().pistonBehavior(PistonBehavior.DESTROY).burnable().mapColor(MapColor.DARK_GREEN).noCollision().ticksRandomly().breakInstantly().sounds(CobblemonSounds.BIG_ROOT_SOUNDS)))
    @JvmField
-    val REVIVAL_HERB = this.create("revival_herb", RevivalHerbBlock(AbstractBlock.Settings.create().pistonBehavior(PistonBehavior.DESTROY).mapColor(MapColor.DARK_GREEN).burnable().noCollision().breakInstantly().sounds(CobblemonSounds.REVIVAL_HERB_SOUNDS)))
+    val REVIVAL_HERB = this.create("revival_herb", RevivalHerbBlock(AbstractBlock.Settings.create().pistonBehavior(PistonBehavior.DESTROY).mapColor(MapColor.DARK_GREEN).burnable().noCollision().breakInstantly().sounds(BlockSoundGroup.CROP)))

    @JvmField
    val TUMBLESTONE_CLUSTER = tumblestoneBlock("tumblestone_cluster", GrowableStoneBlock.STAGE_3, 7, 3, null)
@@ -389,18 +387,6 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, RegistryKey<Registry<
    )

    @JvmField
-    val DISPLAY_CASE = create(
-        "display_case",
-        DisplayCaseBlock(
-            AbstractBlock.Settings.create()
-                .sounds(CobblemonSounds.DISPLAY_CASE_SOUNDS)
-                .nonOpaque()
-                .pistonBehavior(PistonBehavior.BLOCK)
-                .mapColor(MapColor.STONE_GRAY)
-                .strength(0.3f)
-        )
-    )
-
    val RED_MINT = create("red_mint", MintBlock(MintType.RED, AbstractBlock.Settings.create().mapColor(MapColor.RED).noCollision().ticksRandomly().breakInstantly().sounds(CobblemonSounds.MINT_SOUNDS)))
    @JvmField
    val BLUE_MINT = create("blue_mint", MintBlock(MintType.BLUE, AbstractBlock.Settings.create().mapColor(MapColor.BLUE).noCollision().ticksRandomly().breakInstantly().sounds(CobblemonSounds.MINT_SOUNDS)))
@@ -428,7 +414,7 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, RegistryKey<Registry<
    )

    @JvmField
-    val VIVICHOKE_SEEDS = this.create("vivichoke_seeds", VivichokeBlock(AbstractBlock.Settings.create().pistonBehavior(PistonBehavior.DESTROY).burnable().mapColor(MapColor.DARK_GREEN).noCollision().ticksRandomly().breakInstantly().sounds(CobblemonSounds.VIVICHOKE_SOUNDS)))
+    val VIVICHOKE_SEEDS = this.create("vivichoke_seeds", VivichokeBlock(AbstractBlock.Settings.create().pistonBehavior(PistonBehavior.DESTROY).burnable().mapColor(MapColor.DARK_GREEN).noCollision().ticksRandomly().breakInstantly().sounds(BlockSoundGroup.CROP)))
    @JvmField
    val PEP_UP_FLOWER = this.create("pep_up_flower", FlowerBlock(StatusEffects.LEVITATION, 10, AbstractBlock.Settings.create().mapColor(MapColor.DARK_GREEN).noCollision().breakInstantly().sounds(BlockSoundGroup.GRASS).offset(AbstractBlock.OffsetType.XZ).pistonBehavior(PistonBehavior.DESTROY)))
    @JvmField
@@ -48,9 +48,5 @@ object CobblemonCommands {
        PokemonRestartCommand.register(dispatcher)
        BedrockParticleCommand.register(dispatcher)
        OpenDialogueCommand.register(dispatcher)
-
-        // Possibly lock down registration if and only if under dev environment or running in an environment
-        // with a certain system environment variable set
-        CobblemonInfoCommand.register(dispatcher)
    }
 }
@@ -8,7 +8,6 @@

 package com.cobblemon.mod.common

-import com.cobblemon.mod.common.api.item.ability.AbilityChanger
 import com.cobblemon.mod.common.api.mulch.MulchVariant
 import com.cobblemon.mod.common.api.pokeball.PokeBalls
 import com.cobblemon.mod.common.api.pokemon.Natures
@@ -30,8 +29,6 @@ import com.cobblemon.mod.common.item.berry.PortionHealingBerryItem
 import com.cobblemon.mod.common.item.berry.StatusCuringBerryItem
 import com.cobblemon.mod.common.item.berry.VolatileCuringBerryItem
 import com.cobblemon.mod.common.item.interactive.*
-import com.cobblemon.mod.common.item.interactive.PotionItem
-import com.cobblemon.mod.common.item.interactive.ability.AbilityChangeItem
 import com.cobblemon.mod.common.platform.PlatformRegistry
 import com.cobblemon.mod.common.pokeball.PokeBall
 import com.cobblemon.mod.common.pokemon.helditem.CobblemonHeldItemManager
@@ -40,7 +37,14 @@ import net.minecraft.block.Block
 import net.minecraft.entity.LivingEntity
 import net.minecraft.entity.effect.StatusEffectInstance
 import net.minecraft.entity.effect.StatusEffects
-import net.minecraft.item.*
+import net.minecraft.item.BlockItem
+import net.minecraft.item.FoodComponent
+import net.minecraft.item.HangingSignItem
+import net.minecraft.item.Item
+import net.minecraft.item.ItemStack
+import net.minecraft.item.SignItem
+import net.minecraft.item.SmithingTemplateItem
+import net.minecraft.item.StewItem
 import net.minecraft.registry.Registries
 import net.minecraft.registry.Registry
 import net.minecraft.registry.RegistryKey
@@ -254,8 +258,6 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, RegistryKey<Registry<It
    val PC = blockItem("pc", CobblemonBlocks.PC)
    @JvmField
    val PASTURE = blockItem("pasture", CobblemonBlocks.PASTURE)
-    @JvmField
-    val DISPLAY_CASE = blockItem("display_case", CobblemonBlocks.DISPLAY_CASE)

    // Evolution items
    @JvmField val LINK_CABLE = create("link_cable", LinkCableItem())
@@ -283,8 +285,6 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, RegistryKey<Registry<It
    @JvmField val RIBBON_SWEET = noSettingsItem("ribbon_sweet")
    @JvmField val CHIPPED_POT = noSettingsItem("chipped_pot")
    @JvmField val CRACKED_POT = noSettingsItem("cracked_pot")
-    @JvmField val MASTERPIECE_TEACUP = noSettingsItem("masterpiece_teacup")
-    @JvmField val UNREMARKABLE_TEACUP = noSettingsItem("unremarkable_teacup")
    @JvmField val SWEET_APPLE = noSettingsItem("sweet_apple")
    @JvmField val TART_APPLE = noSettingsItem("tart_apple")
    @JvmField val GALARICA_CUFF = noSettingsItem("galarica_cuff")
@@ -408,7 +408,7 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, RegistryKey<Registry<It
    @JvmField
    val CLEVER_FEATHER = create("clever_feather", FeatherItem(Stats.SPECIAL_DEFENCE))
    @JvmField
-    val MEDICINAL_LEEK = heldItem("medicinal_leek", MedicinalLeekItem(CobblemonBlocks.MEDICINAL_LEEK, Item.Settings().food(FoodComponent.Builder().snack().hunger(1).saturationModifier(0.2f).build())), "leek")
+    val MEDICINAL_LEEK = create("medicinal_leek", MedicinalLeekItem(CobblemonBlocks.MEDICINAL_LEEK, Item.Settings().food(FoodComponent.Builder().snack().hunger(1).saturationModifier(0.2f).build())))
    @JvmField
    val ROASTED_LEEK = create("roasted_leek", Item(Item.Settings().food(FoodComponent.Builder().snack().hunger(3).saturationModifier(0.3f).build())))
    @JvmField
@@ -558,11 +558,6 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, RegistryKey<Registry<It
    @JvmField val ELIXIR = create("elixir", ElixirItem(max = false))
    @JvmField val MAX_ELIXIR = create("max_elixir", ElixirItem(max = true))

-    @JvmField
-    val ABILITY_CAPSULE = this.create("ability_capsule", AbilityChangeItem(AbilityChanger.COMMON_ABILITY))
-    @JvmField
-    val ABILITY_PATCH = this.create("ability_patch", AbilityChangeItem(AbilityChanger.HIDDEN_ABILITY))
-
    /**
     * Evolution Ores and Stones
     */
@@ -583,8 +578,6 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, RegistryKey<Registry<It
    @JvmField
    val SUN_STONE_ORE = blockItem("sun_stone_ore", CobblemonBlocks.SUN_STONE_ORE)
    @JvmField
-    val TERRACOTTA_SUN_STONE_ORE = blockItem("terracotta_sun_stone_ore", CobblemonBlocks.TERRACOTTA_SUN_STONE_ORE)
-    @JvmField
    val THUNDER_STONE_ORE = blockItem("thunder_stone_ore", CobblemonBlocks.THUNDER_STONE_ORE)
    @JvmField
    val WATER_STONE_ORE = blockItem("water_stone_ore", CobblemonBlocks.WATER_STONE_ORE)
@@ -636,28 +629,16 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, RegistryKey<Registry<It

    // Held Items
    @JvmField
-    val ABILITY_SHIELD = heldItem("ability_shield")
-    @JvmField
-    val ABSORB_BULB = heldItem("absorb_bulb")
-    @JvmField
-    val AIR_BALLOON = heldItem("air_balloon")
-    @JvmField
    val ASSAULT_VEST = heldItem("assault_vest")
    @JvmField
    val BIG_ROOT = blockItem("big_root", CobblemonBlocks.BIG_ROOT)
    @JvmField
-    val BINDING_BAND = heldItem("binding_band")
-    @JvmField
    val BLACK_BELT = heldItem("black_belt")
    @JvmField
    val BLACK_GLASSES = heldItem("black_glasses")
    @JvmField
    val BLACK_SLUDGE = heldItem("black_sludge")
    @JvmField
-    val BLUNDER_POLICY = heldItem("blunder_policy")
-    @JvmField
-    val CELL_BATTERY = heldItem("cell_battery")
-    @JvmField
    val CHARCOAL = heldItem("charcoal_stick", remappedName = "charcoal")
    @JvmField
    val CHOICE_BAND = heldItem("choice_band")
@@ -668,64 +649,26 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, RegistryKey<Registry<It
    @JvmField
    val CLEANSE_TAG = heldItem("cleanse_tag")
    @JvmField
-    val CLEAR_AMULET = heldItem("clear_amulet")
-    @JvmField
-    val COVERT_CLOAK = heldItem("covert_cloak")
-    @JvmField
-    val DESTINY_KNOT = heldItem("destiny_knot")
-    @JvmField
    val DRAGON_FANG = heldItem("dragon_fang")
    @JvmField
-    val EJECT_BUTTON = heldItem("eject_button")
-    @JvmField
-    val EJECT_PACK = heldItem("eject_pack")
-    @JvmField
-    val EVERSTONE = heldItem("everstone")
-    @JvmField
-    val EVIOLITE = heldItem("eviolite")
-    @JvmField
    val EXP_SHARE = heldItem("exp_share")
    @JvmField
-    val EXPERT_BELT = heldItem("expert_belt")
-    @JvmField
    val FAIRY_FEATHER = heldItem("fairy_feather")
    @JvmField
-    val FLAME_ORB = heldItem("flame_orb")
-    @JvmField
-    val FLOAT_STONE = heldItem("float_stone")
-    @JvmField
    val FOCUS_BAND = heldItem("focus_band")
    @JvmField
-    val FOCUS_SASH = heldItem("focus_sash")
-    @JvmField
-    val GRIP_CLAW = heldItem("grip_claw")
-    @JvmField
    val HARD_STONE = heldItem("hard_stone")
    @JvmField
    val HEAVY_DUTY_BOOTS = heldItem("heavy_duty_boots")
    @JvmField
-    val IRON_BALL = heldItem("iron_ball")
-    @JvmField
-    val LAGGING_TAIL = heldItem("lagging_tail")
-    @JvmField
    val LEFTOVERS = heldItem("leftovers")
    @JvmField
-    val LIFE_ORB = heldItem("life_orb")
-    @JvmField
-    val LIGHT_BALL = heldItem("light_ball")
-    @JvmField
    val LIGHT_CLAY = heldItem("light_clay")
    @JvmField
-    val LOADED_DICE = heldItem("loaded_dice")
-    @JvmField
    val LUCKY_EGG = heldItem("lucky_egg")
    @JvmField
-    val LUMINOUS_MOSS = heldItem("luminous_moss")
-    @JvmField
    val MAGNET = heldItem("magnet")
    @JvmField
-    val METRONOME = heldItem("metronome")
-    @JvmField
    val MIRACLE_SEED = heldItem("miracle_seed")
    @JvmField
    val MUSCLE_BAND = heldItem("muscle_band")
@@ -736,42 +679,14 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, RegistryKey<Registry<It
    @JvmField
    val POISON_BARB = heldItem("poison_barb")
    @JvmField
-    val POWER_ANKLET = heldItem("power_anklet")
-    @JvmField
-    val POWER_BAND = heldItem("power_band")
-    @JvmField
-    val POWER_BELT = heldItem("power_belt")
-    @JvmField
-    val POWER_BRACER = heldItem("power_bracer")
-    @JvmField
-    val POWER_LENS = heldItem("power_lens")
-    @JvmField
-    val POWER_WEIGHT = heldItem("power_weight")
-    @JvmField
-    val PROTECTIVE_PADS = heldItem("protective_pads")
-    @JvmField
-    val PUNCHING_GLOVE = heldItem("punching_glove")
-    @JvmField
    val QUICK_CLAW = heldItem("quick_claw")
    @JvmField
-    val RED_CARD = heldItem("red_card")
-    @JvmField
-    val RING_TARGET = heldItem("ring_target")
-    @JvmField
    val ROCKY_HELMET = heldItem("rocky_helmet")
    @JvmField
-    val ROOM_SERVICE = heldItem("room_service")
-    @JvmField
    val SAFETY_GOGGLES = heldItem("safety_goggles")
    @JvmField
-    val SCOPE_LENS = heldItem("scope_lens")
-    @JvmField
    val SHARP_BEAK = heldItem("sharp_beak")
    @JvmField
-    val SHED_SHELL = heldItem("shed_shell")
-    @JvmField
-    val SHELL_BELL = heldItem("shell_bell")
-    @JvmField
    val SILK_SCARF = heldItem("silk_scarf")
    @JvmField
    val SILVER_POWDER = heldItem("silver_powder")
@@ -780,30 +695,10 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, RegistryKey<Registry<It
    @JvmField
    val SPELL_TAG = heldItem("spell_tag")
    @JvmField
-    val SMOKE_BALL = heldItem("smoke_ball")
-    @JvmField
-    val SOOTHE_BELL = heldItem("soothe_bell")
-    @JvmField
-    val STICKY_BARB = heldItem("sticky_barb")
-    @JvmField
-    val TERRAIN_EXTENDER = heldItem("terrain_extender")
-    @JvmField
-    val THROAT_SPRAY = heldItem("throat_spray")
-    @JvmField
-    val TOXIC_ORB = heldItem("toxic_orb")
-    @JvmField
    val TWISTED_SPOON = heldItem("twisted_spoon")
    @JvmField
-    val UTILITY_UMBRELLA = heldItem("utility_umbrella")
-    @JvmField
-    val WEAKNESS_POLICY = heldItem("weakness_policy")
-    @JvmField
-    val WIDE_LENS = heldItem("wide_lens")
-    @JvmField
    val WISE_GLASSES = heldItem("wise_glasses")
    @JvmField
-    val ZOOM_LENS = heldItem("zoom_lens")
-    @JvmField
    val MENTAL_HERB = compostableHeldItem("mental_herb", null, 1F)
    @JvmField
    val MIRROR_HERB = compostableHeldItem("mirror_herb", null, 1F)
@@ -818,13 +713,29 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, RegistryKey<Registry<It
    @JvmField
    val QUICK_POWDER = heldItem("quick_powder")
    @JvmField
-    val DAMP_ROCK = heldItem("damp_rock")
+    val DESTINY_KNOT = heldItem("destiny_knot")
    @JvmField
-    val HEAT_ROCK = heldItem("heat_rock")
+    val EVERSTONE = heldItem("everstone")
    @JvmField
-    val SMOOTH_ROCK = heldItem("smooth_rock")
+    val POWER_ANKLET = heldItem("power_anklet")
    @JvmField
-    val ICY_ROCK = heldItem("icy_rock")
+    val POWER_BAND = heldItem("power_band")
+    @JvmField
+    val POWER_BELT = heldItem("power_belt")
+    @JvmField
+    val POWER_BRACER = heldItem("power_bracer")
+    @JvmField
+    val POWER_LENS = heldItem("power_lens")
+    @JvmField
+    val POWER_WEIGHT = heldItem("power_weight")
+    @JvmField
+    val FLAME_ORB = heldItem("flame_orb")
+    @JvmField
+    val LIFE_ORB = heldItem("life_orb")
+    @JvmField
+    val TOXIC_ORB = heldItem("toxic_orb")
+    @JvmField
+    val SMOKE_BALL = heldItem("smoke_ball")

    // Mulch
    @JvmField
@@ -1011,16 +922,6 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, RegistryKey<Registry<It
            }
        }
    )
-    private fun heldItem(name: String, item: Item, remappedName: String? = null) = create(
-        name = name,
-        entry = item.also {
-            if (remappedName != null) {
-                CobblemonHeldItemManager.registerRemap(it, remappedName)
-                CobblemonHeldItemManager.registerRemap(Items.BONE, "thickclub")
-                CobblemonHeldItemManager.registerRemap(Items.SNOWBALL, "snowball")
-            }
-        }
-    )

    private fun compostable(item: Item, increaseLevelChance: Float) = Cobblemon.implementation.registerCompostable(item, increaseLevelChance)

@@ -14,7 +14,25 @@ import com.cobblemon.mod.common.api.net.ServerNetworkPacketHandler
 import com.cobblemon.mod.common.client.net.PlayerInteractOptionsHandler
 import com.cobblemon.mod.common.client.net.SetClientPlayerDataHandler
 import com.cobblemon.mod.common.client.net.animation.PlayPoseableAnimationHandler
-import com.cobblemon.mod.common.client.net.battle.*
+import com.cobblemon.mod.common.client.net.battle.BattleApplyPassResponseHandler
+import com.cobblemon.mod.common.client.net.battle.BattleCaptureEndHandler
+import com.cobblemon.mod.common.client.net.battle.BattleCaptureShakeHandler
+import com.cobblemon.mod.common.client.net.battle.BattleCaptureStartHandler
+import com.cobblemon.mod.common.client.net.battle.BattleChallengeExpiredHandler
+import com.cobblemon.mod.common.client.net.battle.BattleChallengeNotificationHandler
+import com.cobblemon.mod.common.client.net.battle.BattleEndHandler
+import com.cobblemon.mod.common.client.net.battle.BattleFaintHandler
+import com.cobblemon.mod.common.client.net.battle.BattleHealthChangeHandler
+import com.cobblemon.mod.common.client.net.battle.BattleInitializeHandler
+import com.cobblemon.mod.common.client.net.battle.BattleMadeInvalidChoiceHandler
+import com.cobblemon.mod.common.client.net.battle.BattleMakeChoiceHandler
+import com.cobblemon.mod.common.client.net.battle.BattleMessageHandler
+import com.cobblemon.mod.common.client.net.battle.BattleMusicHandler
+import com.cobblemon.mod.common.client.net.battle.BattlePersistentStatusHandler
+import com.cobblemon.mod.common.client.net.battle.BattleQueueRequestHandler
+import com.cobblemon.mod.common.client.net.battle.BattleSetTeamPokemonHandler
+import com.cobblemon.mod.common.client.net.battle.BattleSwitchPokemonHandler
+import com.cobblemon.mod.common.client.net.battle.BattleUpdateTeamPokemonHandler
 import com.cobblemon.mod.common.client.net.callback.move.OpenMoveCallbackHandler
 import com.cobblemon.mod.common.client.net.callback.party.OpenPartyCallbackHandler
 import com.cobblemon.mod.common.client.net.callback.partymove.OpenPartyMoveCallbackHandler
@@ -117,6 +135,7 @@ import com.cobblemon.mod.common.net.messages.client.ui.InteractPokemonUIPacket
 import com.cobblemon.mod.common.net.messages.client.ui.SummaryUIPacket
 import com.cobblemon.mod.common.net.messages.server.*
 import com.cobblemon.mod.common.net.messages.server.battle.BattleSelectActionsPacket
+import com.cobblemon.mod.common.net.messages.server.battle.FleeBattlePacket
 import com.cobblemon.mod.common.net.messages.server.battle.RemoveSpectatorPacket
 import com.cobblemon.mod.common.net.messages.server.battle.SpectateBattlePacket
 import com.cobblemon.mod.common.net.messages.server.callback.move.MoveSelectCancelledPacket
@@ -152,6 +171,7 @@ import com.cobblemon.mod.common.net.messages.server.trade.UpdateTradeOfferPacket
 import com.cobblemon.mod.common.net.serverhandling.ChallengeHandler
 import com.cobblemon.mod.common.net.serverhandling.RequestInteractionsHandler
 import com.cobblemon.mod.common.net.serverhandling.battle.BattleSelectActionsHandler
+import com.cobblemon.mod.common.net.serverhandling.battle.FleeBattlePacketHandler
 import com.cobblemon.mod.common.net.serverhandling.battle.RemoveSpectatorHandler
 import com.cobblemon.mod.common.net.serverhandling.battle.SpectateBattleHandler
 import com.cobblemon.mod.common.net.serverhandling.callback.move.MoveSelectCancelledHandler
@@ -287,8 +307,6 @@ object CobblemonNetwork : NetworkManager {
        this.createClientBound(BattleMadeInvalidChoicePacket.ID, BattleMadeInvalidChoicePacket::decode, BattleMadeInvalidChoiceHandler)
        this.createClientBound(BattleMusicPacket.ID, BattleMusicPacket::decode, BattleMusicHandler)
        this.createClientBound(BattleChallengeExpiredPacket.ID, BattleChallengeExpiredPacket::decode, BattleChallengeExpiredHandler)
-        this.createClientBound(BattleReplacePokemonPacket.ID, BattleReplacePokemonPacket::decode, BattleReplacePokemonHandler)
-        this.createClientBound(BattleTransformPokemonPacket.ID, BattleTransformPokemonPacket::decode, BattleTransformPokemonHandler)



@@ -391,6 +409,7 @@ object CobblemonNetwork : NetworkManager {
        this.createServerBound(BattleSelectActionsPacket.ID, BattleSelectActionsPacket::decode, BattleSelectActionsHandler)
        this.createServerBound(SpectateBattlePacket.ID, SpectateBattlePacket::decode, SpectateBattleHandler)
        this.createServerBound(RemoveSpectatorPacket.ID, RemoveSpectatorPacket::decode, RemoveSpectatorHandler)
+        this.createServerBound(FleeBattlePacket.ID, FleeBattlePacket::decode, FleeBattlePacketHandler)

        // Trade
        this.createServerBound(AcceptTradeRequestPacket.ID, AcceptTradeRequestPacket::decode, AcceptTradeRequestHandler)
@@ -99,27 +99,27 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, RegistryKey<Regi
    val MULCH_REMOVE = this.create("mulch.remove")

    @JvmField
-    val FOSSIL_MACHINE_ACTIVATE = this.create("fossil_machine.activate")
+    val FOSSIL_MACHINE_ACTIVATE = this.create("fossilmachine.activate")
    @JvmField
-    val FOSSIL_MACHINE_ACTIVE_LOOP = this.create("fossil_machine.active_loop")
+    val FOSSIL_MACHINE_ACTIVE_LOOP = this.create("fossilmachine.active_loop")
    @JvmField
-    val FOSSIL_MACHINE_ASSEMBLE = this.create("fossil_machine.assemble")
+    val FOSSIL_MACHINE_ASSEMBLE = this.create("fossilmachine.assemble")
    @JvmField
-    val FOSSIL_MACHINE_DNA_FULL = this.create("fossil_machine.dna_full")
+    val FOSSIL_MACHINE_DNA_FULL = this.create("fossilmachine.dna_full")
    @JvmField
-    val FOSSIL_MACHINE_FINISHED = this.create("fossil_machine.finished")
+    val FOSSIL_MACHINE_FINISHED = this.create("fossilmachine.finished")
    @JvmField
-    val FOSSIL_MACHINE_INSERT_DNA = this.create("fossil_machine.insert_dna")
+    val FOSSIL_MACHINE_INSERT_DNA = this.create("fossilmachine.insert_dna")
    @JvmField
-    val FOSSIL_MACHINE_INSERT_DNA_SMALL = this.create("fossil_machine.insert_dna_small")
+    val FOSSIL_MACHINE_INSERT_DNA_SMALL = this.create("fossilmachine.insert_dna_small")
    @JvmField
-    val FOSSIL_MACHINE_INSERT_FOSSIL = this.create("fossil_machine.insert_fossil")
+    val FOSSIL_MACHINE_INSERT_FOSSIL = this.create("fossilmachine.insert_fossil")
    @JvmField
-    val FOSSIL_MACHINE_RETRIEVE_FOSSIL = this.create("fossil_machine.retrieve_fossil")
+    val FOSSIL_MACHINE_RETRIEVE_FOSSIL = this.create("fossilmachine.retrieve_fossil")
    @JvmField
-    val FOSSIL_MACHINE_RETRIEVE_POKEMON = this.create("fossil_machine.retrieve_pokemon")
+    val FOSSIL_MACHINE_RETRIEVE_POKEMON = this.create("fossilmachine.retrieve_pokemon")
    @JvmField
-    val FOSSIL_MACHINE_UNPROTECTED = this.create("fossil_machine.unprotected")
+    val FOSSIL_MACHINE_UNPROTECTED = this.create("fossilmachine.unprotected")

    @JvmField
    val COIN_POUCH_BREAK = this.create("coin_pouch.break")
@@ -155,21 +155,11 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, RegistryKey<Regi
    @JvmField
    val ENERGY_ROOT_PLACE = this.create("energy_root.place")

-    @JvmField
-    val VIVICHOKE_BREAK = this.create("vivichoke.break")
-    @JvmField
-    val VIVICHOKE_PLACE = this.create("vivichoke.place")
-
    @JvmField
    val MINT_BREAK = this.create("mint.break")
    @JvmField
    val MINT_PLACE = this.create("mint.place")

-    @JvmField
-    val REVIVAL_HERB_BREAK = this.create("revival_herb.break")
-    @JvmField
-    val REVIVAL_HERB_PLACE = this.create("revival_herb.place")
-
    @JvmField
    val MEDICINAL_LEEK_BREAK = this.create("medicinal_leek.break")
    @JvmField
@@ -287,15 +277,6 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, RegistryKey<Regi
        SoundEvents.BLOCK_GRASS_FALL
    )

-    @JvmField
-    val VIVICHOKE_SOUNDS = BlockSoundGroup(1f, 1f,
-        VIVICHOKE_BREAK,
-        SoundEvents.BLOCK_GRASS_STEP,
-        VIVICHOKE_PLACE,
-        SoundEvents.BLOCK_GRASS_HIT,
-        SoundEvents.BLOCK_GRASS_FALL
-    )
-
    @JvmField
    val MINT_SOUNDS = BlockSoundGroup(1f, 1f,
        MINT_BREAK,
@@ -305,15 +286,6 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, RegistryKey<Regi
        SoundEvents.BLOCK_GRASS_FALL
    )

-    @JvmField
-    val REVIVAL_HERB_SOUNDS = BlockSoundGroup(1f, 1f,
-        REVIVAL_HERB_BREAK,
-        SoundEvents.BLOCK_GRASS_STEP,
-        REVIVAL_HERB_PLACE,
-        SoundEvents.BLOCK_GRASS_HIT,
-        SoundEvents.BLOCK_GRASS_FALL
-    )
-
    @JvmField
    val GILDED_CHEST_SOUNDS = BlockSoundGroup(1f, 1f,
        GILDED_CHEST_BREAK,
@@ -323,27 +295,5 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, RegistryKey<Regi
        GILDED_CHEST_STEP
    )

-    @JvmField
-    val DISPLAY_CASE_ADD_ITEM = this.create("display_case.add_item")
-    @JvmField
-    val DISPLAY_CASE_REMOVE_ITEM = this.create("display_case.remove_item")
-    @JvmField
-    val DISPLAY_CASE_BREAK = this.create("display_case.break")
-    @JvmField
-    val DISPLAY_CASE_HIT = this.create("display_case.hit")
-    @JvmField
-    val DISPLAY_CASE_PLACE = this.create("display_case.place")
-    @JvmField
-    val DISPLAY_CASE_STEP = this.create("display_case.step")
-
-    @JvmField
-    val DISPLAY_CASE_SOUNDS = BlockSoundGroup(1f, 1f,
-        DISPLAY_CASE_BREAK,
-        DISPLAY_CASE_STEP,
-        DISPLAY_CASE_PLACE,
-        DISPLAY_CASE_HIT,
-        DISPLAY_CASE_STEP
-    )
-
    private fun create(name: String): SoundEvent = this.create(name, SoundEvent.of(cobblemonResource(name)))
 }
@@ -113,14 +113,6 @@ object CobblemonCriteria {
        )
    )

-    // Advancement criteria for [grow_tumblestone.json]
-    val PLANT_TUMBLESTONE = this.create(
-        SimpleCriterionTrigger(
-            cobblemonResource("plant_tumblestone"),
-            PlantTumblestoneCriterionCondition::class.java
-        )
-    )
-
    private fun <T : Criterion<*>> create(criteria: T): T = Cobblemon.implementation.registerCriteria(criteria)

 }
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.advancement.criterion
-
-import com.cobblemon.mod.common.block.TumblestoneBlock
-import com.google.gson.JsonObject
-import net.minecraft.predicate.entity.LootContextPredicate
-import net.minecraft.server.network.ServerPlayerEntity
-import net.minecraft.util.Identifier
-import net.minecraft.util.math.BlockPos
-
-/**
- * A criterion condition for when a tumblestone block is planted
- * @param id The identifier of the criterion
- * @param predicate The predicate for the criterion
- *
- * @author Aethen
- * @since 02/28/2024
- */
-class PlantTumblestoneCriterionCondition(id: Identifier, predicate: LootContextPredicate) :
-    SimpleCriterionCondition<PlantTumblestoneContext>(id, predicate) {
-    override fun toJson(json: JsonObject) {
-        // Add properties to json if needed. None needed for this criterion
-    }
-
-    override fun fromJson(json: JsonObject) {
-        // Parse properties from json if needed. None needed for this criterion
-    }
-
-    /**
-     * Checks if the tumblestone block can grow at the given position
-     * @param player The player that planted the tumblestone block
-     * @param context The context of the criterion
-     * @return True if the tumblestone block can grow at the given position, false otherwise
-     */
-    override fun matches(player: ServerPlayerEntity, context: PlantTumblestoneContext): Boolean {
-        return context.tumbleStoneBlock.canGrow(context.pos, player.world)
-    }
-}
-
-/**
- * The context of the [PlantTumblestoneCriterionCondition]
- * @param pos The position of the tumblestone block
- * @param tumbleStoneBlock The tumblestone block
- */
-open class PlantTumblestoneContext(var pos: BlockPos, var tumbleStoneBlock: TumblestoneBlock)
@@ -9,7 +9,6 @@
 package com.cobblemon.mod.common.api.abilities

 import com.cobblemon.mod.common.api.Priority
-import com.cobblemon.mod.common.pokemon.Pokemon
 import com.cobblemon.mod.common.util.DataKeys
 import com.google.gson.JsonObject
 import net.minecraft.nbt.NbtCompound
@@ -22,7 +21,7 @@ import net.minecraft.nbt.NbtCompound
 * @author Qu
 * @since January 9th, 2022
 */
-open class Ability internal constructor(var template: AbilityTemplate, forced: Boolean) {
+open class Ability internal constructor(var template: AbilityTemplate, var forced: Boolean) {

    val name: String
        get() = template.name
@@ -35,26 +34,16 @@ open class Ability internal constructor(var template: AbilityTemplate, forced: B

    /**
     * This represents the last known index of this backing ability in the species data.
-     * @see [Pokemon.updateAbility].
-     */
-    var forced: Boolean = forced
-        internal set
-
-    /**
-     * This represents the last known index of this backing ability in the species data.
-     *
-     * @see [Pokemon.updateAbility].
+     * If -1 the ability will attempt to find the correct index or reroll itself, this is done in order to be compatible with existing data
+     * The value can be mutated however this is not recommended by API users.
     */
    var index: Int = -1
-        internal set

    /**
     * The last known priority of this ability in the species data.
-     *
-     * @see [Pokemon.updateAbility].
+     * The value can be mutated however this is not recommended by API users.
     */
    var priority = Priority.LOWEST
-        internal set

    open fun saveToNBT(nbt: NbtCompound): NbtCompound {
        nbt.putString(DataKeys.POKEMON_ABILITY_NAME, name)
@@ -73,23 +62,19 @@ open class Ability internal constructor(var template: AbilityTemplate, forced: B
    }

    open fun loadFromNBT(nbt: NbtCompound): Ability {
-        this.template = Abilities.getOrException(nbt.getString(DataKeys.POKEMON_ABILITY_NAME))
-        this.forced = nbt.getBoolean(DataKeys.POKEMON_ABILITY_FORCED)
+        forced = nbt.getBoolean(DataKeys.POKEMON_ABILITY_FORCED)
        if (nbt.contains(DataKeys.POKEMON_ABILITY_INDEX) && nbt.contains(DataKeys.POKEMON_ABILITY_PRIORITY)) {
            this.index = nbt.getInt(DataKeys.POKEMON_ABILITY_INDEX)
            this.priority = Priority.valueOf(nbt.getString(DataKeys.POKEMON_ABILITY_PRIORITY))
        }
        return this
    }
-
    open fun loadFromJSON(json: JsonObject): Ability {
-        this.template = Abilities.getOrException(json.get(DataKeys.POKEMON_ABILITY_NAME).asString)
-        this.forced = json.get(DataKeys.POKEMON_ABILITY_FORCED)?.asBoolean ?: false
+        forced = json.get(DataKeys.POKEMON_ABILITY_FORCED)?.asBoolean ?: false
        if (json.has(DataKeys.POKEMON_ABILITY_INDEX) && json.has(DataKeys.POKEMON_ABILITY_PRIORITY)) {
            this.index = json.get(DataKeys.POKEMON_ABILITY_INDEX).asInt
            this.priority = Priority.valueOf(json.get(DataKeys.POKEMON_ABILITY_PRIORITY).asString)
        }
        return this
    }
-
 }
@@ -28,6 +28,7 @@ class AbilityTemplate(
     */
    fun create(forced: Boolean = false) = builder(this, forced)

+
    /**
     * Returns the Ability and loads the given NBT Tag into it.
     *
@@ -41,5 +42,4 @@ class AbilityTemplate(
     * Ability extensions need to write and read their needed data from here.
     */
    fun create(json: JsonObject) = create().loadFromJSON(json)
-
 }
@@ -1,75 +0,0 @@
-package com.cobblemon.mod.common.api.battles.effects
-
-import com.cobblemon.mod.common.api.battles.model.PokemonBattle
-import com.cobblemon.mod.common.api.conditional.RegistryLikeCondition
-import com.cobblemon.mod.common.api.spawning.TimeRange
-import com.cobblemon.mod.common.util.math.orMax
-import com.cobblemon.mod.common.util.math.orMin
-import com.cobblemon.mod.common.world.gamerules.CobblemonGameRules
-import net.minecraft.registry.Registry
-import net.minecraft.registry.RegistryKeys
-import net.minecraft.util.Identifier
-import net.minecraft.world.biome.Biome
-
-/**
- * Represents a field condition that can occur at battle start.
- *
- * @param identifier The [Identifier] of this condition.
- * @param biomes: A [MutableSet] of biomes that this condition will succeed in.
- * @param timeRange A [TimeRange] that this condition will succeed in.
- * @param isRaining Whether this condition requires rain to succeed. When null, will not perform any check.
- * @param isThundering Whether this condition requires thunder to succeed. When null, will not perform any check.
- * @param result The showdown ID of the field condition to apply.
- *
- * @author whatsy
- * @since April 9th, 2024
- */
-data class BattleStartCondition(
-    var identifier: Identifier,
-    val biomes: MutableSet<RegistryLikeCondition<Biome>>,
-    val timeRange: TimeRange? = null,
-    val isRaining: Boolean?,
-    val isThundering: Boolean?,
-
-    val minX: Float? = null,
-    val minY: Float? = null,
-    val minZ: Float? = null,
-    val maxX: Float? = null,
-    val maxY: Float? = null,
-    val maxZ: Float? = null,
-
-    val result: String
-) {
-    /***
-     * Checks if this [BattleStartCondition] can succeed in the context of the provided [PokemonBattle].
-     *
-     * @author whatsy
-     * @since April 9th, 2024
-     */
-    fun matches(battle: PokemonBattle): Boolean {
-        val player = battle.players.first()
-        val world = player.world ?: return false
-        if (!world.gameRules.getBoolean(CobblemonGameRules.WEATHER_AFFECTS_BATTLES)) return false
-        val pos = player.blockPos ?: return false
-        val biomeRegistry: Registry<Biome> by lazy { world.registryManager.get(RegistryKeys.BIOME) }
-        val biome = world.getBiome(pos).value()
-
-        if (biomes.isNotEmpty() && biomes.none { condition -> condition.fits(biome, biomeRegistry) }) {
-            return false
-        } else if (timeRange != null && !timeRange.contains((world.timeOfDay % 24000).toInt())) {
-            return false
-        } else if (world.isRaining != isRaining && isRaining != null) {
-            return false
-        } else if (world.isThundering != isThundering && isThundering != null) {
-            return false
-        } else if (pos.x < minX.orMin() || pos.x > maxX.orMax()) {
-            return false
-        } else if (pos.y < minY.orMin() || pos.y > maxY.orMax()) {
-            return false
-        } else if (pos.z < minZ.orMin() || pos.z > maxZ.orMax()) {
-            return false
-        }
-
-        return true
-    }
-}
@@ -1,61 +0,0 @@
-package com.cobblemon.mod.common.api.battles.effects
-
-import com.cobblemon.mod.common.Cobblemon
-import com.cobblemon.mod.common.api.conditional.RegistryLikeCondition
-import com.cobblemon.mod.common.api.data.JsonDataRegistry
-import com.cobblemon.mod.common.api.reactive.SimpleObservable
-import com.cobblemon.mod.common.api.spawning.TimeRange
-import com.cobblemon.mod.common.util.adapters.BiomeLikeConditionAdapter
-import com.cobblemon.mod.common.util.adapters.IdentifierAdapter
-import com.cobblemon.mod.common.util.adapters.IntRangesAdapter
-import com.cobblemon.mod.common.util.cobblemonResource
-import com.google.gson.GsonBuilder
-import com.google.gson.reflect.TypeToken
-import net.minecraft.resource.ResourceType
-import net.minecraft.server.network.ServerPlayerEntity
-import net.minecraft.util.Identifier
-import net.minecraft.world.biome.Biome
-
-object BattleStartConditions : JsonDataRegistry<BattleStartCondition> {
-
-    override val id = cobblemonResource("start_conditions")
-    override val type = ResourceType.SERVER_DATA
-    override val observable = SimpleObservable<BattleStartConditions>()
-
-    override val gson = GsonBuilder()
-        .disableHtmlEscaping()
-        .setPrettyPrinting()
-        .registerTypeAdapter(Identifier::class.java, IdentifierAdapter)
-        .registerTypeAdapter(TimeRange::class.java, IntRangesAdapter(TimeRange.timeRanges) { TimeRange(*it) })
-        .registerTypeAdapter(TypeToken.getParameterized(RegistryLikeCondition::class.java, Biome::class.java).type, BiomeLikeConditionAdapter)
-        .create()
-
-    override val typeToken = TypeToken.get(BattleStartCondition::class.java)
-    override val resourcePath = "start_conditions"
-
-    private val conditions = hashMapOf<Identifier, BattleStartCondition>()
-
-    override fun reload(data: Map<Identifier, BattleStartCondition>) {
-        this.conditions.clear()
-        data.forEach { id, condition ->
-            try {
-                condition.identifier = id
-                this.conditions[id] = condition
-            } catch (e: Exception) {
-                Cobblemon.LOGGER.error("Skipped loading battle start condition: {}", condition.identifier)
-            }
-            Cobblemon.LOGGER.info("Loaded {} battle start conditions", this.conditions.size)
-            this.observable.emit(this)
-        }
-    }
-
-    override fun sync(player: ServerPlayerEntity) {
-        // no need for the client to know about these since it's all handled server-side
-    }
-
-    /**
-     * Gets all loaded [BattleStartCondition]s.
-     */
-    fun all() = this.conditions.values.toList()
-
-}
@@ -135,31 +135,28 @@ class BattleMessage(rawMessage: String) {
        return this.actorAndActivePokemon(pnx, battle)
    }

-    /**
-     * Queries an argument at the given [index] for a 'pnx' and uuid that will be parsed into a [BattlePokemon].
-     *
-     * @param index The index of the argument referencing the [BattlePokemon].
-     * @param battle The [PokemonBattle] being queried.
-     * @return The [BattlePokemon] if the argument exists and is successfully parsed; otherwise null.
+    /*
+        Example:
+        |-curestatus|p1: a8e5710e-6835-4387-99d3-331b45f848e6|slp|[msg]
+        |-curestatus|p1: 0686b20d-3019-4167-92e2-786834245743|slp|[msg]
+        // Function used to grab BattlePokemon (As we need to be able to grab non active pokemon to cure their status)
+        // by using playerNumber(actorID) and pokemon uuid(pokemonID)
     */
-    fun battlePokemon(index: Int, battle: PokemonBattle): BattlePokemon? {
-        val (actorID, pokemonID) = this.pnxAndUuid(index) ?: return null
-        return this.battlePokemon(actorID, pokemonID, battle)
+    fun getBattlePokemon(index: Int, battle: PokemonBattle): BattlePokemon? {
+        val actorAndPokemonID = this.argumentAt(index)?.takeIf { it.length >= 2 }?.split(": ") ?: return null
+        if (actorAndPokemonID.count() < 2) return null
+        val actorID = actorAndPokemonID[0]
+        val pokemonID = actorAndPokemonID[1]
+        return this.getBattlePokemon(actorID, pokemonID, battle)
    }

-    /**
-     * Queries an optional argument identified by [optionalArg] for a 'pnx' and uuid that will be parsed into a [BattlePokemon].
-     *
-     * @param optionalArg The id of the optional argument referencing the [BattlePokemon].
-     * @param battle The [PokemonBattle] being queried.
-     * @return The [BattlePokemon] if the argument exists and is successfully parsed; otherwise null.
-     */
-    fun battlePokemonFromOptional(battle: PokemonBattle, optionalArg: String = "of"): BattlePokemon? {
-        val optional = this.optionalArguments.get(optionalArg) ?: return null
-        val pokemonID = optional.takeIf { it.length >= 2 }?.split(":")?.takeIf { it.size == 2 } ?: return null
-        val pnx = pokemonID[0].takeIf { it.matches(PNX_MATCHER) || it.matches(PN_MATCHER) } ?: return null
-        val uuid = pokemonID[1].trim()
-        return this.battlePokemon(pnx, uuid, battle)
+    fun getSourceBattlePokemon(battle: PokemonBattle): BattlePokemon? {
+        val sourcePokemonArgument = this.optionalArguments.get("of") ?: return null
+        val actorAndPokemonID = sourcePokemonArgument.takeIf { it.length >= 2 }?.split(": ") ?: return null
+        if (actorAndPokemonID.count() < 2) return null
+        val actorID = actorAndPokemonID[0]
+        val pokemonID = actorAndPokemonID[1]
+        return this.getBattlePokemon(actorID, pokemonID, battle)
    }

    /**
@@ -237,7 +234,7 @@ class BattleMessage(rawMessage: String) {
        null
    }

-    private fun battlePokemon(pnx: String, pokemonID: String, battle: PokemonBattle): BattlePokemon? = try {
+    private fun getBattlePokemon(pnx: String, pokemonID: String, battle: PokemonBattle): BattlePokemon? = try {
        battle.getBattlePokemon(pnx, pokemonID)
    } catch (_: Exception) {
        null
@@ -8,11 +8,13 @@

 package com.cobblemon.mod.common.api.battles.model

+import com.bedrockk.molang.runtime.MoLangEnvironment
 import com.bedrockk.molang.runtime.struct.QueryStruct
 import com.bedrockk.molang.runtime.value.DoubleValue
 import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.Cobblemon.LOGGER
 import com.cobblemon.mod.common.CobblemonNetwork
+import com.cobblemon.mod.common.Environment
 import com.cobblemon.mod.common.api.battles.interpreter.BattleMessage
 import com.cobblemon.mod.common.api.battles.model.actor.ActorType
 import com.cobblemon.mod.common.api.battles.model.actor.BattleActor
@@ -20,6 +22,8 @@ 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.events.CobblemonEvents
 import com.cobblemon.mod.common.api.events.battles.BattleFledEvent
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.addFunction
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.getQueryStruct
 import com.cobblemon.mod.common.api.net.NetworkPacket
 import com.cobblemon.mod.common.api.tags.CobblemonItemTags
 import com.cobblemon.mod.common.api.text.red
@@ -37,24 +41,19 @@ import com.cobblemon.mod.common.battles.dispatch.WaitDispatch
 import com.cobblemon.mod.common.battles.interpreter.ContextManager
 import com.cobblemon.mod.common.battles.pokemon.BattlePokemon
 import com.cobblemon.mod.common.battles.runner.ShowdownService
-import com.cobblemon.mod.common.entity.generic.GenericBedrockEntity
-import com.cobblemon.mod.common.battles.ForfeitActionResponse
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.net.messages.client.battle.BattleEndPacket
 import com.cobblemon.mod.common.net.messages.client.battle.BattleMessagePacket
+import com.cobblemon.mod.common.net.messages.client.battle.BattleMusicPacket
 import com.cobblemon.mod.common.pokemon.evolution.progress.DefeatEvolutionProgress
 import com.cobblemon.mod.common.pokemon.evolution.progress.LastBattleCriticalHitsEvolutionProgress
 import com.cobblemon.mod.common.pokemon.evolution.requirements.DefeatRequirement
 import com.cobblemon.mod.common.util.battleLang
-import com.cobblemon.mod.common.util.cobblemonResource
 import com.cobblemon.mod.common.util.getPlayer
-import net.minecraft.entity.Entity
 import java.io.File
 import java.util.UUID
 import net.minecraft.server.network.ServerPlayerEntity
 import net.minecraft.text.Text
-import net.minecraft.util.math.Vec3d
-import net.minecraft.world.World
 import java.util.concurrent.ConcurrentLinkedDeque

 /**
@@ -70,7 +69,7 @@ open class PokemonBattle(
    val side2: BattleSide
 ) {
    /** Whether logging will be silenced for this battle. */
-    var mute = false
+    var mute = true

    init {
        side1.battle = this
@@ -108,11 +107,6 @@ open class PokemonBattle(
    var turn: Int = 1
        private set

-    private var ticks: Int = 0
-        set(value) { field = value.coerceAtMost(Int.MAX_VALUE) } // go outside
-
-    /** The current duration of the battle in seconds. */
-    val time: Int get() = ticks % 20

    var dispatchResult = GO
    val dispatches = ConcurrentLinkedDeque<BattleDispatch>()
@@ -124,47 +118,6 @@ open class PokemonBattle(
    val minorBattleActions = hashMapOf<UUID, BattleMessage>()
    val contextManager = ContextManager()

-    var bedrockEntity: GenericBedrockEntity? = null
-    val world: World
-        get() = this.players.first().world
-
-    val pokemonPositions: Set<Vec3d>
-        get() {
-            val vectors = mutableSetOf<Vec3d>()
-            activePokemon.forEach {
-                if (it.position != null) vectors.add(it.position!!.second)
-            }
-            return vectors
-        }
-
-    fun getOrCreateBedrockEntity(): GenericBedrockEntity {
-        return if (bedrockEntity != null) {
-            bedrockEntity!!
-        } else {
-            bedrockEntity = GenericBedrockEntity(world = world)
-            bedrockEntity!!.apply {
-                category = cobblemonResource("field_particles")
-                syncAge = false
-                if (pokemonPositions.isNotEmpty()) setPosition(getPosForBedrockEntity(pokemonPositions))
-            }
-            world.spawnEntity(bedrockEntity)
-            bedrockEntity!!
-        }
-    }
-
-    fun getPosForBedrockEntity(vectors: Set<Vec3d>): Vec3d {
-        var sumX = 0.0
-        var sumZ = 0.0
-        for (vector in vectors) {
-            sumX += vector.x
-            sumZ += vector.z
-        }
-        val count = vectors.size
-        val y = vectors.maxByOrNull { it.y }?.y ?: 0.0
-
-        return Vec3d(sumX / count, y + 5.0, sumZ / count)
-    }
-
    /** Whether or not there is one side with at least one player, and the other only has wild Pokémon. */
    val isPvW: Boolean
        get() {
@@ -213,7 +166,7 @@ open class PokemonBattle(
    fun getActor(player: ServerPlayerEntity) = actors.firstOrNull { it.isForPlayer(player) }

    /**
-     * Gets a [BattleActor] and an [ActiveBattlePokemon] from a pnx key, e.g. p2a
+     * Gets a BattleActor and an [ActiveBattlePokemon] from a pnx key, e.g. p2a
     *
     * Returns null if either the pn or x is invalid.
     */
@@ -226,11 +179,6 @@ open class PokemonBattle(
        return actor to pokemon
    }

-    /**
-     * Gets a [BattlePokemon] from a pnx key and uuid.
-     *
-     * Returns null if the pnx key is invalid or the uuid does not exist.
-     */
    fun getBattlePokemon(pnx: String, pokemonID: String): BattlePokemon {
        val actor = actors.find { it.showdownId == pnx.substring(0, 2) }
            ?: throw IllegalStateException("Invalid pnx: $pnx - unknown actor")
@@ -263,7 +211,6 @@ open class PokemonBattle(

    fun end() {
        ended = true
-        bedrockEntity?.remove(Entity.RemovalReason.DISCARDED)
        this.actors.forEach { actor ->
            val faintedPokemons = actor.pokemonList.filter { it.health <= 0 }
            actor.getSide().getOppositeSide().actors.forEach { opponent ->
@@ -443,11 +390,8 @@ open class PokemonBattle(
            return
        }

-        bedrockEntity?.setPosition(getPosForBedrockEntity(pokemonPositions))
-
-        if (started) {
-            ticks++
-            if (isPvW && !ended && dispatches.isEmpty()) checkFlee()
+        if (started && isPvW && !ended && dispatches.isEmpty()) {
+            checkFlee()
        }
    }

@@ -489,24 +433,13 @@ open class PokemonBattle(
    }

    fun checkForInputDispatch() {
-        if (checkForfeit()) return  // ignore actors that are still choosing, their choices don't matter anymore
-        val readyToInput = (actors.any { !it.mustChoose && it.responses.isNotEmpty() } && actors.none { it.mustChoose })
+        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 }
        }
    }

-    /** Forces Showdown to end the battle when a [BattleActor] chooses to forfeit. */
-    private fun checkForfeit(): Boolean {
-        val forfeit = actors.find { it.responses.any { it is ForfeitActionResponse } }
-        return forfeit?.let {
-            this.dispatchWaiting { this.broadcastChatMessage(battleLang("forfeit", it.getName()).red()) }
-            writeShowdownAction(">forcelose ${it.showdownId}")
-            true
-        } ?: false
-    }
-
    /**
     * Creates a [Text] representation of an error to interpret a battle message.
     * This also logs the error, the goal of this function is to make sure users see missing interpretations and report them to us.
@@ -1,97 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.entity.pokemon
-
-import com.cobblemon.mod.common.api.pokemon.PokemonProperties
-import com.cobblemon.mod.common.api.pokemon.PokemonSpecies
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
-import com.cobblemon.mod.common.entity.pokemon.effects.IllusionEffect
-import com.cobblemon.mod.common.entity.pokemon.effects.TransformEffect
-import com.cobblemon.mod.common.pokemon.FormData
-import com.cobblemon.mod.common.pokemon.Species
-import com.cobblemon.mod.common.util.DataKeys
-import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
-import net.minecraft.nbt.NbtCompound
-import java.util.concurrent.CompletableFuture
-import kotlin.reflect.KClass
-
-/**
- * Represents a temporary alteration to how a [PokemonEntity] is rendered and behaves. May include a temporary visual effect
- * when applied.
- *
- * @author Segfault Guy
- * @since March 5th, 2024
- */
-interface EntityEffect {
-
-    /**
-     * Starts this effect for the provided [PokemonEntity].
-     *
-     * @return A [CompletableFuture] that completes after the effect has been applied. Or null if the effect failed to start.
-     */
-    fun start(entity: PokemonEntity): CompletableFuture<PokemonEntity>?
-
-    /**
-     * Ends this effect for the provided [PokemonEntity].
-     *
-     * @return A [CompletableFuture] that completes after the effect has been reverted. Or null if the effect failed to end.
-     */
-    fun end(entity: PokemonEntity): CompletableFuture<PokemonEntity>?
-
-    /** Saves this effect to NBT. */
-    fun saveToNbt(): NbtCompound
-
-    /** Loads this effect from NBT. */
-    fun loadFromNBT(nbt: NbtCompound)
-
-    companion object {
-
-        private val effects = mutableMapOf<String, KClass<out EntityEffect>>()
-        private val defaults = mutableMapOf<String, () -> EntityEffect>()
-
-        init {
-            register(IllusionEffect.ID, IllusionEffect::class, ::IllusionEffect)
-            register(TransformEffect.ID, TransformEffect::class, ::TransformEffect)
-        }
-
-        fun <T : EntityEffect> register(id: String, type: KClass<T>, default: () -> T) {
-            effects[id] = type
-            defaults[id] = default
-        }
-
-        fun createDefault(id: String): EntityEffect? = defaults[id]?.invoke()
-
-        fun loadFromNbt(nbt: NbtCompound): EntityEffect? {
-            if (nbt.contains(DataKeys.ENTITY_EFFECT_ID)) {
-                val id = nbt.getString(DataKeys.ENTITY_EFFECT_ID)
-                return createDefault(id)?.also { it.loadFromNBT(nbt) }
-            }
-            return null
-        }
-    }
-}
-
-
-/** An [EntityEffect] that modifies the dimensions of a [PokemonEntity]. */
-interface PhysicalEffect : EntityEffect {
-    val scale: Float
-}
-
-/** An [EntityEffect] that alters the physical appearance of a [PokemonEntity] to match a [mock]. */
-interface MocKEffect : PhysicalEffect {
-    val mock: PokemonProperties
-
-    val exposedSpecies: Species?
-        get() = this.mock.species?.let { PokemonSpecies.getByIdentifier(it.asIdentifierDefaultingNamespace()) }
-
-    val exposedForm: FormData?
-        get() = this.mock.form?.let {
-            formID -> this.exposedSpecies?.forms?.firstOrNull { it.formOnlyShowdownId().equals(formID, true) } }
-                ?: this.exposedSpecies?.standardForm
-}
@@ -1,74 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.item.ability
-
-import com.cobblemon.mod.common.api.abilities.*
-import com.cobblemon.mod.common.item.interactive.ability.AbilityTypeChanger
-import com.cobblemon.mod.common.pokemon.Pokemon
-import com.cobblemon.mod.common.pokemon.abilities.HiddenAbility
-import com.cobblemon.mod.common.pokemon.abilities.HiddenAbilityType
-
-/**
- * Represents a change operation for a [Pokemon.ability].
- * This is backed by the associated [PotentialAbility].
- *
- * @param T The type of [PotentialAbility].
- */
-interface AbilityChanger<T : PotentialAbility> {
-
-    /**
-     * The [PotentialAbilityType] of type [T].
-     */
-    val type: PotentialAbilityType<T>
-
-    /**
-     * Collects all the possible targets for the [type] and the given [pokemon].
-     *
-     * @param pokemon The [Pokemon] being queried.
-     * @return A set containing all their legal abilities associated with [type], can be empty.
-     */
-    fun queryPossible(pokemon: Pokemon): Set<AbilityTemplate>
-
-    /**
-     * Attempts to update the ability of the given [pokemon].
-     *
-     * @param pokemon The [Pokemon] attempting to change an ability.
-     * @return If the operation was successful.
-     */
-    fun performChange(pokemon: Pokemon): Boolean
-
-    /**
-     * Checks if the current [PotentialAbilityType] of a [Pokemon.ability] is possible to swap from with this.
-     *
-     * @param type The [PotentialAbilityType] or null if the ability is forced and/or illegal.
-     * @return If the operation can be performed.
-     */
-    fun canChangeFrom(type: PotentialAbilityType<*>?): Boolean
-
-    companion object {
-
-        /**
-         * An implementation of [AbilityChanger] for [CommonAbility].
-         *
-         * While this can be used in custom data scenarios this functions most "game-like" if the Pokémon only has 2 common abilities.
-         */
-        @JvmStatic
-        val COMMON_ABILITY: AbilityChanger<CommonAbility> = AbilityTypeChanger(CommonAbilityType) { other -> other == CommonAbilityType }
-
-        /**
-         * An implementation of [AbilityChanger] for [HiddenAbility].
-         *
-         * While this can be used in custom data scenarios this functions most "game-like" if the Pokémon only has 1 hidden ability.
-         */
-        @JvmStatic
-        val HIDDEN_ABILITY: AbilityChanger<HiddenAbility> = AbilityTypeChanger(HiddenAbilityType) { other -> other == CommonAbilityType || other == HiddenAbilityType }
-
-    }
-
-}
@@ -35,8 +35,8 @@ abstract class MultiblockBlock(properties: Settings) : BlockWithEntity(propertie
        itemStack: ItemStack?
    ) {
        if (world is ServerWorld) {
-            val multiblockEntity = world.getBlockEntity(pos) as? MultiblockEntity
-            multiblockEntity?.multiblockBuilder?.validate(world)
+            val multiblockEntity = world.getBlockEntity(pos) as MultiblockEntity
+            multiblockEntity.multiblockBuilder?.validate(world)
        }
        super.onPlaced(world, pos, state, placer, itemStack)
    }
@@ -52,8 +52,8 @@ abstract class MultiblockBlock(properties: Settings) : BlockWithEntity(propertie
        if(hand == Hand.OFF_HAND) {
            return ActionResult.SUCCESS
        }
-        val entity = world.getBlockEntity(pos) as MultiblockEntity?
-        if (entity?.multiblockStructure != null) {
+        val entity = world.getBlockEntity(pos) as MultiblockEntity
+        if (entity.multiblockStructure != null) {
            return entity.multiblockStructure!!.onUse(state, world, pos, player, hand, hit)
        }
        return super.onUse(state, world, pos, player, hand, hit)
@@ -205,8 +205,8 @@ object PokeBalls : JsonDataRegistry<PokeBall> {
        createDefault("ancient_wing_ball", throwPower = 2.5f, ancient = true)
        createDefault("ancient_jet_ball", throwPower = 2.5f, ancient = true)
        createDefault("ancient_origin_ball", GuaranteedModifier(), ancient = true)
-        // Luxury ball effect, low priority as it must be triggered before soothe bell as of gen 4
-        CobblemonEvents.FRIENDSHIP_UPDATED.subscribe(priority = Priority.LOW) { event ->
+        // Luxury ball effect
+        CobblemonEvents.FRIENDSHIP_UPDATED.subscribe(priority = Priority.LOWEST) { event ->
            var increment = (event.newFriendship - event.pokemon.friendship).toFloat()
            if (increment <= 1F) {
                event.pokemon.caughtBall.effects.filterIsInstance<FriendshipEarningBoostEffect>()
@@ -13,14 +13,12 @@ import com.bedrockk.molang.runtime.value.DoubleValue
 import com.bedrockk.molang.runtime.value.StringValue
 import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.api.abilities.Abilities
-import com.cobblemon.mod.common.api.abilities.Ability
 import com.cobblemon.mod.common.api.pokeball.PokeBalls
 import com.cobblemon.mod.common.api.pokemon.aspect.AspectProvider
 import com.cobblemon.mod.common.api.pokemon.stats.Stats
 import com.cobblemon.mod.common.api.pokemon.status.Statuses
 import com.cobblemon.mod.common.api.properties.CustomPokemonProperty
 import com.cobblemon.mod.common.api.types.ElementalTypes
-import com.cobblemon.mod.common.api.types.tera.TeraTypes
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.pokemon.*
 import com.cobblemon.mod.common.pokemon.status.PersistentStatus
@@ -296,18 +294,6 @@ open class PokemonProperties {
    )

    fun apply(pokemon: Pokemon) {
-        // Custom properties check could be duplicated but can't assume 3rd party hasn't done anything type specific
-        this.customProperties.forEach { it.apply(pokemon) }
-        this.commonApply(pokemon)
-    }
-
-    fun apply(pokemonEntity: PokemonEntity) {
-        // Custom properties check could be duplicated but can't assume 3rd party hasn't done anything type specific
-        this.customProperties.forEach { it.apply(pokemonEntity) }
-        this.commonApply(pokemonEntity.pokemon)
-    }
-
-    private fun commonApply(pokemon: Pokemon) {
        species?.let {
            return@let try {
                if (it == "random") {
@@ -327,8 +313,8 @@ open class PokemonProperties {
        friendship?.let { pokemon.setFriendship(it) }
        pokeball?.let { PokeBalls.getPokeBall(it.asIdentifierDefaultingNamespace())?.let { pokeball -> pokemon.caughtBall = pokeball } }
        nature?.let  { Natures.getNature(it.asIdentifierDefaultingNamespace())?.let { nature -> pokemon.nature = nature } }
-        ability?.let { this.createAbility(it, pokemon.form)?.let(pokemon::updateAbility) }
-        status?.let { Statuses.getStatus(it)?.let { status -> if (status is PersistentStatus) pokemon.applyStatus(status) } }
+        ability?.let { Abilities.getOrException(it).create(true).let { ability -> pokemon.ability = ability } }
+        status?.let { Statuses.getStatus(it)?.let { pokemon.applyStatus(it as PersistentStatus) } }
        customProperties.forEach { it.apply(pokemon) }
        ivs?.let { ivs ->
            ivs.forEach { stat ->
@@ -340,7 +326,7 @@ open class PokemonProperties {
                pokemon.setEV(stat.key, stat.value)
            }
        }
-        teraType?.let { TeraTypes.get(it.asIdentifierDefaultingNamespace())?.let { type -> pokemon.teraType = type } }
+        teraType?.let { ElementalTypes.get(it)?.let { type -> pokemon.teraType = type } }
        dmaxLevel?.let { pokemon.dmaxLevel = it }
        gmaxFactor?.let { pokemon.gmaxFactor = it }
        tradeable?.let { pokemon.tradeable = it }
@@ -369,17 +355,69 @@ open class PokemonProperties {
        pokemon.updateAspects()
    }

+    fun apply(pokemonEntity: PokemonEntity) {
+        species?.let {
+            return@let try {
+                if (it == "random") {
+                    PokemonSpecies.species.random()
+                } else {
+                    PokemonSpecies.getByIdentifier(it.asIdentifierDefaultingNamespace())
+                }
+            } catch (e: InvalidIdentifierException) {
+                null
+            }
+        }?.let { pokemonEntity.pokemon.species = it }
+        nickname?.let { pokemonEntity.pokemon.nickname = it }
+        form?.let { formID -> pokemonEntity.pokemon.species.forms.firstOrNull { it.formOnlyShowdownId().equals(formID, true) } }?.let { form -> pokemonEntity.pokemon.form = form }
+        level?.let { pokemonEntity.pokemon.level = it }
+        shiny?.let { pokemonEntity.pokemon.shiny = it }
+        gender?.let { pokemonEntity.pokemon.gender = it }
+        friendship?.let { pokemonEntity.pokemon.setFriendship(it) }
+        pokeball?.let { PokeBalls.getPokeBall(it.asIdentifierDefaultingNamespace())?.let { pokeball -> pokemonEntity.pokemon.caughtBall = pokeball } }
+        nature?.let { Natures.getNature(it.asIdentifierDefaultingNamespace())?.let { nature -> pokemonEntity.pokemon.nature = nature } }
+        ability?.let { Abilities.getOrException(it).create(true).let { ability -> pokemonEntity.pokemon.ability = ability } }
+        status?.let { Statuses.getStatus(it)?.let { pokemonEntity.pokemon.applyStatus(it as PersistentStatus) } }
+        customProperties.forEach { it.apply(pokemonEntity) }
+        ivs?.let { ivs ->
+            ivs.forEach { stat ->
+                pokemonEntity.pokemon.setIV(stat.key, stat.value)
+            }
+        }
+        evs?.let { evs ->
+            evs.forEach { stat ->
+                pokemonEntity.pokemon.setEV(stat.key, stat.value)
+            }
+        }
+        teraType?.let { ElementalTypes.get(it)?.let { type -> pokemonEntity.pokemon.teraType = type } }
+        dmaxLevel?.let { pokemonEntity.pokemon.dmaxLevel = it }
+        gmaxFactor?.let { pokemonEntity.pokemon.gmaxFactor = it }
+        tradeable?.let { pokemonEntity.pokemon.tradeable = it }
+        // If it has been explicitly set to NONE, clear the stored information, including the originalTrainer property
+        originalTrainerType?.let {
+            if (it == OriginalTrainerType.NONE) {
+                pokemonEntity.pokemon.removeOriginalTrainer()
+                originalTrainer = null
+            }
+        }
+        originalTrainer?.let { ot ->
+            val type = originalTrainerType ?: pokemonEntity.pokemon.originalTrainerType
+            when (type) {
+                OriginalTrainerType.PLAYER -> {
+                    when (ot.length) {
+                        in 3..16 -> server()?.userCache?.findByName(ot)?.get()?.id // OT is a Username
+                        36 -> UUID.fromString(ot) // OT is a UUID
+                        else -> null // OT is invalid
+                    }?.let { uuid -> pokemonEntity.pokemon.setOriginalTrainer(uuid) }
+                }
+                OriginalTrainerType.NPC -> pokemonEntity.pokemon.setOriginalTrainer(ot)
+                else -> {}
+            }
+            pokemonEntity.pokemon.refreshOriginalTrainer()
+        }
+        pokemonEntity.pokemon.updateAspects()
+    }
+
    fun matches(pokemon: Pokemon): Boolean {
-        // Custom properties check could be duplicated but can't assume 3rd party hasn't done anything type specific
-        return this.commonMatches(pokemon) && this.customProperties.none { !it.matches(pokemon) }
-    }
-
-    fun matches(pokemonEntity: PokemonEntity): Boolean {
-        // Custom properties check could be duplicated but can't assume 3rd party hasn't done anything type specific
-        return this.commonMatches(pokemonEntity.pokemon) && this.customProperties.none { !it.matches(pokemonEntity) }
-    }
-
-    private fun commonMatches(pokemon: Pokemon): Boolean {
        level?.takeIf { it != pokemon.level }?.let { return false }
        shiny?.takeIf { it != pokemon.shiny }?.let { return false }
        gender?.takeIf { it != pokemon.gender }?.let { return false }
@@ -397,7 +435,7 @@ open class PokemonProperties {
                return false
            }
        }
-        nickname?.takeIf { it.string != pokemon.nickname?.string }?.let { return false }
+        nickname?.takeIf { it != pokemon.nickname }?.let { return false }
        form?.takeIf { !it.equals(pokemon.form.name, true) }?.let { return false }
        friendship?.takeIf { it != pokemon.friendship }?.let { return false }
        pokeball?.takeIf { it != pokemon.caughtBall.name.toString() }?.let { return false }
@@ -410,23 +448,59 @@ open class PokemonProperties {
        evs?.forEach{ stat ->
            if (stat.value != pokemon.evs[stat.key]) { return false }
        }
-        teraType?.takeIf { it.asIdentifierDefaultingNamespace() != pokemon.teraType.id }?.let { return false }
+        teraType?.takeIf { it != pokemon.teraType.name }?.let { return false }
        dmaxLevel?.takeIf { it != pokemon.dmaxLevel }?.let { return false }
        gmaxFactor?.takeIf { it != pokemon.gmaxFactor }?.let { return false }
        tradeable?.takeIf { it != pokemon.tradeable }?.let { return false }
        originalTrainer?.takeIf { it != pokemon.originalTrainer }?.let{ return false }
        originalTrainerType?.takeIf { it != pokemon.originalTrainerType }?.let{ return false }
-        return true
+        return customProperties.none { !it.matches(pokemon) }
+    }
+
+    fun matches(pokemonEntity: PokemonEntity): Boolean {
+        level?.takeIf { it != pokemonEntity.pokemon.level }?.let { return false }
+        shiny?.takeIf { it != ("shiny" in pokemonEntity.pokemon.aspects) }?.let { return false }
+        gender?.takeIf { it != pokemonEntity.pokemon.gender }?.let { return false }
+        species?.run {
+            try {
+                val species = if (this == "random") {
+                    PokemonSpecies.species.random()
+                } else {
+                    PokemonSpecies.getByIdentifier(this.asIdentifierDefaultingNamespace()) ?: return@run
+                }
+                if (pokemonEntity.pokemon.species != species) {
+                    return false
+                }
+            } catch (e: InvalidIdentifierException) {}
+        }
+        nickname?.takeIf { it != pokemonEntity.pokemon.nickname }?.let { return false }
+        form?.takeIf { !it.equals(pokemonEntity.pokemon.form.name, true) }?.let { return false }
+        friendship?.takeIf { it != pokemonEntity.pokemon.friendship }?.let { return false }
+        pokeball?.takeIf { it != pokemonEntity.pokemon.caughtBall.name.toString() }?.let { return false }
+        nature?.takeIf { it != pokemonEntity.pokemon.nature.name.toString() }?.let { return false }
+        ability?.takeIf { it != pokemonEntity.pokemon.ability.name }?.let { return false }
+        status?.takeIf { it != pokemonEntity.pokemon.status?.status?.showdownName }?.let { return false }
+        ivs?.forEach{ stat ->
+            if (stat.value != pokemonEntity.pokemon.ivs[stat.key]) { return false }
+        }
+        evs?.forEach{ stat ->
+            if (stat.value != pokemonEntity.pokemon.evs[stat.key]) { return false }
+        }
+        teraType?.takeIf { it != pokemonEntity.pokemon.teraType.name }?.let { return false }
+        dmaxLevel?.takeIf { it != pokemonEntity.pokemon.dmaxLevel }?.let { return false }
+        gmaxFactor?.takeIf { it != pokemonEntity.pokemon.gmaxFactor }?.let { return false }
+        tradeable?.takeIf { it != pokemonEntity.pokemon.tradeable }?.let { return false }
+        originalTrainer?.takeIf { it != pokemonEntity.pokemon.originalTrainer }?.let{ return false }
+        originalTrainerType?.takeIf { it != pokemonEntity.pokemon.originalTrainerType }?.let{ return false }
+        return customProperties.none { !it.matches(pokemonEntity) }
    }

-    // TODO Review the need for this, usage for us is in commands that deviate from the behavior established by multiple Pokémon query equivalent
    fun isSubSetOf(properties: PokemonProperties): Boolean {
        level?.takeIf { it != properties.level }?.let { return false }
        shiny?.takeIf { it != ("shiny" in properties.aspects) }?.let { return false }
        gender?.takeIf { it != properties.gender }?.let { return false }
        species?.run {
            try {
-                // TODO get context on this bit, it's highly unlikely two randoms would result in the same Pokémon, doesn't mean the prop is not equal?
                val species = if (this == "random") {
                    PokemonSpecies.species.random()
                } else {
@@ -435,9 +509,9 @@ open class PokemonProperties {
                if (properties.species != species.toString()) {
                    return false
                }
-            } catch (_: InvalidIdentifierException) {}
+            } catch (e: InvalidIdentifierException) {}
        }
-        nickname?.takeIf { it.string != properties.nickname?.string }?.let { return false }
+        nickname?.takeIf { it != properties.nickname }?.let { return false }
        form?.takeIf { !it.equals(properties.form, true) }?.let { return false }
        friendship?.takeIf { it != properties.friendship }?.let { return false }
        pokeball?.takeIf { it != properties.pokeball }?.let { return false }
@@ -477,18 +551,20 @@ open class PokemonProperties {

    // TEST YOUR LUCK!
    fun roll(pokemon: Pokemon) {
-        val baseTypes = pokemon.form.types.toList()
+        val baseTypes = pokemon.species.types.toList()
        if (this.shiny == null) pokemon.shiny = Cobblemon.config.shinyRate.checkRate()
        if (this.teraType == null) pokemon.teraType =
-            if (Cobblemon.config.teraTypeRate.checkRate()) TeraTypes.random(true)
-            else TeraTypes.forElementalType(baseTypes.random())
+            if (Cobblemon.config.teraTypeRate.checkRate()) ElementalTypes.all().filter { !baseTypes.contains(it) }.random()
+            else baseTypes.random()
    }

+    // If the config value is at least 1, then do 1/x and use that as the property chance
+    private fun Float.checkRate(): Boolean = this >= 1 && (Random.Default.nextFloat() < 1 / this)
+
    fun createEntity(world: World): PokemonEntity {
        return PokemonEntity(world, create())
    }

-    // TODO Codecs at some point
    fun saveToNBT(): NbtCompound {
        val nbt = NbtCompound()
        originalString.let { nbt.putString(DataKeys.POKEMON_PROPERTIES_ORIGINAL_TEXT, it) }
@@ -517,7 +593,6 @@ open class PokemonProperties {
        return nbt
    }

-    // TODO Codecs at some point
    fun loadFromNBT(tag: NbtCompound): PokemonProperties {
        originalString = tag.getString(DataKeys.POKEMON_PROPERTIES_ORIGINAL_TEXT)
        level = if (tag.contains(DataKeys.POKEMON_LEVEL)) tag.getInt(DataKeys.POKEMON_LEVEL) else null
@@ -546,7 +621,6 @@ open class PokemonProperties {
        return this
    }

-    // TODO Codecs at some point
    fun saveToJSON(): JsonObject {
        val json = JsonObject()
        originalString.let { json.addProperty(DataKeys.POKEMON_PROPERTIES_ORIGINAL_TEXT, it) }
@@ -576,7 +650,6 @@ open class PokemonProperties {
        return json
    }

-    // TODO Codecs at some point
    fun loadFromJSON(json: JsonObject): PokemonProperties {
        originalString = json.get(DataKeys.POKEMON_PROPERTIES_ORIGINAL_TEXT)?.asString ?: ""
        level = json.get(DataKeys.POKEMON_LEVEL)?.asInt
@@ -654,21 +727,4 @@ open class PokemonProperties {
    fun copy(): PokemonProperties {
        return PokemonProperties().loadFromJSON(saveToJSON())
    }
-
-    // If the config value is at least 1, then do 1/x and use that as the property chance
-    private fun Float.checkRate(): Boolean = this >= 1 && (Random.Default.nextFloat() < 1 / this)
-
-    /**
-     * Attempts to find an ability by ID and resolve if it should be forced or if it's legal for the given form.
-     *
-     * @param id The literal ID of the [Ability] being mapped.
-     * @param form The [FormData] whose [FormData.abilities] is queried for legality.
-     * @return The [Ability] with the [Ability.forced] state necessary for the given [form].
-     */
-    private fun createAbility(id: String, form: FormData): Ability? {
-        val ability = Abilities.get(id) ?: return null
-        val potentialAbility = form.abilities.firstOrNull { potential -> potential.template == ability } ?: return ability.create(true)
-        return potentialAbility.template.create(false)
-    }
-
 }
@@ -48,11 +48,6 @@ fun interface PokemonPropertyExtractor {
        @JvmField
        val STATUS = add { pokemon, properties -> properties.status = pokemon.status?.status?.showdownName }

-        @JvmField
-        val ILLUSION = mutableListOf(SPECIES, FORM, ASPECTS, GENDER, NICKNAME, SHINY)
-        @JvmField
-        val TRANSFORM = mutableListOf(SPECIES, FORM, ASPECTS, GENDER)
-
        fun add(extractor: PokemonPropertyExtractor): PokemonPropertyExtractor {
            ALL.add(extractor)
            return extractor
@@ -49,25 +49,6 @@ enum class Stats(override val identifier: Identifier, override val displayName:
         */
        val BATTLE_ONLY: Set<Stat> = EnumSet.of(EVASION, ACCURACY)

-        /** Gets the [Stat] from the respective Showdown id. */
-        fun getStat(statKey: String) = when(statKey) {
-            "atk" -> ATTACK
-            "def" -> DEFENCE
-            "spa" -> SPECIAL_ATTACK
-            "spd" -> SPECIAL_DEFENCE
-            "spe" -> SPEED
-            "evasion" -> EVASION
-            else -> ACCURACY
-        }
-
-        /** Gets the severity lang key from the respective boost/unboost stage. */
-        fun getSeverity(stages: Int) = when(stages) {
-            0 -> "cap.single"
-            1 -> "slight"
-            2 -> "sharp"
-            else -> "severe"
-        }
-
    }

 }
@@ -20,6 +20,7 @@ import com.mojang.serialization.codecs.PrimitiveCodec
 import com.mojang.serialization.codecs.RecordCodecBuilder
 import net.minecraft.network.PacketByteBuf
 import net.minecraft.util.Identifier
+import net.minecraft.util.math.Vec3d

 /**
 * Effect details for the actual particles of a particle effect.
@@ -43,106 +44,48 @@ class BedrockParticle(
    var cameraMode: ParticleCameraMode = RotateXYZCameraMode(),
    var tinting: ParticleTinting = ExpressionParticleTinting(),
    var collision: ParticleCollision = ParticleCollision(),
-    var environmentLighting: Boolean = false,
-    var creationEvents: MutableList<SimpleEventTrigger> = mutableListOf(),
-    var expirationEvents: MutableList<SimpleEventTrigger> = mutableListOf(),
-    var timeline: EventTriggerTimeline = EventTriggerTimeline(mutableMapOf())
+    var environmentLighting: Boolean = false
 ) {
-    class ExpressionSet(
-        val sizeX: Expression,
-        val sizeY: Expression,
-        val maxAge: Expression,
-        val killExpression: Expression,
-        val updateExpressions: MutableList<Expression>,
-        val renderExpressions: MutableList<Expression>
-    )
-
-    /*
-    				"creation_event": "event_sendspark",
-				"expiration_event": ["event_spark", "event_afterspark", "event_capturestar"],
-				"timeline": {
-					"21.00": "event_spark"
-				}
-     */
-
-    class EventSet(
-        val creationEvents: MutableList<SimpleEventTrigger>,
-        val expirationEvents: MutableList<SimpleEventTrigger>,
-        val timeline: EventTriggerTimeline
-    )
-
    // kill plane maybe
    companion object {
-        val EXPRESSION_SET_CODEC = RecordCodecBuilder.create<ExpressionSet> { instance ->
-            instance.group(
-                EXPRESSION_CODEC.fieldOf("sizeX").forGetter { it.sizeX },
-                EXPRESSION_CODEC.fieldOf("sizeY").forGetter { it.sizeY },
-                EXPRESSION_CODEC.fieldOf("maxAge").forGetter { it.maxAge },
-                EXPRESSION_CODEC.fieldOf("killExpression").forGetter { it.killExpression },
-                ListCodec(EXPRESSION_CODEC).fieldOf("updateExpressions").forGetter { it.updateExpressions },
-                ListCodec(EXPRESSION_CODEC).fieldOf("renderExpressions").forGetter { it.renderExpressions }
-            ).apply(instance, ::ExpressionSet)
-        }
-
-        val EVENT_SET_CODEC = RecordCodecBuilder.create<EventSet> { instance ->
-            instance.group(
-                ListCodec(SimpleEventTrigger.CODEC).fieldOf("creationEvents").forGetter { it.creationEvents },
-                ListCodec(SimpleEventTrigger.CODEC).fieldOf("expirationEvents").forGetter { it.expirationEvents },
-                EventTriggerTimeline.CODEC.fieldOf("timeline").forGetter { it.timeline }
-            ).apply(instance, ::EventSet)
-        }
-
        val CODEC: Codec<BedrockParticle> = RecordCodecBuilder.create { instance ->
            instance.group(
                Identifier.CODEC.fieldOf("texture").forGetter { it.texture },
                PrimitiveCodec.STRING.fieldOf("material").forGetter { it.material.name },
                ParticleUVMode.codec.fieldOf("uvMode").forGetter { it.uvMode },
-                EXPRESSION_SET_CODEC.fieldOf("expressionSet").forGetter {
-                    ExpressionSet(
-                        it.sizeX,
-                        it.sizeY,
-                        it.maxAge,
-                        it.killExpression,
-                        it.updateExpressions,
-                        it.renderExpressions
-                    )
-                },
+                EXPRESSION_CODEC.fieldOf("sizeX").forGetter { it.sizeX },
+                EXPRESSION_CODEC.fieldOf("sizeY").forGetter { it.sizeY },
+                EXPRESSION_CODEC.fieldOf("maxAge").forGetter { it.maxAge },
+                EXPRESSION_CODEC.fieldOf("killExpression").forGetter { it.killExpression },
+                ListCodec(EXPRESSION_CODEC).fieldOf("updateExpressions").forGetter { it.updateExpressions },
+                ListCodec(EXPRESSION_CODEC).fieldOf("renderExpressions").forGetter { it.renderExpressions },
                ParticleMotion.codec.fieldOf("motion").forGetter { it.motion },
                ParticleRotation.codec.fieldOf("rotation").forGetter { it.rotation },
                ParticleViewDirection.codec.fieldOf("viewDirection").forGetter { it.viewDirection },
                ParticleCameraMode.codec.fieldOf("cameraMode").forGetter { it.cameraMode },
                ParticleTinting.codec.fieldOf("tinting").forGetter { it.tinting },
                ParticleCollision.CODEC.fieldOf("collision").forGetter { it.collision },
-                PrimitiveCodec.BOOL.fieldOf("environmentLighting").forGetter { it.environmentLighting },
-                EVENT_SET_CODEC.fieldOf("eventSet").forGetter {
-                    EventSet(
-                        it.creationEvents,
-                        it.expirationEvents,
-                        it.timeline
-                    )
-                }
+                PrimitiveCodec.BOOL.fieldOf("environmentLighting").forGetter { it.environmentLighting }
            ).apply(instance) {
-                    texture, materialStr, uvMode, expressionSet, motion, rotation, viewDirection, cameraMode, tinting, collision, environmentLighting, eventSet ->
+                    texture, materialStr, uvMode, sizeX, sizeY, maxAge, killExpression, updateExpressions,
+                    renderExpressions, motion, rotation, viewDirection, cameraMode, tinting, collision, environmentLighting ->
                BedrockParticle(
                    texture = texture,
                    material = ParticleMaterial.valueOf(materialStr),
                    uvMode = uvMode,
-                    sizeX = expressionSet.sizeX,
-                    sizeY = expressionSet.sizeY,
-                    maxAge = expressionSet.maxAge,
-                    killExpression = expressionSet.killExpression,
-                    updateExpressions = expressionSet.updateExpressions,
-                    renderExpressions = expressionSet.renderExpressions,
+                    sizeX = sizeX,
+                    sizeY = sizeY,
+                    maxAge = maxAge,
+                    killExpression = killExpression,
+                    updateExpressions = updateExpressions,
+                    renderExpressions = renderExpressions,
                    motion = motion,
                    rotation = rotation,
                    viewDirection = viewDirection,
                    cameraMode = cameraMode,
                    tinting = tinting,
                    collision = collision,
-                    environmentLighting = environmentLighting,
-                    creationEvents = eventSet.creationEvents,
-                    expirationEvents = eventSet.expirationEvents,
-                    timeline = eventSet.timeline
+                    environmentLighting = environmentLighting
                )
            }
        }
@@ -165,9 +108,6 @@ class BedrockParticle(
        ParticleTinting.writeToBuffer(buffer, tinting)
        collision.writeToBuffer(buffer)
        buffer.writeBoolean(environmentLighting)
-        buffer.writeCollection(creationEvents) { pb, event -> event.encode(pb) }
-        buffer.writeCollection(expirationEvents) { pb, event -> event.encode(pb) }
-        timeline.encode(buffer)
    }

    fun readFromBuffer(buffer: PacketByteBuf) {
@@ -187,8 +127,5 @@ class BedrockParticle(
        tinting = ParticleTinting.readFromBuffer(buffer)
        collision.readFromBuffer(buffer)
        environmentLighting = buffer.readBoolean()
-        creationEvents = buffer.readList { SimpleEventTrigger("").also { it.decode(buffer) } }
-        expirationEvents = buffer.readList { SimpleEventTrigger("").also { it.decode(buffer) } }
-        timeline.decode(buffer)
    }
 }
@@ -10,9 +10,7 @@ package com.cobblemon.mod.common.api.snowstorm

 import com.mojang.serialization.Codec
 import com.mojang.serialization.codecs.ListCodec
-import com.mojang.serialization.codecs.PrimitiveCodec
 import com.mojang.serialization.codecs.RecordCodecBuilder
-import com.mojang.serialization.codecs.UnboundedMapCodec
 import net.minecraft.network.PacketByteBuf
 import net.minecraft.util.Identifier

@@ -29,8 +27,7 @@ class BedrockParticleEffect(
    var emitter: BedrockParticleEmitter = BedrockParticleEmitter(),
    var particle: BedrockParticle = BedrockParticle(),
    var curves: MutableList<MoLangCurve> = mutableListOf(),
-    var space: ParticleSpace = ParticleSpace(),
-    var events: MutableMap<String, ParticleEvent> = mutableMapOf()
+    var space: ParticleSpace = ParticleSpace()
 ) {
    companion object {
        val CODEC: Codec<BedrockParticleEffect> = RecordCodecBuilder.create { instance ->
@@ -39,16 +36,14 @@ class BedrockParticleEffect(
                BedrockParticleEmitter.CODEC.fieldOf("emitter").forGetter { it.emitter },
                BedrockParticle.CODEC.fieldOf("particle").forGetter { it.particle },
                ListCodec(MoLangCurve.codec).fieldOf("curves").forGetter { it.curves },
-                ParticleSpace.CODEC.fieldOf("space").forGetter { it.space },
-                UnboundedMapCodec(PrimitiveCodec.STRING, ParticleEvent.CODEC).fieldOf("events").forGetter { it.events }
-            ).apply(instance) { id, emitter, particle, curves, space, events ->
+                ParticleSpace.CODEC.fieldOf("space").forGetter { it.space }
+            ).apply(instance) { id, emitter, particle, curves, space ->
                BedrockParticleEffect(
                    id = id,
                    emitter = emitter,
                    particle = particle,
                    curves = curves.toMutableList(),
-                    space = space,
-                    events = events
+                    space = space
                )
            }
        }
@@ -60,7 +55,6 @@ class BedrockParticleEffect(
        particle.writeToBuffer(buffer)
        buffer.writeCollection(curves) { pb, curve -> MoLangCurve.writeToBuffer(buffer, curve) }
        space.writeToBuffer(buffer)
-        buffer.writeMap(events, { _, v -> buffer.writeString(v) }) { _, event -> event.encode(buffer) }
    }

    fun readFromBuffer(buffer: PacketByteBuf) {
@@ -69,6 +63,5 @@ class BedrockParticleEffect(
        particle.readFromBuffer(buffer)
        curves = buffer.readList { MoLangCurve.readFromBuffer(buffer) }
        space.readFromBuffer(buffer)
-        events = buffer.readMap({ buffer.readString() }) { ParticleEvent().also { it.decode(buffer) } }
    }
 }
@@ -29,12 +29,7 @@ class BedrockParticleEmitter(
    var updateExpressions: MutableList<Expression> = mutableListOf(),
    var rate: ParticleEmitterRate = InstantParticleEmitterRate(),
    var shape: ParticleEmitterShape = SphereParticleEmitterShape(),
-    var lifetime: ParticleEmitterLifetime = OnceEmitterLifetime(NumberExpression(1.0)),
-    var eventTimeline: EventTriggerTimeline = EventTriggerTimeline(mutableMapOf()),
-    var creationEvents: MutableList<SimpleEventTrigger> = mutableListOf(),
-    var expirationEvents: MutableList<SimpleEventTrigger> = mutableListOf(),
-    var travelDistanceEvents: EventTriggerTimeline = EventTriggerTimeline(mutableMapOf()),
-    var loopingTravelDistanceEvents: MutableList<LoopingTravelDistanceEventTrigger> = mutableListOf()
+    var lifetime: ParticleEmitterLifetime = OnceEmitterLifetime(NumberExpression(1.0))
 ) {
    companion object {
        val CODEC: Codec<BedrockParticleEmitter> = RecordCodecBuilder.create { instance ->
@@ -43,24 +38,14 @@ class BedrockParticleEmitter(
                ListCodec(EXPRESSION_CODEC).fieldOf("updateExpressions").forGetter { it.updateExpressions },
                ParticleEmitterRate.codec.fieldOf("rate").forGetter { it.rate },
                ParticleEmitterShape.codec.fieldOf("shape").forGetter { it.shape },
-                ParticleEmitterLifetime.codec.fieldOf("lifetime").forGetter { it.lifetime },
-                EventTriggerTimeline.CODEC.fieldOf("eventTimeline").forGetter { it.eventTimeline },
-                ListCodec(SimpleEventTrigger.CODEC).fieldOf("creationEvents").forGetter { it.creationEvents },
-                ListCodec(SimpleEventTrigger.CODEC).fieldOf("expirationEvents").forGetter { it.expirationEvents },
-                EventTriggerTimeline.CODEC.fieldOf("travelDistanceEvents").forGetter { it.travelDistanceEvents },
-                ListCodec(LoopingTravelDistanceEventTrigger.CODEC).fieldOf("loopingTravelDistanceEvents").forGetter { it.loopingTravelDistanceEvents }
-            ).apply(instance) { startExpressions, updateExpressions, rate, shape, lifetime, eventTimeline, creationEvents, expirationEvents, travelDistanceEvents, loopingTravelDistanceEvents ->
+                ParticleEmitterLifetime.codec.fieldOf("lifetime").forGetter { it.lifetime }
+            ).apply(instance) { startExpressions, updateExpressions, rate, shape, lifetime ->
                BedrockParticleEmitter(
                    startExpressions = startExpressions,
                    updateExpressions = updateExpressions,
                    shape = shape,
                    rate = rate,
-                    lifetime = lifetime,
-                    eventTimeline = eventTimeline,
-                    creationEvents = creationEvents,
-                    expirationEvents = expirationEvents,
-                    travelDistanceEvents = travelDistanceEvents,
-                    loopingTravelDistanceEvents = loopingTravelDistanceEvents
+                    lifetime = lifetime
                )
            }
        }
@@ -72,11 +57,6 @@ class BedrockParticleEmitter(
        ParticleEmitterRate.writeToBuffer(buffer, rate)
        ParticleEmitterShape.writeToBuffer(buffer, shape)
        ParticleEmitterLifetime.writeToBuffer(buffer, lifetime)
-        eventTimeline.encode(buffer)
-        buffer.writeCollection(creationEvents) { pb, event -> event.encode(pb) }
-        buffer.writeCollection(expirationEvents) { pb, event -> event.encode(pb) }
-        travelDistanceEvents.encode(buffer)
-        buffer.writeCollection(loopingTravelDistanceEvents) { pb, event -> event.encode(pb) }
    }

    fun readFromBuffer(buffer: PacketByteBuf) {
@@ -85,10 +65,5 @@ class BedrockParticleEmitter(
        rate = ParticleEmitterRate.readFromBuffer(buffer)
        shape = ParticleEmitterShape.readFromBuffer(buffer)
        lifetime = ParticleEmitterLifetime.readFromBuffer(buffer)
-        eventTimeline.decode(buffer)
-        creationEvents = buffer.readList { SimpleEventTrigger("").also { it.decode(buffer) } }
-        expirationEvents = buffer.readList { SimpleEventTrigger("").also { it.decode(buffer) } }
-        travelDistanceEvents.decode(buffer)
-        loopingTravelDistanceEvents = buffer.readList { LoopingTravelDistanceEventTrigger(0.0, mutableListOf()).also { it.decode(buffer) } }
    }
 }
@@ -136,11 +136,6 @@ class LoopingEmitterLifetime(var activeTime: Expression = 1.0.asExpression(), va
        val interval = activeTimeValue + sleepTime
        val displacement = emitterAge % interval
        runtime.environment.setSimpleVariable("emitter_lifetime", activeTime)
-
-        if (emitterAge > activeTimeValue && sleepTime == 0.0) {
-            return ParticleEmitterAction.STOP
-        }
-
        return if (displacement < activeTimeValue) {
            ParticleEmitterAction.GO
        } else {
@@ -145,7 +145,7 @@ class PointParticleEmitterShape(
    override val type = ParticleEmitterShapeType.POINT
    override fun getNewParticlePosition(runtime: MoLangRuntime, entity: Entity?) = runtime.resolveVec3d(offset)
    override fun getCenter(runtime: MoLangRuntime, entity: Entity?): Vec3d {
-        return Vec3d.ZERO
+        return getNewParticlePosition(runtime, entity) // Questionable
    }

    override fun <T> encode(ops: DynamicOps<T>) = CODEC.encodeStart(ops, this)
@@ -1,174 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.snowstorm
-
-import com.bedrockk.molang.runtime.MoLangRuntime
-import com.cobblemon.mod.common.api.molang.ExpressionLike
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.getQueryStruct
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.setup
-import com.cobblemon.mod.common.api.net.Decodable
-import com.cobblemon.mod.common.api.net.Encodable
-import com.cobblemon.mod.common.client.particle.BedrockParticleEffectRepository
-import com.cobblemon.mod.common.client.particle.ParticleStorm
-import com.cobblemon.mod.common.client.render.MatrixWrapper
-import com.cobblemon.mod.common.client.render.SnowstormParticle
-import com.cobblemon.mod.common.util.asExpressionLike
-import com.mojang.serialization.Codec
-import com.mojang.serialization.codecs.PrimitiveCodec
-import com.mojang.serialization.codecs.RecordCodecBuilder
-import net.minecraft.network.PacketByteBuf
-import net.minecraft.sound.SoundCategory
-import net.minecraft.sound.SoundEvent
-import net.minecraft.util.Identifier
-import net.minecraft.util.math.Vec3d
-
-/**
- * An event that can be referenced from various particle event triggers. The events are not necessarily particles,
- * but can be combinations of particles, sounds, and MoLang expressions.
- *
- * @author Hiroku
- * @since March 2nd, 2024
- */
-class ParticleEvent(
-    var particleEffect: EventParticleEffect? = null,
-    var soundEffect: EventSoundEffect? = null,
-    var expression: ExpressionLike? = null
-): Encodable, Decodable {
-    companion object {
-        val CODEC: Codec<ParticleEvent> = RecordCodecBuilder.create { instance ->
-            instance.group(
-                EventParticleEffect.CODEC.optionalFieldOf("particle_effect", null).forGetter { it.particleEffect },
-                EventSoundEffect.CODEC.optionalFieldOf("sound_effect", null).forGetter { it.soundEffect },
-                PrimitiveCodec.STRING.optionalFieldOf("expression", null).forGetter { it.expression?.toString() }
-            ).apply(instance) { particleEffect, soundEffect, expression ->
-                ParticleEvent(
-                    particleEffect,
-                    soundEffect,
-                    expression?.asExpressionLike()
-                )
-            }
-        }
-    }
-
-    override fun encode(buffer: PacketByteBuf) {
-        buffer.writeNullable(particleEffect) { pb, effect ->
-            pb.writeIdentifier(effect.effect)
-            pb.writeEnumConstant(effect.type)
-            pb.writeNullable(effect.expression) { pb, expr -> pb.writeString(expr.toString()) }
-        }
-        buffer.writeNullable(soundEffect) { pb, effect -> pb.writeIdentifier(effect.sound) }
-        buffer.writeNullable(expression) { pb, expr -> pb.writeString(expr.toString()) }
-    }
-    override fun decode(buffer: PacketByteBuf) {
-        particleEffect = buffer.readNullable { pb -> EventParticleEffect(
-            pb.readIdentifier(),
-            pb.readEnumConstant(EventParticleEffect.EventParticleType::class.java),
-            pb.readNullable { pb.readString().asExpressionLike() }
-        ) }
-        soundEffect = buffer.readNullable { pb -> EventSoundEffect(pb.readIdentifier()) }
-        expression = buffer.readNullable { pb -> pb.readString().asExpressionLike() }
-    }
-
-    fun run(storm: ParticleStorm, particle: SnowstormParticle?) {
-        particleEffect?.let { effect ->
-            val bedrockParticleEffect = BedrockParticleEffectRepository.getEffect(effect.effect) ?: return@let
-            val rootMatrix = when (effect.type) {
-                EventParticleEffect.EventParticleType.EMITTER -> MatrixWrapper().updatePosition(storm.matrixWrapper.getOrigin())
-                EventParticleEffect.EventParticleType.EMITTER_BOUND -> storm.matrixWrapper
-                EventParticleEffect.EventParticleType.PARTICLE,
-                EventParticleEffect.EventParticleType.PARTICLE_WITH_VELOCITY -> (particle?.let { Vec3d(it.getX(), it.getY(), it.getZ()) } ?: Vec3d(storm.getX(), storm.getY(), storm.getZ())).let { MatrixWrapper().updatePosition(it) }
-            }
-
-            val sourceVelocity = when (effect.type) {
-                EventParticleEffect.EventParticleType.EMITTER -> storm.sourceVelocity().let { { it } }
-                EventParticleEffect.EventParticleType.EMITTER_BOUND -> storm.sourceVelocity
-                EventParticleEffect.EventParticleType.PARTICLE -> { { Vec3d.ZERO } }
-                EventParticleEffect.EventParticleType.PARTICLE_WITH_VELOCITY -> (particle?.let { Vec3d(it.getVelocityX(), it.getVelocityY(), it.getVelocityZ()) } ?: Vec3d.ZERO).let { { it } }
-            }
-
-            val newStorm = ParticleStorm(
-                effect = bedrockParticleEffect,
-                matrixWrapper = rootMatrix,
-                world = storm.world,
-                sourceVelocity = sourceVelocity,
-                sourceAlive = storm.sourceAlive,
-                sourceVisible = storm.sourceVisible,
-                onDespawn = {},
-                runtime = MoLangRuntime().setup().also { it.environment.structs["query"] = storm.runtime.environment.getQueryStruct() },
-                entity = storm.entity
-            )
-
-            effect.expression?.resolve(newStorm.runtime)
-
-            newStorm.spawn()
-        }
-        soundEffect?.let { effect ->
-            val position = particle?.let { Vec3d(it.getX(), it.getY(), it.getZ()) } ?: Vec3d(storm.getX(), storm.getY(), storm.getZ())
-            val world = storm.world
-            val soundEvent = SoundEvent.of(effect.sound)
-            world.playSound(position.x, position.y, position.z, soundEvent, SoundCategory.NEUTRAL, 1F, 1F, true)
-        }
-        expression?.resolve(storm.runtime)
-    }
-}
-
-/**
- * A particle component of a [ParticleEvent]. It contains the effect to play, the spawning type, and a pre-run
- * expression to run in the new storm's runtime.
- *
- * @author Hiroku
- * @since March 2nd, 2024
- */
-class EventParticleEffect(
-    val effect: Identifier,
-    val type: EventParticleType,
-    val expression: ExpressionLike? = null
-) {
-    companion object {
-        val CODEC = RecordCodecBuilder.create<EventParticleEffect> { instance ->
-            instance.group(
-                Identifier.CODEC.fieldOf("effect").forGetter { it.effect },
-                PrimitiveCodec.STRING.fieldOf("type").forGetter { it.type.name },
-                PrimitiveCodec.STRING.optionalFieldOf("expression", null).forGetter { it.expression?.toString() }
-            ).apply(instance) { effect, type, expression ->
-                EventParticleEffect(
-                    effect,
-                    EventParticleType.valueOf(type),
-                    expression?.asExpressionLike()
-                )
-            }
-        }
-    }
-
-    enum class EventParticleType {
-        EMITTER,
-        EMITTER_BOUND,
-        PARTICLE,
-        PARTICLE_WITH_VELOCITY
-    }
-}
-
-/**
- * A simple sound effect component of a [ParticleEvent]. Plays a sound at the particle location, or if run from an
- * emitter event, at the emitter's location.
- *
- * @author Hiroku
- * @since March 2nd, 2024
- */
-class EventSoundEffect(
-    val sound: Identifier,
-) {
-    companion object {
-        val CODEC = RecordCodecBuilder.create<EventSoundEffect> { instance ->
-            instance.group(
-                Identifier.CODEC.fieldOf("sound").forGetter { it.sound }
-            ).apply(instance, ::EventSoundEffect)
-        }
-    }
-}
@@ -1,118 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.snowstorm
-
-import com.cobblemon.mod.common.api.net.Decodable
-import com.cobblemon.mod.common.api.net.Encodable
-import com.cobblemon.mod.common.client.particle.ParticleStorm
-import com.cobblemon.mod.common.client.render.SnowstormParticle
-import com.mojang.serialization.codecs.PrimitiveCodec
-import com.mojang.serialization.codecs.RecordCodecBuilder
-import com.mojang.serialization.codecs.UnboundedMapCodec
-import net.minecraft.network.PacketByteBuf
-
-/*
- * The different references to events that can be triggered by an effect.
- */
-
-/**
- * It really is simple.
- *
- * @author Hiroku
- * @since March 2nd, 2024
- */
-class SimpleEventTrigger(var event: String): Encodable, Decodable {
-    companion object {
-        val CODEC = RecordCodecBuilder.create<SimpleEventTrigger> { instance ->
-            instance.group(
-                PrimitiveCodec.STRING.fieldOf("event").forGetter { it.event }
-            ).apply(instance, ::SimpleEventTrigger)
-        }
-    }
-
-    override fun encode(buffer: PacketByteBuf) {
-        buffer.writeString(event)
-    }
-
-    override fun decode(buffer: PacketByteBuf) {
-        event = buffer.readString()
-    }
-
-    fun trigger(storm: ParticleStorm, particle: SnowstormParticle?) {
-        val event = storm.effect.events[event] ?: return
-        event.run(storm, particle)
-    }
-}
-
-/**
- * An event trigger that outlines specific times at which point groups of effects will play. This can be used
- * on the basis of time but is also used in the case of travel distance.
- *
- * @author Hiroku
- * @since March 2nd, 2024
- */
-class EventTriggerTimeline(var map: MutableMap<Double, MutableList<String>>): Encodable, Decodable {
-    companion object {
-        val CODEC = RecordCodecBuilder.create<EventTriggerTimeline> { instance ->
-            instance.group(
-                UnboundedMapCodec(PrimitiveCodec.DOUBLE, PrimitiveCodec.STRING.listOf()).fieldOf("map").forGetter { it.map }
-            ).apply(instance, ::EventTriggerTimeline)
-        }
-    }
-
-    override fun encode(buffer: PacketByteBuf) {
-        buffer.writeMap(map, { pb, k -> pb.writeDouble(k) }, { pb, v -> pb.writeCollection(v) { _, s -> pb.writeString(s) } })
-    }
-
-    override fun decode(buffer: PacketByteBuf) {
-        map = buffer.readMap({ pb -> pb.readDouble() }, { pb -> pb.readList { pb.readString() } })
-    }
-
-    fun check(storm: ParticleStorm, particle: SnowstormParticle?, previousTime: Double, newTime: Double) {
-        val events = map.entries.filter { it.key in previousTime..newTime }.flatMap { it.value }
-        events.forEach { event ->
-            val event = storm.effect.events[event] ?: return
-            event.run(storm, particle)
-        }
-    }
-}
-
-/**
- * An event trigger that takes the total distance travelled by the emitter and modulos it across [distance] to know
- * if we need to play it again.
- *
- * @author Hiroku
- * @since March 2nd, 2024
- */
-class LoopingTravelDistanceEventTrigger(var distance: Double, var events: MutableList<String>): Encodable, Decodable {
-    companion object {
-        val CODEC = RecordCodecBuilder.create<LoopingTravelDistanceEventTrigger> { instance ->
-            instance.group(
-                PrimitiveCodec.DOUBLE.fieldOf("distance").forGetter { it.distance },
-                PrimitiveCodec.STRING.listOf().fieldOf("events").forGetter { it.events }
-            ).apply(instance, ::LoopingTravelDistanceEventTrigger)
-        }
-    }
-
-    override fun encode(buffer: PacketByteBuf) {
-        buffer.writeDouble(distance)
-        buffer.writeCollection(events) { _, s -> buffer.writeString(s) }
-    }
-
-    override fun decode(buffer: PacketByteBuf) {
-        distance = buffer.readDouble()
-        events = buffer.readList { buffer.readString() }
-    }
-
-    fun check(storm: ParticleStorm, particle: SnowstormParticle?, previousDistance: Double, currentDistance: Double) {
-        if (previousDistance < distance && currentDistance >= distance) {
-            events.mapNotNull { storm.effect.events[it] }.forEach { it.run(storm, particle) }
-        }
-    }
-}
@@ -140,7 +140,7 @@ class InwardsMotionDirection : ParticleMotionDirection {
        return if (particlePos == emitterPos) {
            Vec3d(storm.world.random.nextDouble() - 0.5, storm.world.random.nextDouble() - 0.5, storm.world.random.nextDouble() - 0.5)
        } else {
-            emitterPos.subtract(particlePos)
+            particlePos.subtract(emitterPos)
        }.normalize()
    }
    override fun <T> encode(ops: DynamicOps<T>) = CODEC.encodeStart(ops, this)
@@ -12,8 +12,6 @@ import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.api.spawning.spawner.PlayerSpawner
 import com.cobblemon.mod.common.api.spawning.spawner.PlayerSpawnerFactory
 import com.cobblemon.mod.common.platform.events.PlatformEvents
-import com.cobblemon.mod.common.util.server
-import com.cobblemon.mod.common.world.gamerules.CobblemonGameRules
 import java.util.UUID
 import net.minecraft.server.network.ServerPlayerEntity

@@ -36,7 +34,7 @@ object CobblemonWorldSpawnerManager : SpawnerManager() {

    fun onPlayerLogin(player: ServerPlayerEntity) {
        // Disables spawning
-        if (!Cobblemon.config.enableSpawning || server()?.gameRules?.getBoolean(CobblemonGameRules.DO_POKEMON_SPAWNING) == false) {
+        if (!Cobblemon.config.enableSpawning) {
            return;
        }

@@ -12,8 +12,6 @@ import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.api.spawning.influence.SpawningInfluence
 import com.cobblemon.mod.common.api.spawning.spawner.Spawner
 import com.cobblemon.mod.common.api.spawning.spawner.TickingSpawner
-import com.cobblemon.mod.common.util.server
-import com.cobblemon.mod.common.world.gamerules.CobblemonGameRules.DO_POKEMON_SPAWNING

 /**
 * A manager of various spawners. This is a class in which you should register
@@ -51,7 +49,7 @@ open class SpawnerManager {

    open fun onServerTick() {
        // Disables spawning
-        if (!Cobblemon.config.enableSpawning || server()?.gameRules?.getBoolean(DO_POKEMON_SPAWNING) == false) {
+        if (!Cobblemon.config.enableSpawning) {
            return
        }
        influences.removeIf { it.isExpired() }
@@ -39,8 +39,7 @@ class TimeRange : IntRanges {
            "dusk" to TimeRange(11834..13701),
            "twilight" to TimeRange(11834..13701, 22300..23999, 0..166),
            "morning" to TimeRange(0..4999),
-            "afternoon" to TimeRange(7000..12039),
-            "midday" to TimeRange(1000..11000)
+            "afternoon" to TimeRange(7000..12039)
        )
    }

@@ -30,16 +30,9 @@ abstract class SingleEntitySpawnAction<T : Entity>(
    override fun run(): EntitySpawnResult? {
        val e = createEntity() ?: return null
        e.setPosition(ctx.position.toVec3d().add(0.5, 1.0, 0.5))
-        var shouldSpawn = false
-        CobblemonEvents.ENTITY_SPAWN.postThen(SpawnEvent(e, ctx), ifSucceeded = {
-            ctx.world.spawnEntity(e)
-            shouldSpawn = true
-        })
-
-        return if (shouldSpawn) {
-            this.entity.emit(e)
-            EntitySpawnResult(listOf(e))
-        } else null
+        entity.emit(e)
+        CobblemonEvents.ENTITY_SPAWN.postThen(SpawnEvent(e, ctx), ifSucceeded = { ctx.world.spawnEntity(e) })
+        return EntitySpawnResult(listOf(e))
    }


@@ -63,6 +63,9 @@ abstract class AreaSpawner(

    override fun run(cause: SpawnCause): Pair<SpawningContext, SpawnDetail>? {
        val area = getArea(cause)
+        if (area?.world?.gameRules?.getBoolean(DO_POKEMON_SPAWNING) == false) {
+            return null
+        }
        val constrainedArea = if (area != null) constrainArea(area) else null
        if (constrainedArea != null) {

@@ -8,7 +8,6 @@

 package com.cobblemon.mod.common.api.storage.adapter.conversions

-import com.cobblemon.mod.common.api.abilities.Abilities
 import com.cobblemon.mod.common.api.moves.Moves
 import com.cobblemon.mod.common.api.pokeball.PokeBalls
 import com.cobblemon.mod.common.api.pokemon.Natures
@@ -99,9 +98,8 @@ class ReforgedConversion(val base: Path) : CobblemonConverter<NbtCompound> {
        result.level = nbt.getInt("Level")
        result.addExperience(SidemodExperienceSource("Reforged"), nbt.getInt("EXP"))
        result.setFriendship(nbt.getInt("Friendship"))
-        Abilities.get(nbt.getString("Ability"))?.let { template ->
-            result.updateAbility(template.create(forced = result.form.abilities.none { it.template == template }))
-        }
+        result.ability = (result.form.abilities.find { it.template.name == nbt.getString("Ability") } ?: result.form.abilities.first())
+            .template.create()
        result.nature = Natures.getNature(Identifier(ReforgedNatures.values()[nbt.getInt("Nature")].name.lowercase())) ?: Natures.getRandomNature()
        result.mintedNature = Natures.getNature(Identifier(ReforgedNatures.values()[nbt.getInt("MintNature")].name.lowercase()))
        result.currentHealth = nbt.getInt("Health")
@@ -260,7 +260,7 @@ open class PartyStore(override val uuid: UUID) : PokemonStore<PartyPosition>() {
        return@mapNotNull if (clone) {
            BattlePokemon.safeCopyOf(it)
        } else {
-            BattlePokemon.playerOwned(it)
+            BattlePokemon(it)
        }
    }.sortedBy { if (it.uuid == leadingPokemon) 0 else (indexOf(it.originalPokemon) + 1) }

@@ -22,15 +22,107 @@ import net.minecraft.registry.tag.TagKey
 object CobblemonBiomeTags {

    @JvmField
-    val IS_AUTUMN = create("has_season/autumn")
+    val IS_DEEP_DARK = create("is_deep_dark")
    @JvmField
-    val IS_SPRING = create("has_season/spring")
+    val IS_ARID = create("is_arid")
    @JvmField
-    val IS_SUMMER = create("has_season/summer")
+    val IS_AUTUMN = create("is_autumn")
+    @JvmField
+    val IS_BADLANDS = create("is_badlands")
+    @JvmField
+    val IS_BAMBOO = create("is_bamboo")
+    @JvmField
+    val IS_CAVE = create("is_cave")
+    @JvmField
+    val IS_COAST = create("is_coast")
+    @JvmField
+    val IS_COLD = create("is_cold")
+    @JvmField
+    val IS_DEEP_OCEAN = create("is_deep_ocean")
+    @JvmField
+    val IS_DESERT = create("is_desert")
+    @JvmField
+    val IS_DRIPSTONE = create("is_dripstone")
+    @JvmField
+    val IS_FLORAL = create("is_floral")
+    @JvmField
+    val IS_FOREST = create("is_forest")
+    @JvmField
+    val IS_FREEZING = create("is_freezing")
+    @JvmField
+    val IS_FRESHWATER = create("is_freshwater")
+    @JvmField
+    val IS_COLD_OCEAN = create("is_cold_ocean")
+    @JvmField
+    val IS_FROZEN_OCEAN = create("is_frozen_ocean")
+    @JvmField
+    val IS_GLACIAL = create("is_glacial")
+    @JvmField
+    val IS_GRASSLAND = create("is_grassland")
+    @JvmField
+    val IS_HIGHLANDS = create("is_highlands")
+    @JvmField
+    val IS_HILLS = create("is_hills")
+    @JvmField
+    val IS_ISLAND = create("is_island")
+    @JvmField
+    val IS_JUNGLE = create("is_jungle")
+    @JvmField
+    val IS_LUKEWARM_OCEAN = create("is_lukewarm_ocean")
+    @JvmField
+    val IS_LUSH = create("is_lush")
+    @JvmField
+    val IS_MAGICAL = create("is_magical")
+    @JvmField
+    val IS_MOUNTAIN = create("is_mountain")
+    @JvmField
+    val IS_MUSHROOM = create("is_mushroom")
+    @JvmField
+    val IS_OVERWORLD = create("is_overworld")
+    @JvmField
+    val IS_PEAK = create("is_peak")
+    @JvmField
+    val IS_PLAINS = create("is_plains")
+    @JvmField
+    val IS_PLATEAU = create("is_plateau")
+    @JvmField
+    val IS_WARM_OCEAN = create("is_warm_ocean")
+    @JvmField
+    val IS_RIVER = create("is_river")
+    @JvmField
+    val IS_SANDY = create("is_sandy")
+    @JvmField
+    val IS_SAVANNA = create("is_savanna")
+    @JvmField
+    val IS_SKY = create("is_sky")
+    @JvmField
+    val IS_SNOWY_FOREST = create("is_snowy_forest")
+    @JvmField
+    val IS_SPOOKY = create("is_spooky")
+    @JvmField
+    val IS_SPRING = create("is_spring")
+    @JvmField
+    val IS_SUMMER = create("is_summer")
+    @JvmField
+    val IS_SWAMP = create("is_swamp")
+    @JvmField
+    val IS_TAIGA = create("is_taiga")
    @JvmField
    val IS_TEMPERATE = create("is_temperate")
    @JvmField
-    val IS_WINTER = create("has_season/winter")
+    val IS_THERMAL = create("is_thermal")
+    @JvmField
+    val IS_TUNDRA = create("is_tundra")
+    @JvmField
+    val IS_VOID = create("is_void")
+    @JvmField
+    val IS_VOlCANIC = create("is_volcanic")
+    @JvmField
+    val IS_WINTER = create("is_winter")
+    @JvmField
+    val IS_SPARSE = create("is_sparse")
+    @JvmField
+    val IS_DENSE = create("is_dense")

    // Has Feature tags
    @JvmField
@@ -88,5 +180,16 @@ object CobblemonBiomeTags {
    @JvmField
    val HAS_WATER_STONE_ORE_RARE = create("has_ore/ore_water_stone_rare")

+    // ToDo remove in 1.3
+    @Deprecated(message = "This tag no longer exists", level = DeprecationLevel.ERROR)
+    @JvmField
+    val IS_CRAG = create("is_crag")
+    @Deprecated(message = "This tag no longer exists", level = DeprecationLevel.ERROR)
+    @JvmField
+    val IS_ICY = create("is_icy")
+    @Deprecated(message = "This tag no longer exists", replaceWith = ReplaceWith("com.cobblemon.mod.common.api.tags.CobblemonBiomeTags.IS_CAVE"), level = DeprecationLevel.ERROR)
+    @JvmField
+    val IS_UNDERGROUND = create("is_underground")
+
    private fun create(path: String) = TagKey.of(RegistryKeys.BIOME, cobblemonResource(path))
 }
@@ -144,12 +144,6 @@ object CobblemonItemTags {
    @JvmField
    val POTTERY_SHERDS = create("decorated_pot_sherds")

-    @JvmField
-    val ABILITY_CHANGERS = create("ability_changers")
-
-    @JvmField
-    val IS_FRIENDSHIP_BOOSTER = create("is_friendship_booster")
-
    private fun create(path: String) = TagKey.of(RegistryKeys.ITEM, cobblemonResource(path))

 }
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.types.tera
-
-import com.cobblemon.mod.common.api.data.ShowdownIdentifiable
-import net.minecraft.text.Text
-import net.minecraft.util.Identifier
-
-/**
- * The representation of the Pokémons Tera type.
- *
- * @see [Bulbapedia](https://bulbapedia.bulbagarden.net/wiki/Terastal_phenomenon)
- *
- */
-interface TeraType : ShowdownIdentifiable {
-
-    /**
-     * The [Identifier] associated to this type.
-     */
-    val id: Identifier
-
-    /**
-     * If this tera type can be selected naturally.
-     */
-    val legalAsStatic: Boolean
-
-    /**
-     * The display name of this type.
-     */
-    val displayName: Text
-
-}
@@ -1,128 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.types.tera
-
-import com.cobblemon.mod.common.api.types.ElementalType
-import com.cobblemon.mod.common.api.types.ElementalTypes
-import com.cobblemon.mod.common.api.types.tera.elemental.ElementalTypeTeraType
-import com.cobblemon.mod.common.api.types.tera.gimmick.StellarTeraType
-import com.cobblemon.mod.common.util.cobblemonResource
-import net.minecraft.util.Identifier
-
-/**
- * The registry of all [TeraType]s.
- */
-@Suppress("unused")
-object TeraTypes {
-    private val types = hashMapOf<Identifier, TeraType>()
-
-    @JvmStatic
-    val NORMAL = this.create(cobblemonResource("normal"), ElementalTypeTeraType(ElementalTypes.NORMAL))
-
-    @JvmStatic
-    val FIRE = this.create(cobblemonResource("fire"), ElementalTypeTeraType(ElementalTypes.FIRE))
-
-    @JvmStatic
-    val WATER = this.create(cobblemonResource("water"), ElementalTypeTeraType(ElementalTypes.WATER))
-
-    @JvmStatic
-    val GRASS = this.create(cobblemonResource("grass"), ElementalTypeTeraType(ElementalTypes.GRASS))
-
-    @JvmStatic
-    val ELECTRIC = this.create(cobblemonResource("electric"), ElementalTypeTeraType(ElementalTypes.ELECTRIC))
-
-    @JvmStatic
-    val ICE = this.create(cobblemonResource("ice"), ElementalTypeTeraType(ElementalTypes.ICE))
-
-    @JvmStatic
-    val FIGHTING = this.create(cobblemonResource("fighting"), ElementalTypeTeraType(ElementalTypes.FIGHTING))
-
-    @JvmStatic
-    val POISON = this.create(cobblemonResource("poison"), ElementalTypeTeraType(ElementalTypes.POISON))
-
-    @JvmStatic
-    val GROUND = this.create(cobblemonResource("ground"), ElementalTypeTeraType(ElementalTypes.GROUND))
-
-    @JvmStatic
-    val FLYING = this.create(cobblemonResource("flying"), ElementalTypeTeraType(ElementalTypes.FLYING))
-
-    @JvmStatic
-    val PSYCHIC = this.create(cobblemonResource("psychic"), ElementalTypeTeraType(ElementalTypes.PSYCHIC))
-
-    @JvmStatic
-    val BUG = this.create(cobblemonResource("bug"), ElementalTypeTeraType(ElementalTypes.BUG))
-
-    @JvmStatic
-    val ROCK = this.create(cobblemonResource("rock"), ElementalTypeTeraType(ElementalTypes.ROCK))
-
-    @JvmStatic
-    val GHOST = this.create(cobblemonResource("ghost"), ElementalTypeTeraType(ElementalTypes.GHOST))
-
-    @JvmStatic
-    val DRAGON = this.create(cobblemonResource("dragon"), ElementalTypeTeraType(ElementalTypes.DRAGON))
-
-    @JvmStatic
-    val DARK = this.create(cobblemonResource("dark"), ElementalTypeTeraType(ElementalTypes.DARK))
-
-    @JvmStatic
-    val STEEL = this.create(cobblemonResource("steel"), ElementalTypeTeraType(ElementalTypes.STEEL))
-
-    @JvmStatic
-    val FAIRY = this.create(cobblemonResource("fairy"), ElementalTypeTeraType(ElementalTypes.FAIRY))
-
-    @JvmStatic
-    val STELLAR = this.create(StellarTeraType.ID, StellarTeraType())
-
-    /**
-     * Pick a random [TeraType].
-     *
-     * @param legalOnly If [TeraType.legalAsStatic] should be respected.
-     * @return The selected [TeraType].
-     */
-    @JvmStatic
-    fun random(legalOnly: Boolean): TeraType {
-        val possible = this.types.values
-        if (legalOnly) {
-            return possible.filter(TeraType::legalAsStatic).random()
-        }
-        return possible.random()
-    }
-
-    /**
-     * Gets a [TeraType] by its [id].
-     *
-     * @param id The [Identifier] expected to match against a [TeraType.id].
-     * @return The found [TeraType] or null.
-     */
-    @JvmStatic
-    fun get(id: Identifier): TeraType? = this.types[id]
-
-    /**
-     * Gets a [TeraType] by its [id].
-     *
-     * @param id The string representation of a [Identifier] if no namespace is present assumes Cobblemon' instead of Minecraft'.
-     * @return The found [TeraType] or null.
-     */
-    @JvmStatic
-    fun get(id: String): TeraType? = this.get(cobblemonResource(id))
-
-    /**
-     * Gets the corresponding tera type for a [ElementalType].
-     *
-     * @param type The [ElementalType] being checked.
-     * @return The associated [TeraType].
-     */
-    @JvmStatic
-    fun forElementalType(type: ElementalType): TeraType = this.get(cobblemonResource(type.name))!! // it's safe to do
-
-    private fun create(id: Identifier, type: TeraType): TeraType {
-        this.types[id] = type
-        return type
-    }
-}
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.types.tera.elemental
-
-import com.cobblemon.mod.common.api.types.ElementalType
-import com.cobblemon.mod.common.api.types.tera.TeraType
-import com.cobblemon.mod.common.util.cobblemonResource
-import net.minecraft.text.Text
-import net.minecraft.util.Identifier
-
-class ElementalTypeTeraType(val type: ElementalType) : TeraType {
-    override val legalAsStatic: Boolean = true
-
-    override val id: Identifier = cobblemonResource(this.type.name)
-
-    override val displayName: Text = this.type.displayName
-
-    override fun showdownId(): String = this.type.name
-}
@@ -1,30 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.types.tera.gimmick
-
-import com.cobblemon.mod.common.Cobblemon
-import com.cobblemon.mod.common.api.types.tera.TeraType
-import com.cobblemon.mod.common.util.cobblemonResource
-import net.minecraft.text.Text
-import net.minecraft.util.Identifier
-
-class StellarTeraType : TeraType {
-    override val id: Identifier = ID
-
-    override val legalAsStatic: Boolean = false
-
-    override val displayName: Text = LANG
-
-    override fun showdownId(): String = ID.path
-
-    companion object {
-        val ID = cobblemonResource("stellar")
-        private val LANG = Text.translatable("${Cobblemon.MODID}.terra_type.stellar")
-    }
-}
@@ -17,8 +17,6 @@ class ActiveBattlePokemon(val actor: BattleActor, var battlePokemon: BattlePokem
    fun getSide() = actor.getSide()
    var position: Pair<ServerWorld, Vec3d>? = null

-    var illusion: BattlePokemon? = null
-
    override fun getAllActivePokemon() = battle.activePokemon
    override fun getActorShowdownId() = actor.showdownId
    override fun getActorPokemon() = actor.activePokemon
@@ -100,19 +100,11 @@ object BattleBuilder {
        fleeDistance: Float = Cobblemon.config.defaultFleeDistance,
        party: PartyStore = player.party()
    ): BattleStartResult {
-        val playerTeam = party.toBattleTeam(clone = cloneParties, checkHealth = !healFirst, leadingPokemon = leadingPokemon).sortedBy { it.health <= 0 }
+        val playerTeam = party.toBattleTeam(clone = cloneParties, checkHealth = !healFirst, leadingPokemon = leadingPokemon)
        val playerActor = PlayerBattleActor(player.uuid, playerTeam)
        val wildActor = PokemonBattleActor(pokemonEntity.pokemon.uuid, BattlePokemon(pokemonEntity.pokemon), fleeDistance)
        val errors = ErroredBattleStart()

-        if(playerTeam.isNotEmpty() && playerTeam[0].health <= 0){
-            errors.participantErrors[playerActor] += BattleStartError.insufficientPokemon(
-                    player = player,
-                    requiredCount = battleFormat.battleType.slotsPerActor,
-                    hadCount = playerActor.pokemonList.size
-            )
-        }
-
        if (playerActor.pokemonList.size < battleFormat.battleType.slotsPerActor) {
            errors.participantErrors[playerActor] += BattleStartError.insufficientPokemon(
                player = player,
@@ -44,10 +44,10 @@ class BattleCaptureAction(
        pokeBallEntity.captureFuture.thenAccept { successful ->
            if (successful) {
                targetPokemon.battlePokemon?.gone = true
-                battle.dispatchWaiting(2F) { battle.broadcastChatMessage(lang("capture.succeeded", pokemonName).green()) }
                battle.writeShowdownAction(">capture ${targetPokemon.getPNX()}")
+                battle.broadcastChatMessage(lang("capture.succeeded", pokemonName).green())
            } else {
-                battle.dispatchWaiting(2F) { battle.broadcastChatMessage(lang("capture.broke_free", pokemonName).red()) }
+                battle.broadcastChatMessage(lang("capture.broke_free", pokemonName).red())
            }
            battle.sendUpdate(BattleCaptureEndPacket(targetPokemon.getPNX(), successful))
            battle.finishCaptureAction(this)
@@ -9,7 +9,6 @@
 package com.cobblemon.mod.common.battles

 import com.cobblemon.mod.common.CobblemonNetwork.sendPacket
-import com.cobblemon.mod.common.api.battles.effects.BattleStartConditions
 import com.cobblemon.mod.common.api.battles.model.PokemonBattle
 import com.cobblemon.mod.common.api.events.CobblemonEvents
 import com.cobblemon.mod.common.api.events.battles.BattleStartedPostEvent
@@ -23,6 +22,7 @@ import com.cobblemon.mod.common.net.messages.client.battle.BattleChallengeExpire
 import com.cobblemon.mod.common.util.getPlayer
 import com.google.gson.GsonBuilder
 import java.time.Instant
+import java.util.Optional
 import java.util.UUID
 import java.util.concurrent.ConcurrentHashMap
 import net.minecraft.server.network.ServerPlayerEntity
@@ -139,7 +139,7 @@ object BattleRegistry {
            // 0 - 9, empty == 10
            packedTeamBuilder.append("${if (pk.dmaxLevel < 10) pk.dmaxLevel else ""},")
            // Teratype
-            packedTeamBuilder.append("${pokemon.effectedPokemon.teraType.showdownId()},")
+            packedTeamBuilder.append("${pokemon.effectedPokemon.teraType.name},")

            team.add(packedTeamBuilder.toString())
        }
@@ -147,16 +147,10 @@ object BattleRegistry {
    }

    private fun startShowdown(battle: PokemonBattle) {
-        // Check for battle start condition
-        val effect = BattleStartConditions.all().firstOrNull { it.matches(battle) }

        // Build request message
        val messages = mutableListOf<String>()
-        if (effect != null) {
-            messages.add(">start { \"format\": ${battle.format.toFormatJSON()}, \"defaultWeather\": \"${effect.result}\" }")
-        } else {
-            messages.add(">start { \"format\": ${battle.format.toFormatJSON()} }")
-        }
+        messages.add(">start { \"format\": ${battle.format.toFormatJSON()} }")

        /*
         * Showdown IDs are like p1, p2, p3, etc. Showdown uses these keys to identify who is doing what to whom.
@@ -95,8 +95,7 @@ enum class ShowdownActionResponseType(val loader: (PacketByteBuf) -> ShowdownAct
    DEFAULT({ DefaultActionResponse() }),
    FORCE_PASS({ ForcePassActionResponse() }),
    PASS({ PassActionResponse }),
-    HEAL_ITEM({ HealItemActionResponse("potion") }),
-    FORFEIT({ ForfeitActionResponse() });
+    HEAL_ITEM({ HealItemActionResponse("potion") });
 }

 abstract class ShowdownActionResponse(val type: ShowdownActionResponseType) {
@@ -266,11 +265,6 @@ class BagItemActionResponse(val bagItem: BagItem, val target: BattlePokemon, val
    }
 }

-class ForfeitActionResponse : ShowdownActionResponse(ShowdownActionResponseType.FORFEIT) {
-    override fun isValid(activeBattlePokemon: ActiveBattlePokemon, showdownMoveSet: ShowdownMoveset?, forceSwitch: Boolean) = true
-    override fun toShowdownString(activeBattlePokemon: ActiveBattlePokemon, showdownMoveSet: ShowdownMoveset?) = "forfeit"
-}
-
 class ShowdownMoveset {
    lateinit var moves: List<InBattleMove>
    var trapped = false
@@ -19,29 +19,33 @@ import com.cobblemon.mod.common.battles.dispatch.WaitDispatch
 import com.cobblemon.mod.common.util.battleLang

 /**
- * Format: |-ability|POKEMON|ABILITY|(from)EFFECT
+ * Format:
+ * |-ability|POKEMON|ABILITY|(from)EFFECT
 *
- * The ABILITY of POKEMON has been changed due to a move/ability EFFECT.
+ * The ABILITY of the POKEMON has been changed due to a move/ability EFFECT.
 *
- * Alt format: |-ability|POKEMON|ABILITY
+ * Format:
+ * |-ability|POKEMON|ABILITY
 *
- * POKEMON has just switched-in, and its ABILITY is being announced to have a long-term effect.
- * @author Xylopia
- * @since January 31st, 2023
+ * POKEMON has just switched-in, and its ability ABILITY is being announced to have a long-term effect.
 */
 class AbilityInstruction(val instructionSet: InstructionSet, val message: BattleMessage) : InterpreterInstruction, CauserInstruction {
    override fun invoke(battle: PokemonBattle) {
-        val pokemon = message.battlePokemon(0, battle) ?: return
+        val pokemon = message.getBattlePokemon(0, battle) ?: return
+        val pokemonName = pokemon.getName()
        val effect = message.effectAt(1) ?: return
        val optionalEffect = message.effect()
-        val optionalPokemon = message.battlePokemonFromOptional(battle)
+        val optionalPokemon = message.getSourceBattlePokemon(battle)
+        val optionalPokemonName = optionalPokemon?.getName()

        // If there is an optional effect causing the activation, broadcast that instead of the standard effect
-        ShowdownInterpreter.broadcastAbility(battle, optionalEffect ?: effect, pokemon)
+        if (optionalEffect != null) {
+            ShowdownInterpreter.broadcastAbility(battle, optionalEffect, pokemonName)
+        } else {
+            ShowdownInterpreter.broadcastAbility(battle, effect, pokemonName)
+        }

        battle.dispatch {
-            val pokemonName = pokemon.getName()
-            val optionalPokemonName = optionalPokemon?.getName()
            ShowdownInterpreter.lastCauser[battle.battleId] = message

            val lang = when (optionalEffect?.id) {
@@ -20,24 +20,21 @@ import com.cobblemon.mod.common.util.battleLang
 import net.minecraft.text.Text

 /**
- * Format: |-activate|POKEMON|EFFECT
+ * Format:
+ * |-activate|POKEMON|EFFECT
 *
- * A miscellaneous EFFECT has activated for POKEMON. This is triggered whenever an effect could not be better described
- * by one of the other minor messages.
- *
- * @author Hunter
- * @since September 25th, 2022
+ * A miscellaneous effect has activated.This is triggered whenever an effect could not be better described by one of the other minor messages.
 */
 class ActivateInstruction(val instructionSet: InstructionSet, val message: BattleMessage) : InterpreterInstruction, CauserInstruction {
    override fun invoke(battle: PokemonBattle) {
-        val pokemon = message.battlePokemon(0, battle) ?: return
+        val pokemon = message.getBattlePokemon(0, battle) ?: return
+        val pokemonName = pokemon.getName()
+        val sourceName = message.getSourceBattlePokemon(battle)?.getName() ?: Text.literal("UNKNOWN")
        val effect = message.effectAt(1) ?: return
        val extraEffect = message.effectAt(2)?.typelessData ?: Text.literal("UNKNOWN")
-        ShowdownInterpreter.broadcastOptionalAbility(battle, effect, pokemon)
+        ShowdownInterpreter.broadcastOptionalAbility(battle, effect, pokemonName)

        battle.dispatch{
-            val pokemonName = pokemon.getName()
-            val sourceName = message.battlePokemonFromOptional(battle)?.getName() ?: Text.literal("UNKNOWN")
            ShowdownInterpreter.lastCauser[battle.battleId] = message
            battle.minorBattleActions[pokemon.uuid] = message

@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.battles.interpreter.instructions
-
-import com.cobblemon.mod.common.api.battles.interpreter.BattleMessage
-import com.cobblemon.mod.common.api.battles.model.PokemonBattle
-import com.cobblemon.mod.common.battles.dispatch.InterpreterInstruction
-import com.cobblemon.mod.common.util.asTranslated
-import com.cobblemon.mod.common.util.battleLang
-
-/**
- * Format: |bagitem|POKEMON|ITEM
- *
- * POKEMON had ITEM used on it from the 'bag'.
- * @author landonjw
- * @since July 31st, 2023
- */
-class BagItemInstruction(val message: BattleMessage): InterpreterInstruction {
-
-    override fun invoke(battle: PokemonBattle) {
-        battle.dispatchGo {
-            val pokemon = message.pokemonByUuid(0, battle)!!
-            val item = message.argumentAt(1)!!
-
-            val ownerName = pokemon.actor.getName()
-            val itemName = item.asTranslated()
-
-            battle.broadcastChatMessage(battleLang("bagitem.use", ownerName, itemName, pokemon.getName()))
-        }
-    }
-}
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.battles.interpreter.instructions
-
-import com.cobblemon.mod.common.api.battles.interpreter.BattleMessage
-import com.cobblemon.mod.common.api.battles.model.PokemonBattle
-import com.cobblemon.mod.common.battles.dispatch.InterpreterInstruction
-import com.cobblemon.mod.common.util.battleLang
-
-/**
- * Format: |-block|POKEMON|EFFECT|MOVE|ATTACKER|(of)SOURCE
- *
- * An effect targeted at POKEMON was blocked by EFFECT. This may optionally specify that the effect was a MOVE from ATTACKER.
- *
- * An optional SOURCE will note the owner of the EFFECT, in the case that it's not EFFECT (for instance, an ally with Aroma Veil.)
- * @author jeffw773
- * @since November 6th, 2023
- */
-class BlockInstruction(val message: BattleMessage): InterpreterInstruction {
-
-    override fun invoke(battle: PokemonBattle) {
-        battle.dispatchWaiting(1.5F) {
-            val pokemon = message.battlePokemon(0, battle) ?: return@dispatchWaiting
-            val pokemonName = pokemon.getName()
-            val effectID = message.effectAt(1)?.id ?: return@dispatchWaiting
-            val lang = battleLang("block.$effectID", pokemonName)
-
-            battle.broadcastChatMessage(lang)
-            battle.minorBattleActions[pokemon.uuid] = message
-        }
-    }
-}
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.battles.interpreter.instructions
-
-import com.cobblemon.mod.common.api.battles.interpreter.BattleContext
-import com.cobblemon.mod.common.api.battles.interpreter.BattleMessage
-import com.cobblemon.mod.common.api.battles.model.PokemonBattle
-import com.cobblemon.mod.common.api.pokemon.stats.Stats
-import com.cobblemon.mod.common.battles.ShowdownInterpreter
-import com.cobblemon.mod.common.battles.dispatch.InstructionSet
-import com.cobblemon.mod.common.battles.dispatch.InterpreterInstruction
-import com.cobblemon.mod.common.util.battleLang
-
-/**
- * Format: |-boost|POKEMON|STAT|AMOUNT or |-unboost|POKEMON|STAT|AMOUNT
- *
- * POKEMON has gained or lost AMOUNT in STAT, using the standard rules for stat changes in-battle.
- * STAT is a standard three-letter abbreviation fot the stat in question.
- * @author Hiroku
- * @since August 20th, 2022
- */
-class BoostInstruction(val instructionSet: InstructionSet, val message: BattleMessage, val remainingLines: Iterator<BattleMessage>, val isBoost: Boolean = true): InterpreterInstruction {
-
-    override fun invoke(battle: PokemonBattle) {
-        val pokemon = message.battlePokemon(0, battle) ?: return
-        val statKey = message.argumentAt(1) ?: return
-        val stages = message.argumentAt(2)?.toInt() ?: return
-        val stat = Stats.getStat(statKey).displayName
-        val severity = Stats.getSeverity(stages)
-        val rootKey = if (isBoost) "boost" else "unboost"
-
-        battle.dispatchWaiting(1.5F) {
-            val lang = when {
-                message.hasOptionalArgument("zeffect") -> battleLang("$rootKey.$severity.zeffect", pokemon.getName(), stat)
-                else -> battleLang("$rootKey.$severity", pokemon.getName(), stat)
-            }
-            battle.broadcastChatMessage(lang)
-
-            val boostBucket = if (isBoost) BattleContext.Type.BOOST else BattleContext.Type.UNBOOST
-            val context = ShowdownInterpreter.getContextFromAction(message, boostBucket, battle)
-            // TODO: replace with context that tracks detailed information such as # of stages
-            repeat(stages) { pokemon.contextManager.add(context) }
-            battle.minorBattleActions[pokemon.uuid] = message
-        }
-    }
-}
@@ -1,51 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.battles.interpreter.instructions
-
-import com.cobblemon.mod.common.api.battles.interpreter.BattleMessage
-import com.cobblemon.mod.common.api.battles.model.PokemonBattle
-import com.cobblemon.mod.common.api.pokemon.status.Statuses
-import com.cobblemon.mod.common.api.text.red
-import com.cobblemon.mod.common.api.text.text
-import com.cobblemon.mod.common.battles.dispatch.InterpreterInstruction
-import com.cobblemon.mod.common.util.battleLang
-import com.cobblemon.mod.common.util.lang
-
-/**
- * Formats: |cant|POKEMON|REASON and |cant|POKEMON|REASON|MOVE
- *
- * The POKEMON could not perform a move because of the indicated REASON.
- * @author Deltric
- * @since January 22nd, 2022
- */
-class CantInstruction(val message: BattleMessage): InterpreterInstruction {
-
-    override fun invoke(battle: PokemonBattle) {
-        battle.dispatchWaiting {
-            val pokemon = message.battlePokemon(0, battle) ?: return@dispatchWaiting
-            val effectID = message.effectAt(1)?.id ?: return@dispatchWaiting
-            val name = pokemon.getName()
-            // Move may be null as it's not always given
-            val moveName = message.moveAt(2)?.displayName ?: run { "(Unrecognized: ${message.argumentAt(2)})".text() }
-
-            val lang = when (effectID) {
-                // TODO: in the games they use a generic image because there is a popup of the ability and the sprite of the mon, it may be good to have a similar system here
-                "armortail", "damp", "dazzling", "queenlymajesty" -> battleLang("cant.generic", name, moveName)
-                "par", "slp", "frz" -> {
-                    val status = Statuses.getStatus(effectID)?.name?.path ?: return@dispatchWaiting
-                    lang("status.$status.is", name)
-                }
-                else -> battleLang("cant.$effectID", name, moveName)
-            }
-
-            battle.broadcastChatMessage(lang.red())
-            battle.minorBattleActions[pokemon.uuid] = message
-        }
-    }
-}
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.battles.interpreter.instructions
-
-import com.cobblemon.mod.common.api.battles.interpreter.BattleContext
-import com.cobblemon.mod.common.api.battles.interpreter.BattleMessage
-import com.cobblemon.mod.common.api.battles.model.PokemonBattle
-import com.cobblemon.mod.common.battles.dispatch.InterpreterInstruction
-import com.cobblemon.mod.common.util.battleLang
-
-/**
- * Format: |-clearallboost|
- *
- * Clears all boosts from all Pokémon on both sides.
- * @author Segfault Guy
- * @since April 26th, 2023
- */
-class ClearAllBoostInstruction(val message: BattleMessage): InterpreterInstruction {
-
-    override fun invoke(battle: PokemonBattle) {
-        battle.dispatchWaiting(1.5F) {
-            battle.activePokemon.forEach {
-                it.battlePokemon?.contextManager?.clear(BattleContext.Type.BOOST, BattleContext.Type.UNBOOST)
-            }
-            battle.broadcastChatMessage(battleLang("clearallboost"))
-        }
-    }
-}
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.battles.interpreter.instructions
-
-import com.cobblemon.mod.common.api.battles.interpreter.BattleContext
-import com.cobblemon.mod.common.api.battles.interpreter.BattleMessage
-import com.cobblemon.mod.common.api.battles.model.PokemonBattle
-import com.cobblemon.mod.common.battles.dispatch.InterpreterInstruction
-import com.cobblemon.mod.common.util.battleLang
-
-/**
- * Format: |-clearnegativeboost|POKEMON
- *
- * Clear the negative boosts from the target POKEMON (usually as the result of a zeffect).
- * @author Segfault Guy
- * @since September 10th, 2023
- */
-class ClearNegativeBoostInstruction(val message: BattleMessage): InterpreterInstruction {
-
-    override fun invoke(battle: PokemonBattle) {
-        val battlePokemon = message.battlePokemon(0, battle) ?: return
-
-        battle.dispatchWaiting(1.5F) {
-            val pokemonName = battlePokemon.getName()
-            val lang = when {
-                message.hasOptionalArgument("zeffect") -> battleLang("clearallnegativeboost.zeffect", pokemonName)
-                else -> battleLang("clearallnegativeboost", pokemonName)
-            }
-            if (!message.hasOptionalArgument("silent")) {
-                battle.broadcastChatMessage(lang)
-            }
-
-            battlePokemon.contextManager.clear(BattleContext.Type.UNBOOST)
-            battle.minorBattleActions[battlePokemon.uuid] = message
-        }
-    }
-}
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.battles.interpreter.instructions
-
-import com.cobblemon.mod.common.api.battles.interpreter.BattleContext
-import com.cobblemon.mod.common.api.battles.interpreter.BattleMessage
-import com.cobblemon.mod.common.api.battles.model.PokemonBattle
-import com.cobblemon.mod.common.battles.dispatch.InterpreterInstruction
-import com.cobblemon.mod.common.util.battleLang
-
-/**
- * Format: |-copyboost|SOURCE|TARGET|(from)EFFECT
- *
- * Copies any stat changes from the TARGET Pokémon to the SOURCE Pokémon due to EFFECT.
- * @author JMMCP
- * @since November 27th, 2023
- */
-class CopyBoostInstruction(val message: BattleMessage): InterpreterInstruction {
-
-    override fun invoke(battle: PokemonBattle) {
-        battle.dispatchWaiting {
-            val pokemon = message.battlePokemon(0, battle) ?: return@dispatchWaiting
-            val pokemonName = pokemon.getName()
-            val targetPokemon = message.battlePokemon(1, battle) ?: return@dispatchWaiting
-            val targetPokemonName = targetPokemon.getName()
-            val lang = battleLang("copyboost.generic", pokemonName, targetPokemonName)
-            battle.broadcastChatMessage(lang)
-
-            pokemon.contextManager.copy(targetPokemon.contextManager, BattleContext.Type.BOOST, BattleContext.Type.UNBOOST)
-            battle.minorBattleActions[pokemon.uuid] = message
-        }
-    }
-}
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.battles.interpreter.instructions
-
-import com.cobblemon.mod.common.api.battles.interpreter.BattleMessage
-import com.cobblemon.mod.common.api.battles.model.PokemonBattle
-import com.cobblemon.mod.common.api.text.yellow
-import com.cobblemon.mod.common.battles.ShowdownInterpreter
-import com.cobblemon.mod.common.battles.dispatch.InterpreterInstruction
-import com.cobblemon.mod.common.pokemon.evolution.progress.LastBattleCriticalHitsEvolutionProgress
-import com.cobblemon.mod.common.util.battleLang
-
-/**
- * Format: |-crit|POKEMON
- *
- * POKEMON received a critical hit.
- * @author Hunter
- * @since August 18th, 2022
- */
-class CritInstruction(val message: BattleMessage): InterpreterInstruction {
-
-    override fun invoke(battle: PokemonBattle) {
-        battle.dispatchGo {
-            val pokemon = message.battlePokemon(0, battle) ?: return@dispatchGo
-            battle.broadcastChatMessage(battleLang("crit").yellow())
-            ShowdownInterpreter.lastCauser[battle.battleId]?.let { message ->
-                val battlePokemon = message.battlePokemon(0, battle) ?: return@let
-                if (LastBattleCriticalHitsEvolutionProgress.supports(battlePokemon.effectedPokemon)) {
-                    val progress = battlePokemon.effectedPokemon.evolutionProxy.current().progressFirstOrCreate({ it is LastBattleCriticalHitsEvolutionProgress }) { LastBattleCriticalHitsEvolutionProgress() }
-                    progress.updateProgress(LastBattleCriticalHitsEvolutionProgress.Progress(progress.currentProgress().amount + 1))
-                }
-            }
-            battle.minorBattleActions[pokemon.uuid] = message
-        }
-    }
-}
@@ -1,58 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.battles.interpreter.instructions
-
-import com.cobblemon.mod.common.api.battles.interpreter.BattleContext
-import com.cobblemon.mod.common.api.battles.interpreter.BattleMessage
-import com.cobblemon.mod.common.api.battles.interpreter.Effect
-import com.cobblemon.mod.common.api.battles.model.PokemonBattle
-import com.cobblemon.mod.common.api.pokemon.status.Statuses
-import com.cobblemon.mod.common.battles.ShowdownInterpreter
-import com.cobblemon.mod.common.battles.dispatch.InterpreterInstruction
-import com.cobblemon.mod.common.net.messages.client.battle.BattlePersistentStatusPacket
-import com.cobblemon.mod.common.util.asTranslated
-import com.cobblemon.mod.common.util.battleLang
-
-/**
- * Format: |-curestatus|POKEMON|STATUS
- *
- * The POKEMON has recovered from its STATUS.
- * @author Hiroku
- * @since November 5th, 2022
- */
-class CureStatusInstruction(val message: BattleMessage): InterpreterInstruction {
-
-    override fun invoke(battle: PokemonBattle) {
-        val maybeActivePokemon = message.actorAndActivePokemon(0, battle)?.second?.battlePokemon
-        val maybePartyPokemon = message.battlePokemon(0, battle)
-        val pokemon = maybeActivePokemon ?: maybePartyPokemon ?: return
-        val status = message.argumentAt(1)?.let(Statuses::getStatus) ?: return
-        val effect = message.effect()
-        ShowdownInterpreter.broadcastOptionalAbility(battle, effect, pokemon)
-
-        battle.dispatchWaiting {
-            val pokemonName = pokemon.getName()
-            pokemon.effectedPokemon.status = null
-            pokemon.sendUpdate()
-
-            if (maybeActivePokemon != null) {
-                message.pnxAndUuid(0)?.let {
-                    battle.sendUpdate(BattlePersistentStatusPacket(it.first, null))
-                }
-            }
-            val lang = when (effect?.type) {
-                Effect.Type.ABILITY -> battleLang("curestatus.${effect.id}", pokemonName)
-                else -> status.removeMessage.asTranslated(pokemonName)
-            }
-            battle.broadcastChatMessage(lang)
-            pokemon.contextManager.remove(status.showdownName, BattleContext.Type.STATUS)
-            battle.minorBattleActions[pokemon.uuid] = message
-        }
-    }
-}
@@ -19,7 +19,6 @@ import com.cobblemon.mod.common.battles.dispatch.InstructionSet
 import com.cobblemon.mod.common.battles.dispatch.InterpreterInstruction
 import com.cobblemon.mod.common.battles.dispatch.UntilDispatch
 import com.cobblemon.mod.common.battles.dispatch.WaitDispatch
-import com.cobblemon.mod.common.battles.pokemon.BattlePokemon
 import com.cobblemon.mod.common.net.messages.client.animation.PlayPoseableAnimationPacket
 import com.cobblemon.mod.common.net.messages.client.battle.BattleHealthChangePacket
 import com.cobblemon.mod.common.net.messages.client.effect.RunPosableMoLangPacket
@@ -31,13 +30,6 @@ import java.util.concurrent.CompletableFuture
 import kotlin.math.roundToInt
 import net.minecraft.text.Text

-/**
- * Format: |-damage|POKEMON|HP STATUS
- *
- * POKEMON has taken damage and is now at HP STATUS
- * @author Hiroku
- * @since March 11th, 2022
- */
 class DamageInstruction(
    val instructionSet: InstructionSet,
    val actor: BattleActor,
@@ -45,10 +37,10 @@ class DamageInstruction(
    val privateMessage: BattleMessage
 ) : InterpreterInstruction {
    var future = CompletableFuture.completedFuture(Unit)
-    val expectedTarget = publicMessage.battlePokemon(0, actor.battle)
+    val battlePokemon = publicMessage.getBattlePokemon(0, actor.battle)

    override fun invoke(battle: PokemonBattle) {
-        val battlePokemon = publicMessage.battlePokemon(0, actor.battle) ?: return
+        battlePokemon ?: return
        val recoiling = privateMessage.optionalArgument("from")?.equals("recoil", true) == true
        val lastCauser  = instructionSet.getMostRecentCauser(comparedTo = this)
        if (recoiling) {
@@ -66,7 +58,8 @@ class DamageInstruction(
        }
        val newHealth = privateMessage.argumentAt(1)?.split(" ")?.get(0) ?: return
        val effect = privateMessage.effect()
-        val source = privateMessage.battlePokemonFromOptional(battle)
+        val pokemonName = battlePokemon.getName()
+        val sourceName = privateMessage.getSourceBattlePokemon(battle)?.getName() ?: Text.literal("UNKNOWN")
        var causedFaint = newHealth == "0"

        battle.dispatch {
@@ -77,10 +70,7 @@ class DamageInstruction(
            }
        }

-        source?.let { ShowdownInterpreter.broadcastOptionalAbility(battle, effect, it) }
-
        battle.dispatch {
-            val pokemonName = battlePokemon.getName()
            val pokemonEntity = battlePokemon.entity
            if (!causedFaint && pokemonEntity != null) {
                val pkt = PlayPoseableAnimationPacket(pokemonEntity.id, setOf("recoil"), emptySet())
@@ -103,6 +93,8 @@ class DamageInstruction(
                )
            }

+
+            ShowdownInterpreter.broadcastOptionalAbility(battle, effect, sourceName)
            val newHealthRatio: Float
            val remainingHealth = newHealth.split("/")[0].toInt()

@@ -116,7 +108,7 @@ class DamageInstruction(
                    "aftermath" -> battleLang("damage.generic", pokemonName)
                    "chloroblast", "steelbeam" -> battleLang("damage.mindblown", pokemonName)
                    "jumpkick" -> battleLang("damage.highjumpkick", pokemonName)
-                    else -> battleLang("damage.${effect.id}", pokemonName, source?.getName() ?: Text.literal("UNKOWN"))
+                    else -> battleLang("damage.${effect.id}", pokemonName, sourceName)
                }
                battle.broadcastChatMessage(lang.red())
            }
@@ -8,20 +8,12 @@

 package com.cobblemon.mod.common.battles.interpreter.instructions

+import com.cobblemon.mod.common.api.battles.interpreter.BattleMessage
 import com.cobblemon.mod.common.api.battles.model.PokemonBattle
 import com.cobblemon.mod.common.battles.dispatch.InterpreterInstruction
-import com.cobblemon.mod.common.util.battleLang
-
-/**
- * Format: |-nothing
- *
- * Pathetic. Your move did absolutely nothing. You should feel bad for being bad.
- * @author Hiroku
- * @since August 20th, 2022
- */
-class NothingInstruction() : InterpreterInstruction {

+class DeprecatedInstruction(val message: BattleMessage, val function: (PokemonBattle, BattleMessage, MutableList<String>) -> Unit) : InterpreterInstruction {
    override fun invoke(battle: PokemonBattle) {
-        battle.dispatchGo { battle.broadcastChatMessage(battleLang("nothing")) }
+        function(battle, message, mutableListOf())
    }
 }
@@ -10,23 +10,16 @@ package com.cobblemon.mod.common.battles.interpreter.instructions

 import com.cobblemon.mod.common.api.battles.interpreter.BattleMessage
 import com.cobblemon.mod.common.api.battles.model.PokemonBattle
+import com.cobblemon.mod.common.api.battles.model.actor.BattleActor
 import com.cobblemon.mod.common.battles.dispatch.InterpreterInstruction
-import com.cobblemon.mod.common.util.battleLang
-
-/**
- * Format: |-resisted|POKEMON
- *
- * POKEMON resisted the attack.
- * @author Hunter
- * @since August 18th, 2022
- */
-class ResistedInstruction(val message: BattleMessage): InterpreterInstruction {

+class DeprecatedSplitInstruction(
+    val battleActor: BattleActor,
+    val publicMessage: BattleMessage,
+    val privateMessage: BattleMessage,
+    val function: (PokemonBattle, BattleActor, BattleMessage, BattleMessage) -> Unit
+) : InterpreterInstruction {
    override fun invoke(battle: PokemonBattle) {
-        battle.dispatchGo {
-            val pokemon = message.battlePokemon(0, battle) ?: return@dispatchGo
-            battle.broadcastChatMessage(battleLang("resisted"))
-            battle.minorBattleActions[pokemon.uuid] = message
-        }
+        function(battle, battleActor, publicMessage, privateMessage)
    }
 }
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.battles.interpreter.instructions
-
-import com.cobblemon.mod.common.api.battles.interpreter.BattleMessage
-import com.cobblemon.mod.common.api.battles.model.PokemonBattle
-import com.cobblemon.mod.common.battles.dispatch.InterpreterInstruction
-import com.cobblemon.mod.common.util.battleLang
-
-/**
- * Format: |detailschange|POKEMON|DETAILS|HP STATUS
- *
- * POKEMON has changed formes permanently (i.e. Mega Evolution) to DETAILS.
- * @author Segfault Guy
- * @since September 10th, 2023
- */
-class DetailsChangeInstruction(val message: BattleMessage): InterpreterInstruction {
-
-    override fun invoke(battle: PokemonBattle) {
-        val battlePokemon = message.battlePokemon(0, battle) ?: return
-        val formName = message.argumentAt(1)?.split(',')?.get(0)?.substringAfter('-')?.lowercase() ?: return
-        battle.dispatchWaiting {
-            val pokemonName = battlePokemon.getName()
-            battle.broadcastChatMessage(battleLang("detailschange.$formName", pokemonName))
-            battle.majorBattleActions[battlePokemon.uuid] = message
-        }
-    }
-}
@@ -1,59 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.battles.interpreter.instructions
-
-import com.cobblemon.mod.common.api.battles.interpreter.BattleContext
-import com.cobblemon.mod.common.api.battles.interpreter.BattleMessage
-import com.cobblemon.mod.common.api.battles.model.PokemonBattle
-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.battles.dispatch.BattleDispatch
-import com.cobblemon.mod.common.battles.dispatch.InstructionSet
-import com.cobblemon.mod.common.battles.dispatch.InterpreterInstruction
-import com.cobblemon.mod.common.util.battleLang
-
-/**
- * Format: |drag|POKEMON|DETAILS|HP STATUS
- *
- * POKEMON has switched in (if there was an old Pokémon in that position, it is switched out).
- * POKEMON|DETAILS represents all the information that can be used to tell Pokémon apart.
- * The switched Pokémon has HP health points and STATUS status.
- * @author Hiroku
- * @since April 24th, 2022
- */
-class DragInstruction(val instructionSet: InstructionSet, val battleActor: BattleActor, val publicMessage: BattleMessage, val privateMessage: BattleMessage): InterpreterInstruction {
-    override fun invoke(battle: PokemonBattle) {
-        battle.dispatchInsert {
-            val (pnx, _) = publicMessage.pnxAndUuid(0)!!
-            val (_, activePokemon) = battle.getActorAndActiveSlotFromPNX(pnx)
-
-            val illusion = publicMessage.battlePokemonFromOptional(battle , "is")
-            val pokemon = publicMessage.battlePokemon(0, battle) ?: return@dispatchInsert emptySet()
-
-            battle.broadcastChatMessage(battleLang("dragged_out", pokemon.getName()))
-            activePokemon.battlePokemon?.let { oldPokemon ->
-                oldPokemon.contextManager.clear(BattleContext.Type.VOLATILE, BattleContext.Type.BOOST, BattleContext.Type.UNBOOST)
-                battle.majorBattleActions[oldPokemon.uuid] = publicMessage
-            }
-            battle.majorBattleActions[pokemon.uuid] = publicMessage
-
-            val entity = if (battleActor is EntityBackedBattleActor<*>) battleActor.entity else null
-            setOf(
-                BattleDispatch {
-                    if (entity != null) {
-                        SwitchInstruction.createEntitySwitch(battle, battleActor, entity, pnx, activePokemon, pokemon, illusion)
-                    } else {
-                        SwitchInstruction.createNonEntitySwitch(battle, battleActor, pnx, activePokemon, pokemon, illusion)
-                    }
-                }
-            )
-        }
-    }
-
-}
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.battles.interpreter.instructions
-
-import com.cobblemon.mod.common.api.battles.interpreter.BattleMessage
-import com.cobblemon.mod.common.api.battles.model.PokemonBattle
-import com.cobblemon.mod.common.battles.dispatch.InterpreterInstruction
-import com.cobblemon.mod.common.util.battleLang
-
-/**
- * Format: |-endability|POKEMON
- *
- * The POKEMON's Ability was suppressed.
- * @author jeffw773
- * @since November 28th, 2023
- */
-class EndAbilityInstruction(val message: BattleMessage): InterpreterInstruction {
-
-    override fun invoke(battle: PokemonBattle) {
-        battle.dispatchWaiting(1.5F) {
-            val pokemon = message.battlePokemon(0, battle) ?: return@dispatchWaiting
-            val pokemonName = pokemon.getName()
-
-            val lang = battleLang("endability", pokemonName)
-            battle.broadcastChatMessage(lang)
-            battle.minorBattleActions[pokemon.uuid] = message
-        }
-    }
-}
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.battles.interpreter.instructions
-
-import com.cobblemon.mod.common.api.battles.interpreter.BattleContext
-import com.cobblemon.mod.common.api.battles.interpreter.BattleMessage
-import com.cobblemon.mod.common.api.battles.model.PokemonBattle
-import com.cobblemon.mod.common.battles.dispatch.InstructionSet
-import com.cobblemon.mod.common.battles.dispatch.InterpreterInstruction
-import com.cobblemon.mod.common.util.battleLang
-import com.cobblemon.mod.common.util.lang
-
-/**
- * Format: |-end|POKEMON|EFFECT
- *
- * The volatile status from EFFECT inflicted on POKEMON has ended.
- * @author Hiroku
- * @since October 3rd, 2022
- */
-class EndInstruction(val message: BattleMessage): InterpreterInstruction {
-
-    override fun invoke(battle: PokemonBattle) {
-        battle.dispatchWaiting {
-            val pokemon = message.battlePokemon(0, battle) ?: return@dispatchWaiting
-            val pokemonName = pokemon.getName()
-            val effectID = message.effectAt(1)?.id ?: return@dispatchWaiting
-            if (!message.hasOptionalArgument("silent")) {
-                val lang = when (effectID) {
-                    "yawn" -> lang("status.sleep.apply", pokemonName)
-                    else -> battleLang("end.$effectID", pokemonName)
-                }
-                battle.broadcastChatMessage(lang)
-            }
-            pokemon.contextManager.remove(effectID, BattleContext.Type.VOLATILE)
-            battle.minorBattleActions[pokemon.uuid] = message
-        }
-    }
-}
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.battles.interpreter.instructions
-
-import com.cobblemon.mod.common.CobblemonSounds
-import com.cobblemon.mod.common.api.battles.interpreter.BattleContext
-import com.cobblemon.mod.common.api.battles.interpreter.BattleMessage
-import com.cobblemon.mod.common.api.battles.model.PokemonBattle
-import com.cobblemon.mod.common.battles.dispatch.InstructionSet
-import com.cobblemon.mod.common.battles.dispatch.InterpreterInstruction
-import com.cobblemon.mod.common.util.battleLang
-
-/**
- * Format: |-enditem|POKEMON|ITEM|(from)EFFECT
- *
- * ITEM held by POKEMON has been destroyed by a move or ability EFFECT, and it now holds no item.
- *
- * Alt format: |-enditem|POKEMON|ITEM
- *
- * POKEMON's ITEM has destroyed itself (consumed or used).
- * @author Licious
- * @since December 30th, 2022
- */
-class EndItemInstruction(val message: BattleMessage): InterpreterInstruction {
-
-    override fun invoke(battle: PokemonBattle) {
-        battle.dispatchGo {
-            // All logic regarding broadcasting battle messages is handled in CobblemonHeldItemManager
-            val battlePokemon = message.battlePokemon(0, battle) ?: return@dispatchGo
-            val itemEffect = message.effectAt(1) ?: return@dispatchGo
-            battlePokemon.heldItemManager.handleEndInstruction(battlePokemon, battle, message)
-            battle.minorBattleActions[battlePokemon.uuid] = message
-            battlePokemon.contextManager.remove(itemEffect.id, BattleContext.Type.ITEM)
-            if (message.hasOptionalArgument("eat")) {
-                battlePokemon.entity?.playSound(CobblemonSounds.BERRY_EAT, 1F, 1F)
-            }
-        }
-    }
-}
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.battles.interpreter.instructions
-
-import com.cobblemon.mod.common.api.battles.interpreter.BattleMessage
-import com.cobblemon.mod.common.api.battles.model.PokemonBattle
-import com.cobblemon.mod.common.api.battles.model.actor.BattleActor
-import com.cobblemon.mod.common.api.text.red
-import com.cobblemon.mod.common.battles.dispatch.InterpreterInstruction
-import com.cobblemon.mod.common.net.messages.client.battle.BattleMadeInvalidChoicePacket
-import com.cobblemon.mod.common.util.battleLang
-
-/**
- * Format: |error|(Invalid choice) ERROR
- *
- * The actor needs to send a different decision due to ERROR.
- * @author Yaseen
- * @since April 22nd, 2023
- */
-class ErrorInstruction(val battleActor: BattleActor, val message: BattleMessage): InterpreterInstruction {
-
-    override fun invoke(battle: PokemonBattle) {
-        battle.log("Error Instruction")
-        battle.dispatchGo {
-            //TODO: some lang stuff for the error messages (Whats the protocol for adding to other langs )
-            //Also is it okay to ignore the team preview error for now? - You bet!
-            val lang = when(message.rawMessage) {
-                "|error|[Unavailable choice] Can't switch: The active Pokémon is trapped" -> battleLang("error.pokemon_is_trapped").red()
-                "|error|[Invalid choice] Can't choose for Team Preview: You're not in a Team Preview phase" -> return@dispatchGo
-                else -> battle.createUnimplemented(message)
-            }
-            battleActor.sendMessage(lang)
-            battleActor.mustChoose = true
-            battleActor.sendUpdate(BattleMadeInvalidChoicePacket())
-        }
-    }
-}
@@ -1,56 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.battles.interpreter.instructions
-
-import com.cobblemon.mod.common.api.battles.interpreter.BattleMessage
-import com.cobblemon.mod.common.api.battles.model.PokemonBattle
-import com.cobblemon.mod.common.api.pokemon.stats.Stats
-import com.cobblemon.mod.common.api.text.red
-import com.cobblemon.mod.common.battles.dispatch.InterpreterInstruction
-import com.cobblemon.mod.common.util.battleLang
-
-/**
- * Format: |-fail|POKEMON|ACTION
- *
- * ACTION has failed against POKEMON.
- * @author Hunter
- * @since September 25th, 2022
- */
-class FailInstruction(val message: BattleMessage): InterpreterInstruction {
-
-    override fun invoke(battle: PokemonBattle) {
-        battle.dispatchWaiting(1.5F){
-            val pokemon = message.battlePokemon(0, battle) ?: return@dispatchWaiting
-            val pokemonName = pokemon.getName()
-            val effectID = message.effectAt(1)?.id
-            val cause = message.effect("from")
-            val of = message.battlePokemonFromOptional(battle)
-
-            val lang = when (effectID) {
-                null, "burnup", "doubleshock" -> battleLang("fail") // Moves that use default fail lang. (Null included for moves that fail with no effect, for example: Baton Pass.)
-                "shedtail" -> battleLang("fail.substitute", pokemonName)
-                "hyperspacefury", "aurawheel" -> battleLang("fail.darkvoid", pokemonName) // Moves that can only be used by one species and fail when any others try
-                "corrosivegas" -> battleLang("fail.healblock", pokemonName)
-                "dynamax" -> battleLang("fail.grassknot", pokemonName) // Covers weight moves that fail against dynamaxed Pokémon
-                "unboost" -> {
-                    val statKey = message.argumentAt(2)
-                    val stat = statKey?.let { Stats.getStat(it).displayName }
-                    if (stat != null) {
-                        battleLang("fail.$effectID.single", pokemonName, stat)
-                    } else {
-                        battleLang("fail.$effectID", pokemonName)
-                    }
-                }
-                else -> battleLang("fail.$effectID", pokemonName)
-            }
-            battle.broadcastChatMessage(lang.red())
-            battle.minorBattleActions[pokemon.uuid] = message
-        }
-    }
-}
@@ -19,18 +19,12 @@ import com.cobblemon.mod.common.battles.dispatch.InterpreterInstruction
 import com.cobblemon.mod.common.net.messages.client.battle.BattleFaintPacket
 import com.cobblemon.mod.common.util.battleLang

-/**
- * Format: |faint|POKEMON
- *
- * POKEMON has fainted.
- * @author Deltric
- * @since January 22nd, 2022
- */
 class FaintInstruction(battle: PokemonBattle, val message: BattleMessage) : InterpreterInstruction {
    var waitTime = 2.5F
-    val faintingPokemon = message.battlePokemon(0, battle)!!
+    val faintingPokemon = message.getBattlePokemon(0, battle)!!

    override fun invoke(battle: PokemonBattle) {
+        val faintMessage = battleLang("fainted", faintingPokemon.getName()).red()

        battle.dispatchWaiting(waitTime) {
            val (pnx, _) = message.pnxAndUuid(0) ?: return@dispatchWaiting
@@ -45,8 +39,7 @@ class FaintInstruction(battle: PokemonBattle, val message: BattleMessage) : Inte
            faintingPokemon.contextManager.clear(BattleContext.Type.STATUS, BattleContext.Type.VOLATILE, BattleContext.Type.BOOST, BattleContext.Type.UNBOOST)
            battle.majorBattleActions[faintingPokemon.uuid] = message
        }
-        battle.dispatchWaiting(0.5F) {
-            val faintMessage = battleLang("fainted", faintingPokemon.getName()).red()
+        battle.dispatchGo {
            battle.broadcastChatMessage(faintMessage)
        }
    }
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.battles.interpreter.instructions
-
-import com.cobblemon.mod.common.api.battles.interpreter.BattleContext
-import com.cobblemon.mod.common.api.battles.interpreter.BattleMessage
-import com.cobblemon.mod.common.api.battles.model.PokemonBattle
-import com.cobblemon.mod.common.api.text.red
-import com.cobblemon.mod.common.battles.ShowdownInterpreter
-import com.cobblemon.mod.common.battles.dispatch.InstructionSet
-import com.cobblemon.mod.common.battles.dispatch.InterpreterInstruction
-import com.cobblemon.mod.common.util.battleLang
-
-/**
- * Format: |-fieldactivate|EFFECT
- *
- * A miscellaneous EFFECT has activated for the entire field.
- * @author Segfault Guy
- * @since April 5th, 2023
- */
-class FieldActivateInstruction(val message: BattleMessage): InterpreterInstruction {
-
-    override fun invoke(battle: PokemonBattle) {
-        battle.dispatchWaiting(2.5F) {
-            val effectID = message.effectAt(0)?.id ?: return@dispatchWaiting
-            val lang = battleLang("fieldactivate.$effectID")
-            battle.broadcastChatMessage(lang.red())
-
-            // share this action with all active Pokemon
-            battle.activePokemon.forEach {
-                it.battlePokemon?.contextManager?.addUnique(ShowdownInterpreter.getContextFromAction(message, BattleContext.Type.VOLATILE, battle))
-            }
-        }
-    }
-}
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.battles.interpreter.instructions
-
-import com.cobblemon.mod.common.api.battles.interpreter.BattleContext
-import com.cobblemon.mod.common.api.battles.interpreter.BattleMessage
-import com.cobblemon.mod.common.api.battles.model.PokemonBattle
-import com.cobblemon.mod.common.api.text.red
-import com.cobblemon.mod.common.battles.ShowdownInterpreter
-import com.cobblemon.mod.common.battles.dispatch.InstructionSet
-import com.cobblemon.mod.common.battles.dispatch.InterpreterInstruction
-import com.cobblemon.mod.common.util.battleLang
-
-/**
- * Format: |-fieldend|CONDITION
- *
- * The field CONDITION has ended.
- * @author Licious
- * @since February 8th, 2023
- */
-class FieldEndInstruction(val message: BattleMessage): InterpreterInstruction {
-
-    override fun invoke(battle: PokemonBattle) {
-        battle.dispatchWaiting(1.5F) {
-            val effect = message.effectAt(0) ?: return@dispatchWaiting
-            val lang = battleLang("fieldend.${effect.id}")
-            battle.broadcastChatMessage(lang)
-
-            val type = BattleContext.Type.valueOf(effect.rawData.substringAfterLast(" ").uppercase())
-            battle.contextManager.remove(effect.id, type)
-        }
-    }
-}
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.battles.interpreter.instructions
-
-import com.cobblemon.mod.common.api.battles.interpreter.BattleContext
-import com.cobblemon.mod.common.api.battles.interpreter.BattleMessage
-import com.cobblemon.mod.common.api.battles.model.PokemonBattle
-import com.cobblemon.mod.common.battles.ShowdownInterpreter
-import com.cobblemon.mod.common.battles.dispatch.InterpreterInstruction
-import com.cobblemon.mod.common.util.battleLang
-import net.minecraft.text.Text
-
-/**
- * Format: |-fieldstart|CONDITION
- *
- * The field CONDITION has started.
- * @author Xylopia
- * @since January 31st, 2023
- */
-class FieldStartInstruction(val message: BattleMessage): InterpreterInstruction {
-
-    override fun invoke(battle: PokemonBattle) {
-        val effect = message.effectAt(0) ?: return
-        val user = message.battlePokemonFromOptional(battle)
-        user?.let { ShowdownInterpreter.broadcastOptionalAbility(battle, effect, user) }
-
-        battle.dispatchWaiting(1.5F) {
-            // Note persistent is a CAP ability only we can ignore the flag
-            val lang = battleLang("fieldstart.${effect.id}", user?.getName() ?: Text.literal("UNKNOWN"))
-            battle.broadcastChatMessage(lang)
-
-            val type = BattleContext.Type.valueOf(effect.rawData.substringAfterLast(" ").uppercase())
-            battle.contextManager.add(ShowdownInterpreter.getContextFromAction(message, type, battle))
-        }
-    }
-}
@@ -1,98 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.battles.interpreter.instructions
-
-import com.cobblemon.mod.common.api.battles.interpreter.BattleMessage
-import com.cobblemon.mod.common.api.battles.interpreter.Effect
-import com.cobblemon.mod.common.api.battles.model.PokemonBattle
-import com.cobblemon.mod.common.api.battles.model.actor.BattleActor
-import com.cobblemon.mod.common.api.data.ShowdownIdentifiable
-import com.cobblemon.mod.common.api.pokemon.status.Statuses
-import com.cobblemon.mod.common.battles.ShowdownInterpreter
-import com.cobblemon.mod.common.battles.dispatch.InterpreterInstruction
-import com.cobblemon.mod.common.net.messages.client.battle.BattleHealthChangePacket
-import com.cobblemon.mod.common.net.messages.client.battle.BattlePersistentStatusPacket
-import com.cobblemon.mod.common.pokemon.status.PersistentStatus
-import com.cobblemon.mod.common.util.asTranslated
-import com.cobblemon.mod.common.util.battleLang
-
-/**
- * Format: |-heal|POKEMON|HP STATUS
- *
- * POKEMON has healed damage and is now at HP STATUS.
- * @author Licious
- * @since February 6th, 2023
- */
-class HealInstruction(val actor: BattleActor, val publicMessage: BattleMessage, val privateMessage: BattleMessage): InterpreterInstruction {
-
-    override fun invoke(battle: PokemonBattle) {
-        val pnx = privateMessage.pnxAndUuid(0)?.first
-        val battlePokemon = privateMessage.battlePokemon(0, battle) ?: return
-        val rawHpAndStatus = privateMessage.argumentAt(1)?.split(" ") ?: return
-        val rawHpRatio = rawHpAndStatus.getOrNull(0) ?: return
-        val newHealth = rawHpRatio.split("/").map { it.toFloatOrNull() ?: return }
-        val newHealthRatio = rawHpRatio.split("/").map { it.toFloatOrNull()?.div(newHealth[1]) ?: return }
-        val effect = privateMessage.effect()
-        ShowdownInterpreter.broadcastOptionalAbility(battle, effect, battlePokemon)
-
-        battle.dispatchWaiting {
-            if (pnx != null) {
-                // dynamax changes max health
-                battle.sendSidedUpdate(actor, BattleHealthChangePacket(pnx, newHealth[0], newHealth[1]), BattleHealthChangePacket(pnx, newHealthRatio[0]))
-            }
-            val silent = privateMessage.hasOptionalArgument("silent")
-            if (!silent) {
-                val lang = when {
-                    privateMessage.hasOptionalArgument("zeffect") -> battleLang("heal.zeffect", battlePokemon.getName())
-                    privateMessage.hasOptionalArgument("wisher") -> {
-                        val name = privateMessage.optionalArgument("wisher")!!
-                        val showdownId = name.lowercase().replace(ShowdownIdentifiable.REGEX, "")
-                        val wisher = actor.pokemonList.firstOrNull { it.effectedPokemon.showdownId() == showdownId }
-                        // If no Pokémon is found this is a nickname
-                        battleLang("heal.wish", wisher?.getName() ?: actor.nameOwned(name))
-                    }
-                    privateMessage.hasOptionalArgument("from") -> {
-                        when (effect!!.type) {
-                            Effect.Type.ITEM -> when (effect.id) {
-                                "leftovers", "shellbell", "blacksludge" -> battleLang("heal.leftovers", battlePokemon.getName(), effect.typelessData)
-                                else -> battleLang("heal.item", battlePokemon.getName(), effect.typelessData)
-                            }
-                            else -> when (effect.id) {
-                                "drain" -> {
-                                    val drained = privateMessage.battlePokemonFromOptional(battle) ?: return@dispatchWaiting
-                                    battleLang("heal.drain", drained.getName())
-                                }
-                                else -> battleLang("heal.${effect.id}", battlePokemon.getName())
-                            }
-                        }
-                    }
-                    else -> {
-                        battleLang("heal.generic", battlePokemon.getName())
-                    }
-                }
-                battle.broadcastChatMessage(lang)
-            }
-            battle.minorBattleActions[battlePokemon.uuid] = privateMessage
-            battlePokemon.effectedPokemon.currentHealth = newHealth[0].toInt()
-
-            // This part is not always present
-            val rawStatus = rawHpAndStatus.getOrNull(1) ?: return@dispatchWaiting
-            val status = Statuses.getStatus(rawStatus) ?: return@dispatchWaiting
-            if (status is PersistentStatus && battlePokemon.effectedPokemon.status?.status != status) {
-                battlePokemon.effectedPokemon.applyStatus(status)
-                if (pnx != null) {
-                    battle.sendUpdate(BattlePersistentStatusPacket(pnx, status))
-                }
-                if (!silent) {
-                    status.applyMessage.let { battle.broadcastChatMessage(it.asTranslated(battlePokemon.getName())) }
-                }
-            }
-        }
-    }
-}
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.battles.interpreter.instructions
-
-import com.cobblemon.mod.common.api.battles.interpreter.BattleMessage
-import com.cobblemon.mod.common.api.battles.model.PokemonBattle
-import com.cobblemon.mod.common.battles.dispatch.InterpreterInstruction
-import com.cobblemon.mod.common.util.battleLang
-
-/**
- * Format: |-hitcount|POKEMON|NUM
- *
- * A multi-hit move hit the POKEMON NUM times.
- * @author Licious
- * @since December 30th, 2022
- */
-class HitCountInstruction(val message: BattleMessage): InterpreterInstruction {
-
-    override fun invoke(battle: PokemonBattle) {
-        battle.dispatchGo {
-            val battlePokemon = message.battlePokemon(0, battle) ?: return@dispatchGo
-            val hitCount = message.argumentAt(1)?.toIntOrNull() ?: return@dispatchGo
-            val lang = if (hitCount == 1) battleLang("hit_count_singular") else battleLang("hit_count", hitCount)
-            battle.minorBattleActions[battlePokemon.uuid] = message
-            battle.broadcastChatMessage(lang)
-        }
-    }
-}
@@ -11,12 +11,6 @@ package com.cobblemon.mod.common.battles.interpreter.instructions
 import com.cobblemon.mod.common.api.battles.model.PokemonBattle
 import com.cobblemon.mod.common.battles.dispatch.InterpreterInstruction

-/**
- * Catch-all for instruction from Showdown that are not parsed.
- *
- * @author Hiroku
- * @since December 25th, 2023
- */
 class IgnoredInstruction : InterpreterInstruction {
    override fun invoke(pokemonBattle: PokemonBattle) = Unit
 }
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.battles.interpreter.instructions
-
-import com.cobblemon.mod.common.api.battles.interpreter.BattleMessage
-import com.cobblemon.mod.common.api.battles.model.PokemonBattle
-import com.cobblemon.mod.common.api.text.red
-import com.cobblemon.mod.common.battles.dispatch.InterpreterInstruction
-import com.cobblemon.mod.common.util.battleLang
-
-/**
- * Format: |-immune|POKEMON
- *
- * POKEMON was immune to a move.
- * @author Hiroku
- * @since October 3rd, 2022
- */
-class ImmuneInstruction(val message: BattleMessage): InterpreterInstruction {
-
-    override fun invoke(battle: PokemonBattle) {
-        battle.dispatchWaiting {
-            val pokemon = message.battlePokemon(0, battle) ?: return@dispatchWaiting
-            val name = pokemon.getName()
-            battle.broadcastChatMessage(battleLang("immune", name).red())
-            battle.minorBattleActions[pokemon.uuid] = message
-        }
-    }
-}
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.battles.interpreter.instructions
-
-import com.cobblemon.mod.common.api.battles.interpreter.BasicContext
-import com.cobblemon.mod.common.api.battles.interpreter.BattleContext
-import com.cobblemon.mod.common.api.battles.interpreter.BattleMessage
-import com.cobblemon.mod.common.api.battles.model.PokemonBattle
-import com.cobblemon.mod.common.battles.ShowdownInterpreter
-import com.cobblemon.mod.common.battles.dispatch.InterpreterInstruction
-import com.cobblemon.mod.common.util.battleLang
-
-/**
- * Format: |-invertboost|POKEMON
- *
- * POKEMON had its stat changes inverted.
- * @author JMMCP
- * @since November 26th, 2023
- */
-class InvertBoostInstruction(val message: BattleMessage): InterpreterInstruction {
-
-    override fun invoke(battle: PokemonBattle) {
-        battle.dispatchWaiting {
-            val pokemon = message.battlePokemon(0, battle) ?: return@dispatchWaiting
-            val name = pokemon.getName()
-            battle.broadcastChatMessage(battleLang("invertboost", name))
-
-            // update and invert BOOST and UNBOOST contexts
-            val context = ShowdownInterpreter.getContextFromAction(message, BattleContext.Type.BOOST, battle)
-            val newUnboosts = pokemon.contextManager.get(BattleContext.Type.BOOST)?.map {
-                BasicContext(it.id, context.turn, BattleContext.Type.UNBOOST, context.origin)
-            }?.toTypedArray()
-            val newBoosts = pokemon.contextManager.get(BattleContext.Type.UNBOOST)?.map {
-                BasicContext(it.id, context.turn, BattleContext.Type.BOOST, context.origin)
-            }?.toTypedArray()
-
-            pokemon.contextManager.clear(BattleContext.Type.BOOST, BattleContext.Type.UNBOOST)
-            newBoosts?.let { pokemon.contextManager.add(*it) }
-            newUnboosts?.let { pokemon.contextManager.add(*it) }
-            battle.minorBattleActions[pokemon.uuid] = message
-        }
-    }
-}
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.battles.interpreter.instructions
-
-import com.cobblemon.mod.common.api.battles.interpreter.BattleContext
-import com.cobblemon.mod.common.api.battles.interpreter.BattleMessage
-import com.cobblemon.mod.common.api.battles.model.PokemonBattle
-import com.cobblemon.mod.common.battles.ShowdownInterpreter
-import com.cobblemon.mod.common.battles.dispatch.InterpreterInstruction
-import net.minecraft.text.Text
-
-/**
- * Format: |-item|POKEMON|ITEM|(from)EFFECT
- *
- * ITEM held by POKEMON has been changed or revealed due to a move or ability EFFECT.
- *
- * Alt format: |-item|POKEMON|ITEM
- *
- * POKEMON has just switched in, and its ITEM is being announced to have a long-term effect.
- * @author Licious
- * @since December 30th, 2022
- */
-class ItemInstruction(val message: BattleMessage): InterpreterInstruction {
-
-    override fun invoke(battle: PokemonBattle) {
-        val source = message.battlePokemonFromOptional(battle)
-        source?.let { ShowdownInterpreter.broadcastOptionalAbility(battle, message.effect(), source) }
-
-        battle.dispatchGo {
-            val battlePokemon = message.battlePokemon(0, battle) ?: return@dispatchGo
-            battlePokemon.heldItemManager.handleStartInstruction(battlePokemon, battle, message)
-            battle.minorBattleActions[battlePokemon.uuid] = message
-            battlePokemon.contextManager.add(ShowdownInterpreter.getContextFromAction(message, BattleContext.Type.ITEM, battle))
-        }
-    }
-}
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.battles.interpreter.instructions
-
-import com.cobblemon.mod.common.api.battles.interpreter.BattleMessage
-import com.cobblemon.mod.common.api.battles.model.PokemonBattle
-import com.cobblemon.mod.common.api.text.yellow
-import com.cobblemon.mod.common.battles.dispatch.InterpreterInstruction
-import com.cobblemon.mod.common.util.battleLang
-
-/**
- * Format: |-mega|POKEMON|MEGASTONE
- *
- * POKEMON used item MEGASTONE to Mega Evolve.
- * @author Segfault Guy
- * @since September 10th, 2023
- */
-class MegaInstruction(val message: BattleMessage): InterpreterInstruction {
-
-    override fun invoke(battle: PokemonBattle) {
-        val battlePokemon = message.battlePokemon(0, battle) ?: return
-        battle.dispatchWaiting {
-            val pokemonName = battlePokemon.getName()
-            battle.broadcastChatMessage(battleLang("mega", pokemonName).yellow())
-            battle.minorBattleActions[battlePokemon.uuid] = message
-        }
-    }
-}
@@ -11,22 +11,22 @@ package com.cobblemon.mod.common.battles.interpreter.instructions
 import com.cobblemon.mod.common.api.battles.interpreter.BattleMessage
 import com.cobblemon.mod.common.api.battles.model.PokemonBattle
 import com.cobblemon.mod.common.api.text.red
+import com.cobblemon.mod.common.battles.dispatch.InstructionSet
 import com.cobblemon.mod.common.battles.dispatch.InterpreterInstruction
 import com.cobblemon.mod.common.util.battleLang

 /**
- * Format: |-miss|SOURCE|TARGET
+ * Format:
+ * |-miss|SOURCE|TARGET
 *
 * The move used by the SOURCE Pokémon missed (maybe absent) the TARGET Pokémon.
- * @author Hiroku
- * @since October 3rd, 2022
 */
-class MissInstruction(val battle: PokemonBattle, val message: BattleMessage): InterpreterInstruction {
-    val target = message.battlePokemon(1, battle)
+class MissInstruction(val battle: PokemonBattle, val instructionSet: InstructionSet, val message: BattleMessage): InterpreterInstruction {
+    val target = message.getBattlePokemon(1, battle)

    override fun invoke(battle: PokemonBattle) {
        battle.dispatchGo {
-            val pokemon = message.battlePokemon(0, battle) ?: return@dispatchGo
+            val pokemon = message.getBattlePokemon(0, battle) ?: return@dispatchGo
            battle.broadcastChatMessage(battleLang("missed").red())
            battle.minorBattleActions[pokemon.uuid] = message
        }
@@ -31,13 +31,6 @@ import com.cobblemon.mod.common.pokemon.evolution.progress.UseMoveEvolutionProgr
 import com.cobblemon.mod.common.util.battleLang
 import java.util.concurrent.CompletableFuture

-/**
- * Format: |move|POKEMON|MOVE|TARGET
- *
- * POKEMON has used MOVE at TARGET.
- * @author Deltric
- * @since January 22nd, 2022
- */
 class MoveInstruction(
    val instructionSet: InstructionSet,
    val message: BattleMessage
@@ -53,17 +46,17 @@ class MoveInstruction(
    var targetPokemon: BattlePokemon? = null

    override fun invoke(battle: PokemonBattle) {
-        userPokemon = message.battlePokemon(0, battle)!!
-        targetPokemon = message.battlePokemon(2, battle)
+        userPokemon = message.getBattlePokemon(0, battle)!!
+        targetPokemon = message.getBattlePokemon(2, battle)
        val targetPokemon = targetPokemon // So smart non-null casts can happen

        val optionalEffect = message.effect()
-        ShowdownInterpreter.broadcastOptionalAbility(battle, optionalEffect, userPokemon)
+        val pokemonName = userPokemon.getName()
+        ShowdownInterpreter.broadcastOptionalAbility(battle, optionalEffect, pokemonName)

        battle.dispatch { UntilDispatch { instructionSet.getMostRecentInstruction<MoveInstruction>(this)?.future?.isDone != false } }

        battle.dispatch {
-            val pokemonName = userPokemon.getName()
            ShowdownInterpreter.lastCauser[battle.battleId] = message

            userPokemon.effectedPokemon.let { pokemon ->
@@ -110,7 +103,7 @@ class MoveInstruction(
                }
            }

-            val hurtTargets = subsequentInstructions.filterIsInstance<DamageInstruction>().mapNotNull { it.expectedTarget }
+            val hurtTargets = subsequentInstructions.filterIsInstance<DamageInstruction>().mapNotNull { it.battlePokemon }
            runtime.environment.getQueryStruct().addFunction("hurt") { params ->
                if (params.params.size == 0) {
                    return@addFunction DoubleValue(hurtTargets.isNotEmpty())
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.battles.interpreter.instructions
-
-import com.cobblemon.mod.common.api.battles.interpreter.BattleMessage
-import com.cobblemon.mod.common.api.battles.model.PokemonBattle
-import com.cobblemon.mod.common.battles.dispatch.GO
-import com.cobblemon.mod.common.battles.dispatch.InterpreterInstruction
-
-/**
- * Format: |pp_update|<side_id>: <pokemon_uuid>|...<move_id>: <move_pp>
- *
- * @author Licious
- * @since September 22nd, 2022
- */
-class PpUpdateInstruction( val message: BattleMessage): InterpreterInstruction {
-
-    override fun invoke(battle: PokemonBattle) {
-        battle.dispatch {
-            val pokemon = message.battlePokemon(0, battle) ?: return@dispatch GO
-            val moveDatum = message.argumentAt(1)?.split(", ") ?: return@dispatch GO
-            moveDatum.forEach { moveData ->
-                val moveIdAndPp = moveData.split(": ")
-                val moveId = moveIdAndPp[0]
-                val movePp = moveIdAndPp[1]
-                val move = pokemon.effectedPokemon.moveSet.firstOrNull { move -> move.name.equals(moveId, true) } ?: return@dispatch GO
-                move.currentPp = movePp.toInt()
-            }
-            GO
-        }
-    }
-}
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.battles.interpreter.instructions
-
-import com.cobblemon.mod.common.api.battles.interpreter.BattleMessage
-import com.cobblemon.mod.common.api.battles.model.PokemonBattle
-import com.cobblemon.mod.common.battles.dispatch.InterpreterInstruction
-import com.cobblemon.mod.common.util.battleLang
-
-/**
- * Format: |-prepare|ATTACKER|MOVE and |-prepare|ATTACKER|MOVE|DEFENDER
- *
- * ATTACKER Pokémon is preparing to use a charge MOVE on DEFENDER or an unknown target.
- * @author Renaissance
- * @since March 24th, 2023
- */
-class PrepareInstruction(val message: BattleMessage): InterpreterInstruction {
-
-    override fun invoke(battle: PokemonBattle) {
-        battle.dispatchWaiting(1.5F) {
-            val pokemon = message.battlePokemon(0, battle) ?: return@dispatchWaiting
-            val pokemonName = pokemon.getName()
-            val effectID = message.effectAt(1)?.id ?: return@dispatchWaiting
-            //Prevents spam when the move Role Play is used
-            val lang = when (effectID) {
-                "shadowforce" -> battleLang("prepare.phantomforce", pokemonName) //Phantom Force and Shadow Force share the same text
-                "solarblade" -> battleLang("prepare.solarbeam", pokemonName) //Solar Beam and Solar Blade share the same text
-                else -> battleLang("prepare.$effectID", pokemonName)
-            }
-            battle.broadcastChatMessage(lang)
-            battle.minorBattleActions[pokemon.uuid] = message
-        }
-    }
-}
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.battles.interpreter.instructions
-
-import com.cobblemon.mod.common.api.battles.interpreter.BattleMessage
-import com.cobblemon.mod.common.api.battles.model.PokemonBattle
-import com.cobblemon.mod.common.battles.dispatch.InterpreterInstruction
-import com.cobblemon.mod.common.util.battleLang
-
-/**
- * Format: |-mustrecharge|POKEMON
- *
- * POKEMON must spend the turn recharging from a previous move.
- * @author Hunter
- * @since September 25th, 2022
- */
-class RechargeInstruction(val message: BattleMessage): InterpreterInstruction {
-
-    override fun invoke(battle: PokemonBattle) {
-        battle.dispatchWaiting(2F){
-            val pokemon = message.battlePokemon(0, battle) ?: return@dispatchWaiting
-            battle.broadcastChatMessage(battleLang("recharge", pokemon.getName()))
-            battle.minorBattleActions[pokemon.uuid] = message
-        }
-    }
-}
@@ -1,48 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.battles.interpreter.instructions
-
-import com.cobblemon.mod.common.api.battles.interpreter.BattleMessage
-import com.cobblemon.mod.common.api.battles.model.PokemonBattle
-import com.cobblemon.mod.common.api.text.yellow
-import com.cobblemon.mod.common.battles.dispatch.InterpreterInstruction
-import com.cobblemon.mod.common.net.messages.client.battle.BattleReplacePokemonPacket
-import com.cobblemon.mod.common.net.messages.client.battle.BattleTransformPokemonPacket
-import com.cobblemon.mod.common.util.battleLang
-
-/**
- * Format: |replace|POKEMON|DETAILS|HP STATUS
- *
- * Illusion has ended for POKEMON. Syntax is the same as [SwitchInstruction].
- * @author Segfault Guy
- * @since March 18th, 2024
- */
-class ReplaceInstruction(val message: BattleMessage): InterpreterInstruction {
-
-    override fun invoke(battle: PokemonBattle) {
-
-        val (pnx, _) = message.pnxAndUuid(0) ?: return
-        val (actor, activePokemon) = battle.getActorAndActiveSlotFromPNX(pnx)
-        val pokemon = message.battlePokemon(0, battle) ?: return
-
-        battle.dispatchGo {
-            val entity = pokemon.entity
-            entity?.let { it.effects.mockEffect?.end(it) }
-
-            battle.sendSidedUpdate(
-                source = actor,
-                allyPacket = BattleReplacePokemonPacket(pnx, pokemon, true),
-                opponentPacket = BattleReplacePokemonPacket(pnx, pokemon, false)
-            )
-
-            activePokemon.illusion = null
-            //lang done by EndInstruction
-        }
-    }
-}
@@ -1,57 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.battles.interpreter.instructions
-
-import com.cobblemon.mod.common.api.battles.interpreter.BattleMessage
-import com.cobblemon.mod.common.api.battles.model.PokemonBattle
-import com.cobblemon.mod.common.api.battles.model.actor.BattleActor
-import com.cobblemon.mod.common.battles.BattleRegistry
-import com.cobblemon.mod.common.battles.ShowdownActionRequest
-import com.cobblemon.mod.common.battles.dispatch.InterpreterInstruction
-import com.cobblemon.mod.common.net.messages.client.battle.BattleMakeChoicePacket
-import com.cobblemon.mod.common.net.messages.client.battle.BattleQueueRequestPacket
-
-/**
- * Format: |request|REQUEST
- *
- * It's time for the actor to make a decision.
- * @author Deltric
- * @since January 22nd, 2022
- */
-class RequestInstruction(val battleActor: BattleActor, val message: BattleMessage): InterpreterInstruction {
-    override fun invoke(battle: PokemonBattle) {
-        battle.log("Request Instruction")
-
-        if (message.rawMessage.contains("teamPreview")) // TODO probably change when we're allowing team preview
-            return
-
-        // Parse Json message and update state info for actor
-        val request = BattleRegistry.gson.fromJson(message.rawMessage.split("|request|")[1], ShowdownActionRequest::class.java)
-        request.sanitize(battle, battleActor)
-        if (battle.started) {
-            battle.dispatchGo {
-                // This request won't be acted on until the start of next turn
-                battleActor.sendUpdate(BattleQueueRequestPacket(request))
-                battleActor.request = request
-                battleActor.responses.clear()
-                // We need to send this out because 'upkeep' isn't received until the request is handled since the turn won't swap
-                if (request.forceSwitch.contains(true)) {
-                    battle.doWhenClear {
-                        battleActor.mustChoose = true
-                        battleActor.sendUpdate(BattleMakeChoicePacket())
-                    }
-                }
-            }
-        } else {
-            battleActor.request = request
-            battleActor.responses.clear()
-        }
-    }
-
-}
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.battles.interpreter.instructions
-
-import com.cobblemon.mod.common.api.battles.interpreter.BattleContext
-import com.cobblemon.mod.common.api.battles.interpreter.BattleMessage
-import com.cobblemon.mod.common.api.battles.model.PokemonBattle
-import com.cobblemon.mod.common.battles.ShowdownInterpreter
-import com.cobblemon.mod.common.battles.dispatch.InterpreterInstruction
-import com.cobblemon.mod.common.util.battleLang
-
-/**
- * Format: |-setboost|POKEMON|STAT|AMOUNT
- *
- * Same as -boost and -unboost, but STAT is set to AMOUNT instead of boosted by AMOUNT.\
- * @author Renaissance
- * @since February 16th, 2023
- */
-class SetBoostInstruction(val message: BattleMessage): InterpreterInstruction {
-
-    override fun invoke(battle: PokemonBattle) {
-        battle.dispatchWaiting(1.5F) {
-            val pokemon = message.battlePokemon(0, battle) ?: return@dispatchWaiting
-            val pokemonName = pokemon.getName()
-            val effectID = message.effect()?.id ?: return@dispatchWaiting
-            val lang = battleLang("setboost.$effectID", pokemonName)
-            battle.broadcastChatMessage(lang)
-            pokemon.contextManager.add(ShowdownInterpreter.getContextFromAction(message, BattleContext.Type.BOOST, battle))
-            battle.minorBattleActions[pokemon.uuid] = message
-        }
-    }
-}
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.battles.interpreter.instructions
-
-import com.cobblemon.mod.common.api.battles.interpreter.BattleMessage
-import com.cobblemon.mod.common.api.battles.model.PokemonBattle
-import com.cobblemon.mod.common.api.battles.model.actor.BattleActor
-import com.cobblemon.mod.common.battles.dispatch.InterpreterInstruction
-import com.cobblemon.mod.common.net.messages.client.battle.BattleHealthChangePacket
-import com.cobblemon.mod.common.util.battleLang
-import kotlin.math.roundToInt
-
-/**
- * Format: |-sethp|POKEMON|HP
- *
- * POKEMON now has HP hit points.
- * @author Licious
- * @since February 8th, 2023
- */
-class SetHpInstruction(val actor: BattleActor, val publicMessage: BattleMessage, val privateMessage: BattleMessage): InterpreterInstruction {
-
-    override fun invoke(battle: PokemonBattle) {
-        battle.dispatchWaiting {
-            val (pnx, _) = privateMessage.pnxAndUuid(0) ?: return@dispatchWaiting
-            val flatHp = privateMessage.argumentAt(1)?.split("/")?.getOrNull(0)?.toFloatOrNull() ?: return@dispatchWaiting
-            val ratioHp = publicMessage.argumentAt(1)?.split("/")?.getOrNull(0)?.toFloatOrNull()?.times(0.01F) ?: return@dispatchWaiting
-            val battlePokemon = privateMessage.battlePokemon(0, battle) ?: return@dispatchWaiting
-            battlePokemon.effectedPokemon.currentHealth = flatHp.roundToInt()
-            battle.sendSidedUpdate(actor, BattleHealthChangePacket(pnx, flatHp), BattleHealthChangePacket(pnx, ratioHp))
-            // It doesn't matter which we check when silent both have it
-            if (!publicMessage.hasOptionalArgument("silent")) {
-                val effectID = publicMessage.effect()?.id ?: return@dispatchWaiting
-                val lang = battleLang("sethp.$effectID")
-                battle.broadcastChatMessage(lang)
-            }
-            battle.minorBattleActions[battlePokemon.uuid] = publicMessage
-        }
-    }
-}
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.battles.interpreter.instructions
-
-import com.cobblemon.mod.common.api.battles.interpreter.BattleContext
-import com.cobblemon.mod.common.api.battles.interpreter.BattleMessage
-import com.cobblemon.mod.common.api.battles.model.PokemonBattle
-import com.cobblemon.mod.common.battles.dispatch.InterpreterInstruction
-import com.cobblemon.mod.common.util.battleLang
-
-/**
- * Format: |-sideend|SIDE|CONDITION
- *
- * Indicates that the side CONDITION ended for the given SIDE.
- * @author Segfault Guy
- * @since April 5th, 2023
- */
-class SideEndInstruction(val message: BattleMessage): InterpreterInstruction {
-
-    override fun invoke(battle: PokemonBattle) {
-        battle.dispatchWaiting(2F) {
-            val side = if (message.argumentAt(0)?.get(1) == '1') battle.side1 else battle.side2
-            val effect = message.effectAt(1) ?: return@dispatchWaiting
-            battle.sides.forEach {
-                val subject = if (it == side) battleLang("side_subject.ally") else battleLang("side_subject.opponent")
-                val lang = battleLang("sideend.${effect.id}", subject)
-                it.broadcastChatMessage(lang)
-            }
-
-            val bucket = when(effect.rawData.substringAfterLast(" ").lowercase()) {
-                "reflect", "screen", "veil" -> BattleContext.Type.SCREEN
-                "spikes", "rock", "web" -> BattleContext.Type.HAZARD
-                "tailwind" -> BattleContext.Type.TAILWIND
-                else -> BattleContext.Type.MISC
-            }
-            side.contextManager.remove(effect.id, bucket)
-        }
-    }
-}
--- a/Show More
+++ b/Show More