client sendout event

irk
differentiate badly poisoned in ui
2026-11-08 09:18:53 -05:00 · 2024-04-24 03:51:17 +01:00 · 2024-04-23 00:49:34 +01:00 · 2024-04-17 21:50:03 -04:00 · 2024-04-15 19:14:48 +00:00 · 2024-04-15 19:14:48 +00:00
2072 changed files with 159204 additions and 18029 deletions
@@ -35,6 +35,10 @@
 - 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.
+- Added forfeit option to PVP battles.
+- Added visual changes for entities affected by Illusion, Imposter, or Transform in battle.

 ### Pokémon Added
 #### Gen 2
@@ -43,8 +47,9 @@
 - Qwilfish
 - Heracross
 - Skarmory
- Ferroseed
- Ferrothorn
+- Larvitar
+- Pupitar
+- Tyranitar

 #### Gen 3
 - Lileep
@@ -53,6 +58,16 @@
 - Armaldo
 - Tropius
 - Roselia
+- Aron
+- Lairon
+- Aggron
+- Solrock
+- Lunatone
+- Makuhita
+- Hariyama
+- Trapinch
+- Vibrava
+- Flygon

 #### Gen 4
 - Shieldon
@@ -61,6 +76,8 @@
 - Rampardos
 - Budew
 - Roserade
+- Hippopotas
+- Hippowdon

 #### Gen 5
 - Tirtouga
@@ -87,6 +104,9 @@
 - Hydreigon
 - Larvesta
 - Volcarona
+- Alomomola
+- Ferroseed
+- Ferrothorn

 #### Gen 6
 - Tyrunt
@@ -96,6 +116,11 @@
 - Goomy
 - Sliggoo
 - Goodra
+- Carbink
+- Flabébé
+- Floette
+- Florges
+- Klefki

 #### Gen 7
 - Turtonator
@@ -106,6 +131,8 @@
 - Jangmo-o
 - Hakamo-o
 - Kommo-o
+- Alolan Diglett
+- Alolan Dugtrio

 #### Gen 8
 - Gossifleur
@@ -115,6 +142,12 @@
 - Dracozolt
 - Dracovish
 - Basculegion
+- Hisuian Decidueye
+- Hisuian Typhlosion
+- Hisuian Samurott
+- Hisuian Lilligant
+- Hisuian Sliggoo
+- Hisuian Goodra
 - Hisuian Zorua
 - Hisuian Zoroark
 - Hisuian Voltorb
@@ -131,17 +164,32 @@
 - Dragapult
 - Hisuian Sliggoo
 - Hisuian Goodra
+- Impidimp
+- Morgrem
+- Grimmsnarl

 #### Gen 9
- Gimmighoul.
+- 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, Omanyte, Omastar, Growlithe, Swinub, Piloswine, Basculine, Rowlet, Dartrix, Decidueye, Kabuto, Kabutops, Piplup, Prinplup, Elekid, Electabuzz, Cubone, Marowak, Paras, Drifloon, Drifblim, Venonat, Venomoth, Yanma, Yanmega, and Raboot.
- Updated animations for Diglett, Dugtrio, Dragonite, Omanyte, Omastar, Pinsir, Falinks, Lechonk, Litwick, Lampent, Chandelure, Carnivine, Galarian Meowth, Galarian Rapidash, Venonat, Venomoth, Phanphy, Donphan, Dratini, Dragonair, Happiny, Chansey, Blissey, Volbeat, Illumise, Numel, Drifloon, and Drifblim.
+- 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.
@@ -154,6 +202,14 @@
 - 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.
+- Updated shiny icon within summary and PC interfaces.

 ### Fixes
 - Resized Snorlax
@@ -171,12 +227,16 @@
 - 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.
+- Fixed capture messages not displaying.
+- Fixed illusion ability causing the wrong Pokémon to be targeted in battle. 
+- Battles starting with fainted party members no longer cause a softlock on defeat.

 ### Developer
 - Significantly changed the way properties in PokemonEntity work. This could break some plugins (not in a big way, but changes will be needed).
@@ -195,6 +255,8 @@
 - ``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.
+- Updated Showdown with Gen 9 DLC. 

 ### Datapack & Resourcepack Creators
 - The maximum amount of fossils that can fit in the Fossil Analyzer can be adjusted in the config.
@@ -160,7 +160,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(BlockSoundGroup.CROP)))
+    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)))

    @JvmField
    val TUMBLESTONE_CLUSTER = tumblestoneBlock("tumblestone_cluster", GrowableStoneBlock.STAGE_3, 7, 3, null)
@@ -428,7 +428,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(BlockSoundGroup.CROP)))
+    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)))
    @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
@@ -14,25 +14,7 @@ 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.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.battle.*
 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
@@ -305,6 +287,8 @@ 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)



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

    @JvmField
    val COIN_POUCH_BREAK = this.create("coin_pouch.break")
@@ -155,11 +155,21 @@ 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
@@ -277,6 +287,15 @@ 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,
@@ -286,6 +305,15 @@ 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,
@@ -37,6 +37,7 @@ 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.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
@@ -439,13 +440,24 @@ open class PokemonBattle(
    }

    fun checkForInputDispatch() {
-        val readyToInput = actors.any { !it.mustChoose && it.responses.isNotEmpty() } && actors.none { it.mustChoose }
+        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 })
        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,3 +1,11 @@
+/*
+ * 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
@@ -0,0 +1,11 @@
+package com.cobblemon.mod.common.api.events
+
+import com.cobblemon.mod.common.api.events.client.ClientSendoutEvent
+import com.cobblemon.mod.common.api.reactive.CancelableObservable
+import com.cobblemon.mod.common.api.reactive.SimpleObservable
+
+@Suppress("unused")
+object CobblemonClientEvents {
+    @JvmField
+    val CLIENT_SENDOUT = SimpleObservable<ClientSendoutEvent>()
+}
@@ -0,0 +1,9 @@
+package com.cobblemon.mod.common.api.events.client
+
+import com.cobblemon.mod.common.api.events.Cancelable
+import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
+import net.minecraft.client.util.math.MatrixStack
+import net.minecraft.util.math.Vec3d
+import org.joml.Vector3f
+
+data class ClientSendoutEvent(var sendoutOffset: Vec3d, var startPos: Vec3d, val pokemon: PokemonEntity)
@@ -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)
@@ -397,7 +397,7 @@ open class PokemonProperties {
                return false
            }
        }
-        nickname?.takeIf { it != pokemon.nickname }?.let { return false }
+        nickname?.takeIf { it.string != pokemon.nickname?.string }?.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 }
@@ -437,7 +437,7 @@ open class PokemonProperties {
                }
            } catch (_: InvalidIdentifierException) {}
        }
-        nickname?.takeIf { it != properties.nickname }?.let { return false }
+        nickname?.takeIf { it.string != properties.nickname?.string }?.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 }
@@ -12,6 +12,8 @@ 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

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

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

@@ -12,6 +12,8 @@ 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
@@ -49,7 +51,7 @@ open class SpawnerManager {

    open fun onServerTick() {
        // Disables spawning
-        if (!Cobblemon.config.enableSpawning) {
+        if (!Cobblemon.config.enableSpawning || server()?.gameRules?.getBoolean(DO_POKEMON_SPAWNING) == false) {
            return
        }
        influences.removeIf { it.isExpired() }
@@ -63,9 +63,6 @@ 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) {

@@ -100,11 +100,19 @@ object BattleBuilder {
        fleeDistance: Float = Cobblemon.config.defaultFleeDistance,
        party: PartyStore = player.party()
    ): BattleStartResult {
-        val playerTeam = party.toBattleTeam(clone = cloneParties, checkHealth = !healFirst, leadingPokemon = leadingPokemon)
+        val playerTeam = party.toBattleTeam(clone = cloneParties, checkHealth = !healFirst, leadingPokemon = leadingPokemon).sortedBy { it.health <= 0 }
        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.broadcastChatMessage(lang("capture.broke_free", pokemonName).red())
+                battle.dispatchWaiting(2F) { battle.broadcastChatMessage(lang("capture.broke_free", pokemonName).red()) }
            }
            battle.sendUpdate(BattleCaptureEndPacket(targetPokemon.getPNX(), successful))
            battle.finishCaptureAction(this)
@@ -95,7 +95,8 @@ enum class ShowdownActionResponseType(val loader: (PacketByteBuf) -> ShowdownAct
    DEFAULT({ DefaultActionResponse() }),
    FORCE_PASS({ ForcePassActionResponse() }),
    PASS({ PassActionResponse }),
-    HEAL_ITEM({ HealItemActionResponse("potion") });
+    HEAL_ITEM({ HealItemActionResponse("potion") }),
+    FORFEIT({ ForfeitActionResponse() });
 }

 abstract class ShowdownActionResponse(val type: ShowdownActionResponseType) {
@@ -265,6 +266,11 @@ 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
@@ -56,7 +56,7 @@ object ShowdownInterpreter {
        }

        listOf(
-            "player", "teamsize", "gametype", "gen", "tier", "rated", "clearpoke", "poke", "teampreview", "start", "rule", "t:", ""
+            "player", "teamsize", "gametype", "gen", "tier", "rated", "clearpoke", "poke", "teampreview", "start", "rule", "t:", "", "capture"
        ).forEach { updateInstructionParser[it] = { _, _, _, _ -> IgnoredInstruction() } }

        updateInstructionParser["-ability"]              = { _, instructionSet, message, _ -> AbilityInstruction(instructionSet, message) }
@@ -64,7 +64,7 @@ object ShowdownInterpreter {
        updateInstructionParser["bagitem"]               = { _, _, message, _ -> BagItemInstruction(message) }
        updateInstructionParser["-boost"]                = { _, instructionSet, message, remainingLines -> BoostInstruction(instructionSet, message, remainingLines, true) }
        updateInstructionParser["-block"]                = { _, _, message, _ -> BlockInstruction(message) }
-        updateInstructionParser["-cant"]                 = { _, _, message, _ -> CantInstruction(message) }
+        updateInstructionParser["cant"]                  = { _, _, message, _ -> CantInstruction(message) }
        updateInstructionParser["-clearallboost"]        = { _, _, message, _ -> ClearAllBoostInstruction(message) }
        updateInstructionParser["-clearnegativeboost"]   = { _, _, message, _ -> ClearNegativeBoostInstruction(message) }
        updateInstructionParser["-copyboost"]            = { _, _, message, _ -> CopyBoostInstruction(message) }
@@ -88,7 +88,7 @@ object ShowdownInterpreter {
        updateInstructionParser["move"]                  = { _, instructionSet, message, _ -> MoveInstruction(instructionSet, message) }
        updateInstructionParser["-nothing"]              = { _, _, _, _ -> NothingInstruction() }
        updateInstructionParser["pp_update"]             = { _, _, message, _ -> PpUpdateInstruction(message) }
-        updateInstructionParser["-prepare"]              = { _, _, message, _ -> RechargeInstruction(message) }
+        updateInstructionParser["-prepare"]              = { _, _, message, _ -> PrepareInstruction(message) }
        updateInstructionParser["-mustrecharge"]         = { _, _, message, _ -> RechargeInstruction(message) }
        updateInstructionParser["replace"]               = { _, _, message, _ -> ReplaceInstruction(message) }
        updateInstructionParser["-resisted"]             = { _, _, message, _ -> ResistedInstruction(message) }
@@ -104,7 +104,7 @@ object ShowdownInterpreter {
        updateInstructionParser["-swapboost"]            = { _, _, message, _ -> SwapBoostInstruction(message) }
        updateInstructionParser["-swapsideconditions"]   = { _, _, message, _ -> SwapSideConditionsInstruction(message) }
        updateInstructionParser["-terastallize"]         = { _, _, message, _ -> TerastallizeInstruction(message) }
-        updateInstructionParser["-transform"]            = { _, _, message, _ -> TransformInstruction(message) }
+        updateInstructionParser["-transform"]            = { battle, _, message, _ -> TransformInstruction(battle, message) }
        updateInstructionParser["turn"]                  = { _, _, message, _ -> TurnInstruction(message) }
        updateInstructionParser["-unboost"]              = { _, instructionSet, message, remainingLines -> BoostInstruction(instructionSet, message, remainingLines, false) }
        updateInstructionParser["upkeep"]                = { _, _, _, _ -> UpkeepInstruction() }
@@ -128,9 +128,9 @@ object ShowdownInterpreter {
        splitInstructionParser["-sethp"]                 = { _, targetActor, _, publicMessage, privateMessage, _ ->
                                                                SetHpInstruction(targetActor, publicMessage, privateMessage)
                                                           }
-        splitInstructionParser["switch"]                = { _, targetActor, instructionSet, publicMessage, privateMessage, _ ->
+        splitInstructionParser["switch"]                 = { _, targetActor, instructionSet, publicMessage, privateMessage, _ ->
                                                                SwitchInstruction(instructionSet, targetActor, publicMessage, privateMessage)
-                                                          }
+                                                           }

        // Note '-cureteam' is a legacy thing that is only used in generation 2 and 4 mods for heal bell and aromatherapy respectively as such we can just ignore that
    }
@@ -199,15 +199,15 @@ object ShowdownInterpreter {
        }
    }

-    fun broadcastOptionalAbility(battle: PokemonBattle, effect: Effect?, pokemonName: MutableText) {
+    fun broadcastOptionalAbility(battle: PokemonBattle, effect: Effect?, pokemon: BattlePokemon) {
        if (effect != null && effect.type == Effect.Type.ABILITY)
-            broadcastAbility(battle, effect, pokemonName)
+            broadcastAbility(battle, effect, pokemon)
    }

    // Broadcasts a generic lang to notify players of ability activations (effects are broadcasted separately)
-    fun broadcastAbility(battle: PokemonBattle, effect: Effect, pokemonName: MutableText) {
+    fun broadcastAbility(battle: PokemonBattle, effect: Effect, pokemon: BattlePokemon) {
        battle.dispatchGo {
-            val lang = battleLang("ability.generic", pokemonName, effect.typelessData).yellow()
+            val lang = battleLang("ability.generic", pokemon.getName(), effect.typelessData).yellow()
            battle.broadcastChatMessage(lang)
        }
    }
@@ -27,25 +27,21 @@ import com.cobblemon.mod.common.util.battleLang
 *
 * POKEMON has just switched-in, and its ABILITY is being announced to have a long-term effect.
 * @author Xylopia
- * @since January 31, 2023
+ * @since January 31st, 2023
 */
 class AbilityInstruction(val instructionSet: InstructionSet, val message: BattleMessage) : InterpreterInstruction, CauserInstruction {
    override fun invoke(battle: PokemonBattle) {
        val pokemon = message.battlePokemon(0, battle) ?: return
-        val pokemonName = pokemon.getName()
        val effect = message.effectAt(1) ?: return
        val optionalEffect = message.effect()
        val optionalPokemon = message.battlePokemonFromOptional(battle)
-        val optionalPokemonName = optionalPokemon?.getName()

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

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

            val lang = when (optionalEffect?.id) {
@@ -26,18 +26,18 @@ import net.minecraft.text.Text
 * by one of the other minor messages.
 *
 * @author Hunter
- * @since September 25, 2022
+ * @since September 25th, 2022
 */
 class ActivateInstruction(val instructionSet: InstructionSet, val message: BattleMessage) : InterpreterInstruction, CauserInstruction {
    override fun invoke(battle: PokemonBattle) {
        val pokemon = message.battlePokemon(0, battle) ?: return
-        val pokemonName = pokemon.getName()
-        val sourceName = message.battlePokemonFromOptional(battle)?.getName() ?: Text.literal("UNKNOWN")
        val effect = message.effectAt(1) ?: return
        val extraEffect = message.effectAt(2)?.typelessData ?: Text.literal("UNKNOWN")
-        ShowdownInterpreter.broadcastOptionalAbility(battle, effect, pokemonName)
+        ShowdownInterpreter.broadcastOptionalAbility(battle, effect, pokemon)

        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,3 +1,11 @@
+/*
+ * 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
@@ -11,7 +19,7 @@ import com.cobblemon.mod.common.util.battleLang
 *
 * POKEMON had ITEM used on it from the 'bag'.
 * @author landonjw
- * @since July 31, 2023
+ * @since July 31st, 2023
 */
 class BagItemInstruction(val message: BattleMessage): InterpreterInstruction {

@@ -1,3 +1,11 @@
+/*
+ * 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
@@ -12,7 +20,7 @@ import com.cobblemon.mod.common.util.battleLang
 *
 * 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 6, 2023
+ * @since November 6th, 2023
 */
 class BlockInstruction(val message: BattleMessage): InterpreterInstruction {

@@ -1,3 +1,11 @@
+/*
+ * 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
@@ -15,7 +23,7 @@ import com.cobblemon.mod.common.util.battleLang
 * 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 20, 2022
+ * @since August 20th, 2022
 */
 class BoostInstruction(val instructionSet: InstructionSet, val message: BattleMessage, val remainingLines: Iterator<BattleMessage>, val isBoost: Boolean = true): InterpreterInstruction {

@@ -1,3 +1,11 @@
+/*
+ * 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
@@ -14,7 +22,7 @@ import com.cobblemon.mod.common.util.lang
 *
 * The POKEMON could not perform a move because of the indicated REASON.
 * @author Deltric
- * @since January 22, 2022
+ * @since January 22nd, 2022
 */
 class CantInstruction(val message: BattleMessage): InterpreterInstruction {

@@ -1,3 +1,11 @@
+/*
+ * 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
@@ -11,7 +19,7 @@ import com.cobblemon.mod.common.util.battleLang
 *
 * Clears all boosts from all Pokémon on both sides.
 * @author Segfault Guy
- * @since April 26, 2023
+ * @since April 26th, 2023
 */
 class ClearAllBoostInstruction(val message: BattleMessage): InterpreterInstruction {

@@ -1,3 +1,11 @@
+/*
+ * 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
@@ -11,14 +19,15 @@ import com.cobblemon.mod.common.util.battleLang
 *
 * Clear the negative boosts from the target POKEMON (usually as the result of a zeffect).
 * @author Segfault Guy
- * @since September 10, 2023
+ * @since September 10th, 2023
 */
 class ClearNegativeBoostInstruction(val message: BattleMessage): InterpreterInstruction {

    override fun invoke(battle: PokemonBattle) {
        val battlePokemon = message.battlePokemon(0, battle) ?: return
-        val pokemonName = battlePokemon.getName()
+
        battle.dispatchWaiting(1.5F) {
+            val pokemonName = battlePokemon.getName()
            val lang = when {
                message.hasOptionalArgument("zeffect") -> battleLang("clearallnegativeboost.zeffect", pokemonName)
                else -> battleLang("clearallnegativeboost", pokemonName)
@@ -1,3 +1,11 @@
+/*
+ * 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
@@ -11,7 +19,7 @@ import com.cobblemon.mod.common.util.battleLang
 *
 * Copies any stat changes from the TARGET Pokémon to the SOURCE Pokémon due to EFFECT.
 * @author JMMCP
- * @since November 27, 2023
+ * @since November 27th, 2023
 */
 class CopyBoostInstruction(val message: BattleMessage): InterpreterInstruction {

@@ -1,3 +1,11 @@
+/*
+ * 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
@@ -13,7 +21,7 @@ import com.cobblemon.mod.common.util.battleLang
 *
 * POKEMON received a critical hit.
 * @author Hunter
- * @since August 18, 2022
+ * @since August 18th, 2022
 */
 class CritInstruction(val message: BattleMessage): InterpreterInstruction {

@@ -1,3 +1,11 @@
+/*
+ * 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
@@ -16,7 +24,7 @@ import com.cobblemon.mod.common.util.battleLang
 *
 * The POKEMON has recovered from its STATUS.
 * @author Hiroku
- * @since November 5, 2022
+ * @since November 5th, 2022
 */
 class CureStatusInstruction(val message: BattleMessage): InterpreterInstruction {

@@ -24,12 +32,12 @@ class CureStatusInstruction(val message: BattleMessage): InterpreterInstruction
        val maybeActivePokemon = message.actorAndActivePokemon(0, battle)?.second?.battlePokemon
        val maybePartyPokemon = message.battlePokemon(0, battle)
        val pokemon = maybeActivePokemon ?: maybePartyPokemon ?: return
-        val pokemonName = pokemon.getName()
        val status = message.argumentAt(1)?.let(Statuses::getStatus) ?: return
        val effect = message.effect()
-        ShowdownInterpreter.broadcastOptionalAbility(battle, effect, pokemonName)
+        ShowdownInterpreter.broadcastOptionalAbility(battle, effect, pokemon)

        battle.dispatchWaiting {
+            val pokemonName = pokemon.getName()
            pokemon.effectedPokemon.status = null
            pokemon.sendUpdate()

@@ -36,7 +36,7 @@ import net.minecraft.text.Text
 *
 * POKEMON has taken damage and is now at HP STATUS
 * @author Hiroku
- * @since March 11, 2022
+ * @since March 11th, 2022
 */
 class DamageInstruction(
    val instructionSet: InstructionSet,
@@ -66,8 +66,7 @@ class DamageInstruction(
        }
        val newHealth = privateMessage.argumentAt(1)?.split(" ")?.get(0) ?: return
        val effect = privateMessage.effect()
-        val pokemonName = battlePokemon.getName()
-        val sourceName = privateMessage.battlePokemonFromOptional(battle)?.getName() ?: Text.literal("UNKNOWN")
+        val source = privateMessage.battlePokemonFromOptional(battle)
        var causedFaint = newHealth == "0"

        battle.dispatch {
@@ -78,7 +77,10 @@ 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())
@@ -101,8 +103,6 @@ class DamageInstruction(
                )
            }

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

@@ -116,7 +116,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, sourceName)
+                    else -> battleLang("damage.${effect.id}", pokemonName, source?.getName() ?: Text.literal("UNKOWN"))
                }
                battle.broadcastChatMessage(lang.red())
            }
@@ -1,3 +1,11 @@
+/*
+ * 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
@@ -10,15 +18,15 @@ import com.cobblemon.mod.common.util.battleLang
 *
 * POKEMON has changed formes permanently (i.e. Mega Evolution) to DETAILS.
 * @author Segfault Guy
- * @since September 10, 2023
+ * @since September 10th, 2023
 */
 class DetailsChangeInstruction(val message: BattleMessage): InterpreterInstruction {

    override fun invoke(battle: PokemonBattle) {
        val battlePokemon = message.battlePokemon(0, battle) ?: return
-        val pokemonName = battlePokemon.getName()
        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,3 +1,11 @@
+/*
+ * 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
@@ -16,7 +24,8 @@ import com.cobblemon.mod.common.util.battleLang
 * 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
+ * @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) {
@@ -24,6 +33,7 @@ class DragInstruction(val instructionSet: InstructionSet, val battleActor: Battl
            val (pnx, _) = publicMessage.pnxAndUuid(0)!!
            val (_, activePokemon) = battle.getActorAndActiveSlotFromPNX(pnx)

+            val imposter = instructionSet.getNextInstruction<TransformInstruction>(this)?.expectedTarget != null
            val illusion = publicMessage.battlePokemonFromOptional(battle , "is")
            val pokemon = publicMessage.battlePokemon(0, battle) ?: return@dispatchInsert emptySet()

@@ -36,13 +46,13 @@ class DragInstruction(val instructionSet: InstructionSet, val battleActor: Battl

            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)
-                        }
+                BattleDispatch {
+                    if (entity != null) {
+                        SwitchInstruction.createEntitySwitch(battle, battleActor, entity, pnx, activePokemon, pokemon, illusion, imposter)
+                    } else {
+                        SwitchInstruction.createNonEntitySwitch(battle, battleActor, pnx, activePokemon, pokemon, illusion)
                    }
+                }
            )
        }
    }
@@ -1,3 +1,11 @@
+/*
+ * 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
@@ -10,7 +18,7 @@ import com.cobblemon.mod.common.util.battleLang
 *
 * The POKEMON's Ability was suppressed.
 * @author jeffw773
- * @since November 28, 2023
+ * @since November 28th, 2023
 */
 class EndAbilityInstruction(val message: BattleMessage): InterpreterInstruction {

@@ -1,3 +1,11 @@
+/*
+ * 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
@@ -13,7 +21,7 @@ import com.cobblemon.mod.common.util.lang
 *
 * The volatile status from EFFECT inflicted on POKEMON has ended.
 * @author Hiroku
- * @since October 3, 2022
+ * @since October 3rd, 2022
 */
 class EndInstruction(val message: BattleMessage): InterpreterInstruction {

@@ -1,3 +1,11 @@
+/*
+ * 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
@@ -17,7 +25,7 @@ import com.cobblemon.mod.common.util.battleLang
 *
 * POKEMON's ITEM has destroyed itself (consumed or used).
 * @author Licious
- * @since December 30, 2022
+ * @since December 30th, 2022
 */
 class EndItemInstruction(val message: BattleMessage): InterpreterInstruction {

@@ -1,3 +1,11 @@
+/*
+ * 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
@@ -13,7 +21,7 @@ import com.cobblemon.mod.common.util.battleLang
 *
 * The actor needs to send a different decision due to ERROR.
 * @author Yaseen
- * @since April 22, 2023
+ * @since April 22nd, 2023
 */
 class ErrorInstruction(val battleActor: BattleActor, val message: BattleMessage): InterpreterInstruction {

@@ -1,3 +1,11 @@
+/*
+ * 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
@@ -12,7 +20,7 @@ import com.cobblemon.mod.common.util.battleLang
 *
 * ACTION has failed against POKEMON.
 * @author Hunter
- * @since September 25, 2022
+ * @since September 25th, 2022
 */
 class FailInstruction(val message: BattleMessage): InterpreterInstruction {

@@ -24,14 +24,13 @@ import com.cobblemon.mod.common.util.battleLang
 *
 * POKEMON has fainted.
 * @author Deltric
- * @since January 22, 2022
+ * @since January 22nd, 2022
 */
 class FaintInstruction(battle: PokemonBattle, val message: BattleMessage) : InterpreterInstruction {
    var waitTime = 2.5F
    val faintingPokemon = message.battlePokemon(0, battle)!!

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

        battle.dispatchWaiting(waitTime) {
            val (pnx, _) = message.pnxAndUuid(0) ?: return@dispatchWaiting
@@ -46,7 +45,8 @@ 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.dispatchGo {
+        battle.dispatchWaiting(0.5F) {
+            val faintMessage = battleLang("fainted", faintingPokemon.getName()).red()
            battle.broadcastChatMessage(faintMessage)
        }
    }
@@ -1,3 +1,11 @@
+/*
+ * 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
@@ -14,7 +22,7 @@ import com.cobblemon.mod.common.util.battleLang
 *
 * A miscellaneous EFFECT has activated for the entire field.
 * @author Segfault Guy
- * @since April 5, 2023
+ * @since April 5th, 2023
 */
 class FieldActivateInstruction(val message: BattleMessage): InterpreterInstruction {

@@ -1,3 +1,11 @@
+/*
+ * 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
@@ -14,7 +22,7 @@ import com.cobblemon.mod.common.util.battleLang
 *
 * The field CONDITION has ended.
 * @author Licious
- * @since February 8, 2023
+ * @since February 8th, 2023
 */
 class FieldEndInstruction(val message: BattleMessage): InterpreterInstruction {

@@ -1,3 +1,11 @@
+/*
+ * 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
@@ -13,18 +21,18 @@ import net.minecraft.text.Text
 *
 * The field CONDITION has started.
 * @author Xylopia
- * @since January 31, 2023
+ * @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)?.getName() ?: Text.literal("UNKNOWN")
-        ShowdownInterpreter.broadcastOptionalAbility(battle, effect, user)
+        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)
+            val lang = battleLang("fieldstart.${effect.id}", user?.getName() ?: Text.literal("UNKNOWN"))
            battle.broadcastChatMessage(lang)

            val type = BattleContext.Type.valueOf(effect.rawData.substringAfterLast(" ").uppercase())
@@ -1,3 +1,11 @@
+/*
+ * 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
@@ -19,7 +27,7 @@ import com.cobblemon.mod.common.util.battleLang
 *
 * POKEMON has healed damage and is now at HP STATUS.
 * @author Licious
- * @since February 6, 2023
+ * @since February 6th, 2023
 */
 class HealInstruction(val actor: BattleActor, val publicMessage: BattleMessage, val privateMessage: BattleMessage): InterpreterInstruction {

@@ -31,8 +39,7 @@ class HealInstruction(val actor: BattleActor, val publicMessage: BattleMessage,
        val newHealth = rawHpRatio.split("/").map { it.toFloatOrNull() ?: return }
        val newHealthRatio = rawHpRatio.split("/").map { it.toFloatOrNull()?.div(newHealth[1]) ?: return }
        val effect = privateMessage.effect()
-        val pokemonName = battlePokemon.getName()
-        ShowdownInterpreter.broadcastOptionalAbility(battle, effect, pokemonName)
+        ShowdownInterpreter.broadcastOptionalAbility(battle, effect, battlePokemon)

        battle.dispatchWaiting {
            if (pnx != null) {
@@ -1,3 +1,11 @@
+/*
+ * 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
@@ -10,7 +18,7 @@ import com.cobblemon.mod.common.util.battleLang
 *
 * A multi-hit move hit the POKEMON NUM times.
 * @author Licious
- * @since December 30, 2022
+ * @since December 30th, 2022
 */
 class HitCountInstruction(val message: BattleMessage): InterpreterInstruction {

@@ -15,7 +15,7 @@ import com.cobblemon.mod.common.battles.dispatch.InterpreterInstruction
 * Catch-all for instruction from Showdown that are not parsed.
 *
 * @author Hiroku
- * @since December 25, 2023
+ * @since December 25th, 2023
 */
 class IgnoredInstruction : InterpreterInstruction {
    override fun invoke(pokemonBattle: PokemonBattle) = Unit
@@ -1,3 +1,11 @@
+/*
+ * 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
@@ -11,7 +19,7 @@ import com.cobblemon.mod.common.util.battleLang
 *
 * POKEMON was immune to a move.
 * @author Hiroku
- * @since October 3, 2022
+ * @since October 3rd, 2022
 */
 class ImmuneInstruction(val message: BattleMessage): InterpreterInstruction {

@@ -1,3 +1,11 @@
+/*
+ * 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
@@ -13,7 +21,7 @@ import com.cobblemon.mod.common.util.battleLang
 *
 * POKEMON had its stat changes inverted.
 * @author JMMCP
- * @since November 26, 2023
+ * @since November 26th, 2023
 */
 class InvertBoostInstruction(val message: BattleMessage): InterpreterInstruction {

@@ -1,3 +1,11 @@
+/*
+ * 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
@@ -16,13 +24,13 @@ import net.minecraft.text.Text
 *
 * POKEMON has just switched in, and its ITEM is being announced to have a long-term effect.
 * @author Licious
- * @since December 30, 2022
+ * @since December 30th, 2022
 */
 class ItemInstruction(val message: BattleMessage): InterpreterInstruction {

    override fun invoke(battle: PokemonBattle) {
-        val sourceName = message.battlePokemonFromOptional(battle)?.getName() ?: Text.literal("UNKOWN")
-        ShowdownInterpreter.broadcastOptionalAbility(battle, message.effect(), sourceName)
+        val source = message.battlePokemonFromOptional(battle)
+        source?.let { ShowdownInterpreter.broadcastOptionalAbility(battle, message.effect(), source) }

        battle.dispatchGo {
            val battlePokemon = message.battlePokemon(0, battle) ?: return@dispatchGo
@@ -1,3 +1,11 @@
+/*
+ * 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
@@ -11,14 +19,14 @@ import com.cobblemon.mod.common.util.battleLang
 *
 * POKEMON used item MEGASTONE to Mega Evolve.
 * @author Segfault Guy
- * @since September 10, 2023
+ * @since September 10th, 2023
 */
 class MegaInstruction(val message: BattleMessage): InterpreterInstruction {

    override fun invoke(battle: PokemonBattle) {
        val battlePokemon = message.battlePokemon(0, battle) ?: return
-        val pokemonName = battlePokemon.getName()
        battle.dispatchWaiting {
+            val pokemonName = battlePokemon.getName()
            battle.broadcastChatMessage(battleLang("mega", pokemonName).yellow())
            battle.minorBattleActions[battlePokemon.uuid] = message
        }
@@ -19,7 +19,7 @@ import com.cobblemon.mod.common.util.battleLang
 *
 * The move used by the SOURCE Pokémon missed (maybe absent) the TARGET Pokémon.
 * @author Hiroku
- * @since October 3, 2022
+ * @since October 3rd, 2022
 */
 class MissInstruction(val battle: PokemonBattle, val message: BattleMessage): InterpreterInstruction {
    val target = message.battlePokemon(1, battle)
@@ -36,7 +36,7 @@ import java.util.concurrent.CompletableFuture
 *
 * POKEMON has used MOVE at TARGET.
 * @author Deltric
- * @since January 22, 2022
+ * @since January 22nd, 2022
 */
 class MoveInstruction(
    val instructionSet: InstructionSet,
@@ -58,12 +58,12 @@ class MoveInstruction(
        val targetPokemon = targetPokemon // So smart non-null casts can happen

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

        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 ->
@@ -1,3 +1,11 @@
+/*
+ * 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.model.PokemonBattle
@@ -9,7 +17,7 @@ import com.cobblemon.mod.common.util.battleLang
 *
 * Pathetic. Your move did absolutely nothing. You should feel bad for being bad.
 * @author Hiroku
- * @since August 20, 2022
+ * @since August 20th, 2022
 */
 class NothingInstruction() : InterpreterInstruction {

@@ -1,3 +1,11 @@
+/*
+ * 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
@@ -9,7 +17,7 @@ import com.cobblemon.mod.common.battles.dispatch.InterpreterInstruction
 * Format: |pp_update|<side_id>: <pokemon_uuid>|...<move_id>: <move_pp>
 *
 * @author Licious
- * @since September 22, 2022
+ * @since September 22nd, 2022
 */
 class PpUpdateInstruction( val message: BattleMessage): InterpreterInstruction {

@@ -1,3 +1,11 @@
+/*
+ * 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
@@ -10,7 +18,7 @@ import com.cobblemon.mod.common.util.battleLang
 *
 * ATTACKER Pokémon is preparing to use a charge MOVE on DEFENDER or an unknown target.
 * @author Renaissance
- * @since March 24, 2023
+ * @since March 24th, 2023
 */
 class PrepareInstruction(val message: BattleMessage): InterpreterInstruction {

@@ -1,3 +1,11 @@
+/*
+ * 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
@@ -10,7 +18,7 @@ import com.cobblemon.mod.common.util.battleLang
 *
 * POKEMON must spend the turn recharging from a previous move.
 * @author Hunter
- * @since September 25, 2022
+ * @since September 25th, 2022
 */
 class RechargeInstruction(val message: BattleMessage): InterpreterInstruction {

@@ -1,9 +1,19 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
 package com.cobblemon.mod.common.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

 /**
@@ -16,10 +26,23 @@ import com.cobblemon.mod.common.util.battleLang
 class ReplaceInstruction(val message: BattleMessage): InterpreterInstruction {

    override fun invoke(battle: PokemonBattle) {
-        battle.dispatchWaiting(1F) {
-            val pokemon = message.battlePokemon(0, battle) ?: return@dispatchWaiting
+
+        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,3 +1,11 @@
+/*
+ * 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
@@ -14,7 +22,7 @@ import com.cobblemon.mod.common.net.messages.client.battle.BattleQueueRequestPac
 *
 * It's time for the actor to make a decision.
 * @author Deltric
- * @since January 22, 2022
+ * @since January 22nd, 2022
 */
 class RequestInstruction(val battleActor: BattleActor, val message: BattleMessage): InterpreterInstruction {
    override fun invoke(battle: PokemonBattle) {
@@ -1,3 +1,11 @@
+/*
+ * 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
@@ -9,8 +17,8 @@ import com.cobblemon.mod.common.util.battleLang
 * Format: |-resisted|POKEMON
 *
 * POKEMON resisted the attack.
- * @author
- * @since
+ * @author Hunter
+ * @since August 18th, 2022
 */
 class ResistedInstruction(val message: BattleMessage): InterpreterInstruction {

@@ -1,3 +1,11 @@
+/*
+ * 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
@@ -12,7 +20,7 @@ import com.cobblemon.mod.common.util.battleLang
 *
 * Same as -boost and -unboost, but STAT is set to AMOUNT instead of boosted by AMOUNT.\
 * @author Renaissance
- * @since February 16, 2023
+ * @since February 16th, 2023
 */
 class SetBoostInstruction(val message: BattleMessage): InterpreterInstruction {

@@ -1,3 +1,11 @@
+/*
+ * 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
@@ -13,7 +21,7 @@ import kotlin.math.roundToInt
 *
 * POKEMON now has HP hit points.
 * @author Licious
- * @since February 8, 2023
+ * @since February 8th, 2023
 */
 class SetHpInstruction(val actor: BattleActor, val publicMessage: BattleMessage, val privateMessage: BattleMessage): InterpreterInstruction {

@@ -1,3 +1,11 @@
+/*
+ * 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
@@ -11,7 +19,7 @@ import com.cobblemon.mod.common.util.battleLang
 *
 * Indicates that the side CONDITION ended for the given SIDE.
 * @author Segfault Guy
- * @since April 5, 2023
+ * @since April 5th, 2023
 */
 class SideEndInstruction(val message: BattleMessage): InterpreterInstruction {

@@ -1,3 +1,11 @@
+/*
+ * 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
@@ -12,7 +20,7 @@ import com.cobblemon.mod.common.util.battleLang
 *
 * A side CONDITION has started on SIDE.
 * @author Segfault Guy
- * @since April 5, 2023
+ * @since April 5th, 2023
 */
 class SideStartInstruction(val message: BattleMessage): InterpreterInstruction {

@@ -1,17 +0,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.api.types.ElementalTypes
-import com.cobblemon.mod.common.battles.dispatch.InstructionSet
-import com.cobblemon.mod.common.battles.dispatch.InterpreterInstruction
-import com.cobblemon.mod.common.util.battleLang
-
-/** Placeholder for instructions that only */
-class SilentInstruction(val instructionSet: InstructionSet, val message: BattleMessage): InterpreterInstruction {
-
-    override fun invoke(battle: PokemonBattle) {
-        battle.dispatchGo {  }
-    }
-}
@@ -1,3 +1,11 @@
+/*
+ * 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
@@ -10,7 +18,7 @@ import com.cobblemon.mod.common.util.battleLang
 *
 * POKEMON used MOVE which causes a temporary effect lasting the duration of the move.
 * @author Renaissance
- * @since March 24, 2023
+ * @since March 24th, 2023
 */
 class SingleMoveInstruction(val message: BattleMessage): InterpreterInstruction {

@@ -1,3 +1,11 @@
+/*
+ * 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
@@ -11,7 +19,7 @@ import net.minecraft.text.Text
 *
 * POKEMON used MOVE which causes a temporary effect lasting the duration of the turn.
 * @author Renaissance
- * @since March 24, 2023
+ * @since March 24th, 2023
 */
 class SingleTurnInstruction(val message: BattleMessage): InterpreterInstruction {

@@ -1,3 +1,11 @@
+/*
+ * 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
@@ -16,7 +24,7 @@ import net.minecraft.text.Text
 *
 * A volatile status has been inflicted on POKEMON by EFFECT.
 * @author Deltric
- * @since January 21, 2022
+ * @since January 21st, 2022
 */
 class StartInstruction(val message: BattleMessage): InterpreterInstruction {

@@ -1,3 +1,11 @@
+/*
+ * 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.Cobblemon
@@ -16,7 +24,7 @@ import com.cobblemon.mod.common.util.asTranslated
 *
 * POKEMON has been inflicted with STATUS.
 * @author Hiroku
- * @since October 3, 2022
+ * @since October 3rd, 2022
 */
 class StatusInstruction( val message: BattleMessage): InterpreterInstruction {

@@ -26,10 +34,8 @@ class StatusInstruction( val message: BattleMessage): InterpreterInstruction {
        val otherPokemon = message.actorAndActivePokemonFromOptional(battle, "of")?.second?.battlePokemon
        val statusLabel = message.argumentAt(1) ?: return
        val status = Statuses.getStatus(statusLabel) ?: return Cobblemon.LOGGER.error("Unrecognized status: $statusLabel")
-        if (otherPokemon == null)
-            ShowdownInterpreter.broadcastOptionalAbility(battle, message.effect(), pokemon.getName())
-        else
-            ShowdownInterpreter.broadcastOptionalAbility(battle, message.effect(), otherPokemon.getName())
+
+        ShowdownInterpreter.broadcastOptionalAbility(battle, message.effect(), otherPokemon ?: pokemon)

        battle.dispatchWaiting {
            if (status is PersistentStatus) {
@@ -1,3 +1,11 @@
+/*
+ * 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
@@ -10,7 +18,7 @@ import com.cobblemon.mod.common.util.battleLang
 *
 * A move was super effective against POKEMON.
 * @author Hunter
- * @since August 18, 2022
+ * @since August 18th, 2022
 */
 class SuperEffectiveInstruction(val message: BattleMessage): InterpreterInstruction {

@@ -1,3 +1,11 @@
+/*
+ * 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
@@ -11,7 +19,7 @@ import com.cobblemon.mod.common.util.battleLang
 *
 * Swaps the boosts from STATS between the SOURCE Pokémon and TARGET Pokémon.
 * @author Renaissance
- * @since March 24, 2023
+ * @since March 24th, 2023
 */
 class SwapBoostInstruction(val message: BattleMessage): InterpreterInstruction {

@@ -1,3 +1,11 @@
+/*
+ * 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
@@ -11,7 +19,7 @@ import com.cobblemon.mod.common.battles.dispatch.InterpreterInstruction
 *
 * Swaps side conditions between sides. Used for Court Change.
 * @author Segfault Guy
- * @since February 19, 2024
+ * @since February 19th, 2024
 */
 class SwapSideConditionsInstruction(val message: BattleMessage): InterpreterInstruction {

@@ -1,3 +1,11 @@
+/*
+ * 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
@@ -16,13 +24,13 @@ import net.minecraft.server.world.ServerWorld
 import java.util.concurrent.CompletableFuture

 /**
- * Format: |switch|POKEMON|DETAILS|HP STATUS or |drag|POKEMON|DETAILS|HP STATUS
+ * Format: |switch|POKEMON|DETAILS|HP STATUS
 *
 * POKEMON has switched in (if there was an old Pokémon at 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 Deltric
- * @since January 22, 2022
+ * @since January 22nd, 2022
 */
 class SwitchInstruction(val instructionSet: InstructionSet, val battleActor: BattleActor, val publicMessage: BattleMessage, val privateMessage: BattleMessage): InterpreterInstruction {

@@ -32,6 +40,7 @@ class SwitchInstruction(val instructionSet: InstructionSet, val battleActor: Bat
        val (actor, activePokemon) = battle.getActorAndActiveSlotFromPNX(pnx)
        val entity = if (actor is EntityBackedBattleActor<*>) actor.entity else null

+        val imposter = instructionSet.getNextInstruction<TransformInstruction>(this)?.expectedTarget != null
        val illusion = publicMessage.battlePokemonFromOptional(battle, "is")
        val pokemon = publicMessage.battlePokemon(0, battle) ?: return

@@ -79,7 +88,7 @@ class SwitchInstruction(val instructionSet: InstructionSet, val battleActor: Bat
                setOf(
                    BattleDispatch {
                        if (entity != null) {
-                            createEntitySwitch(battle, actor, entity, pnx, activePokemon, pokemon, illusion)
+                            createEntitySwitch(battle, actor, entity, pnx, activePokemon, pokemon, illusion, imposter)
                        } else {
                            createNonEntitySwitch(battle, actor, pnx, activePokemon, pokemon, illusion)
                        }
@@ -90,10 +99,21 @@ class SwitchInstruction(val instructionSet: InstructionSet, val battleActor: Bat
    }

    companion object{
-        fun createEntitySwitch(battle: PokemonBattle, actor: BattleActor, entity: LivingEntity, pnx: String, activePokemon: ActiveBattlePokemon, newPokemon: BattlePokemon, illusion: BattlePokemon? = null): DispatchResult {
+        fun createEntitySwitch(
+            battle: PokemonBattle,
+            actor: BattleActor,
+            entity: LivingEntity,
+            pnx: String,
+            activePokemon: ActiveBattlePokemon,
+            newPokemon: BattlePokemon,
+            illusion: BattlePokemon? = null,
+            imposter: Boolean = false
+        ): DispatchResult {
            val pokemonEntity = activePokemon.battlePokemon?.entity
            // If we can't find the entity for some reason then we're going to skip the recall animation
            val sendOutFuture = CompletableFuture<Unit>()
+            // skip if handled by respective EntityEffect
+            val doCry = illusion == null && !imposter
            (pokemonEntity?.recallWithAnimation() ?: CompletableFuture.completedFuture(Unit)).thenApply {
                // Queue actual swap and send-in after the animation has ended
                actor.pokemonList.swap(actor.activePokemon.indexOf(activePokemon), actor.pokemonList.indexOf(newPokemon))
@@ -102,7 +122,7 @@ class SwitchInstruction(val instructionSet: InstructionSet, val battleActor: Bat
                battle.sendSidedUpdate(actor, BattleSwitchPokemonPacket(pnx, newPokemon, true, illusion), BattleSwitchPokemonPacket(pnx, newPokemon, false, illusion))
                if (newPokemon.entity != null) {
                    illusion?.let { IllusionEffect(it.effectedPokemon).start(newPokemon.entity!!) }
-                    newPokemon.entity?.cry()
+                    if (doCry) newPokemon.entity?.cry()
                    sendOutFuture.complete(Unit)
                } else {
                    val lastPosition = activePokemon.position
@@ -114,6 +134,7 @@ class SwitchInstruction(val instructionSet: InstructionSet, val battleActor: Bat
                        battleId = battle.battleId,
                        level = world,
                        position = pos,
+                        doCry = doCry,
                        illusion = illusion?.let { IllusionEffect(it.effectedPokemon) }
                    ).thenAccept { sendOutFuture.complete(Unit) }
                }
@@ -1,3 +1,11 @@
+/*
+ * 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
@@ -12,15 +20,15 @@ import com.cobblemon.mod.common.util.battleLang
 *
 * POKEMON terastallized into TYPE.
 * @author Segfault Guy
- * @since September 10, 2023
+ * @since September 10th, 2023
 */
 class TerastallizeInstruction(val message: BattleMessage): InterpreterInstruction {

    override fun invoke(battle: PokemonBattle) {
        val battlePokemon = message.battlePokemon(0, battle) ?: return
-        val pokemonName = battlePokemon.getName()
        val type = message.effectAt(1)?.let { ElementalTypes.get(it.id) } ?: return
        battle.dispatchWaiting {
+            val pokemonName = battlePokemon.getName()
            battle.broadcastChatMessage(battleLang("terastallize", pokemonName, type.displayName).yellow())
            battle.minorBattleActions[battlePokemon.uuid] = message
        }
@@ -1,9 +1,21 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
 package com.cobblemon.mod.common.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.ShowdownInterpreter
+import com.cobblemon.mod.common.battles.dispatch.GO
 import com.cobblemon.mod.common.battles.dispatch.InterpreterInstruction
+import com.cobblemon.mod.common.battles.dispatch.UntilDispatch
 import com.cobblemon.mod.common.entity.pokemon.effects.TransformEffect
+import com.cobblemon.mod.common.net.messages.client.battle.BattleTransformPokemonPacket
 import com.cobblemon.mod.common.util.battleLang

 /**
@@ -11,18 +23,40 @@ import com.cobblemon.mod.common.util.battleLang
 *
 * POKEMON used Transform to turn into target POKEMON.
 * @author jeffw773
- * @since November 28, 2023
+ * @since November 28th, 2023
 */
-class TransformInstruction(val message: BattleMessage): InterpreterInstruction {
+class TransformInstruction(val battle: PokemonBattle, val message: BattleMessage): InterpreterInstruction {
+
+    val expectedTarget = message.battlePokemon(0, battle)

    override fun invoke(battle: PokemonBattle) {
-        battle.dispatchWaiting(1.5F) {
-            val pokemon = message.battlePokemon(0, battle) ?: return@dispatchWaiting
+
+        val (pnx, _) = message.pnxAndUuid(0) ?: return
+        val (actor, _) = battle.getActorAndActiveSlotFromPNX(pnx)
+        val pokemon = message.battlePokemon(0, battle) ?: return
+        val targetPokemon = message.battlePokemon(1, battle) ?: return
+
+        val effect = message.effect()
+        ShowdownInterpreter.broadcastOptionalAbility(battle, effect, pokemon)
+
+        battle.dispatch {
+            val entity = pokemon.entity ?: return@dispatch GO
+            val future = TransformEffect(targetPokemon.effectedPokemon, battle.started).start(entity)
+            UntilDispatch { future?.isDone != false }
+        }
+
+        battle.dispatchWaiting {
+            val mock = pokemon.entity?.effects?.mockEffect?.mock
            val pokemonName = pokemon.getName()
-            val targetPokemon = message.battlePokemon(1, battle) ?: return@dispatchWaiting
            val targetPokemonName = targetPokemon.getName()

-            pokemon.entity?.let { TransformEffect(targetPokemon.effectedPokemon).start(it) }
+            mock?.let {
+                battle.sendSidedUpdate(
+                    source = actor,
+                    allyPacket = BattleTransformPokemonPacket(pnx, pokemon, it, true),
+                    opponentPacket = BattleTransformPokemonPacket(pnx, pokemon, it, false)
+                )
+            }

            val lang = battleLang("transform", pokemonName, targetPokemonName)
            battle.broadcastChatMessage(lang)
@@ -28,7 +28,7 @@ import com.cobblemon.mod.common.util.battleLang
 *
 * It is now turn NUMBER.
 * @author Deltric
- * @since January 22, 2022
+ * @since January 22nd, 2022
 */
 class TurnInstruction(val message: BattleMessage) : InterpreterInstruction {
    override fun invoke(battle: PokemonBattle) {
@@ -18,7 +18,7 @@ import com.cobblemon.mod.common.battles.ShowdownInterpreter
 * Catch-all for unimplemented instructions that need to be added to the [ShowdownInterpreter].
 *
 * @author Hiroku
- * @since December 25, 2023
+ * @since December 25th, 2023
 */
 class UnknownInstruction(val battleMessage: BattleMessage) : InterpreterInstruction {
    override fun invoke(battle: PokemonBattle) {
@@ -17,7 +17,7 @@ import com.cobblemon.mod.common.battles.dispatch.InterpreterInstruction
 *
 * Signals the upkeep phase of the turn where the number of turns left for field conditions are updated.
 * @author Hiroku
- * @since March 12, 2022
+ * @since March 12th, 2022
 */
 class UpkeepInstruction : InterpreterInstruction {
    override fun invoke(battle: PokemonBattle) {
@@ -1,3 +1,11 @@
+/*
+ * 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
@@ -16,13 +24,13 @@ import net.minecraft.text.Text
 * If upkeep is present, it means that WEATHER was active previously and is still in effect that turn.
 * Otherwise, it means that the weather has changed due to a move or ability, or has expired, in which case WEATHER will be none.
 * @author Hunter
- * @since September 25, 2022
+ * @since September 25th, 2022
 */
 class WeatherInstruction(val message: BattleMessage): InterpreterInstruction {

    override fun invoke(battle: PokemonBattle) {
        val weather = message.effectAt(0)?.id ?: return
-        val user = message.battlePokemonFromOptional(battle)?.getName() ?: Text.literal("UNKNOWN")
+        val user = message.battlePokemonFromOptional(battle) ?: return
        ShowdownInterpreter.broadcastOptionalAbility(battle, message.effect(), user)

        battle.dispatchWaiting(1.5F) {
@@ -1,3 +1,11 @@
+/*
+ * 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
@@ -7,9 +15,12 @@ import com.cobblemon.mod.common.api.events.CobblemonEvents
 import com.cobblemon.mod.common.api.events.battles.BattleVictoryEvent
 import com.cobblemon.mod.common.api.text.gold
 import com.cobblemon.mod.common.api.text.plus
+import com.cobblemon.mod.common.api.text.red
 import com.cobblemon.mod.common.battles.ShowdownInterpreter
 import com.cobblemon.mod.common.battles.actor.PlayerBattleActor
+import com.cobblemon.mod.common.battles.dispatch.GO
 import com.cobblemon.mod.common.battles.dispatch.InterpreterInstruction
+import com.cobblemon.mod.common.battles.dispatch.WaitDispatch
 import com.cobblemon.mod.common.battles.pokemon.BattlePokemon
 import com.cobblemon.mod.common.util.battleLang
 import java.util.UUID
@@ -19,24 +30,20 @@ import java.util.UUID
 *
 * USER has won the battle.
 * @author Deltric
- * @since January 22, 2022
+ * @since January 22nd, 2022
 */
 class WinInstruction(val message: BattleMessage): InterpreterInstruction {

    override fun invoke(battle: PokemonBattle) {
-        battle.dispatchGo {
-            val user = message.argumentAt(0) ?: return@dispatchGo
-            val ids = user.split("&").map { it.trim() }
-            val winners = ids.map { battle.getActor(UUID.fromString(it))!! }
-            val losers = battle.actors.filter { !winners.contains(it) }
-            val winnersText = winners.map { it.getName() }.reduce { acc, next -> acc + " & " + next }
-
-            battle.broadcastChatMessage(battleLang("win", winnersText).gold())
-
-            battle.end()
-
-            val wasCaught = battle.showdownMessages.any { "capture" in it }
+        val user = message.argumentAt(0) ?: return
+        val ids = user.split("&").map { it.trim() }
+        val winners = ids.map { battle.getActor(UUID.fromString(it))!! }
+        val losers = battle.actors.filter { !winners.contains(it) }
+        val winnersText = winners.map { it.getName() }.reduce { acc, next -> acc + " & " + next }
+        val losersText = losers.map { it.getName() }.reduce { acc, next -> acc + " & " + next }
+        val wasCaught = battle. showdownMessages.any { "capture" in it }

+        battle.dispatch {
            // If the battle was a PvW battle, we need to set the killer of the wild Pokémon to the player
            if (battle.isPvW) {
                val nonPlayerActor = battle.actors.first { it.type == ActorType.WILD }
@@ -47,8 +54,20 @@ class WinInstruction(val message: BattleMessage): InterpreterInstruction {
                }
            }

+            // broadcast victory / defeat
+            if (!wasCaught) {
+                val blackedOut = battle.isPvW && losers.any { it is PlayerBattleActor }
+                val lang = if (blackedOut) battleLang("lose", losersText).red() else battleLang("win", winnersText).gold()
+                battle.broadcastChatMessage(lang)
+                return@dispatch WaitDispatch(2F)
+            }
+            else {
+                return@dispatch GO  // see BattleCaptureAction
+            }
+        }
+        battle.dispatchGo {
+            battle.end()
            CobblemonEvents.BATTLE_VICTORY.post(BattleVictoryEvent(battle, winners, losers, wasCaught))
-
            ShowdownInterpreter.lastCauser.remove(battle.battleId)
        }
    }
@@ -1,3 +1,11 @@
+/*
+ * 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
@@ -11,14 +19,14 @@ import com.cobblemon.mod.common.util.battleLang
 *
 * A z-move has broken through protect and hit POKEMON.
 * @author Segfault Guy
- * @since September 10, 2023
+ * @since September 10th, 2023
 */
 class ZBrokenInstruction(val message: BattleMessage): InterpreterInstruction {

    override fun invoke(battle: PokemonBattle) {
        val battlePokemon = message.battlePokemon(0, battle) ?: return
-        val pokemonName = battlePokemon.getName()
        battle.dispatchWaiting {
+            val pokemonName = battlePokemon.getName()
            battle.broadcastChatMessage(battleLang("zbroken", pokemonName).red())
            battle.minorBattleActions[battlePokemon.uuid] = message
        }
@@ -1,3 +1,11 @@
+/*
+ * 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
@@ -11,14 +19,14 @@ import com.cobblemon.mod.common.util.battleLang
 *
 * POKEMON has used the z-move variant of its move.
 * @author Segfault Guy
- * @since September 10, 2023
+ * @since September 10th, 2023
 */
 class ZPowerInstruction(val message: BattleMessage): InterpreterInstruction {

    override fun invoke(battle: PokemonBattle) {
        val battlePokemon = message.battlePokemon(0, battle) ?: return
-        val pokemonName = battlePokemon.getName()
        battle.dispatchWaiting {
+            val pokemonName = battlePokemon.getName()
            battle.broadcastChatMessage(battleLang("zpower", pokemonName).yellow())
            battle.minorBattleActions[battlePokemon.uuid] = message
        }
@@ -17,6 +17,7 @@ import net.minecraft.entity.player.PlayerEntity
 import net.minecraft.item.BlockItem
 import net.minecraft.item.ItemPlacementContext
 import net.minecraft.state.StateManager
+import net.minecraft.state.property.DirectionProperty
 import net.minecraft.util.ActionResult
 import net.minecraft.util.Hand
 import net.minecraft.util.ItemScatterer
@@ -32,6 +33,11 @@ class DisplayCaseBlock(settings: Settings) : BlockWithEntity(settings) {
    init {
        this.defaultState = this.stateManager.defaultState
            .with(FACING, Direction.NORTH)
+            .with(ITEM_DIRECTION, Direction.NORTH)
+    }
+
+    companion object {
+        val ITEM_DIRECTION = DirectionProperty.of("item_facing")
    }

    override fun getPlacementState(ctx: ItemPlacementContext): BlockState? {
@@ -40,7 +46,10 @@ class DisplayCaseBlock(settings: Settings) : BlockWithEntity(settings) {
        val blockPos = ctx.blockPos
        ctx.placementDirections.forEach { direction ->
            if (direction.axis.isHorizontal) {
-                blockState = blockState.with(FACING, direction) as BlockState
+                blockState = blockState
+                    .with(FACING, direction)
+                    .with(ITEM_DIRECTION, direction)
+                        as BlockState
                if (blockState.canPlaceAt(worldView, blockPos)) {
                    return blockState
                }
@@ -51,6 +60,7 @@ class DisplayCaseBlock(settings: Settings) : BlockWithEntity(settings) {

    override fun appendProperties(builder: StateManager.Builder<Block, BlockState>) {
        builder.add(FACING)
+        builder.add(ITEM_DIRECTION)
    }

    override fun createBlockEntity(pos: BlockPos, state: BlockState): DisplayCaseBlockEntity {
@@ -80,7 +90,7 @@ class DisplayCaseBlock(settings: Settings) : BlockWithEntity(settings) {
        val entity = world.getBlockEntity(pos) as DisplayCaseBlockEntity
        val result = entity.updateItem(player, hand)
        if ((hit.side != Direction.UP && hit.side != Direction.DOWN) && result == ActionResult.SUCCESS) {
-            world.setBlockState(pos, state.with(FACING, hit.side.opposite))
+            world.setBlockState(pos, state.with(ITEM_DIRECTION, hit.side.opposite))
        }
        return result
    }
@@ -62,8 +62,8 @@ class MonitorBlock(properties: Settings) : MultiblockBlock(properties) {
        if(world == null || pos == null) {
            return 0
        }
-        val monitorEntity = world.getBlockEntity(pos) as MultiblockEntity
-        val multiBlockEntity = monitorEntity.multiblockStructure
+        val monitorEntity = world.getBlockEntity(pos) as? MultiblockEntity
+        val multiBlockEntity = monitorEntity?.multiblockStructure
        if(multiBlockEntity != null) {
            return multiBlockEntity.getComparatorOutput(state, world, pos)
        }
@@ -149,8 +149,8 @@ class RestorationTankBlock(properties: Settings) : MultiblockBlock(properties),
        if(world == null || pos == null) {
            return 0
        }
-        val tankEntity = world.getBlockEntity(pos) as MultiblockEntity
-        val multiBlockEntity = tankEntity.multiblockStructure
+        val tankEntity = world.getBlockEntity(pos) as? MultiblockEntity
+        val multiBlockEntity = tankEntity?.multiblockStructure
        if(multiBlockEntity != null) {
            return multiBlockEntity.getComparatorOutput(state, world, pos)
        }
@@ -180,7 +180,7 @@ class RestorationTankBlock(properties: Settings) : MultiblockBlock(properties),
            return
        }
        val tankEntity = world.getBlockEntity(pos) as? MultiblockEntity
-        tankEntity?.multiblockStructure!!.onTriggerEvent(state, world, pos, random)
+        tankEntity?.multiblockStructure?.onTriggerEvent(state, world, pos, random)
    }

    override fun getOutlineShape(
@@ -9,15 +9,23 @@
 package com.cobblemon.mod.common.block

 import com.cobblemon.mod.common.api.tags.CobblemonBlockTags
+import com.cobblemon.mod.common.block.chest.GildedChestBlock
 import net.minecraft.block.*
+import net.minecraft.entity.player.PlayerEntity
+import net.minecraft.fluid.FluidState
+import net.minecraft.fluid.Fluids
 import net.minecraft.item.ItemPlacementContext
+import net.minecraft.server.network.ServerPlayerEntity
 import net.minecraft.server.world.ServerWorld
 import net.minecraft.state.StateManager
+import net.minecraft.state.property.BooleanProperty
+import net.minecraft.state.property.Properties
 import net.minecraft.util.math.BlockPos
 import net.minecraft.util.math.Direction
 import net.minecraft.util.math.random.Random
 import net.minecraft.util.shape.VoxelShape
 import net.minecraft.world.BlockView
+import net.minecraft.world.World
 import net.minecraft.world.WorldAccess
 import net.minecraft.world.WorldView

@@ -28,7 +36,18 @@ class TumblestoneBlock(
    height: Int,
    xzOffset: Int,
    nextStage: Block?
-) : GrowableStoneBlock(settings, stage, height, xzOffset, nextStage) {
+) : GrowableStoneBlock(settings, stage, height, xzOffset, nextStage), Waterloggable {
+
+    init {
+        this.defaultState = this.stateManager.defaultState
+            .with(FACING, Direction.DOWN)
+            .with(WATERLOGGED, false)
+    }
+
+    companion object {
+        val WATERLOGGED = BooleanProperty.of("waterlogged")
+    }
+
    override fun canGrow(pos: BlockPos, world: BlockView): Boolean {
        if (stage == MAX_STAGE) return false
        val iterator: Iterator<BlockPos> =
@@ -43,4 +62,31 @@ class TumblestoneBlock(
        return true
    }

+    override fun getFluidState(state: BlockState): FluidState {
+        return if (state.get(GildedChestBlock.WATERLOGGED)) {
+            Fluids.WATER.getStill(false)
+        } else super.getFluidState(state)
+    }
+
+    override fun appendProperties(builder: StateManager.Builder<Block, BlockState>) {
+        super.appendProperties(builder)
+        builder.add(GildedChestBlock.WATERLOGGED)
+    }
+
+    override fun getPlacementState(blockPlaceContext: ItemPlacementContext): BlockState? {
+        return super.getPlacementState(blockPlaceContext)?.with(GildedChestBlock.WATERLOGGED, blockPlaceContext.world.getFluidState(blockPlaceContext.blockPos).fluid == Fluids.WATER)
+
+    }
+
+    override fun getStateForNeighborUpdate(
+        state: BlockState,
+        direction: Direction,
+        neighborState: BlockState,
+        world: WorldAccess,
+        pos: BlockPos,
+        neighborPos: BlockPos
+    ): BlockState? {
+        if (state.get(GildedChestBlock.WATERLOGGED)) world.scheduleFluidTick(pos, Fluids.WATER, Fluids.WATER.getTickRate(world))
+        return super.getStateForNeighborUpdate(state, direction, neighborState, world, pos, neighborPos)
+    }
 }
@@ -16,20 +16,15 @@ import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.util.cobblemonResource
 import com.cobblemon.mod.common.util.party
 import com.cobblemon.mod.common.util.toVec3d
-import net.minecraft.block.Block
-import net.minecraft.block.BlockRenderType
-import net.minecraft.block.BlockState
-import net.minecraft.block.BlockWithEntity
-import net.minecraft.block.Blocks
-import net.minecraft.block.HorizontalFacingBlock
-import net.minecraft.block.ShapeContext
-import net.minecraft.block.Waterloggable
+import net.minecraft.block.*
+import net.minecraft.entity.LivingEntity
 import net.minecraft.entity.ai.pathing.NavigationType
 import net.minecraft.entity.mob.PiglinBrain
 import net.minecraft.entity.player.PlayerEntity
 import net.minecraft.fluid.FluidState
 import net.minecraft.fluid.Fluids
 import net.minecraft.item.ItemPlacementContext
+import net.minecraft.item.ItemStack
 import net.minecraft.screen.ScreenHandler
 import net.minecraft.server.network.ServerPlayerEntity
 import net.minecraft.sound.SoundCategory
@@ -38,12 +33,7 @@ import net.minecraft.state.property.BooleanProperty
 import net.minecraft.state.property.Properties
 import net.minecraft.text.MutableText
 import net.minecraft.text.Text
-import net.minecraft.util.ActionResult
-import net.minecraft.util.BlockMirror
-import net.minecraft.util.BlockRotation
-import net.minecraft.util.Hand
-import net.minecraft.util.Identifier
-import net.minecraft.util.ItemScatterer
+import net.minecraft.util.*
 import net.minecraft.util.hit.BlockHitResult
 import net.minecraft.util.math.BlockPos
 import net.minecraft.util.math.Direction
@@ -106,7 +96,7 @@ class GildedChestBlock(settings: Settings, val type: Type = Type.RED) : BlockWit
        neighborPos: BlockPos
    ): BlockState {
        if (state.get(WATERLOGGED)) world.scheduleFluidTick(pos, Fluids.WATER, Fluids.WATER.getTickRate(world))
-        return super.getStateForNeighborUpdate(state, direction, neighborState, world, pos, neighborPos)
+        return super.getStateForNeighborUpdate(state,   direction, neighborState, world, pos, neighborPos)
    }

    override fun getFluidState(state: BlockState): FluidState {
@@ -258,4 +248,17 @@ class GildedChestBlock(settings: Settings, val type: Type = Type.RED) : BlockWit
        return false
    }

+    override fun onPlaced(
+        world: World,
+        pos: BlockPos,
+        state: BlockState,
+        placer: LivingEntity?,
+        itemStack: ItemStack
+    ) {
+        val blockEntity = world.getBlockEntity(pos)
+        if (itemStack.hasCustomName() && blockEntity is GildedChestBlockEntity) {
+            blockEntity.customName = itemStack.name
+        }
+    }
+
 }
@@ -92,8 +92,7 @@ class DisplayCaseBlockEntity(pos: BlockPos, state: BlockState) : BlockEntity(Cob
        } else {
            world!!.playSound(null, pos, CobblemonSounds.DISPLAY_CASE_ADD_ITEM, SoundCategory.BLOCKS)
        }
-        world!!.updateListeners(pos, oldState, world!!.getBlockState(pos), Block.NOTIFY_LISTENERS)
-        world!!.updateComparators(pos, world!!.getBlockState(pos).block)
+        onItemUpdated(world!!, oldState, world!!.getBlockState(pos))
    }

    override fun writeNbt(nbt: NbtCompound) {
@@ -116,9 +115,9 @@ class DisplayCaseBlockEntity(pos: BlockPos, state: BlockState) : BlockEntity(Cob
    }

    private fun onItemUpdated(world: World, oldState: BlockState, newState: BlockState) {
-        markDirty()
        world.updateListeners(pos, oldState, newState, Block.NOTIFY_LISTENERS)
        world.updateComparators(pos, world.getBlockState(pos).block)
+        markDirty()
    }

    override fun clear() {
@@ -42,7 +42,7 @@ open class FossilMultiblockEntity(
                field
            } else if (masterBlockPos != null && masterBlockPos != pos) {
                val chunkPos = ChunkPos(masterBlockPos)
-                if (world?.chunkManager?.isChunkLoaded(chunkPos.x, chunkPos.z) ==  true) {
+                if (world?.chunkManager?.isChunkLoaded(chunkPos.x, chunkPos.z) == true) {
                    val entity: FossilMultiblockEntity? = world?.getBlockEntity(masterBlockPos) as FossilMultiblockEntity?
                    field = entity?.multiblockStructure
                }
@@ -140,7 +140,7 @@ class PokemonPastureBlockEntity(pos: BlockPos, val state: BlockState) : BlockEnt
            if (fixedPosition != null) {
                entity.setPosition(fixedPosition.toCenterPos().subtract(0.0, 0.5, 0.0))
                val pc = Cobblemon.storage.getPC(player.uuid)
-                entity.beamMode = 1
+                entity.beamMode = 2
                afterOnServer(seconds = SendOutPokemonHandler.SEND_OUT_DURATION) {
                    entity.beamMode = 0
                }
@@ -117,10 +117,10 @@ class FossilMultiblockBuilder(val centerPos: BlockPos) : MultiblockStructureBuil
        val monitorPos = monitorPositions[fossilTankIndex]
        val fossilAnalyzerPos = fossilAnalyzerPositions[fossilTankIndex]!!
        val restorationTankPos = restorationTankPositions[fossilTankIndex]!!
-        val monitorEntity = world.getBlockEntity(monitorPos) as MultiblockEntity
-        val analyzerEntity = world.getBlockEntity(fossilAnalyzerPos) as MultiblockEntity
-        val tankBaseEntity = world.getBlockEntity(restorationTankPos) as MultiblockEntity
-        val tankTopEntity = world.getBlockEntity(restorationTankPos.up()) as MultiblockEntity
+        val monitorEntity = world.getBlockEntity(monitorPos) as? MultiblockEntity
+        val analyzerEntity = world.getBlockEntity(fossilAnalyzerPos) as? MultiblockEntity
+        val tankBaseEntity = world.getBlockEntity(restorationTankPos) as? MultiblockEntity
+        val tankTopEntity = world.getBlockEntity(restorationTankPos.up()) as? MultiblockEntity
        val structure = FossilMultiblockStructure(monitorPos, fossilAnalyzerPos, restorationTankPos)

        structure.tankConnectorDirection = dirsToCheck.filter {
@@ -128,20 +128,20 @@ class FossilMultiblockBuilder(val centerPos: BlockPos) : MultiblockStructureBuil
            return@filter adjPos == fossilAnalyzerPos
        }.first()

-        analyzerEntity.multiblockStructure = structure
-        tankBaseEntity.multiblockStructure = structure
-        tankTopEntity.multiblockStructure = structure
-        monitorEntity.multiblockStructure = structure
+        analyzerEntity?.multiblockStructure = structure
+        tankBaseEntity?.multiblockStructure = structure
+        tankTopEntity?.multiblockStructure = structure
+        monitorEntity?.multiblockStructure = structure
        structure.syncToClient(world)
        structure.markDirty(world)

        world.playSound(null, centerPos, CobblemonSounds.FOSSIL_MACHINE_ASSEMBLE, SoundCategory.BLOCKS)

        //Set these to null so the builders can be freed
-        analyzerEntity.multiblockBuilder = null
-        tankBaseEntity.multiblockBuilder = null
-        tankTopEntity.multiblockBuilder = null
-        monitorEntity.multiblockBuilder = null
+        analyzerEntity?.multiblockBuilder = null
+        tankBaseEntity?.multiblockBuilder = null
+        tankTopEntity?.multiblockBuilder = null
+        monitorEntity?.multiblockBuilder = null
    }

    companion object {
@@ -306,22 +306,22 @@ class FossilMultiblockStructure (
    }

    override fun onBreak(world: World, pos: BlockPos, state: BlockState, player: PlayerEntity?) {
-        val monitorEntity = world.getBlockEntity(monitorPos) as MultiblockEntity
-        val analyzerEntity = world.getBlockEntity(analyzerPos) as MultiblockEntity
-        val tankBaseEntity = world.getBlockEntity(tankBasePos) as MultiblockEntity
-        val tankTopEntity = world.getBlockEntity(tankBasePos.up()) as MultiblockEntity
-        val state = world.getBlockState(tankBaseEntity.pos)
+        val monitorEntity = world.getBlockEntity(monitorPos) as? MultiblockEntity
+        val analyzerEntity = world.getBlockEntity(analyzerPos) as? MultiblockEntity
+        val tankBaseEntity = world.getBlockEntity(tankBasePos) as? MultiblockEntity
+        val tankTopEntity = world.getBlockEntity(tankBasePos.up()) as? MultiblockEntity
+        val state = world.getBlockState(tankBaseEntity?.pos)
        val direction = state.get(HorizontalFacingBlock.FACING).getOpposite()
        val wildPokemon: Pokemon? = this.createdPokemon

-        monitorEntity.multiblockStructure = null
-        analyzerEntity.multiblockStructure = null
-        tankBaseEntity.multiblockStructure = null
-        tankTopEntity.multiblockStructure = null
-        monitorEntity.masterBlockPos = null
-        analyzerEntity.masterBlockPos = null
-        tankBaseEntity.masterBlockPos = null
-        tankTopEntity.masterBlockPos = null
+        monitorEntity?.multiblockStructure = null
+        analyzerEntity?.multiblockStructure = null
+        tankBaseEntity?.multiblockStructure = null
+        tankTopEntity?.multiblockStructure = null
+        monitorEntity?.masterBlockPos = null
+        analyzerEntity?.masterBlockPos = null
+        tankBaseEntity?.masterBlockPos = null
+        tankTopEntity?.masterBlockPos = null

        // Drop fossils from machine as long as the machine is not started or near completion
        if (this.timeRemaining == -1 || this.timeRemaining >= 20) {
@@ -619,8 +619,8 @@ class FossilMultiblockStructure (
        }

        const val TICKS_PER_MINUTE = 1200
-        const val MATERIAL_TO_START = 256
-        const val TIME_TO_TAKE = TICKS_PER_MINUTE * 15
+        const val MATERIAL_TO_START = 128
+        const val TIME_TO_TAKE = TICKS_PER_MINUTE * 12
        const val TIME_PER_STAGE = TIME_TO_TAKE / 8
        const val PROTECTION_TIME = TICKS_PER_MINUTE * 5

@@ -12,6 +12,8 @@ import com.bedrockk.molang.runtime.value.DoubleValue
 import com.bedrockk.molang.runtime.value.StringValue
 import com.cobblemon.mod.common.CobblemonSounds
 import com.cobblemon.mod.common.api.entity.PokemonSideDelegate
+import com.cobblemon.mod.common.api.events.CobblemonClientEvents
+import com.cobblemon.mod.common.api.events.client.ClientSendoutEvent
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.addFunctions
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.getQueryStruct
 import com.cobblemon.mod.common.api.pokemon.PokemonSpecies
@@ -25,6 +27,7 @@ import com.cobblemon.mod.common.client.render.models.blockbench.PoseableEntitySt
 import com.cobblemon.mod.common.client.render.models.blockbench.animation.PrimaryAnimation
 import com.cobblemon.mod.common.client.render.models.blockbench.animation.StatefulAnimation
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPoseableModel
+import com.cobblemon.mod.common.client.render.models.blockbench.repository.PokemonModelRepository
 import com.cobblemon.mod.common.client.render.pokemon.PokemonRenderer.Companion.ease
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.pokemon.Pokemon
@@ -85,6 +88,8 @@ class PokemonClientDelegate : PoseableEntityState<PokemonEntity>(), PokemonSideD
                val identifier = Identifier(currentEntity.dataTracker.get(PokemonEntity.SPECIES))
                currentPose = null
                currentEntity.pokemon.species = PokemonSpecies.getByIdentifier(identifier)!! // TODO exception handling
+                // force a model update - handles edge case where the PoseableEntityState's tracked PoseableEntityModel isn't updated until the LivingEntityRenderer render is run
+                currentModel = PokemonModelRepository.getPoser(identifier, currentEntity.aspects)
            } else if (data == PokemonEntity.DYING_EFFECTS_STARTED) {
                val isDying = currentEntity.dataTracker.get(PokemonEntity.DYING_EFFECTS_STARTED)
                if (isDying) {
@@ -100,6 +105,8 @@ class PokemonClientDelegate : PoseableEntityState<PokemonEntity>(), PokemonSideD
                    this.addPrimaryAnimation(primaryAnimation)
                }
            } else if (data == PokemonEntity.BEAM_MODE) {
+                // If you make adjustments to this code, make sure to Find Usages for both PokemonEntity.beamMode and PokemonEntity.BEAM_MODE
+                // TODO: change beamMode to an enum, or a set of booleans (send-out vs recall, delay vs delay)
                val beamMode = currentEntity.beamMode
                when (beamMode) {
                    0 -> { /* Do nothing */ }
@@ -129,6 +136,19 @@ class PokemonClientDelegate : PoseableEntityState<PokemonEntity>(), PokemonSideD
                        if(!playedThrowingSound){
                            client.soundManager.play(sound)
                            playedThrowingSound = true
+                            sendOutPosition?.let {
+                                sendOutOffset?.let { it1 ->
+                                    ClientSendoutEvent(
+                                        it1,
+                                        it,
+                                        currentEntity
+                                    )
+                                }
+                            }?.let {
+                                CobblemonClientEvents.CLIENT_SENDOUT.emit(
+                                    it
+                                )
+                            }
                        }
                        lerpOnClient(POKEBALL_AIR_TIME) { ballOffset = it }
                        ballRotOffset = ((Math.random()) * currentEntity.world.random.nextBetween(-15, 15)).toFloat()
@@ -136,39 +156,37 @@ class PokemonClientDelegate : PoseableEntityState<PokemonEntity>(), PokemonSideD
                        currentEntity.after(seconds = POKEBALL_AIR_TIME){
                            beamStartTime = System.currentTimeMillis()
                            ballDone = true
-                            if (client.soundManager.get(CobblemonSounds.POKE_BALL_OPEN.id) != null && !playedSendOutSound) {
-                                currentEntity.owner?.let {
-                                    client.world?.playSound(client.player, soundPos.x, soundPos.y, soundPos.z, SoundEvent.of(CobblemonSounds.POKE_BALL_SEND_OUT.id), SoundCategory.PLAYERS, 0.6f, 1f)
-                                    playedSendOutSound = true
-                                    /// create end rod particles in a 0.1 radius around the soundPos with a count of 50 and a random velocity of 0.1
-                                    sendOutPosition?.let{
-                                        val newPos = it.add(sendOutOffset)
-                                        val ballType = currentEntity.pokemon.caughtBall.name.path.toLowerCase().replace("_","")
-                                        val mode = if(currentEntity.isBattling) "battle" else "casual"
-                                        val sendflash = BedrockParticleEffectRepository.getEffect(cobblemonResource("${ballType}/${mode}/sendflash"))
-                                        sendflash?.let { effect ->
-                                            val wrapper = MatrixWrapper()
-                                            val matrix = MatrixStack()
-                                            matrix.translate(newPos.x, newPos.y, newPos.z)
-                                            wrapper.updateMatrix(matrix.peek().positionMatrix)
-                                            val world = MinecraftClient.getInstance().world ?: return@let
+                            if (client.soundManager.get(CobblemonSounds.POKE_BALL_SEND_OUT.id) != null && !playedSendOutSound) {
+                                client.world?.playSound(client.player, soundPos.x, soundPos.y, soundPos.z, SoundEvent.of(CobblemonSounds.POKE_BALL_SEND_OUT.id), SoundCategory.PLAYERS, 0.6f, 1f)
+                                playedSendOutSound = true
+                            }
+                            // Display ball-specific particles
+                            sendOutPosition?.let{
+                                val newPos = it.add(sendOutOffset)
+                                val ballType = currentEntity.pokemon.caughtBall.name.path.lowercase().replace("_","")
+                                val mode = if(currentEntity.isBattling) "battle" else "casual"
+                                val sendflash = BedrockParticleEffectRepository.getEffect(cobblemonResource("${ballType}/${mode}/sendflash"))
+                                sendflash?.let { effect ->
+                                    val wrapper = MatrixWrapper()
+                                    val matrix = MatrixStack()
+                                    matrix.translate(newPos.x, newPos.y, newPos.z)
+                                    wrapper.updateMatrix(matrix.peek().positionMatrix)
+                                    val world = MinecraftClient.getInstance().world ?: return@let
+                                    ParticleStorm(effect, wrapper, world).spawn()
+                                    val ballsparks = BedrockParticleEffectRepository.getEffect(cobblemonResource("${ballType}/${mode}/ballsparks"))
+                                    val ballsendsparkle = BedrockParticleEffectRepository.getEffect(cobblemonResource("${ballType}/${mode}/ballsendsparkle"))
+                                    // using afterOnClient because it's such a small timeframe that it's unlikely the entity has been removed & we'd like the precision
+                                    afterOnClient(seconds = 0.01667f) {
+                                        ballsparks?.let { effect ->
                                            ParticleStorm(effect, wrapper, world).spawn()
-                                            val ballsparks = BedrockParticleEffectRepository.getEffect(cobblemonResource("${ballType}/${mode}/ballsparks"))
-                                            val ballsendsparkle = BedrockParticleEffectRepository.getEffect(cobblemonResource("${ballType}/${mode}/ballsendsparkle"))
-                                            // using afterOnClient because it's such a small timeframe that it's unlikely the entity has been removed & we'd like the precision
-                                            afterOnClient(seconds = 0.01667f) {
-                                                ballsparks?.let { effect ->
-                                                    ParticleStorm(effect, wrapper, world).spawn()
-                                                }
-                                                ballsendsparkle?.let { effect ->
-                                                    ParticleStorm(effect, wrapper, world).spawn()
-                                                }
-                                                currentEntity.after(seconds = 0.4f) {
-                                                    val ballsparkle = BedrockParticleEffectRepository.getEffect(cobblemonResource("${ballType}/ballsparkle"))
-                                                    ballsparkle?.let { effect ->
-                                                        ParticleStorm(effect, wrapper, world).spawn()
-                                                    }
-                                                }
+                                        }
+                                        ballsendsparkle?.let { effect ->
+                                            ParticleStorm(effect, wrapper, world).spawn()
+                                        }
+                                        currentEntity.after(seconds = 0.4f) {
+                                            val ballsparkle = BedrockParticleEffectRepository.getEffect(cobblemonResource("${ballType}/ballsparkle"))
+                                            ballsparkle?.let { effect ->
+                                                ParticleStorm(effect, wrapper, world).spawn()
                                            }
                                        }
                                    }
@@ -185,7 +203,35 @@ class PokemonClientDelegate : PoseableEntityState<PokemonEntity>(), PokemonSideD
                            }
                        }
                    }
-                    else -> {
+                    2 -> {
+                        // Scaling up with no delay and no particles
+                        playedSendOutSound = false
+                        entityScaleModifier = 0F
+                        currentEntity.isInvisible = false
+                        val soundPos = currentEntity.pos
+                        val client = MinecraftClient.getInstance()
+
+                        if (client.soundManager.get(CobblemonSounds.POKE_BALL_SEND_OUT.id) != null && !playedSendOutSound) {
+                            client.world?.playSound(
+                                client.player,
+                                soundPos.x,
+                                soundPos.y,
+                                soundPos.z,
+                                CobblemonSounds.POKE_BALL_SEND_OUT,
+                                SoundCategory.PLAYERS,
+                                0.6f,
+                                1f
+                            )
+                            playedSendOutSound = true
+                        }
+                        lerpOnClient(BEAM_SHRINK_TIME) { entityScaleModifier = it }
+                        currentEntity.after(seconds = BEAM_SHRINK_TIME * 2) {
+                            ballOffset = 0f
+                            ballRotOffset = 0f
+                            sendOutPosition = null
+                        }
+                    }
+                    3 -> {
                        // Scaling down into pokeball
                        entityScaleModifier = 1F
                        beamStartTime = System.currentTimeMillis()
@@ -198,6 +244,7 @@ class PokemonClientDelegate : PoseableEntityState<PokemonEntity>(), PokemonSideD
                            }
                        }
                    }
+                    else -> { /* Do nothing */ }
                }
            } else if (data == PokemonEntity.LABEL_LEVEL) {
                currentEntity.dataTracker.get(PokemonEntity.LABEL_LEVEL)
@@ -16,6 +16,7 @@ import com.cobblemon.mod.common.client.gui.battle.subscreen.BattleActionSelectio
 import com.cobblemon.mod.common.client.gui.battle.subscreen.BattleBackButton
 import com.cobblemon.mod.common.client.gui.battle.subscreen.BattleGeneralActionSelection
 import com.cobblemon.mod.common.client.gui.battle.subscreen.BattleSwitchPokemonSelection
+import com.cobblemon.mod.common.client.gui.battle.subscreen.ForfeitConfirmationSelection
 import com.cobblemon.mod.common.client.gui.battle.widgets.BattleMessagePane
 import com.cobblemon.mod.common.client.keybind.boundKey
 import com.cobblemon.mod.common.client.keybind.keybinds.PartySendBinding
@@ -123,6 +124,15 @@ class BattleGUI : Screen(battleLang("gui.title")) {
                opacity = 0.75F * opacity,
                centered = true
            )
+        } else if (currentSelection is ForfeitConfirmationSelection) {
+            drawScaledText(
+                context = context,
+                text = battleLang("ui.forfeit_confirmation", PartySendBinding.boundKey().localizedText),
+                x = MinecraftClient.getInstance().window.scaledWidth / 2,
+                y = (MinecraftClient.getInstance().window.scaledHeight / 5),
+                opacity = 0.75F * opacity,
+                centered = true
+            )
        }


@@ -66,6 +66,11 @@ class BattleGeneralActionSelection(
                    MinecraftClient.getInstance().player?.sendMessage(battleLang("run_prompt"), false)
                    playDownSound(MinecraftClient.getInstance().soundManager)
                }
+            } else {
+                addOption(rank++, battleLang("ui.forfeit"), BattleGUI.runResource) {
+                    battleGUI.changeActionSelection(ForfeitConfirmationSelection(battleGUI, request))
+                    playDownSound(MinecraftClient.getInstance().soundManager)
+                }
            }
        }
    }
@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.client.gui.battle.subscreen
+
+import com.cobblemon.mod.common.battles.ForfeitActionResponse
+import com.cobblemon.mod.common.client.battle.SingleActionRequest
+import com.cobblemon.mod.common.client.gui.battle.BattleGUI
+import com.cobblemon.mod.common.client.gui.battle.BattleOverlay
+import com.cobblemon.mod.common.client.gui.battle.widgets.BattleOptionTile
+import com.cobblemon.mod.common.util.battleLang
+import net.minecraft.client.MinecraftClient
+import net.minecraft.client.gui.DrawContext
+import net.minecraft.client.util.math.MatrixStack
+
+class ForfeitConfirmationSelection(
+    battleGUI: BattleGUI,
+    request: SingleActionRequest
+) : BattleActionSelection(
+    battleGUI,
+    request,
+    x = 12,
+    y = 12,
+    width = 250,
+    height = 100,
+    battleLang("ui.forfeit_confirmation")
+) {
+
+    val forfeitButton: BattleOptionTile
+    val backButton = BattleBackButton(x - 3F, MinecraftClient.getInstance().window.scaledHeight - 22F )
+
+    init {
+        val x = (MinecraftClient.getInstance().window.scaledWidth / 2) - (BattleOptionTile.OPTION_WIDTH / 2)
+        val y = (MinecraftClient.getInstance().window.scaledHeight / 2) - (BattleOptionTile.OPTION_HEIGHT / 2)
+
+        forfeitButton = BattleOptionTile(battleGUI, x, y, BattleGUI.runResource, battleLang("ui.forfeit")) {
+            battleGUI.selectAction(request, ForfeitActionResponse())
+            playDownSound(MinecraftClient.getInstance().soundManager)
+        }
+    }
+
+    override fun renderButton(context: DrawContext, mouseX: Int, mouseY: Int, delta: Float) {
+        if (opacity <= 0.05F) {
+            return
+        }
+        forfeitButton.render(context, mouseX, mouseY, delta)
+        backButton.render(context.matrices, mouseX, mouseY, delta)
+    }
+
+    override fun mouseClicked(mouseX: Double, mouseY: Double, button: Int): Boolean {
+        if (backButton.isHovered(mouseX, mouseY)) {
+            battleGUI.changeActionSelection(null)
+            playDownSound(MinecraftClient.getInstance().soundManager)
+            return true
+        }
+
+        return forfeitButton.mouseClicked(mouseX, mouseY, button)
+    }
+
+}
@@ -279,10 +279,10 @@ class PCGUI(
                blitk(
                    matrixStack = matrices,
                    texture = Summary.iconShinyResource,
-                    x = (x + 63.5) / SCALE,
+                    x = (x + 62.5) / SCALE,
                    y = (y + 28.5) / SCALE,
-                    width = 14,
-                    height = 14,
+                    width = 16,
+                    height = 16,
                    scale = SCALE
                )
            }
@@ -524,10 +524,10 @@ class Summary private constructor(party: Collection<Pokemon?>, private val edita
            blitk(
                    matrixStack = matrices,
                    texture = iconShinyResource,
-                    x = (x + 63.5) / SCALE,
+                    x = (x + 62.5) / SCALE,
                    y = (y + 33.5) / SCALE,
-                    width = 14,
-                    height = 14,
+                    width = 16,
+                    height = 16,
                    scale = SCALE
            )
        }
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.client.net.battle
+
+import com.cobblemon.mod.common.api.net.ClientNetworkPacketHandler
+import com.cobblemon.mod.common.client.CobblemonClient
+import com.cobblemon.mod.common.client.battle.ClientBattlePokemon
+import com.cobblemon.mod.common.net.messages.client.battle.BattleReplacePokemonPacket
+import net.minecraft.client.MinecraftClient
+
+/**
+ * The handler for [BattleReplacePokemonPacket]s. Removes the illusion [ClientBattlePokemon] and replaces it with the actual data.
+ *
+ * @author Segfault Guy
+ * @since March 30th, 2024
+ */
+object BattleReplacePokemonHandler : ClientNetworkPacketHandler<BattleReplacePokemonPacket> {
+    override fun handle(packet: BattleReplacePokemonPacket, client: MinecraftClient) {
+        val battle = CobblemonClient.battle ?: return
+        val (actor, activeBattlePokemon) = battle.getPokemonFromPNX(packet.pnx)
+
+        with(packet.realPokemon) {
+            activeBattlePokemon.battlePokemon = ClientBattlePokemon(
+                uuid = uuid,
+                displayName = displayName,
+                properties = properties,
+                aspects = aspects,
+                hpValue = hpValue,
+                maxHp = maxHp,
+                isHpFlat = packet.isAlly,
+                status = status,
+                statChanges = statChanges
+            ).also {
+                it.actor = actor
+            }
+        }
+    }
+}
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.client.net.battle
+
+import com.cobblemon.mod.common.api.net.ClientNetworkPacketHandler
+import com.cobblemon.mod.common.client.CobblemonClient
+import com.cobblemon.mod.common.client.battle.ClientBattlePokemon
+import com.cobblemon.mod.common.net.messages.client.battle.BattleTransformPokemonPacket
+import net.minecraft.client.MinecraftClient
+
+/**
+ * The handler for [BattleTransformPokemonPacket]s. Updates the [ClientBattlePokemon] after a transformation.
+ *
+ * @author Segfault Guy
+ * @since April 22nd, 2023
+ */
+object BattleTransformPokemonHandler : ClientNetworkPacketHandler<BattleTransformPokemonPacket> {
+    override fun handle(packet: BattleTransformPokemonPacket, client: MinecraftClient) {
+        val battle = CobblemonClient.battle ?: return
+        val (_, activeBattlePokemon) = battle.getPokemonFromPNX(packet.pnx)
+        val update = packet.updatedPokemon
+
+        activeBattlePokemon.battlePokemon?.apply {
+            displayName = update.displayName
+            properties = update.properties
+            aspects = update.aspects
+            hpValue = update.hpValue
+            maxHp = update.maxHp
+            isHpFlat = update.isFlatHp
+            status = update.status
+            statChanges = update.statChanges
+        }
+    }
+}
@@ -10,12 +10,12 @@ package com.cobblemon.mod.common.client.render.block

 import com.cobblemon.mod.common.CobblemonBlocks
 import com.cobblemon.mod.common.CobblemonItems
+import com.cobblemon.mod.common.block.DisplayCaseBlock
 import com.cobblemon.mod.common.block.entity.DisplayCaseBlockEntity
 import com.cobblemon.mod.common.client.render.models.blockbench.repository.PokemonModelRepository
 import com.cobblemon.mod.common.entity.PoseType
 import com.cobblemon.mod.common.item.PokeBallItem
 import com.cobblemon.mod.common.item.PokemonItem
-import net.minecraft.block.HorizontalFacingBlock
 import net.minecraft.client.MinecraftClient
 import net.minecraft.client.render.OverlayTexture
 import net.minecraft.client.render.VertexConsumer
@@ -52,9 +52,9 @@ class DisplayCaseRenderer(ctx: BlockEntityRendererFactory.Context) : BlockEntity
        val world = entity.world ?: return
        val posType = getPositioningType(stack, world)
        val blockState = if (entity.world != null) entity.cachedState
-            else (CobblemonBlocks.DISPLAY_CASE.defaultState.with(HorizontalFacingBlock.FACING, Direction.NORTH))
-        val yRot = if (posType == PositioningType.ITEM_MODEL) blockState.get(HorizontalFacingBlock.FACING).opposite.asRotation()
-            else blockState.get(HorizontalFacingBlock.FACING).asRotation()
+            else (CobblemonBlocks.DISPLAY_CASE.defaultState.with(DisplayCaseBlock.ITEM_DIRECTION, Direction.NORTH))
+        val yRot = if (posType == PositioningType.ITEM_MODEL) blockState.get(DisplayCaseBlock.ITEM_DIRECTION).opposite.asRotation()
+            else blockState.get(DisplayCaseBlock.ITEM_DIRECTION).asRotation()

        if (stack.item is PokemonItem) {
            renderPokemon(
@@ -72,7 +72,7 @@ class RestorationTankRenderer(ctx: BlockEntityRendererFactory.Context) : BlockEn

        val fluidModel = if (struct.isRunning()) FLUID_MODELS[8]
        else if (struct.createdPokemon != null) FLUID_MODELS[7]
-        else FLUID_MODELS[fillLevel-1]
+        else FLUID_MODELS[fillLevel.coerceAtMost(FLUID_MODELS.size - 1) - 1]
        fluidModel.getQuads(entity.cachedState, null, entity.world?.random).forEach { quad ->
            transparentBuffer?.quad(matrices.peek(), quad, 0.75f, 0.75f, 0.75f, light, OverlayTexture.DEFAULT_UV)
        }
@@ -383,7 +383,7 @@ abstract class PoseableEntityModel<T : Entity>(
            transformedParts,
            quirks
        ).also {
-            poses[poseType.name] = it
+            setPose(poseType.name, it)
        }
    }

@@ -409,7 +409,7 @@ abstract class PoseableEntityModel<T : Entity>(
            transformedParts,
            quirks
        ).also {
-            poses[poseName] = it
+            setPose(poseName, it)
        }
    }

@@ -435,10 +435,18 @@ abstract class PoseableEntityModel<T : Entity>(
            transformedParts,
            quirks
        ).also {
-            poses[poseName] = it
+            setPose(poseName, it)
        }
    }

+    fun <F : ModelFrame> setPose(poseName: String, pose: Pose<T, F>) {
+        // if pose already exists for poseName, log the name of the class and pose name
+        if (poses.containsKey(poseName)) {
+            LOGGER.error("Pose with name $poseName already exists for class ${this::class.simpleName}")
+        }
+        poses[poseName] = pose
+    }
+
    fun ModelPart.registerChildWithAllChildren(name: String): ModelPart {
        val child = this.getChild(name)!!
        registerRelevantPart(name to child)
@@ -35,21 +35,29 @@ class SingleBoneLookAnimation<T : Entity>(
    val maxPitch: Float = 70F,
    val minPitch: Float = 45F,
    val maxYaw: Float = 45F,
+    val minYaw: Float = -45F,
 ) : StatelessAnimation<T, ModelFrame>(frame) {
    constructor(
        frame: HeadedFrame,
        invertX: Boolean,
        invertY: Boolean,
        disableX: Boolean,
-        disableY: Boolean
+        disableY: Boolean,
+        pitchMultiplier: Float? = null,
+        yawMultiplier: Float? = null,
+        maxPitch: Float? = null,
+        minPitch: Float? = null,
+        maxYaw: Float? = null,
+        minYaw: Float? = null,
    ): this(
        frame = frame,
        bone = frame.head,
-        pitchMultiplier = if (disableX) 0F else if (invertX) -1F else 1F,
-        yawMultiplier = if (disableY) 0F else if (invertY) -1F else 1F,
-        maxPitch = if (invertX) -45F else 45F,
-        minPitch = if (invertX) -70F else -45F,
-        maxYaw = if (invertY) -45F else 45F,
+        pitchMultiplier = pitchMultiplier ?: if (disableX) 0F else if (invertX) -1F else 1F,
+        yawMultiplier = yawMultiplier ?: if (disableY) 0F else if (invertY) -1F else 1F,
+        maxPitch = maxPitch ?: 45F,
+        minPitch = minPitch ?: -70F,
+        maxYaw = maxYaw ?: 45F,
+        minYaw = minYaw ?: -45F,
    )


@@ -58,7 +66,7 @@ class SingleBoneLookAnimation<T : Entity>(
    override fun setAngles(entity: T?, model: PoseableEntityModel<T>, state: PoseableEntityState<T>?, limbSwing: Float, limbSwingAmount: Float, ageInTicks: Float, headYaw: Float, headPitch: Float, intensity: Float) {
        val head = bone ?: return
        val pitch = pitchMultiplier * headPitch.coerceIn(minPitch, maxPitch)
-        val yaw = yawMultiplier * headYaw.coerceIn(-maxYaw, maxYaw)
+        val yaw = yawMultiplier * headYaw.coerceIn(minYaw, maxYaw)
        head.addRotation(X_AXIS, pitch.toRadians() * intensity)
        head.addRotation(Y_AXIS, yaw.toRadians() * intensity)
    }