Added type checking

Implemented missing functions.
Merge branch '830-only-player-entity-can-send-out-pokemon' into 'main'
2026-10-23 15:46:24 -04:00 · 2024-05-14 00:46:40 -05:00 · 2024-05-14 00:24:09 -05:00 · 2024-05-12 10:23:34 +00:00 · 2024-05-12 11:04:52 +01:00 · 2024-05-12 08:05:27 +00:00
1690 changed files with 18922 additions and 8874 deletions
@@ -21,6 +21,8 @@ build
 # other
 eclipse
 run
+runClient
+runServer

 # Files from Forge MDK
 forge*changelog.txt
@@ -1,42 +1,46 @@
 # Changelog
-## [1.5.0](#1-5-0)
+
+## [1.5.1](#1-5-1)
+
+### Fixes
+-Fixed a bug in which adding organic material to the fossil tank via right click was adding the full count of the stack currently in hand
+
+## [1.5.0 - The Ruins and Revival Update (May Xth, 2024)](#1-5-0)
+#### "You're telling me that Mojang has added archaeology to the game? Hmm... that gives me an idea."

 ### Additions
- Added over (number here) ruin structures, where you can find Pokémon-themed Armor Trims and Pottery Sherds, Tumblestones, and more.
- Added (number here) fossil structures, where you can brush Suspicious Sand/Gravel for Fossils.
- Added the Data Monitor, Fossil Compartment, and Restoration Tank. Placed in the correct formation, you can use these to create a Restoration Machine where you can bring fossils back to life.
- Added 3 variants of Tumblestones, which can be planted near Lava or Magma to grow harvestable Tumblestone Clusters.
+- Added 17 ruin structures, where you can find Pokémon-themed Armor Trims and Pottery Sherds, Tumblestones, and more.
+- Added 23 fossil structures, where you can brush Suspicious Sand/Gravel for [Fossils](https://wiki.cobblemon.com/index.php/Fossil). You can add [custom fossils using datapacks](https://wiki.cobblemon.com/index.php/Fossils_File).
+- Added the Data Monitor, Fossil Compartment, and Restoration Tank blocks. Placed in the correct formation, you can use these to create a [Restoration Machine](https://wiki.cobblemon.com/index.php/Resurrection_Machine) where you can bring fossils back to life. Use organic material to fill the tank first!
+- Added 3 variants of [Tumblestone](https://wiki.cobblemon.com/index.php/Tumblestone), which can be planted near Lava or Magma to grow harvestable Tumblestone Clusters.
 - Added Tumblestone Blocks, a storage block crafted from 9 Tumblestones.
 - Added Ancient Poké Balls, which are aesthetic variants crafted from Tumblestones.
 - Added the Ancient Feather, Wing, and Jet Balls, which fly further than regular Poké Balls.
 - Added the Ancient Heavy, Leaden, and Gigaton Balls, which are heavier and don't fly as far as regular Poké Balls. These will receive more functionality in a future update.
- Added Original Trainer functionality. To edit the OT through commands, you must specify originaltrainertype=<Player/NPC>, and originaltrainer=<Username or UUID/NPC Name>
+- Added visual effects for many Poké Balls when sending out or capturing Pokémon.
+- Added a new send-out ball toss animation that showcases the ball used for the Pokémon.
+- Added simple move animations for Pokémon in battle with a proof of concept (Flamethrower) for more complicated animations. More and more specific animations will come in future updates.
+- Added Original Trainer to the summary menu. To edit the OT through commands, you must specify originaltrainertype=<Player/NPC>, and originaltrainer=<Username or UUID/NPC Name>
 - Added support for planting Apricorn trees, berries, and mints in [Botany Pots](https://modrinth.com/mod/botany-pots)
 - Added the hidden "True Vivillionaire" advancement.
- The "Poké Ball" Vivillon variant is now obtainable by evolving a Spewpa after obtaining the "Aspiring Vivillionaire" advancement.
- Added dynamic lighting support for any Species or Forms when using [LambDynamicLights](https://modrinth.com/mod/lambdynamiclights) or [Dynamic Lights Reforged](https://www.curseforge.com/minecraft/mc-mods/dynamiclights-reforged), at this time we don't ship with any defaults for this feature but addon creators can make use of this feature.
- Added a Display Case block! Use it to display your archaeological findings, or other items.
- Added 6 Pokémon-themed Pottery Sherds, obtained from ruin structures.
+- Added the [Display Case](https://wiki.cobblemon.com/index.php/Display_Case) block. Use it to display your archaeological findings, Poké Balls, or other items.
+- Added 6 Pokémon-themed Pottery Sherds, obtained from ruin structures. Sherds... sh-erds. Weird word.
 - Added a Pokémon-themed armor trim, obtained from ruin structures.
- You can now find Nether Fire Stone Ore in, surprisingly, the Nether.
- You'll also find Terracotta Sun Stone Ore in Badlands biomes.
- Added effects for many Poké Balls when sending out Pokémon or capturing.
- Added a new send-out ball toss animation that showcases the ball used for the Pokémon.
- Added simple move animations for Pokémon in battle with a proof of concept for more complicated animations.
+- Added Nether Fire Stone Ore to, surprisingly, the Nether.
+- Added Terracotta Sun Stone Ore to Badlands biomes.
 - Added the EV Boosting Feathers.
- Added Type Gems. 
- Added various new tags for searchability and better compatibility.
- Added the [Ability Capsule](https://bulbapedia.bulbagarden.net/wiki/Ability_Capsule) and [Patch](https://bulbapedia.bulbagarden.net/wiki/Ability_Patch), these have no acquisition method for now and only work as intended with the traditional ability format of 1 to 2 common abilities and 1 hidden ability.
- Added Gilded Chests, available in all Apricorn colors.
- Added Relic Coins, Relic Coin Pouches, and Relic Coin Sacks.
- Added various new tags for searchability and better compatibility. 
- Added Type Gems. These items hold no functionality for now. Start collecting though...
- Added 6 custom Pottery Sherds, obtained from ruin structures.
- Added cries to Meowth, Alolan Meowth, Galaraian Meowth,
- Completed the advancement for placing a Tumblestone near Lava or Magma to make it grow.
+- Added [Gilded Chests](https://wiki.cobblemon.com/index.php/Gilded_Chest), available in all Apricorn colors.
+- Added Relic Coins, Relic Coin Pouches, and Relic Coin Sacks. Gimmighoul might be interested in these.
+- Added Type Gems. These will have additional uses later, so you should start collecting them.
 - Added new held items: Ability Shield, Absorb Bulb, Air Balloon, Binding Band, Blunder Policy, Cell Battery, Covert Cloak, Damp Rock, Eject Button, Eviolite, Expert Belt, Float Stone, Focus Sash, Heat Rock, Icy Rock, Iron Ball, Light Ball, Loaded Dice, Red Card, Shell Bell, Sticky Barb, Smooth Rock, Soothe Bell and Weakness Policy.
- Added Hisui starters to the starter selection menu.
- Added bubble quirk to Krabby that only play during clear sunset's.
+- Added Hisui starters to the starter selection menu. They come inside of ancient Poké Balls.
+- Added a bubble quirk to Krabby that only plays during clear sunsets. It looks familiar...
+- Added forfeit option to PVP battles.
+- Added visual changes for entities affected by Illusion, Imposter, or Transform in battle.
+- Added shoulder mounting for Squirtle, Ralts, Roggenrola, Charcadet, Sizzlipede, Litwick, Cutiefly, Flabebe, Flittle, and Scatterbug
+- Added species data for Hydrapple, Iron Boulder, Iron Crown, Pecharunt, Raging Bolt, and Terapagos
+- Added various new tags for search-ability and better mod compatibility.
+- Added the [Ability Capsule](https://bulbapedia.bulbagarden.net/wiki/Ability_Capsule) and [Patch](https://bulbapedia.bulbagarden.net/wiki/Ability_Patch). These have no way of getting them (for now) and only work as intended with the traditional ability format of 1 to 2 common abilities and 1 hidden ability.

 ### Pokémon Added
 #### Gen 2
@@ -160,8 +164,6 @@
 - Dreepy
 - Drakloak
 - Dragapult
- Hisuian Sliggoo
- Hisuian Goodra
 - Impidimp
 - Morgrem
 - Grimmsnarl
@@ -169,10 +171,10 @@
 #### Gen 9
 - Gimmighoul
  - Using Relic Coins, you can increase Gimmighoul's Coin Stash. Upon reaching 999, it can be evolved into Gholdengo.
-  - Additionally, if you give Gimmighoul a Netherite Scrap, you can increase its Netherite Stash. Who knows what might happen if it fills up?
+  - Additionally, if you give Gimmighoul a Netherite Scrap, you can increase its Netherite Stash. But what will that do to when you evolve it?
 - Gholdengo

-#### Cobblemon Exclusive's
+#### Cobblemon Exclusives
 - Hisui Bias Rowlet
 - Hisui Bias Dartrix
 - Hisui Bias Cyndaquil
@@ -182,74 +184,153 @@
 - Hisui Bias Goomy
 - Hisui Bias Petilil

+These are our compromise for having both regular and Hisuian forms of these Pokémon in the game. Hisui Biased variations will evolve into the Hisuian evolutions under most conditions. They are otherwise purely cosmetic differences.
+
+### Added cries to the following Pokémon
+- Alolan Raticate
+- Vulpix, Ninetales
+- Zubat, Golbat, Crobat
+- Meowth, Persian
+- Psyduck, Golduck
+- Growlithe, Arcanine
+- Geodude, Graveler, Golem
+- Doduo, Dodrio
+- Seel, Dewgong
+- Muk, Grimer
+- Krabby, Kingler
+- Voltorb, Electrode, Hisuian Voltorb, Hisuian Electrode
+- Tangela, Tangrowth
+- Snorlax
+- Cubone, Marowak
+- Koffing, Weezing
+- Aerodactyl
+- Elekid, Electabuzz, Electivire
+- Omanyte, Omastar
+- Kabuto, Kabutops
+- Lapras
+- Scyther
+- Hisui Bias Cyndaquil, Hisui Bias Quilava
+- Igglybuff
+- Yanma, Yanmega
+- Gligar, Gliscor
+- Qwilfish, Hisuian Qwilfish, Overqwil
+- Sneasel, Hisuian Sneasel, Weavile, Sneasler
+- Larvitar, Pupitar, Tyranitar
+- Swinub, Piloswine, Mamoswine
+- Aron, Lairon, Aggron
+- Trapinch, Vibrava, Flygon
+- Cacnea, Cacturne
+- Barboach, Whiscash
+- Lileep, Cradily
+- Anorith, Armaldo
+- Tropius
+- Chimecho
+- Bidoof, Bibarel
+- Buizel, Floatzel
+- Gible, Gabite, Garchomp
+- Hisui Bias Oshawott, Hisui Bias Dewott
+- Petilil, Lilligant, Hisui Bias Petilil, Hisuian Lilligant
+- Basculin, Basculegion
+- Sandile, Krokolok, Krookodile
+- Darumaka, Darmanitan
+- Archen, Archeops
+- Zorua, Zoroark, Hisuian Zorua, Hisuian Zoroark
+- Tyrunt, Tyrantrum
+- Amaura Aurorus
+- Carbink
+- Goomy, Sliggoo, Goodra, Hisui Bias Goomy, Hisuian Sliggoo, Hisuian Goodra
+- Klefki
+- Hisui Bias Rowlet, Hisui Bias Dartrix
+- Komala
+- Impidimp, Morgrem, Grimmsnarl
+- Cufant, Copperajah
+- Dreepy, Drakloak, Dragapult
+- Dracozolt, Arctozolt, Dracovish, Arctovish
+- Lechonk, Oinkologne
+- Maushold family of three and four
+

 ### Changes
- Alolan Pikachu and Exeggcute changed to Alola bias.
+- Alolan Pikachu and Exeggcute changed to Alola Bias.
 - Pokémon now transition more smoothly between different poses.
- Updated models for Mimikyu, Alcremie, Squirtle, Wartortle, Blastoise, Pidgey, Pidgeotto, Pidgeot, Omanyte, Omastar, Growlithe, Arcanine, Nidoran Male, Nidoran Female, Lapras, Swinub, Piloswine, Basculin, Rowlet, Dartrix, Decidueye, Kabuto, Kabutops, Piplup, Prinplup, Elekid, Electabuzz, Cubone, Marowak, Paras, Mawile, Drifloon, Drifblim, Venonat, Venomoth, Yanma, Yanmega, Psyduck, Dusknoir, Diglett, Dugtrio, Natu, Xatu, Oshawott, Samurott, Torchic, Grovyle, Sceptile, Sizzlipede, and Raboot.
+- Updated models for Mimikyu, Alcremie, Squirtle, Wartortle, Blastoise, Pidgey, Pidgeotto, Pidgeot, Omanyte, Omastar, Growlithe, Arcanine, Nidoran Male, Nidoran Female, Lapras, Swinub, Piloswine, Basculin, Rowlet, Dartrix, Decidueye, Kabuto, Kabutops, Piplup, Prinplup, Elekid, Electabuzz, Cubone, Marowak, Paras, Mawile, Drifloon, Drifblim, Venonat, Venomoth, Yanma, Yanmega, Psyduck, Dusknoir, Diglett, Dugtrio, Natu, Xatu, Oshawott, Samurott, Torchic, Grovyle, Sceptile, Sizzlipede, Mismagius, and Raboot.
 - Updated animations for Squirtle, Wartortle, Blastoise, Pidgey, Pidgeotto, Diglett, Dugtrio, Magikarp, Dragonite, Omanyte, Omastar, Kabuto, Pinsir, Chinchou, Lanturn, Ralts, Kirlia, Gardevoir, Gallade, Buizel, Garchomp, Pumpkaboo, Falinks, Lechonk, Litwick, Lampent, Chandelure, Carnivine, Galarian Meowth, Galarian Rapidash, Venonat, Venomoth, Phanphy, Donphan, Dratini, Dragonair, Happiny, Chansey, Blissey, Volbeat, Illumise, Numel, Sizzlipede, Centiskorch, Obstagoon, Timburr, Gurdurr, Conkeldurr, Drifloon, and Drifblim.
+- Resized Drifloon.
 - Added more held items to the held item tag, and Metal Coat to the held item tab.
 - Added all ores to the modloader ore tags, and added tags for each ore type to the mod (both blocks and items).
- Changed the Destiny Knot to be crafted with a Ghast Tear, rather than a diamond.
- You can now punch grown apricorns to harvest them.
+- Changed the Destiny Knot to be crafted with a Ghast Tear rather than a diamond. We have big plans for the Destiny Knot...
+- You can now punch grown apricorns to harvest them. We saw so many content creators breaking apricorns with their fists that it was making us die inside.
+- The "Poké Ball" Vivillon variant is now obtainable by evolving a Spewpa after obtaining the "Aspiring Vivillionaire" advancement.
 - Renamed the "Vivillionaire" advancement to "Aspiring Vivillionaire"
 - Removed the Inferno, Forsaken, Poké Ball, and Void patterns from the Aspiring Vivillionaire advancement.
- Updated movesets to add Gen 9 DLC moves.
+- Updated the biome tags for Spewpa's evolutions into the various Vivillon patterns. You should mostly be getting one evolution option at a time now.
 - Apricorn Sprouts can now be planted directly on Apricorn leaves to create a new Apricorn of the same color.
 - Added tooltips to interaction GUIs to make it clearer what they do.
- Poké Ball recipes now use tags for their center ingredient, rather than 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.
+- Poké Ball recipes now use tags for their center ingredient, rather than specifically Copper Ingots, Iron Ingots, Gold Ingots, and Diamonds, allowing for further datapack customisation and mod compatibility.
+- Starter Toast now closes once the corresponding button is pressed once.
+- Moved some items into the vanilla Food & Drinks category.
 - Stacked Cobblemon Potion Bases can now be quick moved into Brewing Stands.
- Changed Healer recipe to swap the Max Revive for a Revive.
- Upped the rate that Gastly drop Ghast Tears from 2.5% to 5%.
+- Changed the Healing Machine recipe to swap the Max Revive for a Revive so that it is a bit easier to craft.
+- Upped the rate that Gastly drop Ghast Tears from 2.5% to 5%, further helping the crafting of a Healing Machine.
 - Pokémon with a low Blaze Powder drop chance now drop it more frequently in the Nether.
 - Reorganised a few advancements.
 - Pokémon entity shadows now scale when the Pokémon is being sent out or recalled.
 - Remade Torkoal particles, now they only appear when in battle.
+- Improved the shiny icon within summary and PC interfaces.
+- Changed the Poison Barb sprite so that it doesn't look like a sword when held. It's a Poison Barb, not a Poison Sword. Wait, that gives me an idea.
+- Moon Stone ore generates more frequently in Taigas and has been added to Magical and Spooky biomes. Ooo... Sorry.
+- Density, Season, and Nether biome tags have been moved and renamed within the biome tags directory.
+- Added particles to Lucario when in battle. Lucario is special.
+- Movesets updated for Blueberry DLC.

 ### Fixes
- Resized Snorlax
- Re-added the recipe for the Iron Vitamin.
- Cleaned up empty evolutions declaration in species files (no, I'm not listing all 169 by name).
- Fixed Exeggcute not being able to evolve.
- Fixed battle lang for Poison Touch Ability
- Fixed Cubone not being able to evolve into Alolan Marowak.
+- Re-added the recipe for the Iron vitamin. Well, technically it's a mineral.
+- Fixed Exeggcute and Pikachu not being able to evolve.
+- Fixed evolution priority for Exeggcute and Pikachu regional evolutions. Using a thunder stone on Kantonian Pikachu on the beach will give Alolan Raichu. A second thunder stone would then give Kantonian Raichu.
+- Fixed battle text for the Poison Touch Ability.
+- Finally found Sudowoodo and Bonsly. They were missing spawn data. Same with Drifloon and Litwick. Uh... sorry about that.
 - Fixed Squawkabilly forms not being recognized.
- Fixed the bounce animation for Poké Balls being delayed by like, a full second.
- Note blocks now play the correct sound on the Apricorn Plank based blocks.
+- Fixed the bounce animation for Poké Balls being delayed by like, a full second. It's enough to drive you mad.
+- Note blocks now play the correct sound on the Apricorn Plank-based blocks.
 - Fixed an issue with transformed parts in posers causing whacky positional issues.
- Fixed Poké Balls freezing in an open state if you look away when it's meant to close.
- Adds a translation string name to the Empty Pokeball entity.
- Fixed very many issues with Bedrock particle effects.
- Fixed Arbok patterns not being as specific in spawning as they were intended.
+- Fixed Poké Balls freezing in an open state if you're looking away at the moment that it's meant to close. This actually fixes some other things but it's hard to explain.
+- Fixed thrown Poké Balls technically having no name.
+- Fixed very many issues with Bedrock particle effects. There are probably many more. Life goes on.
+- Fixed Arbok patterns not being as specific in spawning as they were intended to be.
 - Fixed Pokémon not avoiding danger at all when pathfinding. 
 - Fixed Pokémon pathing over snow layers and carpets.
- Fixed 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 Sobble line not being able to swim or breathe underwater.
+- Fixed mod incompatibility with [Just Enough Resources](https://modrinth.com/mod/just-enough-resources-jer).
+- Fixed mod incompatibility with [Visual Overhaul](https://modrinth.com/mod/visual-overhaul).
+- Fixed an issue that allowed Pokémon to spawn on rails.
 - Fixed the data set on Pokémon when abilities are given via properties such as in ``/spawnpokemon``.
- Fixed sometimes Pokémon losing hidden abilities when evolving, this fix will only take effect to newly created Pokémon.
+- Fixed Pokémon sometimes losing hidden abilities when evolving. This fix will only take effect for newly created Pokémon because of technical reasons that were explained to me but which I then forgot.
+- Fixed capture messages not displaying in battle.
+- Fixed the Illusion ability causing the wrong Pokémon to be targeted in battle. 
+- Fixed battles started with fainted party members causing a soft-lock on defeat.
+- Fixed some issues with eyes in the faint animations of Hitmonlee and Phantump
+- Fixed missing evolution moves, for example Stone Axe for Kleavor.
+- Cleaned up empty evolutions declaration in species data (And no, I'm not listing all 169. No I don't care what you pay me, I'm not doing it).
+- Fixed non-consumable held items being consumed or swapped in battle permanently.

 ### Developer
- Significantly changed the way properties in PokemonEntity work. This could break some plugins (not in a big way, but changes will be needed).
- Rebuilt the scheduling API to more clearly force side choices and temporal frames of reference for tasks.
- Added dialogue API and data registry.
+- Significantly changed the way the properties in PokemonEntity work. This could break some plugins (not in a big way, but changes will be needed for some things).
+- Rebuilt the scheduling API to more clearly force side choices and temporal frames of reference for tasks. The developers say that how it works is cool but I stopped listening.
+- Added dialogue API and data registry. This is powerful, and there is a full example in the Cobblemon mod you can trigger using /opendialogue \<username\> cobblemon:example. The example JSON is inside the data folder of the mod.
 - Opened up the ItemDropEntry class to allow for it to be extended.
 - Added a new "advancement" evolution variant that takes an advancement identifier and succeeds if the player has the advancement.
- Made spawning API capable of non-entity spawning
- Made PokemonProperties.parse more interoperable with Java.
+- Made the spawning API capable of non-entity spawning. You can make it 'spawn' commands if you want. Go nuts.
+- Made PokemonProperties.parse more interoperable with Java. Save yourself and stop using Java.
 - Added the ``HeldItemEvent``, this comes with 2 implementation ``HeldItemEvent.Pre`` and ``HeldItemEvent.Post``. 
- API to support dynamic lighting in any mod that implements this feature has been added to all Species & Forms, see LightingData class for details.
- Added a Mixin for the BrewingStandScreenHandler to fix the incorrect handling of quickMove in Fabric.
 - Corrections to the ability implementation have been made that make ``Ability.forced`` function as intended and never reroll an ability for a Pokémon, please check your implementations to ensure the corrected behavior is intended for your use case.
- ``Pokemon.ability`` no longer has a public setter, please migrate to using ``Pokemon#updateAbility``, this handles the ability coordinate storage for you when necessary.
+- ``Pokemon.ability`` no longer has a public setter. Please migrate to using ``Pokemon#updateAbility``, this handles the ability coordinate storage for you when necessary.
 - ``Ability.forced``, ``Ability.index`` and ``Ability.priority`` have all had their setters internalized, there is no longer any need to manually adjust these migrate to the method mentioned above to handle that process for you.
- ``AbilityChanger`` has been added to API alongside some implementations, this is subject to change as the ability capsule and patch currently only expect the traditional behaviour in the Pokémon games of 1 to 2 regular abilities and 1 hidden.
- ``Pokemon#rollAbility`` has been added, this rerolls a legal ability for the Pokémon.
- `docs/cobblemon-tags` tags and spawn-presets can now be auto-generated from the current tags in the cobblemon mod with the `generateSpawnPresetList.py` and `generateTagList.py` scripts.
+- ``AbilityChanger`` has been added to API alongside some implementations, this is subject to change as the ability capsule and patch currently only expect the traditional behaviour in the Pokémon games of 1 or 2 regular abilities and 1 hidden ability.
+- ``Pokemon#rollAbility`` has been added which rerolls for a legal ability for the Pokémon.
+- `docs/cobblemon-tags` tags and spawn-presets can now be auto-generated from the current tags in the Cobblemon mod with the `generateSpawnPresetList.py` and `generateTagList.py` scripts.
 - `public_spawns_to_json.py` script has been added to give the powerful spawn.json generator a simplistic UI.
+- Updated Showdown with Gen 9 DLC.
+- Changed mixins to be Java 17 for compatibility level instead of 16, removing a warning from startup logs.

 ### Datapack & Resourcepack Creators
 - The maximum amount of fossils that can fit in the Fossil Analyzer can be adjusted in the config.
@@ -419,6 +500,7 @@
 Thank you so much to all of our community translators that bring the mod to the rest of the world!

 ## [1.4.0 - The Friends and Farms Update (October 13th, 2023)](#1-4-0)
+#### "No, we don't provide the friends."
 ### Additions
 - Added pasture blocks, used to let your PC Pokémon roam around an area.
 - Added nicknaming from the summary menu of a Pokémon (click their name).
@@ -959,6 +1041,7 @@ Thank you so much to all of our community translators that bring the mod to the
 - All the translators that contributed are amazing.

 ## [1.3.0 - The Foundation Update (March 17th, 2023)](#1-3-0)
+#### "Now we can start doing the really cool stuff."

 ### Dependencies
 - Upgraded Fabric API dependence to 0.75.1+1.19.2
@@ -1108,6 +1191,7 @@ Thank you so much to all of our community translators that bring the mod to the
 - Thank you to all of the fantastic volunteer translators for taking the time to help with this!

 ## [1.2.0 - The Customization Update (January 1st, 2023)](#1-2-0)
+#### "There are going to be so many fakemon..."
 ### Additions
 - Added models for Natu and Xatu, Murkrow and Honchkrow, Wailmer and Wailord.
 - Added new PC interface and it is beautiful.
@@ -1221,4 +1305,4 @@ Thank you so much to all of our community translators that bring the mod to the
 - Added species, ability, and move translations for `ko_ko`, `jp_jp`, `fr_fr`, `es_es`, `it_it`, and `zh_cn`.

 ## [1.0.0 (November 12th, 2022)](#1-0-0)
- Initial release.
+- Initial release.
@@ -1,10 +0,0 @@
-import ca.stellardrift.build.configurate.ConfigFormats
-import ca.stellardrift.build.configurate.catalog.PolyglotVersionCatalogExtension
-
-plugins {
-    id("ca.stellardrift.polyglot-version-catalogs") version "5.0.1"
-}
-
-extensions.configure<PolyglotVersionCatalogExtension> {
-    from(ConfigFormats.YAML, file("../gradle/libs.versions.yml"))
-}
@@ -1,32 +0,0 @@
-plugins {
-    id("cobblemon.base-conventions")
-    id("com.github.johnrengelman.shadow")
-}
-
-val bundle: Configuration by configurations.creating {
-    isCanBeConsumed = false
-    isCanBeResolved = true
-}
-
-tasks {
-
-    jar {
-        archiveBaseName.set("Cobblemon-${project.name}")
-        archiveClassifier.set("dev-slim")
-    }
-
-    shadowJar {
-        archiveClassifier.set("dev-shadow")
-        archiveBaseName.set("Cobblemon-${project.name}")
-        configurations = listOf(bundle)
-        mergeServiceFiles()
-    }
-
-    remapJar {
-        dependsOn(shadowJar)
-        inputFile.set(shadowJar.flatMap { it.archiveFile })
-        archiveBaseName.set("Cobblemon-${project.name}")
-        archiveVersion.set("${rootProject.version}")
-    }
-
-}
@@ -1,21 +0,0 @@
-plugins {
-    `java-library`
-}
-
-tasks {
-    val collectJars by registering(Copy::class) {
-        val tasks = subprojects.filter { it.path != ":common" }.map { it.tasks.named("remapJar") }
-        dependsOn(tasks)
-
-        from(tasks)
-        into(buildDir.resolve("libs"))
-    }
-
-    assemble {
-        dependsOn(collectJars)
-    }
-}
-
-tasks.withType<Test> {
-    useJUnitPlatform()
-}
@@ -1,13 +1,12 @@
 plugins {
-    base
    id("cobblemon.root-conventions")
    id ("net.nemerosa.versioning") version "2.8.2"
 }

-group = "com.cobblemon.mod"
 version = "${project.property("mod_version")}+${project.property("mc_version")}"

 val isSnapshot = project.property("snapshot")?.equals("true") ?: false
 if (isSnapshot) {
-    version = "$version-${versioning.info.branch}-${versioning.info.build}"
+    val fixedBranchName = versioning.info.branch.substringAfter("/")
+    version = "$version-${fixedBranchName}-${versioning.info.build}"
 }
@@ -1,5 +1,5 @@
-import extensions.isSnapshot
-import extensions.version
+import utilities.isSnapshot
+import utilities.version
 import java.time.OffsetDateTime
 import java.time.ZoneOffset
 import java.time.format.DateTimeFormatter
@@ -20,7 +20,7 @@ plugins {

    id("net.kyori.blossom")
    id("org.jetbrains.gradle.plugin.idea-ext")
-    id ("net.nemerosa.versioning") version "2.8.2"
+    id("net.nemerosa.versioning") version "2.8.2"
 }

 architectury {
@@ -34,31 +34,26 @@ repositories {
 }

 dependencies {
-    implementation(libs.stdlib)
-    implementation(libs.reflect)
-
-    modImplementation(libs.fabricLoader)
-    //Flywheel has no common dep so just pick one and don't use any platform specific code in common
-//    modCompileOnly(libs.flywheelFabric)
+    implementation(libs.bundles.kotlin)
+    modImplementation(libs.fabric.loader)
    modApi(libs.molang)
-    compileOnlyApi(libs.jeiApi)
-    modCompileOnly(libs.adornFabric)
-    modCompileOnly(libs.lambDynamicLights) { isTransitive = false }

-    // For Showdown
+    // Integrations
+    compileOnlyApi(libs.jei.api)
+    modCompileOnly(libs.bundles.fabric.integrations.compileOnly) {
+        isTransitive = false
+    }
+    // Flywheel has no common dep so just pick one and don't use any platform specific code in common
+    // modCompileOnly(libs.flywheelFabric)
+
+    // Showdown
    modCompileOnly(libs.graal)

-    //shadowCommon group: 'commons-io', name: 'commons-io', version: '2.6'
+    // Data Storage
+    modCompileOnly(libs.bundles.mongo)

-    // For datastore
-    modCompileOnly(libs.mongoDriverCore)
-    modCompileOnly(libs.mongoDriverSync)
-
-    testImplementation(libs.fabricJunit)
-    testImplementation(libs.junitParams)
-    testImplementation(libs.mockito)
-    testImplementation(libs.mockk)
-    testImplementation(libs.classgraph)
+    // Unit Testing
+    testImplementation(libs.bundles.unitTesting)
 }

 tasks.withType<Test> {
@@ -94,7 +89,6 @@ sourceSets {
                property("gitCommit", versioning.info.commit)
                property("branch", versioning.info.branch)
                System.getProperty("buildNumber")?.let { property("buildNumber", it) }
-                property("timestamp", OffsetDateTime.now(ZoneOffset.UTC).format(DateTimeFormatter.ofPattern("MM/dd/yyyy hh:mm:ss")) + " UTC")
            }
        }
    }
@@ -26,7 +26,6 @@ public final class CrashReportMixin {
        cobblemon.add("Is Snapshot", CobblemonBuildDetails.SNAPSHOT);
        cobblemon.add("Git Commit", CobblemonBuildDetails.INSTANCE.smallCommitHash() + " (" + "https://gitlab.com/cable-mc/cobblemon/-/commit/" + CobblemonBuildDetails.GIT_COMMIT + ")");
        cobblemon.add("Branch", CobblemonBuildDetails.BRANCH);
-        cobblemon.add("Timestamp", CobblemonBuildDetails.TIMESTAMP);

        cobblemon.addStackTrace(builder);
        builder.append("\n\n");
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.mixin.invoker;
+
+import com.cobblemon.mod.common.integration.adorn.AdornCompatibility;
+import java.util.List;
+import juuxel.adorn.block.variant.BlockVariantSet;
+import juuxel.adorn.block.variant.BlockVariantSets;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+//This is a yucky hack but better than what we were doing before
+@Mixin(BlockVariantSets.class)
+public abstract class AdornRegisterInvoker {
+    @Final
+    @Shadow(remap = false)
+    private static List<BlockVariantSet> variantSets;
+
+    @Inject(method = "register()V", at = @At("HEAD"), remap = false)
+    void register(CallbackInfo ci) {
+        variantSets.add(AdornCompatibility.INSTANCE);
+    }
+}
@@ -10,7 +10,6 @@ object CobblemonBuildDetails {

    const val GIT_COMMIT = "{{ gitCommit | default("Not Specified") }}"
    const val BRANCH = "{{ branch | default("Not Specified") }}"
-    const val TIMESTAMP = "{{ timestamp }}"

    fun smallCommitHash(): String {
        return this.GIT_COMMIT.substring(0, 7)
@@ -141,8 +141,8 @@ import kotlin.reflect.jvm.javaField
 import kotlin.math.roundToInt

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

@@ -179,7 +179,6 @@ object Cobblemon {
        if(CobblemonBuildDetails.SNAPSHOT) {
            this.LOGGER.info("  - Git Commit: ${smallCommitHash()} (https://gitlab.com/cable-mc/cobblemon/-/commit/${CobblemonBuildDetails.GIT_COMMIT})")
            this.LOGGER.info("  - Branch: ${CobblemonBuildDetails.BRANCH}")
-            this.LOGGER.info("  - Timestamp: ${CobblemonBuildDetails.TIMESTAMP}")
        }

        implementation.registerPermissionValidator()
@@ -667,8 +667,8 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, RegistryKey<Registry<It
    val CHOICE_SPECS = heldItem("choice_specs")
    @JvmField
    val CLEANSE_TAG = heldItem("cleanse_tag")
-    @JvmField
-    val CLEAR_AMULET = heldItem("clear_amulet")
+   // @JvmField
+   // val CLEAR_AMULET = heldItem("clear_amulet")
    @JvmField
    val COVERT_CLOAK = heldItem("covert_cloak")
    @JvmField
@@ -697,16 +697,16 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, RegistryKey<Registry<It
    val FOCUS_BAND = heldItem("focus_band")
    @JvmField
    val FOCUS_SASH = heldItem("focus_sash")
-    @JvmField
-    val GRIP_CLAW = heldItem("grip_claw")
+   // @JvmField
+   // val GRIP_CLAW = heldItem("grip_claw")
    @JvmField
    val HARD_STONE = heldItem("hard_stone")
    @JvmField
    val HEAVY_DUTY_BOOTS = heldItem("heavy_duty_boots")
    @JvmField
    val IRON_BALL = heldItem("iron_ball")
-    @JvmField
-    val LAGGING_TAIL = heldItem("lagging_tail")
+   // @JvmField
+   // val LAGGING_TAIL = heldItem("lagging_tail")
    @JvmField
    val LEFTOVERS = heldItem("leftovers")
    @JvmField
@@ -719,12 +719,12 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, RegistryKey<Registry<It
    val LOADED_DICE = heldItem("loaded_dice")
    @JvmField
    val LUCKY_EGG = heldItem("lucky_egg")
-    @JvmField
-    val LUMINOUS_MOSS = heldItem("luminous_moss")
+   // @JvmField
+   // val LUMINOUS_MOSS = heldItem("luminous_moss")
    @JvmField
    val MAGNET = heldItem("magnet")
-    @JvmField
-    val METRONOME = heldItem("metronome")
+   // @JvmField
+   // val METRONOME = heldItem("metronome")
    @JvmField
    val MIRACLE_SEED = heldItem("miracle_seed")
    @JvmField
@@ -747,10 +747,10 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, RegistryKey<Registry<It
    val POWER_LENS = heldItem("power_lens")
    @JvmField
    val POWER_WEIGHT = heldItem("power_weight")
-    @JvmField
-    val PROTECTIVE_PADS = heldItem("protective_pads")
-    @JvmField
-    val PUNCHING_GLOVE = heldItem("punching_glove")
+   // @JvmField
+   // val PROTECTIVE_PADS = heldItem("protective_pads")
+   // @JvmField
+   // val PUNCHING_GLOVE = heldItem("punching_glove")
    @JvmField
    val QUICK_CLAW = heldItem("quick_claw")
    @JvmField
@@ -759,16 +759,16 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, RegistryKey<Registry<It
    val RING_TARGET = heldItem("ring_target")
    @JvmField
    val ROCKY_HELMET = heldItem("rocky_helmet")
-    @JvmField
-    val ROOM_SERVICE = heldItem("room_service")
+   // @JvmField
+   // val ROOM_SERVICE = heldItem("room_service")
    @JvmField
    val SAFETY_GOGGLES = heldItem("safety_goggles")
-    @JvmField
-    val SCOPE_LENS = heldItem("scope_lens")
+   // @JvmField
+   // val SCOPE_LENS = heldItem("scope_lens")
    @JvmField
    val SHARP_BEAK = heldItem("sharp_beak")
-    @JvmField
-    val SHED_SHELL = heldItem("shed_shell")
+   // @JvmField
+   // val SHED_SHELL = heldItem("shed_shell")
    @JvmField
    val SHELL_BELL = heldItem("shell_bell")
    @JvmField
@@ -785,24 +785,24 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, RegistryKey<Registry<It
    val SOOTHE_BELL = heldItem("soothe_bell")
    @JvmField
    val STICKY_BARB = heldItem("sticky_barb")
-    @JvmField
-    val TERRAIN_EXTENDER = heldItem("terrain_extender")
-    @JvmField
-    val THROAT_SPRAY = heldItem("throat_spray")
+   // @JvmField
+   // val TERRAIN_EXTENDER = heldItem("terrain_extender")
+   // @JvmField
+   // val THROAT_SPRAY = heldItem("throat_spray")
    @JvmField
    val TOXIC_ORB = heldItem("toxic_orb")
    @JvmField
    val TWISTED_SPOON = heldItem("twisted_spoon")
-    @JvmField
-    val UTILITY_UMBRELLA = heldItem("utility_umbrella")
+   // @JvmField
+   // val UTILITY_UMBRELLA = heldItem("utility_umbrella")
    @JvmField
    val WEAKNESS_POLICY = heldItem("weakness_policy")
-    @JvmField
-    val WIDE_LENS = heldItem("wide_lens")
+   // @JvmField
+   // val WIDE_LENS = heldItem("wide_lens")
    @JvmField
    val WISE_GLASSES = heldItem("wise_glasses")
-    @JvmField
-    val ZOOM_LENS = heldItem("zoom_lens")
+   // @JvmField
+   // val ZOOM_LENS = heldItem("zoom_lens")
    @JvmField
    val MENTAL_HERB = compostableHeldItem("mental_herb", null, 1F)
    @JvmField
@@ -170,7 +170,7 @@ class BattleMessage(rawMessage: String) {
     */
    fun pnxAndUuid(index: Int): Pair<String, String>? {
        val argument = this.argumentAt(index)?.takeIf { it.length >= 2 }?.split(":")?.takeIf { it.size == 2 } ?: return null
-        val pnx = argument[0].takeIf { it.matches(PNX_MATCHER) } ?: return null
+        val pnx = argument[0].takeIf { it.matches(PNX_MATCHER) || it.matches(PN_MATCHER) } ?: return null
        val uuid = argument[1].trim()
        return pnx to uuid
    }
@@ -123,10 +123,8 @@ class RotateYCameraMode : ParticleCameraMode {
        viewDirection: Vec3d
    ): Quaternionf {
        val i = if (angle == 0F) 0F else MathHelper.lerp(deltaTicks, prevAngle, angle)
-
-        val q2 = RotationAxis.POSITIVE_Y.rotationDegrees(/*180 - */cameraYaw)
+        val q2 = RotationAxis.POSITIVE_Y.rotationDegrees(-cameraYaw)
        q2.hamiltonProduct(RotationAxis.POSITIVE_Z.rotationDegrees(i))
-
        return q2
    }

@@ -191,9 +189,10 @@ class LookAtY : ParticleCameraMode {
        cameraPitch: Float,
        viewDirection: Vec3d
    ): Quaternionf {
-        val rotation = Quaternionf(0F, 0F, 0F, 1F)
-        rotation.hamiltonProduct(RotationAxis.POSITIVE_Y.rotationDegrees(-cameraYaw))
-        return rotation
+        val i = if (angle == 0F) 0F else MathHelper.lerp(deltaTicks, prevAngle, angle)
+        val q2 = RotationAxis.POSITIVE_Y.rotationDegrees(-cameraYaw)
+        q2.hamiltonProduct(RotationAxis.POSITIVE_Z.rotationDegrees(i))
+        return q2
    }

    override fun <T> encode(ops: DynamicOps<T>) = CODEC.encodeStart(ops, this)
@@ -65,7 +65,7 @@ class DynamicParticleRotation(
    override val type = ParticleRotationType.DYNAMIC
    override fun <T> encode(ops: DynamicOps<T>) = CODEC.encodeStart(ops, this)
    override fun getInitialRotation(runtime: MoLangRuntime) = runtime.resolveDouble(startRotation)
-    override fun getInitialAngularVelocity(runtime: MoLangRuntime) = runtime.resolveDouble(speed)
+    override fun getInitialAngularVelocity(runtime: MoLangRuntime) = runtime.resolveDouble(speed) / 20
    override fun getAngularAcceleration(runtime: MoLangRuntime, angularVelocity: Double): Double {
        val acceleration = runtime.resolveDouble(acceleration)
        val nextVelocity = angularVelocity + acceleration
@@ -35,11 +35,13 @@ class TimeRange : IntRanges {
            "night" to TimeRange(12542..23459),
            "noon" to TimeRange(5000..6999),
            "midnight" to TimeRange(17000..18999),
-            "dawn" to TimeRange(22300..23999, 0..166),
+            "dawn" to TimeRange(22300..23999, 0..999),
            "dusk" to TimeRange(11834..13701),
            "twilight" to TimeRange(11834..13701, 22300..23999, 0..166),
-            "morning" to TimeRange(0..4999),
-            "afternoon" to TimeRange(7000..12039)
+            "morning" to TimeRange(23000..23999, 0..4999),
+            "afternoon" to TimeRange(7000..12999),
+			"predawn" to TimeRange(19000..22999),
+            "evening" to TimeRange(13000..16999)
        )
    }

@@ -30,8 +30,8 @@ import net.minecraft.server.world.ServerWorld
 */
 interface SpawningContextCalculator<I : SpawningContextInput, O : SpawningContext> {
    companion object {
-        val isAirCondition: (BlockState) -> Boolean = { it.isAir || (!it.isSolid && !it.isLiquid) }
-        val isSolidCondition: (BlockState) -> Boolean = { it.isSolid && !it.isIn(BlockTags.LEAVES) }
+        val isAirCondition: (BlockState) -> Boolean = { it.isAir || (!it.isSolid && !it.fluidState.isIn(FluidTags.WATER)) }
+        val isSolidCondition: (BlockState) -> Boolean = { it.isSolid }
        val isWaterCondition: (BlockState) -> Boolean = { it.fluidState.isIn(FluidTags.WATER) && it.fluidState.isStill  }
        val isLavaCondition: (BlockState) -> Boolean = { it.fluidState.isIn(FluidTags.LAVA) && it.fluidState.isStill }

@@ -48,7 +48,7 @@ abstract class SpawnDetailPreset {
    var weightMultipliers: MutableList<WeightMultiplier>? = null
    var weight: Float? = null
    var percentage: Float? = null
-    var mergeMode = MergeMode.KEEP
+    var mergeMode = MergeMode.INSERT

    open fun apply(spawnDetail: SpawnDetail) {
        bucket?.let { spawnDetail.bucket = it }
@@ -71,7 +71,6 @@ object BattleBuilder {
                player1Actor.battleTheme = player2.getBattleTheme()
                player2Actor.battleTheme = player1.getBattleTheme()
            }
-            errors
        } else {
            errors
        }
@@ -140,7 +139,6 @@ object BattleBuilder {
                }
                playerActor.battleTheme = pokemonEntity.getBattleTheme()
            }
-            errors
        } else {
            errors
        }
@@ -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() }
@@ -35,7 +35,7 @@ class BoostInstruction(val instructionSet: InstructionSet, val message: BattleMe
        val severity = Stats.getSeverity(stages)
        val rootKey = if (isBoost) "boost" else "unboost"

-        battle.dispatchWaiting(1.5F) {
+        battle.dispatchWaiting {
            val lang = when {
                message.hasOptionalArgument("zeffect") -> battleLang("$rootKey.$severity.zeffect", pokemon.getName(), stat)
                else -> battleLang("$rootKey.$severity", pokemon.getName(), stat)
@@ -33,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()

@@ -47,7 +48,7 @@ class DragInstruction(val instructionSet: InstructionSet, val battleActor: Battl
            setOf(
                BattleDispatch {
                    if (entity != null) {
-                        SwitchInstruction.createEntitySwitch(battle, battleActor, entity, pnx, activePokemon, pokemon, illusion)
+                        SwitchInstruction.createEntitySwitch(battle, battleActor, entity, pnx, activePokemon, pokemon, illusion, imposter)
                    } else {
                        SwitchInstruction.createNonEntitySwitch(battle, battleActor, pnx, activePokemon, pokemon, illusion)
                    }
@@ -27,12 +27,12 @@ class FieldStartInstruction(val message: BattleMessage): InterpreterInstruction

    override fun invoke(battle: PokemonBattle) {
        val effect = message.effectAt(0) ?: return
-        val user = message.battlePokemonFromOptional(battle)
-        user?.let { ShowdownInterpreter.broadcastOptionalAbility(battle, effect, user) }
+        val source = message.battlePokemonFromOptional(battle)
+        source?.let { ShowdownInterpreter.broadcastOptionalAbility(battle, message.effect(), source) }

        battle.dispatchWaiting(1.5F) {
            // Note persistent is a CAP ability only we can ignore the flag
-            val lang = battleLang("fieldstart.${effect.id}", user?.getName() ?: Text.literal("UNKNOWN"))
+            val lang = battleLang("fieldstart.${effect.id}", source?.getName() ?: Text.literal("UNKNOWN"))
            battle.broadcastChatMessage(lang)

            val type = BattleContext.Type.valueOf(effect.rawData.substringAfterLast(" ").uppercase())
@@ -40,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

@@ -87,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)
                        }
@@ -98,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))
@@ -110,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
@@ -122,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) }
                }
@@ -10,12 +10,11 @@ package com.cobblemon.mod.common.battles.interpreter.instructions

 import com.cobblemon.mod.common.api.battles.interpreter.BattleMessage
 import com.cobblemon.mod.common.api.battles.model.PokemonBattle
-import com.cobblemon.mod.common.api.pokemon.PokemonProperties
+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.BattleInitializePacket
 import com.cobblemon.mod.common.net.messages.client.battle.BattleTransformPokemonPacket
 import com.cobblemon.mod.common.util.battleLang

@@ -26,7 +25,9 @@ import com.cobblemon.mod.common.util.battleLang
 * @author jeffw773
 * @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) {

@@ -35,9 +36,12 @@ class TransformInstruction(val message: BattleMessage): InterpreterInstruction {
        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).start(entity)
+            val future = TransformEffect(targetPokemon.effectedPokemon, battle.started).start(entity)
            UntilDispatch { future?.isDone != false }
        }

@@ -30,8 +30,8 @@ class WeatherInstruction(val message: BattleMessage): InterpreterInstruction {

    override fun invoke(battle: PokemonBattle) {
        val weather = message.effectAt(0)?.id ?: return
-        val user = message.battlePokemonFromOptional(battle) ?: return
-        ShowdownInterpreter.broadcastOptionalAbility(battle, message.effect(), user)
+        val source = message.battlePokemonFromOptional(battle)
+        source?.let { ShowdownInterpreter.broadcastOptionalAbility(battle, message.effect(), source) }

        battle.dispatchWaiting(1.5F) {
            val lang = when {
@@ -29,11 +29,17 @@ class FossilAnalyzerBlockEntity(

    class FossilAnalyzerInventory(val analyzerEntity: FossilAnalyzerBlockEntity) : SidedInventory {
        override fun clear() {
-            TODO("Not yet implemented")
+            if(analyzerEntity.multiblockStructure != null && analyzerEntity.multiblockStructure is FossilMultiblockStructure) {
+                val fossilMultiblockStructure = analyzerEntity.multiblockStructure as FossilMultiblockStructure
+                fossilMultiblockStructure.fossilInventory.clear()
+            }
        }

        override fun size(): Int {
-            TODO("Not yet implemented")
+            if (analyzerEntity.multiblockStructure != null) {
+                return 3
+            }
+            return 0
        }

        override fun isEmpty(): Boolean {
@@ -41,19 +47,37 @@ class FossilAnalyzerBlockEntity(
        }

        override fun getStack(slot: Int): ItemStack {
+            if (analyzerEntity.multiblockStructure != null && analyzerEntity.multiblockStructure is FossilMultiblockStructure) {
+                val fossilMultiblockStructure = analyzerEntity.multiblockStructure as FossilMultiblockStructure
+                if (fossilMultiblockStructure.fossilInventory.size > slot) {
+                    return fossilMultiblockStructure.fossilInventory[slot]
+                }
+            }
            return ItemStack.EMPTY
        }

        override fun removeStack(slot: Int, amount: Int): ItemStack {
+            if (analyzerEntity.multiblockStructure != null && analyzerEntity.multiblockStructure is FossilMultiblockStructure) {
+                val fossilMultiblockStructure = analyzerEntity.multiblockStructure as FossilMultiblockStructure
+                if (fossilMultiblockStructure.fossilInventory.size > slot) {
+                    return fossilMultiblockStructure.fossilInventory[slot]
+                }
+            }
            return ItemStack.EMPTY
        }

        override fun removeStack(slot: Int): ItemStack {
+            if(analyzerEntity.multiblockStructure is FossilMultiblockStructure) {
+                val fossilMultiblockStructure = analyzerEntity.multiblockStructure as FossilMultiblockStructure
+                if (fossilMultiblockStructure.fossilInventory.size > slot) {
+                    return fossilMultiblockStructure.fossilInventory.removeAt(slot)
+                }
+            }
            return ItemStack.EMPTY
        }

        override fun setStack(slot: Int, stack: ItemStack) {
-            if (analyzerEntity.multiblockStructure != null) {
+            if (analyzerEntity.multiblockStructure != null && analyzerEntity.multiblockStructure is FossilMultiblockStructure) {
                val struct = analyzerEntity.multiblockStructure as FossilMultiblockStructure
                analyzerEntity.world?.let {
                    struct.insertFossil(stack, it)
@@ -72,6 +96,9 @@ class FossilAnalyzerBlockEntity(
        }

        override fun getAvailableSlots(side: Direction?): IntArray {
+            if(analyzerEntity.multiblockStructure != null && analyzerEntity.multiblockStructure is FossilMultiblockStructure) {
+                return intArrayOf(0,1,2)
+            }
            return IntArray(1)
        }

@@ -86,7 +86,7 @@ class GildedChestBlockEntity(pos: BlockPos, state: BlockState, val type: Type =
    }

    override fun getAvailableSlots(side: Direction): IntArray {
-        return if (type == Type.FAKE) IntArray(0) else IntArray(NUM_SLOTS)
+        return if (type == Type.FAKE) IntArray(0) else IntArray(NUM_SLOTS) { it }
    }

    override fun canInsert(slot: Int, stack: ItemStack?, dir: Direction?): Boolean {
@@ -36,8 +36,8 @@ import net.minecraft.util.math.BlockPos

@Suppress("MemberVisibilityCanBePrivate", "unused")
 class HealingMachineBlockEntity(
-    val blockPos: BlockPos,
-    val blockState: BlockState
+    blockPos: BlockPos,
+    blockState: BlockState
 ) : BlockEntity(CobblemonBlockEntities.HEALING_MACHINE, blockPos, blockState) {
    var currentUser: UUID? = null
        private set
@@ -114,7 +114,7 @@ class HealingMachineBlockEntity(
        this.setUser(player.uuid)
        alreadyHealing.add(player.uuid)
        updateBlockChargeLevel(HealingMachineBlock.MAX_CHARGE_LEVEL + 1)
-        if (world != null && !world!!.isClient) world!!.playSoundServer(position = blockPos.toVec3d(), sound = CobblemonSounds.HEALING_MACHINE_ACTIVE, volume = 1F, pitch = 1F)
+        if (world != null && !world!!.isClient) world!!.playSoundServer(position = pos.toVec3d(), sound = CobblemonSounds.HEALING_MACHINE_ACTIVE, volume = 1F, pitch = 1F)
    }

    fun completeHealing() {
@@ -217,10 +217,10 @@ class HealingMachineBlockEntity(
                else floor((healingCharge / maxCharge) * HealingMachineBlock.MAX_CHARGE_LEVEL).toInt()
            ).coerceIn(0..HealingMachineBlock.MAX_CHARGE_LEVEL + 1)

-            val state = world!!.getBlockState(blockPos)
+            val state = world!!.getBlockState(pos)
            if (state != null && state.block is HealingMachineBlock) {
                val currentCharge = state.get(HealingMachineBlock.CHARGE_LEVEL).toInt()
-                if (chargeLevel != currentCharge) world!!.setBlockState(blockPos, state.with(HealingMachineBlock.CHARGE_LEVEL, chargeLevel))
+                if (chargeLevel != currentCharge) world!!.setBlockState(pos, state.with(HealingMachineBlock.CHARGE_LEVEL, chargeLevel))
            }
        }
    }
@@ -26,24 +26,24 @@ import net.minecraft.util.math.Box
 import net.minecraft.world.World

 class PCBlockEntity(
-    val blockPos: BlockPos,
-    val blockState: BlockState
+    blockPos: BlockPos,
+    blockState: BlockState
 ) : BlockEntity(CobblemonBlockEntities.PC, blockPos, blockState) {

    companion object {
        internal val TICKER = BlockEntityTicker<PCBlockEntity> { world, _, _, blockEntity ->
            if (world.isClient) return@BlockEntityTicker

-            blockEntity.togglePCOn(blockEntity.getInRangeViewerCount(world, blockEntity.blockPos) > 0)
+            blockEntity.togglePCOn(blockEntity.getInRangeViewerCount(world, blockEntity.pos) > 0)
        }
    }

    private fun togglePCOn(on: Boolean) {
-        val pcBlock = blockState.block as PCBlock
+        val pcBlock = cachedState.block as PCBlock

        if (world != null && !world!!.isClient) {
            val world = world!!
-            val posBottom = pcBlock.getBasePosition(blockState, blockPos)
+            val posBottom = pcBlock.getBasePosition(cachedState, pos)
            val stateBottom = world.getBlockState(posBottom)

            val posTop = pcBlock.getPositionOfOtherPart(stateBottom, posBottom)
@@ -71,7 +71,7 @@ class PCBlockEntity(
        val pcLink = PCLinkManager.getLink(player.uuid)
        return pcLink != null
                && pcLink is ProximityPCLink
-                && pcLink.pos == blockPos
+                && pcLink.pos == pos
                && pcLink.world!!.dimension == player.world.dimension
    }

@@ -48,7 +48,7 @@ import net.minecraft.world.World
 import java.util.*
 import kotlin.math.ceil

-class PokemonPastureBlockEntity(pos: BlockPos, val state: BlockState) : BlockEntity(CobblemonBlockEntities.PASTURE, pos, state) {
+class PokemonPastureBlockEntity(pos: BlockPos, state: BlockState) : BlockEntity(CobblemonBlockEntities.PASTURE, pos, state) {
    open class Tethering(
        val minRoamPos: BlockPos,
        val maxRoamPos: BlockPos,
@@ -173,11 +173,11 @@ class PokemonPastureBlockEntity(pos: BlockPos, val state: BlockState) : BlockEnt
    }

    private fun togglePastureOn(on: Boolean) {
-        val pastureBlock = state.block as PastureBlock
+        val pastureBlock = cachedState.block as PastureBlock

        if (world != null && !world!!.isClient) {
            val world = world!!
-            val posBottom = pastureBlock.getBasePosition(state, pos)
+            val posBottom = pastureBlock.getBasePosition(cachedState, pos)
            val stateBottom = world.getBlockState(posBottom)

            val posTop = pastureBlock.getPositionOfOtherPart(stateBottom, posBottom)
@@ -12,13 +12,16 @@ import com.cobblemon.mod.common.CobblemonBlockEntities
 import com.cobblemon.mod.common.api.fossil.NaturalMaterials
 import com.cobblemon.mod.common.api.multiblock.builder.MultiblockStructureBuilder
 import com.cobblemon.mod.common.block.multiblock.FossilMultiblockStructure
+import net.minecraft.block.Block
 import net.minecraft.block.BlockState
 import net.minecraft.entity.player.PlayerEntity
 import net.minecraft.inventory.Inventories
 import net.minecraft.inventory.SidedInventory
+import net.minecraft.inventory.SimpleInventory
 import net.minecraft.item.Item
 import net.minecraft.item.ItemStack
 import net.minecraft.nbt.NbtCompound
+import net.minecraft.nbt.NbtList
 import net.minecraft.registry.Registries
 import net.minecraft.util.collection.DefaultedList
 import net.minecraft.util.math.BlockPos
@@ -27,88 +30,71 @@ import net.minecraft.util.math.Direction
 class RestorationTankBlockEntity(
    pos: BlockPos, state: BlockState,
    multiblockBuilder: MultiblockStructureBuilder
-) : FossilMultiblockEntity(pos, state, multiblockBuilder, CobblemonBlockEntities.RESTORATION_TANK) {
+) : FossilMultiblockEntity(pos, state, multiblockBuilder, CobblemonBlockEntities.RESTORATION_TANK)  {
    val inv = RestorationTankInventory(this)

    override fun writeNbt(nbt: NbtCompound) {
        super.writeNbt(nbt)
-        Inventories.writeNbt(nbt, inv.items)
+        nbt.put("inventory", inv.toNbtList())
    }

    override fun readNbt(nbt: NbtCompound) {
        super.readNbt(nbt)
-        Inventories.readNbt(nbt, inv.items)
+        if (nbt.contains("Items")) {
+            // Old format
+            val items = DefaultedList.ofSize(inv.size(), ItemStack.EMPTY)
+            Inventories.readNbt(nbt, items)
+            RestorationTankInventory(this, *items.toTypedArray())
+        } else if (nbt.contains("inventory")) {
+            // New format
+            inv.readNbtList(nbt.get("inventory") as NbtList)
+        }
    }

-    class RestorationTankInventory(val tankEntity: RestorationTankBlockEntity) : SidedInventory {
+    class RestorationTankInventory(val tankEntity: RestorationTankBlockEntity, vararg items: ItemStack) : SimpleInventory(*items), SidedInventory {

-        val items: DefaultedList<ItemStack> =  DefaultedList.ofSize(8, ItemStack.EMPTY)
+        constructor(tankEntity: RestorationTankBlockEntity) : this(tankEntity, *Array(8) { ItemStack.EMPTY })


-        override fun clear() {
-            for (i in items.indices) {
-                items[i] = ItemStack.EMPTY
-            }
-        }
-
-        override fun size(): Int {
-            return 8
-        }
-
-        override fun isEmpty(): Boolean {
-            return items.all { it == ItemStack.EMPTY }
-        }
-
-        override fun getStack(slot: Int): ItemStack {
-            if(slot == -1 || slot >= size()) {
-                return ItemStack.EMPTY
-            }
-            return items[slot]
-        }
-
-        override fun removeStack(slot: Int, amount: Int): ItemStack {
-            if(slot < 0 || slot >= size()) {
-                return ItemStack.EMPTY
-            }
-            val result = items[slot].split(amount)
-            if(items[slot].count == 0) {
-                items[slot] = ItemStack.EMPTY
-            }
-            return result
-        }
-
-        override fun removeStack(slot: Int): ItemStack {
-            return removeStack(slot, 1)
-        }
-
-        override fun setStack(slot: Int, stack: ItemStack) {
-            val struct = tankEntity.multiblockStructure as? FossilMultiblockStructure
-            tankEntity.world?.let {
-                struct?.insertOrganicMaterial(stack, it)
-                val returnIdentifier = NaturalMaterials.getReturnItem((stack))
-                if(returnIdentifier != null ) {
-                    // Store the return item
-                    val returnItem = Registries.ITEM.get(returnIdentifier)
-                    storeReturnItem(returnItem, stack.count)
-                }
-            }
-        }
-
-        private fun storeReturnItem(returnItem: Item, count: Int) {
-            val destStack = items.withIndex().firstOrNull {
-                it.value == ItemStack.EMPTY || (it.value.count < it.value.maxCount && it.value.item == returnItem)
-            }
-            if (destStack != null) {
-                if(destStack.value == ItemStack.EMPTY) {
-                    items[destStack.index] = ItemStack(returnItem, 1)
-                } else {
-                    destStack.value.increment(count)
-                }
-            }
-        }

        override fun markDirty() {
+            super.markDirty()
+            for(i in 0 until size()) { // iterate over inventory, consume items, generate and place return items
+                val itemStack : ItemStack = this.getStack(i)
+                if(!itemStack.isEmpty) {
+                    val struct = tankEntity.multiblockStructure as? FossilMultiblockStructure
+                    val returnIdentifier = NaturalMaterials.getReturnItem(itemStack)
+
+                    if(tankEntity.world != null) {
+                        if(struct?.insertOrganicMaterial(itemStack, tankEntity.world!!) == true) {
+                            removeStack(i)
+                            if (returnIdentifier != null) {
+                                val returnItem = Registries.ITEM.get(returnIdentifier)
+                                val returnStack =  ItemStack(returnItem, itemStack.count)
+                                var done = false
+                                if (returnStack.maxCount > 1) { // Only search for a merge if merging could be possible
+                                    for(j in 0 until size()) {
+                                        // Look for a inventory slot to merge with
+                                        val existingStack : ItemStack = getStack(j)
+                                        if (Registries.ITEM.getId(existingStack.item) == returnIdentifier && existingStack.count + returnStack.count < existingStack.maxCount) {
+                                            setStack(j, ItemStack(returnItem, existingStack.count + returnStack.count))
+                                            done = true
+                                        }
+                                    }
+                                }
+                                if (!done) {
+                                    setStack(i, ItemStack(returnItem, itemStack.count))
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+
            tankEntity.world?.let {
+//                tankEntity.world!!.updateListeners(tankEntity.pos, tankEntity.cachedState, tankEntity.cachedState, Block.NOTIFY_ALL)
+//                tankEntity.world!!.updateComparators(tankEntity.pos, tankEntity.world!!.getBlockState(tankEntity.pos).block)
+                tankEntity.markDirty()
                tankEntity.multiblockStructure?.markDirty(it)
            }
        }
@@ -118,7 +104,7 @@ class RestorationTankBlockEntity(
        }

        override fun getAvailableSlots(side: Direction?): IntArray {
-            return if(side == Direction.DOWN)  intArrayOf(0,1,2,3,4,5,6,7) else intArrayOf(-1)
+            return intArrayOf(0,1,2,3,4,5,6,7)
        }

        override fun canInsert(slot: Int, stack: ItemStack?, dir: Direction?): Boolean {
@@ -129,12 +115,26 @@ class RestorationTankBlockEntity(
                            && structure.organicMaterialInside < FossilMultiblockStructure.MATERIAL_TO_START
                            && structure.createdPokemon == null
                    val returnItem = NaturalMaterials.getReturnItem(stack!!) ?: return canUtilize
-                    if(canUtilize) {
-                        // See if there's room
-                        for (i in items.indices ) {
-                            if(items[i] == ItemStack.EMPTY || (items[i].count < items[i].maxCount
-                                            && items[i].item == Registries.ITEM.get(returnItem))) {
-                                return true
+                    val returnStack = ItemStack(Registries.ITEM.get(returnItem), stack.count)
+                    if(canUtilize && super.canInsert(returnStack)) {
+                        // See if there's room for the return
+                        if(returnStack == ItemStack.EMPTY) {
+                            return true
+                        }
+                        var emptyCount = 0
+                        for(i in 0 until size()) {
+                            val existingStack : ItemStack = getStack(i)
+                            if(existingStack == ItemStack.EMPTY) {
+                                emptyCount += 1
+                                if(emptyCount > 1) {
+                                    // 2 empty slots, safe to insert
+                                    return true
+                                }
+                            } else if(returnStack.maxCount > 1) {
+                                if(Registries.ITEM.getId(existingStack.item) == returnItem && existingStack.count + returnStack.count < existingStack.maxCount) {
+                                    // Return item can merge with an item already in the inventory
+                                    return true
+                                }
                            }
                        }
                        return false
@@ -188,7 +188,7 @@ class FossilMultiblockStructure (

        // Check if the player is holding a natural material and if so, feed it to the machine.
        if (NaturalMaterials.isNaturalMaterial(stack)) {
-            if (!this.isRunning() && this.createdPokemon == null && this.organicMaterialInside < MATERIAL_TO_START && insertOrganicMaterial(stack, world)) {
+            if (!this.isRunning() && this.createdPokemon == null && this.organicMaterialInside < MATERIAL_TO_START && insertOrganicMaterial(ItemStack(stack.item, 1), world)) {
                this.lastInteraction = world.time
                if (!player.isCreative) {
                    val returnItem = NaturalMaterials.getReturnItem(stack)
@@ -331,11 +331,9 @@ class FossilMultiblockStructure (
            }
        }
        if(tankBaseEntity is RestorationTankBlockEntity) {
-            tankBaseEntity.inv.items.forEach {
-                val stack = ItemStack(it.item, 1)
-                ItemScatterer.spawn(world, pos.x.toDouble(), pos.y.toDouble(), pos.z.toDouble(), stack)
+            tankBaseEntity.inv.clearToList().forEach {
+                ItemScatterer.spawn(world, pos.x.toDouble(), pos.y.toDouble(), pos.z.toDouble(), it)
            }
-            tankBaseEntity.inv.clear()
        }


@@ -533,12 +531,13 @@ class FossilMultiblockStructure (

    //Returns false if material wasnt inserted
    fun insertOrganicMaterial(stack: ItemStack, world: World): Boolean {
-        val natureValue = NaturalMaterials.getContent(stack)
+        var natureValue = NaturalMaterials.getContent(stack)
        if (timeRemaining > 0 || this.organicMaterialInside >= MATERIAL_TO_START || natureValue == null) {
            return false
        }
+        natureValue *= stack.count

-        if (natureValue < 0 && organicMaterialInside == 0) return false
+        if (natureValue <= 0 && organicMaterialInside == 0) return false
        val oldFillStage = organicMaterialInside * 8 / MATERIAL_TO_START

        // to prevent over/under filling the tank causing a crash
@@ -25,6 +25,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 +86,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) {
@@ -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
                )
            }
@@ -318,7 +318,6 @@ class PCGUI(
                centered = true,
                shadow = true,
                scale = SCALE,
-                colour = 0x32CBFF,
                pMouseX = mouseX,
                pMouseY = mouseY
            )
@@ -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
            )
        }
@@ -18,7 +18,8 @@ import net.minecraft.client.MinecraftClient

 object PlayPoseableAnimationHandler : ClientNetworkPacketHandler<PlayPoseableAnimationPacket> {
    override fun handle(packet: PlayPoseableAnimationPacket, client: MinecraftClient) {
-        val entity = client.world?.getEntityById(packet.entityId) ?: return
+        val world = client.world ?: return
+        val entity = world.getEntityById(packet.entityId) ?: return
        if (entity is Poseable) {
            val delegate = entity.delegate
            if (delegate is PoseableEntityState<*>) {
@@ -18,7 +18,8 @@ import net.minecraft.client.MinecraftClient

 object RunPosableMoLangHandler : ClientNetworkPacketHandler<RunPosableMoLangPacket> {
    override fun handle(packet: RunPosableMoLangPacket, client: MinecraftClient) {
-        val entity = client.world?.getEntityById(packet.entityId) ?: return
+        val world = client.world ?: return
+        val entity = world.getEntityById(packet.entityId) ?: return
        if (entity is Poseable) {
            val state = entity.delegate as? PoseableEntityState<*> ?: return
            for (expression in packet.expressions.map { it.asExpression() }) {
@@ -243,6 +243,10 @@ class SnowstormParticle(
            .next()
    }

+    fun runExpirationEvents() {
+        storm.effect.particle.expirationEvents.forEach { it.trigger(storm, this)}
+    }
+
    override fun tick() {
        if (storm.effect.space.localPosition) {
            originPos = storm.matrixWrapper.getOrigin()
@@ -250,18 +254,19 @@ class SnowstormParticle(

        applyRandoms()
        setParticleAgeInRuntime()
+        storm.effect.curves.forEach { it.apply(storm.runtime) }
        storm.runtime.execute(storm.effect.particle.updateExpressions)
        angularVelocity += storm.effect.particle.rotation.getAngularAcceleration(storm.runtime, angularVelocity) / 20

        if (age > maxAge || storm.runtime.resolveBoolean(storm.effect.particle.killExpression)) {
-            storm.effect.particle.expirationEvents.forEach { it.trigger(storm, this)}
+            runExpirationEvents()
            markDead()
            return
        } else {
            val acceleration = storm.effect.particle.motion.getAcceleration(
                storm.runtime,
                Vec3d(velocityX, velocityY, velocityZ).multiply(20.0) // Uses blocks per second, not blocks per tick
-            ).multiply(1 / 20.0).multiply(1 / 20.0)
+            ).multiply(1 / 20.0).multiply(1 / 20.0) // blocks per second per second -> blocks per tick per tick

            velocityX += acceleration.x
            velocityY += acceleration.y
@@ -354,7 +359,7 @@ class SnowstormParticle(
 //                velocityZ = 0.0
 //            }
        } else {
-            collidesWithWorld =  false
+            collidesWithWorld = false
            if (dx != 0.0 || dy != 0.0 || dz != 0.0) {
                localX += dx
                localY += dy
@@ -383,6 +388,7 @@ class SnowstormParticle(
            colliding = false
            return movement
        } else if (expiresOnContact) {
+            runExpirationEvents()
            markDead()
            return movement
        }
@@ -154,6 +154,7 @@ abstract class PoseableEntityModel<T : Entity>(
            val maxPitch = params.getDoubleOrNull(3) ?: 70F
            val minPitch = params.getDoubleOrNull(4) ?: -45F
            val maxYaw = params.getDoubleOrNull(5) ?: 45F
+            val minYaw = params.getDoubleOrNull(6) ?: -45F
            ObjectValue(
                SingleBoneLookAnimation<T>(
                    frame = this,
@@ -162,7 +163,8 @@ abstract class PoseableEntityModel<T : Entity>(
                    yawMultiplier = yawMultiplier.toFloat(),
                    maxPitch = maxPitch.toFloat(),
                    minPitch = minPitch.toFloat(),
-                    maxYaw = maxYaw.toFloat()
+                    maxYaw = maxYaw.toFloat(),
+                    minYaw = minYaw.toFloat()
                )
            )
        }
@@ -33,7 +33,7 @@ class SingleBoneLookAnimation<T : Entity>(
    val pitchMultiplier: Float = 1F,
    val yawMultiplier: Float = 1F,
    val maxPitch: Float = 70F,
-    val minPitch: Float = 45F,
+    val minPitch: Float = -45F,
    val maxYaw: Float = 45F,
    val minYaw: Float = -45F,
 ) : StatelessAnimation<T, ModelFrame>(frame) {
@@ -54,8 +54,8 @@ class SingleBoneLookAnimation<T : Entity>(
        bone = frame.head,
        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,
+        maxPitch = maxPitch ?: 70F,
+        minPitch = minPitch ?: -45F,
        maxYaw = maxYaw ?: 45F,
        minYaw = minYaw ?: -45F,
    )
@@ -20,6 +20,10 @@ import com.cobblemon.mod.common.client.render.models.blockbench.pose.Pose
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.util.adapters.ExpressionLikeAdapter
 import com.cobblemon.mod.common.util.adapters.Vec3dAdapter
+import com.cobblemon.mod.common.util.isDusk
+import com.cobblemon.mod.common.util.isStandingOnRedSand
+import com.cobblemon.mod.common.util.isStandingOnSand
+import com.cobblemon.mod.common.util.isStandingOnSandOrRedSand
 import com.google.gson.ExclusionStrategy
 import com.google.gson.FieldAttributes
 import com.google.gson.GsonBuilder
@@ -163,6 +167,30 @@ class JsonPokemonPoseableModel(override val rootPart: Bone) : PokemonPoseableMod
            if (mustBeTouchingWater != null) {
                conditionsList.add { mustBeTouchingWater == it.isTouchingWater }
            }
+            val mustBeTouchingWaterOrRain = json.get("isTouchingWaterOrRain")?.asBoolean
+            if (mustBeTouchingWaterOrRain != null) {
+                conditionsList.add { mustBeTouchingWaterOrRain == it.isTouchingWaterOrRain }
+            }
+            val mustBeSubmergedInWater = json.get("isSubmergedInWater")?.asBoolean
+            if (mustBeSubmergedInWater != null) {
+                conditionsList.add { mustBeSubmergedInWater == it.isSubmergedInWater }
+            }
+            val mustBeStandingOnRedSand = json.get("isStandingOnRedSand")?.asBoolean
+            if (mustBeStandingOnRedSand != null) {
+                conditionsList.add { mustBeStandingOnRedSand == it.isStandingOnRedSand() }
+            }
+            val mustBeStandingOnSand = json.get("isStandingOnSand")?.asBoolean
+            if (mustBeStandingOnSand != null) {
+                conditionsList.add { mustBeStandingOnSand == it.isStandingOnSand() }
+            }
+            val mustBeStandingOnSandOrRedSand = json.get("isStandingOnSandOrRedSand")?.asBoolean
+            if (mustBeStandingOnSandOrRedSand != null) {
+                conditionsList.add { mustBeStandingOnSandOrRedSand == it.isStandingOnSandOrRedSand() }
+            }
+            val mustBeDusk = json.get("isDusk")?.asBoolean
+            if (mustBeDusk != null) {
+                conditionsList.add { mustBeDusk == it.isDusk() }
+            }

            val poseCondition: ((PokemonEntity) -> Boolean)? = if (conditionsList.isEmpty()) null else conditionsList.reduce { acc, function -> { acc(it) && function(it) } }

@@ -19,6 +19,7 @@ import com.cobblemon.mod.common.entity.PoseType.Companion.STATIONARY_POSES
 import com.cobblemon.mod.common.entity.PoseType.Companion.UI_POSES
 import net.minecraft.client.model.ModelPart
 import net.minecraft.util.math.Vec3d
+
 class ArcanineModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, QuadrupedFrame {
    override val rootPart = root.registerChildWithAllChildren("arcanine")
    override val head = getPart("head")
@@ -37,7 +38,7 @@ class ArcanineModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Quad
    lateinit var standing: PokemonPose
    lateinit var walk: PokemonPose

-    //override val cryAnimation = CryProvider { _, _ -> bedrockStateful("arcanine", "cry") }
+    override val cryAnimation = CryProvider { _, _ -> bedrockStateful("arcanine", "cry") }

    override fun registerPoses() {
        val blink = quirk { bedrockStateful("arcanine", "blink") }
@@ -9,8 +9,8 @@
 package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen1

 import com.cobblemon.mod.common.client.render.models.blockbench.PoseableEntityState
-import com.cobblemon.mod.common.client.render.models.blockbench.animation.BipedWalkAnimation
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.BipedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPose
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPoseableModel
 import com.cobblemon.mod.common.entity.PoseType
@@ -37,6 +37,8 @@ class ChanseyModel(root: ModelPart) : PokemonPoseableModel(), BipedFrame {
    lateinit var sleep: PokemonPose
    lateinit var battleIdle: PokemonPose

+    override val cryAnimation = CryProvider { _, _ -> bedrockStateful("chansey", "cry") }
+
    override fun registerPoses() {
        val blink = quirk { bedrockStateful("chansey", "blink") }

@@ -50,6 +50,11 @@ class DodrioModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame {
        val blink1 = quirk { bedrockStateful("dodrio", "blink1") }
        val blink2 = quirk { bedrockStateful("dodrio", "blink2") }
        val blink3 = quirk { bedrockStateful("dodrio", "blink3") }
+        val bite1 = quirk(secondsBetweenOccurrences = 5F to 20F) { bedrockStateful("dodrio", "bite_quirk1") }
+        val bite2 = quirk(secondsBetweenOccurrences = 5F to 20F) { bedrockStateful("dodrio", "bite_quirk2") }
+        val bite3 = quirk(secondsBetweenOccurrences = 5F to 20F) { bedrockStateful("dodrio", "bite_quirk3") }
+
+
        sleep = registerPose(
            poseType = PoseType.SLEEP,
            idleAnimations = arrayOf(bedrock("dodrio", "sleep"))
@@ -83,7 +88,7 @@ class DodrioModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame {
            poseName = "battle_idle",
            poseTypes = PoseType.STATIONARY_POSES,
            transformTicks = 10,
-            quirks = arrayOf(blink1, blink2, blink3),
+            quirks = arrayOf(blink1, blink2, blink3, bite1, bite2, bite3),
            condition = { it.isBattling },
            idleAnimations = arrayOf(
                bedrock("dodrio", "battle_idle")
@@ -37,8 +37,8 @@ class DoduoModel (root: ModelPart) : PokemonPoseableModel() {
    override fun registerPoses() {
        val blink = quirk { bedrockStateful("doduo", "blink1") }
        val blink2 = quirk { bedrockStateful("doduo", "blink2") }
-        val bite = quirk { bedrockStateful("doduo", "bite_quirk1") }
-        val bite2 = quirk { bedrockStateful("doduo", "bite_quirk2") }
+        val bite = quirk(secondsBetweenOccurrences = 5F to 20F) { bedrockStateful("doduo", "bite_quirk1") }
+        val bite2 = quirk(secondsBetweenOccurrences = 5F to 20F) { bedrockStateful("doduo", "bite_quirk2") }

        sleep = registerPose(
            poseType = PoseType.SLEEP,
@@ -50,7 +50,7 @@ class DoduoModel (root: ModelPart) : PokemonPoseableModel() {
            poseTypes = STATIONARY_POSES + UI_POSES,
            transformTicks = 10,
            condition = { !it.isBattling },
-            quirks = arrayOf(blink, blink2, bite, bite2),
+            quirks = arrayOf(blink, blink2),
            idleAnimations = arrayOf(
                bedrock("doduo", "ground_idle")
            )
@@ -60,7 +60,7 @@ class DoduoModel (root: ModelPart) : PokemonPoseableModel() {
            poseName = "walking",
            poseTypes = MOVING_POSES,
            transformTicks = 10,
-            quirks = arrayOf(blink, blink2, bite, bite2),
+            quirks = arrayOf(blink, blink2),
            idleAnimations = arrayOf(
                bedrock("doduo", "ground_walk")
            )
@@ -8,6 +8,7 @@

 package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen1

+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPose
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPoseableModel
 import com.cobblemon.mod.common.entity.PoseType
@@ -26,6 +27,8 @@ class ElectrodeHisuianModel (root: ModelPart) : PokemonPoseableModel() {
    lateinit var standing: PokemonPose
    lateinit var walk: PokemonPose

+    override val cryAnimation = CryProvider { _, _ -> bedrockStateful("electrode_hisuian", "cry") }
+
    override fun registerPoses() {
        val blink = quirk { bedrockStateful("electrode_hisuian", "blink") }
        standing = registerPose(
@@ -29,7 +29,7 @@ class KabutoModel(root: ModelPart) : PokemonPoseableModel() {
    lateinit var standing: PokemonPose
    lateinit var walk: PokemonPose

-//    override val cryAnimation = CryProvider { _, _ -> bedrockStateful("kabuto", "cry") }
+    override val cryAnimation = CryProvider { _, _ -> bedrockStateful("kabuto", "cry") }

    override fun registerPoses() {
        val blink = quirk { bedrockStateful("kabuto", "blink") }
@@ -34,7 +34,7 @@ class KrabbyModel(root: ModelPart) : PokemonPoseableModel() {
    lateinit var standingBubbles: PokemonPose
    lateinit var standingRain: PokemonPose

-//    override val cryAnimation = CryProvider { _, _ -> bedrockStateful("krabby", "cry") }
+    override val cryAnimation = CryProvider { _, _ -> bedrockStateful("krabby", "cry") }

    override fun registerPoses() {
        val blink = quirk { bedrockStateful("krabby", "blink")}
@@ -41,7 +41,7 @@ class LaprasModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Quadru
    lateinit var underwaterIdle: PokemonPose
    lateinit var underwaterMove: PokemonPose

-    //override val cryAnimation = CryProvider { _, _ -> bedrockStateful("lapras", "cry") }
+    override val cryAnimation = CryProvider { _, _ -> bedrockStateful("lapras", "cry") }

    override fun registerPoses() {
        val blink = quirk { bedrockStateful("lapras", "blink") }
@@ -86,7 +86,7 @@ class LaprasModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Quadru
            quirks = arrayOf(blink),
            idleAnimations = arrayOf(
                singleBoneLook(),
-                bedrock("lapras", "surfacewater_idle")
+                bedrock("lapras", "surfacewater_swim")
            )
        )

@@ -106,7 +106,7 @@ class LaprasModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Quadru
            quirks = arrayOf(blink),
            idleAnimations = arrayOf(
                singleBoneLook(),
-                bedrock("lapras", "surfacewater_idle")
+                bedrock("lapras", "surfacewater_swim")
            )
        )
    }
@@ -58,7 +58,6 @@ class RattataAlolanModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame,
            poseTypes = setOf(PoseType.NONE, PoseType.PROFILE, PoseType.STAND, PoseType.FLOAT, PoseType.PORTRAIT, PoseType.SHOULDER_LEFT, PoseType.SHOULDER_RIGHT),
            transformTicks = 10,
            quirks = arrayOf(blink),
-            condition = { !it.dataTracker.get(PokemonEntity.MOVING) },
            idleAnimations = arrayOf(
                singleBoneLook(),
                bedrock("rattata_alolan", "ground_idle")
@@ -69,7 +68,6 @@ class RattataAlolanModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame,
            poseType = PoseType.WALK,
            transformTicks = 10,
            quirks = arrayOf(blink),
-            condition = { it.dataTracker.get(PokemonEntity.MOVING) },
            idleAnimations = arrayOf(
                singleBoneLook(),
                bedrock("rattata_alolan", "ground_walk")
@@ -57,7 +57,6 @@ class RattataModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Quadr
            poseTypes = setOf(PoseType.NONE, PoseType.PROFILE, PoseType.STAND, PoseType.FLOAT, PoseType.PORTRAIT, PoseType.SHOULDER_LEFT, PoseType.SHOULDER_RIGHT),
            transformTicks = 10,
            quirks = arrayOf(blink),
-            condition = { !it.dataTracker.get(PokemonEntity.MOVING) },
            idleAnimations = arrayOf(
                singleBoneLook(),
                bedrock("rattata", "ground_idle")
@@ -68,7 +67,6 @@ class RattataModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Quadr
            poseType = PoseType.WALK,
            transformTicks = 10,
            quirks = arrayOf(blink),
-            condition = { it.dataTracker.get(PokemonEntity.MOVING) },
            idleAnimations = arrayOf(
                singleBoneLook(),
                bedrock("rattata", "ground_walk")
@@ -45,7 +45,7 @@ class ScytherModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Biped
    lateinit var hover: PokemonPose
    lateinit var fly: PokemonPose

-    override val cryAnimation = CryProvider { _, _ -> bedrockStateful("voltorb", "cry") }
+    override val cryAnimation = CryProvider { _, _ -> bedrockStateful("scyther", "cry") }

    override fun registerPoses() {
        val blink = quirk { bedrockStateful("scyther", "blink")}
@@ -9,6 +9,7 @@
 package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen1

 import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPose
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPoseableModel
 import com.cobblemon.mod.common.entity.PoseType.Companion.MOVING_POSES
@@ -30,6 +31,8 @@ class SnorlaxModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame {
    lateinit var standing: PokemonPose
    lateinit var walk: PokemonPose

+    override val cryAnimation = CryProvider { _, _ -> bedrockStateful("snorlax", "cry") }
+
    override fun registerPoses() {
        standing = registerPose(
            poseName = "standing",
@@ -10,6 +10,7 @@ package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen1

 import com.cobblemon.mod.common.client.render.models.blockbench.animation.BipedWalkAnimation
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.BipedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPose
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPoseableModel
 import com.cobblemon.mod.common.entity.PoseType.Companion.MOVING_POSES
@@ -33,6 +34,9 @@ class TangelaModel(root: ModelPart) : PokemonPoseableModel(), BipedFrame {
    lateinit var standing: PokemonPose
    lateinit var walk: PokemonPose

+    override val cryAnimation = CryProvider { _, _ -> bedrockStateful("tangela", "cry") }
+    // Animating illegally rn. Created a new file for this cry. hope it works
+
    override fun registerPoses() {
        standing = registerPose(
            poseName = "standing",
@@ -8,6 +8,7 @@

 package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen1

+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPose
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPoseableModel
 import com.cobblemon.mod.common.entity.PoseType
@@ -26,6 +27,8 @@ class VoltorbHisuianModel (root: ModelPart) : PokemonPoseableModel() {
    lateinit var standing: PokemonPose
    lateinit var walk: PokemonPose

+    override val cryAnimation = CryProvider { _, _ -> bedrockStateful("voltorb_hisuian", "cry") }
+
    override fun registerPoses() {
        val blink = quirk { bedrockStateful("voltorb_hisuian", "blink") }

@@ -0,0 +1,83 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen2
+
+import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPose
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPoseableModel
+import com.cobblemon.mod.common.entity.PoseType
+import net.minecraft.client.model.ModelPart
+import net.minecraft.util.math.Vec3d
+
+class CyndaquilHisuiBiasModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame {
+    override val rootPart = root.registerChildWithAllChildren("cyndaquil_hisui_bias")
+    override val head = getPart("head")
+
+    override var portraitScale = 1.4F
+    override var portraitTranslation = Vec3d(-0.26, 0.0, 0.0)
+
+    override var profileScale = 0.65F
+    override var profileTranslation = Vec3d(0.0, 0.8, 0.0)
+
+    lateinit var standing: PokemonPose
+    lateinit var walking: PokemonPose
+    lateinit var sleep: PokemonPose
+    lateinit var battleidle: PokemonPose
+
+    override val cryAnimation = CryProvider { entity, _ -> if (entity.isBattling) bedrockStateful("cyndaquil_hisui_bias", "battle_cry") else bedrockStateful("cyndaquil_hisui_bias", "cry") }
+
+    override fun registerPoses() {
+//        val sneeze = quirk { bedrockStateful("cyndaquil_hisui_bias", "sneeze_quirk") }
+
+        sleep = registerPose(
+                poseType = PoseType.SLEEP,
+                idleAnimations = arrayOf(bedrock("cyndaquil_hisui_bias", "sleep"))
+        )
+
+        standing = registerPose(
+                poseName = "standing",
+                poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES,
+                transformTicks = 10,
+                condition = { !it.isBattling },
+//            quirks = arrayOf(sneeze),
+                idleAnimations = arrayOf(
+                        singleBoneLook(),
+                        bedrock("cyndaquil_hisui_bias", "ground_idle")
+                )
+        )
+
+        walking = registerPose(
+                poseName = "walking",
+                poseTypes = PoseType.MOVING_POSES,
+                transformTicks = 10,
+//            quirks = arrayOf(sneeze),
+                idleAnimations = arrayOf(
+                        singleBoneLook(),
+                        bedrock("cyndaquil_hisui_bias", "ground_walk")
+                )
+        )
+
+        battleidle = registerPose(
+                poseName = "battle_idle",
+                poseTypes = PoseType.STATIONARY_POSES,
+                transformTicks = 10,
+//            quirks = arrayOf(sneeze),
+                condition = { it.isBattling },
+                idleAnimations = arrayOf(
+                        singleBoneLook(minPitch = 0F),
+                        bedrock("cyndaquil_hisui_bias", "battle_idle")
+                )
+        )
+    }
+//    override fun getFaintAnimation(
+//        pokemonEntity: PokemonEntity,
+//        state: PoseableEntityState<PokemonEntity>
+//    ) = if (state.isPosedIn(standing, walking, battleidle, sleep)) bedrockStateful("cyndaquil_hisui_bias", "faint") else null
+}
@@ -71,7 +71,7 @@ class CyndaquilModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame {
 //            quirks = arrayOf(sneeze),
            condition = { it.isBattling },
            idleAnimations = arrayOf(
-                singleBoneLook(),
+                singleBoneLook(minPitch = 0F),
                bedrock("cyndaquil", "battle_idle")
            )
        )
@@ -12,6 +12,7 @@ import com.cobblemon.mod.common.client.render.models.blockbench.animation.Bimanu
 import com.cobblemon.mod.common.client.render.models.blockbench.animation.BipedWalkAnimation
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.BimanualFrame
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.BipedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPose
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPoseableModel
 import com.cobblemon.mod.common.entity.PoseType
@@ -38,6 +39,8 @@ class ElekidModel(root: ModelPart) : PokemonPoseableModel(), BipedFrame, Bimanua
    lateinit var walk: PokemonPose
    lateinit var sleep: PokemonPose

+    override val cryAnimation = CryProvider { _, _ -> bedrockStateful("elekid", "cry") }
+
    override fun registerPoses() {
        val blink = quirk { bedrockStateful("elekid", "blink") }

@@ -10,6 +10,7 @@ package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen2

 import com.cobblemon.mod.common.client.render.models.blockbench.animation.BipedWalkAnimation
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.BipedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPose
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPoseableModel
 import com.cobblemon.mod.common.entity.PoseType.Companion.FLYING_POSES
@@ -35,6 +36,8 @@ class GligarModel(root: ModelPart) : PokemonPoseableModel(), BipedFrame {
    lateinit var battling: PokemonPose
    lateinit var walk: PokemonPose

+    override val cryAnimation = CryProvider { _, _ -> bedrockStateful("gligar", "cry") }
+
    override fun registerPoses() {

        val blink = quirk { bedrockStateful("gligar", "blink") }
@@ -8,6 +8,7 @@

 package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen2

+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPose
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPoseableModel
 import com.cobblemon.mod.common.entity.PoseType.Companion.MOVING_POSES
@@ -28,6 +29,8 @@ class IgglybuffModel(root: ModelPart) : PokemonPoseableModel() {
    lateinit var standing: PokemonPose
    lateinit var walk: PokemonPose

+    override val cryAnimation = CryProvider { _, _ -> bedrockStateful("igglybuff", "cry") }
+
    override fun registerPoses() {
        val blink = quirk { bedrockStateful("igglybuff", "blink") }
        standing = registerPose(
@@ -13,6 +13,7 @@ import com.cobblemon.mod.common.client.render.models.blockbench.animation.BipedW
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.BimanualFrame
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.BipedFrame
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPose
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPoseableModel
 import com.cobblemon.mod.common.entity.PoseType
@@ -37,6 +38,8 @@ class LarvitarModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bipe
    lateinit var standing: PokemonPose
    lateinit var walk: PokemonPose

+    override val cryAnimation = CryProvider { _, _ -> bedrockStateful("larvitar", "cry") }
+
    override fun registerPoses() {
        val blink = quirk { bedrockStateful("larvitar", "blink") }
        standing = registerPose(
@@ -8,6 +8,7 @@

 package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen2

+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPose
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPoseableModel
 import com.cobblemon.mod.common.entity.PoseType
@@ -30,6 +31,8 @@ class PiloswineModel(root: ModelPart) : PokemonPoseableModel() {
    lateinit var standing: PokemonPose
    lateinit var walk: PokemonPose

+    override val cryAnimation = CryProvider { _, _ -> bedrockStateful("piloswine", "cry") }
+
    override fun registerPoses() {
 //        sleep = registerPose(
 //            poseType = PoseType.SLEEP,
@@ -12,6 +12,7 @@ import com.cobblemon.mod.common.client.render.models.blockbench.animation.Bimanu
 import com.cobblemon.mod.common.client.render.models.blockbench.animation.BipedWalkAnimation
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.BimanualFrame
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.BipedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPose
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPoseableModel
 import com.cobblemon.mod.common.entity.PoseType
@@ -30,6 +31,8 @@ class PupitarModel(root: ModelPart) : PokemonPoseableModel(){
    lateinit var standing: PokemonPose
    lateinit var walk: PokemonPose

+    override val cryAnimation = CryProvider { _, _ -> bedrockStateful("pupitar", "cry") }
+
    override fun registerPoses() {
        val blink = quirk { bedrockStateful("pupitar", "blink") }
        standing = registerPose(
@@ -0,0 +1,87 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen2
+
+import com.cobblemon.mod.common.client.render.models.blockbench.animation.PrimaryAnimation
+import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPose
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPoseableModel
+import com.cobblemon.mod.common.entity.PoseType
+import net.minecraft.client.model.ModelPart
+import net.minecraft.util.math.Vec3d
+
+class QuilavaHisuiBiasModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame {
+    override val rootPart = root.registerChildWithAllChildren("quilava_hisui_bias")
+    override val head = getPart("head")
+
+    override var portraitScale = 1.5F
+    override var portraitTranslation = Vec3d(-0.65, -0.6, 0.0)
+
+    override var profileScale = 0.7F
+    override var profileTranslation = Vec3d(0.0, 0.65, 0.0)
+
+    lateinit var standing: PokemonPose
+    lateinit var walking: PokemonPose
+    lateinit var sleep: PokemonPose
+    lateinit var battleidle: PokemonPose
+
+    override val cryAnimation = CryProvider { entity, _ -> if (entity.isBattling) bedrockStateful("quilava_hisui_bias", "battle_cry") else PrimaryAnimation(bedrockStateful("quilava_hisui_bias", "cry")) }
+
+    override fun registerPoses() {
+        val blink = quirk { bedrockStateful("quilava_hisui_bias", "blink") }
+
+        sleep = registerPose(
+                poseType = PoseType.SLEEP,
+                idleAnimations = arrayOf(bedrock("quilava_hisui_bias", "sleep"))
+        )
+
+        standing = registerPose(
+                poseName = "standing",
+                poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES,
+                transformTicks = 10,
+                condition = { !it.isBattling },
+                quirks = arrayOf(blink),
+                idleAnimations = arrayOf(
+                        singleBoneLook(),
+                        bedrock("quilava_hisui_bias", "fire_idle"),
+                        bedrock("quilava_hisui_bias", "ground_idle")
+                )
+        )
+
+        walking = registerPose(
+                poseName = "walking",
+                poseTypes = PoseType.MOVING_POSES,
+                transformTicks = 10,
+                quirks = arrayOf(blink),
+                idleAnimations = arrayOf(
+                        singleBoneLook(),
+                        bedrock("quilava_hisui_bias", "fire_idle"),
+                        bedrock("quilava_hisui_bias", "ground_walk")
+                )
+        )
+
+        battleidle = registerPose(
+                poseName = "battle_idle",
+                poseTypes = PoseType.STATIONARY_POSES,
+                transformTicks = 10,
+                quirks = arrayOf(blink),
+                condition = { it.isBattling },
+                idleAnimations = arrayOf(
+                        singleBoneLook(),
+                        bedrock("quilava_hisui_bias", "fire_idle"),
+                        bedrock("quilava_hisui_bias", "battle_idle")
+                )
+        )
+    }
+//    override fun getFaintAnimation(
+//        pokemonEntity: PokemonEntity,
+//        state: PoseableEntityState<PokemonEntity>
+//    ) = if (state.isPosedIn(standing, walking, battleidle, sleep)) bedrockStateful("quilava_hisui_bias", "faint") else null
+}
@@ -11,6 +11,7 @@ package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen2
 import com.cobblemon.mod.common.client.render.models.blockbench.animation.WaveAnimation
 import com.cobblemon.mod.common.client.render.models.blockbench.animation.WaveSegment
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPose
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPoseableModel
 import com.cobblemon.mod.common.client.render.models.blockbench.pose.ModelPartTransformation
@@ -36,6 +37,8 @@ class QwilfishHisuianModel (root: ModelPart) : PokemonPoseableModel(), HeadedFra
    lateinit var standing: PokemonPose
    lateinit var walk: PokemonPose

+    override val cryAnimation = CryProvider { _, _ -> bedrockStateful("qwilfish_hisuian", "cry") }
+
    override fun registerPoses() {
        val blink = quirk { bedrockStateful("qwilfish_hisuian", "blink") }

@@ -12,6 +12,7 @@ import com.cobblemon.mod.common.client.render.models.blockbench.animation.WaveAn
 import com.cobblemon.mod.common.client.render.models.blockbench.animation.WaveSegment
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.BiWingedFrame
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPose
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPoseableModel
 import com.cobblemon.mod.common.client.render.models.blockbench.pose.ModelPartTransformation
@@ -37,6 +38,8 @@ class QwilfishModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame  {
    lateinit var standing: PokemonPose
    lateinit var walk: PokemonPose

+    override val cryAnimation = CryProvider { _, _ -> bedrockStateful("qwilfish", "cry") }
+
    override fun registerPoses() {
        val blink = quirk { bedrockStateful("qwilfish", "blink") }

@@ -13,6 +13,7 @@ import com.cobblemon.mod.common.client.render.models.blockbench.animation.BipedW
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.BimanualFrame
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.BipedFrame
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPose
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPoseableModel
 import com.cobblemon.mod.common.entity.PoseType
@@ -37,6 +38,8 @@ class SneaselHisuianModel (root: ModelPart) : PokemonPoseableModel(), HeadedFram
    lateinit var standing: PokemonPose
    lateinit var walk: PokemonPose

+    override val cryAnimation = CryProvider { _, _ -> bedrockStateful("sneasel_hisuian", "cry") }
+
    override fun registerPoses() {
        val blink = quirk { bedrockStateful("sneasel_hisuian", "blink") }

@@ -13,6 +13,7 @@ import com.cobblemon.mod.common.client.render.models.blockbench.animation.BipedW
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.BimanualFrame
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.BipedFrame
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPose
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPoseableModel
 import com.cobblemon.mod.common.entity.PoseType
@@ -37,6 +38,8 @@ class SneaselModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bipe
    lateinit var standing: PokemonPose
    lateinit var walk: PokemonPose

+    override val cryAnimation = CryProvider { _, _ -> bedrockStateful("sneasel", "cry") }
+
    override fun registerPoses() {
        val blink = quirk { bedrockStateful("sneasel", "blink") }
        standing = registerPose(
@@ -46,7 +46,7 @@ class SudowoodoModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bip
            poseTypes = STATIONARY_POSES + UI_POSES,
            quirks = arrayOf(blink),
            idleAnimations = arrayOf(
-                singleBoneLook(),
+                singleBoneLook(yawMultiplier = 0F),
                bedrock("sudowoodo", "ground_idle")
            )
        )
@@ -56,7 +56,7 @@ class SudowoodoModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bip
            poseTypes = MOVING_POSES,
            quirks = arrayOf(blink),
            idleAnimations = arrayOf(
-                singleBoneLook(),
+                singleBoneLook(yawMultiplier = 0F),
                bedrock("sudowoodo", "ground_idle"),
                BipedWalkAnimation(this, periodMultiplier = 0.6F, amplitudeMultiplier = 0.9F),
                BimanualSwingAnimation(this, swingPeriodMultiplier = 0.6F, amplitudeMultiplier = 0.9F)
@@ -8,6 +8,7 @@

 package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen2

+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPose
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPoseableModel
 import com.cobblemon.mod.common.entity.PoseType
@@ -30,6 +31,8 @@ class SwinubModel(root: ModelPart) : PokemonPoseableModel() {
    lateinit var standing: PokemonPose
    lateinit var walk: PokemonPose

+    override val cryAnimation = CryProvider { _, _ -> bedrockStateful("swinub", "cry") }
+
    override fun registerPoses() {
 //        sleep = registerPose(
 //            poseType = PoseType.SLEEP,
@@ -66,7 +66,7 @@ class TyphlosionHisuianModel  (root: ModelPart) : PokemonPoseableModel(), Headed
                        spoopy_orb3.createTransformation().withVisibility(visibility = false)
                ),
                idleAnimations = arrayOf(
-                        singleBoneLook(),
+                        singleBoneLook(minPitch = 0F),
                        bedrock("typhlosion_hisuian", "ground_idle")
                )
        )
@@ -83,7 +83,7 @@ class TyphlosionHisuianModel  (root: ModelPart) : PokemonPoseableModel(), Headed
                        spoopy_orb3.createTransformation().withVisibility(visibility = false)
                ),
                idleAnimations = arrayOf(
-                        singleBoneLook(),
+                        singleBoneLook(minPitch = 0F),
                        bedrock("typhlosion_hisuian", "ground_walk")
                )
        )
@@ -101,7 +101,7 @@ class TyphlosionHisuianModel  (root: ModelPart) : PokemonPoseableModel(), Headed
                ),
                condition = { it.isBattling },
                idleAnimations = arrayOf(
-                        singleBoneLook(),
+                        singleBoneLook(minPitch = 0F),
                        bedrock("typhlosion_hisuian", "battle_idle")
                )
        )
@@ -48,7 +48,7 @@ class TyphlosionModel  (root: ModelPart) : PokemonPoseableModel(), HeadedFrame {
            condition = { !it.isBattling },
            quirks = arrayOf(blink),
            idleAnimations = arrayOf(
-                singleBoneLook(),
+                singleBoneLook(minPitch = 0F),
                bedrock("typhlosion", "ground_idle")
            )
        )
@@ -59,7 +59,7 @@ class TyphlosionModel  (root: ModelPart) : PokemonPoseableModel(), HeadedFrame {
            transformTicks = 10,
            quirks = arrayOf(blink),
            idleAnimations = arrayOf(
-                singleBoneLook(),
+                singleBoneLook(minPitch = 0F),
                bedrock("typhlosion", "ground_walk")
            )
        )
@@ -71,7 +71,7 @@ class TyphlosionModel  (root: ModelPart) : PokemonPoseableModel(), HeadedFrame {
            quirks = arrayOf(blink),
            condition = { it.isBattling },
            idleAnimations = arrayOf(
-                singleBoneLook(),
+                singleBoneLook(minPitch = 0F),
                bedrock("typhlosion", "battle_idle")
            )
        )
@@ -13,6 +13,7 @@ import com.cobblemon.mod.common.client.render.models.blockbench.animation.BipedW
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.BimanualFrame
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.BipedFrame
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPose
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPoseableModel
 import com.cobblemon.mod.common.entity.PoseType
@@ -37,6 +38,8 @@ class TyranitarModel(root: ModelPart) : PokemonPoseableModel(), BipedFrame, Bima
    lateinit var standing: PokemonPose
    lateinit var walk: PokemonPose

+    override val cryAnimation = CryProvider { _, _ -> bedrockStateful("tyranitar", "cry") }
+
    override fun registerPoses() {
        val blink = quirk { bedrockStateful("tyranitar", "blink") }
        standing = registerPose(
@@ -11,6 +11,7 @@ package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen2
 import com.cobblemon.mod.common.client.render.models.blockbench.createTransformation
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.BiWingedFrame
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPose
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPoseableModel
 import com.cobblemon.mod.common.client.render.models.blockbench.pose.ModelPartTransformation.Companion.Y_AXIS
@@ -35,6 +36,8 @@ class YanmaModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame {
    lateinit var standing: PokemonPose
    lateinit var walk: PokemonPose

+    override val cryAnimation = CryProvider { _, _ -> bedrockStateful("yanma", "cry") }
+
    override fun registerPoses() {
        val wingFrame1 = object : BiWingedFrame {
            override val rootPart = this@YanmaModel.rootPart
@@ -13,6 +13,7 @@ import com.cobblemon.mod.common.client.render.models.blockbench.animation.BipedW
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.BimanualFrame
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.BipedFrame
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPose
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPoseableModel
 import com.cobblemon.mod.common.entity.PoseType
@@ -37,6 +38,8 @@ class AggronModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Biman
    lateinit var standing: PokemonPose
    lateinit var walking: PokemonPose

+    override val cryAnimation = CryProvider { _, _ -> bedrockStateful("aggron", "cry") }
+
    override fun registerPoses() {

        standing = registerPose(
@@ -11,6 +11,7 @@ package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen3
 import com.cobblemon.mod.common.client.render.models.blockbench.animation.QuadrupedWalkAnimation
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.QuadrupedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPose
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPoseableModel
 import com.cobblemon.mod.common.entity.PoseType
@@ -35,6 +36,8 @@ class AronModel  (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Quadru
    lateinit var standing: PokemonPose
    lateinit var walk: PokemonPose

+    override val cryAnimation = CryProvider { _, _ -> bedrockStateful("aron", "cry") }
+
    override fun registerPoses() {
        val blink = quirk { bedrockStateful("aron", "blink") }

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

 package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen3

+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPose
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPoseableModel
 import com.cobblemon.mod.common.entity.PoseType
@@ -30,6 +31,8 @@ class BarboachModel (root: ModelPart) : PokemonPoseableModel() {
    lateinit var watersleep: PokemonPose
    lateinit var battleidle: PokemonPose

+    override val cryAnimation = CryProvider { _, _ -> bedrockStateful("barboach", "cry") }
+
    override fun registerPoses() {
        val blink = quirk { bedrockStateful("barboach", "blink") }

@@ -10,6 +10,7 @@ package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen3

 import com.cobblemon.mod.common.client.render.models.blockbench.frame.BimanualFrame
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.BipedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPose
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPoseableModel
 import com.cobblemon.mod.common.entity.PoseType
@@ -35,6 +36,8 @@ class CacneaModel (root: ModelPart) : PokemonPoseableModel(), BimanualFrame, Bip
    lateinit var sleep: PokemonPose
    lateinit var battleidle: PokemonPose

+    override val cryAnimation = CryProvider { _, _ -> bedrockStateful("cacnea", "cry") }
+
    override fun registerPoses() {
        val blink = quirk { bedrockStateful("cacnea", "blink") }
        sleep = registerPose(
@@ -11,6 +11,7 @@ package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen3
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.BimanualFrame
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.BipedFrame
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPose
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPoseableModel
 import com.cobblemon.mod.common.entity.PoseType
@@ -37,6 +38,8 @@ class CacturneModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bim
    lateinit var sleep: PokemonPose
    lateinit var battleidle: PokemonPose

+    override val cryAnimation = CryProvider { _, _ -> bedrockStateful("cacturne", "cry") }
+
    override fun registerPoses() {
        val blink = quirk { bedrockStateful("cacturne", "blink") }
        sleep = registerPose(
@@ -9,6 +9,7 @@
 package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen3

 import com.cobblemon.mod.common.client.render.models.blockbench.PoseableEntityState
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPose
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPoseableModel
 import com.cobblemon.mod.common.entity.PoseType
@@ -29,6 +30,8 @@ class ChimechoModel(root: ModelPart) : PokemonPoseableModel() {
    lateinit var hover: PokemonPose
    lateinit var fly: PokemonPose

+    override val cryAnimation = CryProvider { _, _ -> bedrockStateful("chimecho", "cry") }
+
    override fun registerPoses() {
        val blink = quirk { bedrockStateful("chimecho", "blink") }
        sleep = registerPose(
@@ -9,6 +9,7 @@
 package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen3

 import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPose
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPoseableModel
 import com.cobblemon.mod.common.entity.PoseType
@@ -31,6 +32,8 @@ class CradilyModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame {
 //    lateinit var waterIdle: PokemonPose
 //    lateinit var waterSwim: PokemonPose

+    override val cryAnimation = CryProvider { _, _ -> bedrockStateful("cradily", "cry") }
+
    override fun registerPoses() {
        val blink = quirk { bedrockStateful("cradily", "blink") }

@@ -13,6 +13,7 @@ import com.cobblemon.mod.common.client.render.models.blockbench.animation.WingFl
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.BiWingedFrame
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.BipedFrame
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPose
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPoseableModel
 import com.cobblemon.mod.common.client.render.models.blockbench.pose.ModelPartTransformation
@@ -39,6 +40,8 @@ class FlygonModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, BiWin
    lateinit var walk: PokemonPose
    lateinit var hover: PokemonPose

+    override val cryAnimation = CryProvider { _, _ -> bedrockStateful("flygon", "cry") }
+
    override fun registerPoses() {
        val blink = quirk { bedrockStateful("flygon", "blink") }

@@ -37,7 +37,7 @@ class GrovyleModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bipe
    lateinit var standing: PokemonPose
    lateinit var walk: PokemonPose

-    //override val cryAnimation = CryProvider { _, _ -> bedrockStateful("grovyle", "cry") }
+    override val cryAnimation = CryProvider { _, _ -> bedrockStateful("grovyle", "cry") }

    override fun registerPoses() {
        //sleep = registerPose(
@@ -11,6 +11,7 @@ package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen3
 import com.cobblemon.mod.common.client.render.models.blockbench.animation.QuadrupedWalkAnimation
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.QuadrupedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPose
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPoseableModel
 import com.cobblemon.mod.common.entity.PoseType
@@ -35,6 +36,8 @@ class LaironModel  (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Quad
    lateinit var standing: PokemonPose
    lateinit var walk: PokemonPose

+    override val cryAnimation = CryProvider { _, _ -> bedrockStateful("lairon", "cry") }
+
    override fun registerPoses() {
        val blink = quirk { bedrockStateful("lairon", "blink") }

@@ -9,6 +9,7 @@
 package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen3

 import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPose
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPoseableModel
 import com.cobblemon.mod.common.entity.PoseType
@@ -31,6 +32,8 @@ class LileepModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame {
    lateinit var waterIdle: PokemonPose
    lateinit var waterSwim: PokemonPose

+    override val cryAnimation = CryProvider { _, _ -> bedrockStateful("lileep", "cry") }
+
    override fun registerPoses() {
        val blink = quirk { bedrockStateful("lileep", "blink") }

@@ -37,7 +37,7 @@ class SceptileModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bip
    lateinit var standing: PokemonPose
    lateinit var walk: PokemonPose

-    //override val cryAnimation = CryProvider { _, _ -> bedrockStateful("sceptile", "cry") }
+    override val cryAnimation = CryProvider { _, _ -> bedrockStateful("sceptile", "cry") }

    override fun registerPoses() {
       // sleep = registerPose(
@@ -11,6 +11,7 @@ package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen3
 import com.cobblemon.mod.common.client.render.models.blockbench.animation.QuadrupedWalkAnimation
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.QuadrupedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPose
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPoseableModel
 import com.cobblemon.mod.common.entity.PoseType
@@ -35,6 +36,8 @@ class TrapinchModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Qua
    lateinit var standing: PokemonPose
    lateinit var walk: PokemonPose

+    override val cryAnimation = CryProvider { _, _ -> bedrockStateful("trapinch", "cry") }
+
    override fun registerPoses() {
        val blink = quirk { bedrockStateful("trapinch", "blink") }

@@ -8,29 +8,23 @@

 package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen3

-import com.cobblemon.mod.common.client.render.models.blockbench.PoseableEntityState
-import com.cobblemon.mod.common.client.render.models.blockbench.frame.BipedFrame
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPose
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPoseableModel
 import com.cobblemon.mod.common.entity.PoseType
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import net.minecraft.client.model.ModelPart
 import net.minecraft.util.math.Vec3d

-class TreeckoModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, BipedFrame {
+class TreeckoModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame {
    override val rootPart = root.registerChildWithAllChildren("treecko")
    override val head = getPart("head")

-    override val leftLeg = getPart("leg_left")
-    override val rightLeg = getPart("leg_right")
+    override var portraitScale = 2.25F
+    override var portraitTranslation = Vec3d(0.02, 0.12, 0.0)

-    override var portraitScale = 2.8F
-    override var portraitTranslation = Vec3d(0.05, -0.55, 0.0)
-
-    override var profileScale = 0.85F
-    override var profileTranslation = Vec3d(0.0, 0.5, 0.0)
+    override var profileScale = 0.74F
+    override var profileTranslation = Vec3d(0.0, 0.6, 0.0)

    lateinit var sleep: PokemonPose
    lateinit var standing: PokemonPose
@@ -39,15 +33,15 @@ class TreeckoModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bipe
    override val cryAnimation = CryProvider { _, _ -> bedrockStateful("treecko", "cry") }

    override fun registerPoses() {
-        sleep = registerPose(
-            poseType = PoseType.SLEEP,
-            idleAnimations = arrayOf(bedrock("treecko", "sleep"))
-        )
+        //sleep = registerPose(
+        //    poseType = PoseType.SLEEP,
+        //    idleAnimations = arrayOf(bedrock("treecko", "sleep"))
+        //)

        val blink = quirk { bedrockStateful("treecko", "blink") }
        standing = registerPose(
            poseName = "standing",
-            poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES,
+            poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES + PoseType.SLEEP,
            quirks = arrayOf(blink),
            idleAnimations = arrayOf(
                singleBoneLook(),
@@ -65,8 +59,8 @@ class TreeckoModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bipe
            )
        )
    }
-    override fun getFaintAnimation(
-        pokemonEntity: PokemonEntity,
-        state: PoseableEntityState<PokemonEntity>
-    ) = if (state.isNotPosedIn(sleep)) bedrockStateful("treecko", "faint") else null
+    //override fun getFaintAnimation(
+    //    pokemonEntity: PokemonEntity,
+    //    state: PoseableEntityState<PokemonEntity>
+    //) = if (state.isNotPosedIn(sleep)) bedrockStateful("treecko", "faint") else null
 }
@@ -11,6 +11,7 @@ package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen3
 import com.cobblemon.mod.common.client.render.models.blockbench.animation.QuadrupedWalkAnimation
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.QuadrupedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPose
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPoseableModel
 import com.cobblemon.mod.common.entity.PoseType
@@ -35,6 +36,8 @@ class TropiusModel  (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Qua
    lateinit var standing: PokemonPose
    lateinit var walk: PokemonPose

+    override val cryAnimation = CryProvider { _, _ -> bedrockStateful("tropius", "cry") }
+
    override fun registerPoses() {
        val blink = quirk { bedrockStateful("tropius", "blink") }
        standing = registerPose(
@@ -13,6 +13,7 @@ import com.cobblemon.mod.common.client.render.models.blockbench.createTransforma
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.BiWingedFrame
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.QuadrupedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPose
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPoseableModel
 import com.cobblemon.mod.common.client.render.models.blockbench.pose.ModelPartTransformation
@@ -40,6 +41,8 @@ class VibravaModel  (root: ModelPart) : PokemonPoseableModel(), QuadrupedFrame,
    lateinit var standing: PokemonPose
    lateinit var walk: PokemonPose

+    override val cryAnimation = CryProvider { _, _ -> bedrockStateful("vibrava", "cry") }
+
    val wing_front_left = getPart("wing_front_left")
    val wing_front_right = getPart("wing_front_right")

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

 package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen3

+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPose
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPoseableModel
 import com.cobblemon.mod.common.entity.PoseType
@@ -26,6 +27,8 @@ class WhiscashModel (root: ModelPart) : PokemonPoseableModel() {
    lateinit var standing: PokemonPose
    lateinit var walk: PokemonPose

+    override val cryAnimation = CryProvider { _, _ -> bedrockStateful("whiscash", "cry") }
+
    override fun registerPoses() {
        standing = registerPose(
            poseName = "standing",
@@ -9,6 +9,7 @@
 package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen3

 import com.cobblemon.mod.common.client.render.models.blockbench.animation.QuadrupedWalkAnimation
+import com.cobblemon.mod.common.client.render.models.blockbench.createTransformation
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.QuadrupedFrame
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPose
@@ -34,6 +35,12 @@ class ZigzagoonGalarianModel (root: ModelPart) : PokemonPoseableModel(), HeadedF

    lateinit var standing: PokemonPose
    lateinit var walk: PokemonPose
+    lateinit var shoulderLeft: PokemonPose
+    lateinit var shoulderRight: PokemonPose
+
+    val shoulderOffsetX = 0
+    val shoulderOffsetY = 0
+    val shoulderOffsetZ = -0.5

    override fun registerPoses() {
        val blink = quirk { bedrockStateful("zigzagoon_galarian", "blink") }
@@ -57,6 +64,30 @@ class ZigzagoonGalarianModel (root: ModelPart) : PokemonPoseableModel(), HeadedF
                bedrock("zigzagoon_galarian", "ground_idle")
            )
        )
+
+        shoulderLeft = registerPose(
+                poseType = PoseType.SHOULDER_LEFT,
+                quirks = arrayOf(blink),
+                idleAnimations = arrayOf(
+                        singleBoneLook(),
+                        bedrock("zigzagoon", "shoulder_left")
+                ),
+                transformedParts = arrayOf(
+                        rootPart.createTransformation().addPosition(shoulderOffsetX, shoulderOffsetY, shoulderOffsetZ)
+                )
+        )
+
+        shoulderRight = registerPose(
+                poseType = PoseType.SHOULDER_RIGHT,
+                quirks = arrayOf(blink),
+                idleAnimations = arrayOf(
+                        singleBoneLook(),
+                        bedrock("zigzagoon", "shoulder_right")
+                ),
+                transformedParts = arrayOf(
+                        rootPart.createTransformation().addPosition(-shoulderOffsetX, shoulderOffsetY, shoulderOffsetZ)
+                )
+        )
    }

 //    override fun getFaintAnimation(
@@ -12,6 +12,7 @@ import com.cobblemon.mod.common.client.render.models.blockbench.animation.Quadru
 import com.cobblemon.mod.common.client.render.models.blockbench.createTransformation
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.QuadrupedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPose
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPoseableModel
 import com.cobblemon.mod.common.client.render.models.blockbench.pose.ModelPartTransformation
@@ -43,6 +44,8 @@ class BibarelModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Quadr

    val wateroffset = -1

+    override val cryAnimation = CryProvider { _, _ -> bedrockStateful("bibarel", "cry") }
+
    override fun registerPoses() {
        val blink = quirk { bedrockStateful("bibarel", "blink") }
        standing = registerPose(
@@ -13,6 +13,7 @@ import com.cobblemon.mod.common.client.render.models.blockbench.PoseableEntitySt
 import com.cobblemon.mod.common.client.render.models.blockbench.createTransformation
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.QuadrupedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPose
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPoseableModel
 import com.cobblemon.mod.common.client.render.models.blockbench.pose.ModelPartTransformation
@@ -47,6 +48,8 @@ class BidoofModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Quadru

    val wateroffset = -2

+    override val cryAnimation = CryProvider { _, _ -> bedrockStateful("bidoof", "cry") }
+
    override fun registerPoses() {
        val blink = quirk { bedrockStateful("bidoof", "blink") }

@@ -15,6 +15,7 @@ import com.cobblemon.mod.common.client.render.models.blockbench.createTransforma
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.BimanualFrame
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.BipedFrame
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPose
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPoseableModel
 import com.cobblemon.mod.common.client.render.models.blockbench.pose.ModelPartTransformation
@@ -45,6 +46,8 @@ class BuizelModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame {

    val wateroffset = -8

+    override val cryAnimation = CryProvider { _, _ -> bedrockStateful("buizel", "cry") }
+
    override fun registerPoses() {
        val blink = quirk { bedrockStateful("buizel", "blink") }
        sleep = registerPose(
@@ -8,9 +8,11 @@

 package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen4

+import com.cobblemon.mod.common.client.render.models.blockbench.createTransformation
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPose
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPoseableModel
+import com.cobblemon.mod.common.client.render.models.blockbench.pose.ModelPartTransformation
 import com.cobblemon.mod.common.entity.PoseType
 import net.minecraft.client.model.ModelPart
 import net.minecraft.util.math.Vec3d
@@ -32,8 +34,10 @@ class DusknoirModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame {
    lateinit var walk: PokemonPose
    lateinit var battleidle: PokemonPose

+    var spoopytail = getPart("tail")
+
    override fun registerPoses() {
-        val blink = quirk { bedrockStateful("dusknoir", "blink") }
+        //val blink = quirk { bedrockStateful("dusknoir", "blink") }

        sleep = registerPose(
            poseType = PoseType.SLEEP,
@@ -87,7 +91,6 @@ class DusknoirModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame {
            idleAnimations = arrayOf(
                bedrock("dusknoir", "battle_idle")
            )
-
        )
    }
 //
@@ -13,6 +13,7 @@ import com.cobblemon.mod.common.client.render.models.blockbench.animation.BipedW
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.BimanualFrame
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.BipedFrame
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPose
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPoseableModel
 import com.cobblemon.mod.common.entity.PoseType.Companion.MOVING_POSES
@@ -37,6 +38,8 @@ class ElectivireModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bi
    lateinit var standing: PokemonPose
    lateinit var walk: PokemonPose

+    override val cryAnimation = CryProvider { _, _ -> bedrockStateful("electivire", "cry") }
+
    override fun registerPoses() {
        val blink = quirk { bedrockStateful("electivire", "blink")}
        standing = registerPose(
@@ -13,6 +13,7 @@ import com.cobblemon.mod.common.client.render.models.blockbench.animation.BipedW
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.BimanualFrame
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.BipedFrame
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPose
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPoseableModel
 import com.cobblemon.mod.common.entity.PoseType
@@ -37,6 +38,8 @@ class FloatzelModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bip
    lateinit var walking: PokemonPose
 //    lateinit var sleep: PokemonPose

+    override val cryAnimation = CryProvider { _, _ -> bedrockStateful("floatzel", "cry") }
+
    override fun registerPoses() {
        val blink = quirk { bedrockStateful("floatzel", "blink") }
 //        sleep = registerPose(
@@ -11,6 +11,7 @@ package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen4
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.BimanualFrame
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.BipedFrame
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPose
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPoseableModel
 import com.cobblemon.mod.common.entity.PoseType
@@ -35,6 +36,8 @@ class GabiteModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, BipedF
    lateinit var walk: PokemonPose
    lateinit var battleidle: PokemonPose

+    override val cryAnimation = CryProvider { _, _ -> bedrockStateful("gabite", "cry") }
+
    override fun registerPoses() {

        val blink = quirk { bedrockStateful("gabite", "blink") }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
JazzMcNade	6ba2804a46	Added type checking	2024-05-14 00:46:40 -05:00
JazzMcNade	d13d5183c8	Implemented missing functions.	2024-05-14 00:24:09 -05:00
Hiroku	920e314444	Merge branch '830-only-player-entity-can-send-out-pokemon' into 'main' Remove unnecessary cast of phaseTarget to PlayerEntity in PokemonRenderer.renderTransition Closes #830 See merge request cable-mc/cobblemon!1008	2024-05-12 10:23:34 +00:00
David Sadler	3e4fdc0f22	Remove unnecessary cast of phaseTarget to PlayerEntity in PokemonRenderer.renderTransition	2024-05-12 11:04:52 +01:00
Hiroku	209ac71e06	Merge branch 'FossilTankFixes' into 'main' Fix for using incorrect item count when applying organic material with right click. See merge request cable-mc/cobblemon!1007	2024-05-12 08:05:27 +00:00
JazzMcNade	ecfc77f311	Updated Changelog	2024-05-12 02:49:19 -05:00
JazzMcNade	e64de3aa7d	Fixed a bug in which adding organic material was adding the full count of the stack currently in hand	2024-05-12 01:29:55 -05:00
Nick	fd7b82dbe3	Merge branch 'build/gradle-updates' into 'main' gradle and build improvements See merge request cable-mc/cobblemon!1006	2024-05-11 23:40:09 +00:00
broccolaiandNick	7ef48402fb	gradle and build improvements	2024-05-11 23:40:09 +00:00
Nick	81ac6f3b44	Snapshot = true	2024-05-11 16:39:06 -07:00
Paul	347e10d7e4	Snapshot = false	2024-05-12 08:20:46 +10:00
Paul	32270b6176	Attempt at fixing data migration error in species features	2024-05-11 14:39:49 +10:00
Hiroku	a0a26a98b5	Merge branch 'V-lpen-main-patch-49919' into 'main' Update dragapult.json See merge request cable-mc/cobblemon!996	2024-05-11 04:37:18 +00:00
Hiroku	85836f19b2	Merge branch 'held_item_back' into 'main' Fixed held items without consumable tags from being consumed or swapped in battle. See merge request cable-mc/cobblemon!1005	2024-05-11 04:36:47 +00:00
Hiroku	9f251b7070	Update CHANGELOG.md	2024-05-11 04:36:13 +00:00
Segfault Guy	86ddb6d743	Fixed held items without consumable tags from being consumed or swapped in battle.	2024-05-11 00:15:26 -04:00
Paul	9c8a00bbdc	Fixed bad moveset JSON for Kyurem	2024-05-11 13:04:50 +10:00
Hiroku	04abf2bd25	Update CHANGELOG.md [skip-ci]	2024-05-11 00:27:36 +00:00
Paul	e6553655a6	Changelog update heading [skip-ci]	2024-05-11 10:19:43 +10:00
Paul	5f33d16a75	More changelog cleanup	2024-05-11 09:53:00 +10:00
Hiroku	468f84862e	Merge branch '1.5-structure-fixes' into 'main' Deleted Duplicate Loot Table See merge request cable-mc/cobblemon!1003	2024-05-10 22:27:50 +00:00
Slippy	e863c6d094	Deleted Duplicate Loot Table	2024-05-10 16:19:15 -05:00
Nick	5b2d542fca	Merge branch 'Myslippy-main-patch-94569' into 'main' Update CHANGELOG.md See merge request cable-mc/cobblemon!1002	2024-05-10 20:06:14 +00:00
Myslippy	95db34c55e	Update CHANGELOG.md	2024-05-10 19:41:41 +00:00
Paul	15da48c5c0	Merge remote-tracking branch 'origin/main'	2024-05-10 18:42:29 +10:00
Paul	ead62763c1	Changelog cleanup	2024-05-10 18:42:22 +10:00
apion	247c475c2d	Fix oversight in incendium fix	2024-05-09 23:44:04 -04:00
Hiroku	44aab4f0e7	Merge branch 'spawn-fixes' into 'main' Spawn fixes See merge request cable-mc/cobblemon!1001	2024-05-10 03:02:48 +00:00
Frank The FarmerandHiroku	94edae591c	Spawn fixes	2024-05-10 03:02:48 +00:00
Hiroku	c83f045b4d	Merge branch 'incendium-fix' into 'main' Fixes #823 Closes #823 See merge request cable-mc/cobblemon!999	2024-05-10 00:16:23 +00:00
apion	b5d7786ff7	Fixes #823	2024-05-09 20:05:03 -04:00
Paul	9283794e26	Merge remote-tracking branch 'origin/main'	2024-05-10 09:53:11 +10:00
Hiroku	55580fb564	Merge branch 'sound' into 'main' Flamethrower sound fixes See merge request cable-mc/cobblemon!998	2024-05-09 23:52:44 +00:00
Paul	472c9be634	Applied pt-pt translations	2024-05-10 09:49:07 +10:00
Sterrezo	a247344ae4	Removed unused audio files	2024-05-10 01:41:03 +02:00
FrankTheFarmer	1fd0a9775c	Flamethrower is flamethrowering now	2024-05-10 09:39:32 +10:00
Hiroku	9d9495f1f9	Merge branch 'fix-adorn-compat' into 'main' Fixed adorn compat See merge request cable-mc/cobblemon!997	2024-05-09 22:56:26 +00:00
apion	88e301d7c8	Fixed adorn compat	2024-05-09 18:53:44 -04:00
Hiroku	b0e16a7f26	Merge branch 'FossilTankCreateFix' into 'main' Fossil Tank Create Fix See merge request cable-mc/cobblemon!993	2024-05-09 22:07:43 +00:00
Hiroku	54b5b3cbbc	Merge branch 'implement_pokemon' into 'main' Forgot to merge request See merge request cable-mc/cobblemon!992	2024-05-09 22:07:14 +00:00
Frank The FarmerandHiroku	7850bc5263	Forgot to merge request	2024-05-09 22:07:14 +00:00
V-lpen	8ce5a927b9	Update dragapult.json	2024-05-09 19:19:22 +00:00
Test	24c34af8bf	remove random color from ui text	2024-05-08 22:25:19 +00:00
Hiroku	7402426656	Merge branch 'tmetcalfe89/fletchinder-name-ru' into 'main' in Russian translation the fletchinder was called fletchling See merge request cable-mc/cobblemon!990	2024-05-08 20:47:41 +00:00
Hiroku	c658e496cc	Merge branch 'GildedChestHopperInteractionFix' into 'main' Hoppers can now interact with all inventory slots in a Gilded Chest, Closes #822 Closes #822 See merge request cable-mc/cobblemon!994	2024-05-08 20:40:42 +00:00
JazzMcNade	f3300806a3	Hoppers can now interact with all inventory slots in a Gilded Chest	2024-05-08 02:12:53 -05:00
JazzMcNade	8fee4de49b	Graceful transition to new inventory, fixed item scatterer	2024-05-08 01:28:41 -05:00
JazzMcNade	5b951ef511	Added Anti-item clogging technology to the fossil tank	2024-05-07 23:43:40 -05:00
tmetcalfe89	6e0850331a	held item too	2024-05-06 12:40:22 -07:00
tmetcalfe89	79b1771e7e	quick fix	2024-05-06 10:00:50 -07:00
JazzMcNade	c9b2c44083	Fixed create chute crash and item duping when chutes attempt to put items in a restoration tank. Refactored RestorationTankEntity to use SimpleInventory	2024-05-05 20:19:09 -05:00
Hiroku	c370076337	Merge branch 'bye-j16' into 'main' Bye J16 See merge request cable-mc/cobblemon!988	2024-05-05 03:34:07 +00:00
MoeBoy76	d05ae4d535	Merge branch 'main' of https://gitlab.com/cable-mc/cobblemon into bye-j16	2024-05-03 10:19:18 +10:00
MoeBoy76	3cebfb38ef	fix mixin compat level being set to Java 16 for no reason	2024-05-03 10:18:58 +10:00
Apion	d69f1f17b6	Merge branch 'implement_pokemon' into 'main' Daily Implementation Mission See merge request cable-mc/cobblemon!987	2024-05-02 06:59:35 +00:00
Frank The FarmerandApion	3ba89472fa	Daily Implementation Mission	2024-05-02 06:59:35 +00:00
MoeBoy76	573608b6fc	Merge branch 'main' of https://gitlab.com/cable-mc/cobblemon	2024-05-02 16:04:01 +10:00
MoeBoy76	f092584f83	changelog blank line at end [skip-ci]	2024-05-02 16:03:52 +10:00
Apion	a76146f8e9	Merge branch 'JSON-Poser-Tweaks' into 'main' Json poser tweaks See merge request cable-mc/cobblemon!986	2024-05-02 05:53:59 +00:00
Frank The FarmerandApion	548daa84e4	Json poser tweaks	2024-05-02 05:53:59 +00:00
Apion	7f1dd4546b	Merge branch 'can-moe-scrape' into 'main' Blueberry DLC Closes #757, #649, and #758 See merge request cable-mc/cobblemon!953	2024-05-02 05:48:29 +00:00
MoeBoy76andApion	a129c361df	Blueberry DLC	2024-05-02 05:48:29 +00:00
Hiroku	5d5508a71e	Merge branch '1.5-structure-fixes' into 'main' 1.5 structure fixes See merge request cable-mc/cobblemon!984	2024-04-29 12:29:34 +00:00
Hiroku	5e5684d9fd	Merge branch 'implement_pokemon' into 'main' A couple fixes See merge request cable-mc/cobblemon!985	2024-04-29 12:29:16 +00:00
Frank The FarmerandHiroku	a1623c04b7	A couple fixes	2024-04-29 12:29:15 +00:00
Slippy	a070dc56bd	Cleaning up unused files	2024-04-29 01:05:00 -05:00
Slippy	79f9e0f0f2	Gimmi Towers now have more junk it can generate at the top	2024-04-29 00:59:41 -05:00
Slippy	8500eb58ef	Removed spam log issues and blended some structures into the world better	2024-04-29 00:49:48 -05:00
Hiroku	97e51eb7b5	Merge branch 'removing-items-is-hard' into 'main' Update is_held_item.json See merge request cable-mc/cobblemon!983	2024-04-29 05:44:20 +00:00
dhi_holo	ba75dcdf31	Update is_held_item.json why is removing held items so damn annoying, can't we just get vera to fasttrack the sprites instead /j	2024-04-29 15:19:59 +10:00
Paul	9bf8c0e3ec	Fixed MOVING data tracker field not using the new logic that drives the pose	2024-04-29 11:25:12 +10:00
Hiroku	0c62c247ec	Merge branch '1.5-bug-fixes' into 'main' (misleading branch name) Run config changes See merge request cable-mc/cobblemon!980	2024-04-29 00:16:52 +00:00
Hiroku	c70e8872ce	Merge branch 'implement_pokemon' into 'main' Implementation yet again See merge request cable-mc/cobblemon!982	2024-04-29 00:10:19 +00:00
Frank The FarmerandHiroku	ce323ddfbf	Implementation yet again	2024-04-29 00:10:19 +00:00
Hiroku	ffe7978560	Merge branch 'no-more-heldies' into 'main' Commented out the Held Items See merge request cable-mc/cobblemon!981	2024-04-28 07:44:29 +00:00
dhi_holo	a58632752a	Commented out the Held Items (just the ones without sprites, ofc, just trying to scare public git readers)	2024-04-28 17:21:23 +10:00
apion	0b93481dbf	Remove unneeded imports	2024-04-27 13:10:21 -04:00
apion	dda004a66c	Change default run configs to generate with a uuid and username	2024-04-27 13:05:44 -04:00
apion	9648a91f4a	Fixed fabric server run config, split client and server run folders	2024-04-26 20:35:50 -04:00
Hiroku	e0c4bf7fb2	Merge branch 'implement_pokemon' into 'main' Today's implementation fixes See merge request cable-mc/cobblemon!977	2024-04-26 23:23:50 +00:00
Frank The FarmerandHiroku	ed919f63f0	Today's implementation fixes	2024-04-26 23:23:49 +00:00
Apion	239acc0623	Merge branch '1.5-structure-fixes' into 'main' One more try See merge request cable-mc/cobblemon!978	2024-04-26 22:12:46 +00:00
Slippy	e835b833b3	One more try	2024-04-26 16:48:04 -05:00
Hiroku	8f1127be46	Merge branch 'pve-fix' into 'main' Fix BattleBuilder's Successful-ness See merge request cable-mc/cobblemon!976	2024-04-26 00:44:27 +00:00
Hiroku	26a8bf1ca5	Merge branch 'idev-botarium-crash-fix' into 'main' Fix for a very specific issue where Botarium and Cobblemon will have mapping... See merge request cable-mc/cobblemon!975	2024-04-25 23:43:58 +00:00
Stampede	d3da8c99a8	Simplify battle success fix and apply to 1v1s	2024-04-25 16:41:56 -05:00
Stampede	d106deb7f6	Fix PvE battles not returning successful even it was	2024-04-25 14:32:57 -05:00
Waterpicker	f1d1e87e47	Fix for a very specific issue where Botarium and Cobblemon will have mapping conflicts indev when the project uses mojang due to how kotlin syntax works.	2024-04-25 12:20:48 -05:00
Paul	2d9d6e172c	Updated pt_pt	2024-04-25 19:19:07 +10:00
Paul	3c03b0e210	Updated many translations (de_de, en_pt, es_es, es_mx, fr_ca, fr_fr, ja_jp, ko_kr, pl_pl, ru_ru)	2024-04-25 19:03:35 +10:00
Nick	724c674992	Fix packet/mixin issues related to forge, bump KFF version, and build details	2024-04-24 22:07:31 -07:00
Paul	99eb317a87	Fixed Kabuto animations	2024-04-25 13:32:06 +10:00
Hiroku	43a2c2f55d	Merge branch 'implement_pokemon' into 'main' Implementation stuff See merge request cable-mc/cobblemon!973	2024-04-25 02:00:16 +00:00
Frank The FarmerandHiroku	4db9a35f2b	Implementation stuff	2024-04-25 02:00:16 +00:00
Hiroku	8228ac517b	Merge branch 'interpreter_my_beloved' into 'main' Misc interpreter refactor fixes See merge request cable-mc/cobblemon!972	2024-04-24 02:48:02 +00:00
Segfault Guy	c7ae41bf7b	Merge branch 'main' into interpreter_my_beloved	2024-04-23 22:43:06 -04:00
Segfault Guy	1653be5fa8	Misc refactor fixes.	2024-04-23 22:42:00 -04:00
Hiroku	b0497065f4	Merge branch '1.5-spawns-and-fixes' into 'main' 1.5 spawns and fixes See merge request cable-mc/cobblemon!968	2024-04-24 02:34:03 +00:00
Paul	dfc1a39f58	Merge branch 'refs/heads/main' into 1.5-spawns-and-fixes # Conflicts: # CHANGELOG.md	2024-04-24 12:30:17 +10:00
Paul	9a92e074a2	Fixed instant particle emitter not defaulting the number of particles the way it does in Snowstorm	2024-04-24 11:38:59 +10:00
Hiroku	44b195f0a6	Updated changelog with exact counts for structures [skip-ci]	2024-04-22 23:34:40 +00:00
Hiroku	7c21e6feb5	Merge branch '1.5-Structures' into 'main' 1.5 structures See merge request cable-mc/cobblemon!971	2024-04-22 22:33:21 +00:00
Slippy	3b653b745e	suspicious mound shoved further into the ground	2024-04-22 17:20:46 -05:00
Paul	f246d90e4c	Merge remote-tracking branch 'origin/main'	2024-04-22 09:11:59 +10:00
Hiroku	df22cc5b3e	Merge branch 'advancement-description-inconsistencies-fixes' into 'main' Update en_us.json Closes #809 See merge request cable-mc/cobblemon!969	2024-04-21 23:11:49 +00:00
Paul	3fbe2102a0	Fixed curves not working properly at the particle level if they weren't always on screen, closes #806	2024-04-22 09:11:39 +10:00
dhi_holo	21b667f5d8	Update en_us.json Corrects two advancement descriptions to be accurate and match formatting of all other advancements. I think I made the branch name longer than the changes, looking at it in githubdesktop I'm not so sure now xD	2024-04-21 16:35:29 +10:00
Paul	eb88a43769	Fixed bedrock particle rotation velocity being treated as blocks per tick instead of blocks per second, closes #807	2024-04-21 15:32:07 +10:00
Paul	c41a6766ef	Fixed lookat_y camera mode	2024-04-21 15:31:19 +10:00
Paul	842de0e92c	Fixed woopsy with automaton armor trim advancement	2024-04-21 15:30:50 +10:00
Veraxiel	04b516765d	Edited Moon Stone Ore gen. Updated changelog.	2024-04-21 00:44:28 -04:00
Paul	3faad69484	Oops remove that TODO	2024-04-21 12:36:13 +10:00
Paul	74e2f8429c	Fixed expiration events not running for particles when they expire on collision. Closes #805	2024-04-21 12:35:53 +10:00
Paul	10219fbf38	Made vivillon advancement description consistent on punctuation. Closes #809	2024-04-21 12:33:15 +10:00
Hiroku	cf68ccc29e	Merge branch 'sound' into 'main' Removed an unused sound file See merge request cable-mc/cobblemon!966	2024-04-21 02:29:58 +00:00
Hiroku	f78847f917	Merge branch 'mistrim' into 'main' Trim Recipe Fixes See merge request cable-mc/cobblemon!967	2024-04-21 02:29:17 +00:00
Village	8768c4c541	differentiate badly poisoned in ui	2024-04-17 21:50:03 -04:00
Veraxiel	2bf0fd625b	Tweaked some spawns, flipped the Poison Barb sprite for looking too much like a sword when held.	2024-04-17 19:49:53 -04:00
dhi_holo	65e3052e69	Removed Missing Textures Automaton Trims now work when trimming same material (Iron Armour, Iron Trim Material, same for diamond, gold, and netherite)	2024-04-16 17:00:28 +10:00
dhi_holo	be7192ae2c	Trim Recipe Fixes + Adds duplication recipe + Adds advancement to unlock duplication recipe - Renamed smithing recipe to match Vanilla + Adds advancement to unlock smithing recipe	2024-04-16 16:14:45 +10:00
Sterrezo	1c921a372b	Removed an unused sound file My guess is it was put there when battle effects or particles were being worked on. As far as I can tell it's not used anywhere.	2024-04-15 23:14:01 +02:00
Nick	cf3587557d	Merge branch 'ui-icon' into 'main' Update shiny icon See merge request cable-mc/cobblemon!963	2024-04-15 19:14:48 +00:00
TestandNick	bbd44c0010	Update shiny icon	2024-04-15 19:14:48 +00:00
Nick	bb05177985	Merge branch 'imposter_fix' into 'main' Imposter fixes See merge request cable-mc/cobblemon!965	2024-04-15 19:14:18 +00:00
Segfault GuyandNick	31143359ee	Imposter fixes	2024-04-15 19:14:18 +00:00
Nick	c8f0140870	Merge branch '1.5-Structures' into 'main' found a spelling error smh See merge request cable-mc/cobblemon!964	2024-04-15 19:13:00 +00:00
MyslippyandNick	0b9ca3a97c	found a spelling error smh	2024-04-15 19:12:59 +00:00
Slippy	d03541ff6f	iron bar fix	2024-04-15 00:56:31 -05:00
Slippy	0d7aff0349	Please work	2024-04-15 00:24:54 -05:00
Slippy	c904888c6a	found a spelling error smh	2024-04-13 09:12:21 -05:00