- adjusted logic to prepare for detecting user switches and to allow for better use of pivot moves

# Conflicts:
#	common/src/main/kotlin/com/cobblemon/mod/common/api/pokemon/PokemonProperties.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/pokemon/Pokemon.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/pokemon/properties/PropertiesCompletionProvider.kt

.gitattributes

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

.gitignore

@@ -21,8 +21,6 @@ build
 # other
 eclipse
 run
-runClient
-runServer
 
 # Files from Forge MDK
 forge*changelog.txt
@@ -35,8 +33,3 @@ common/src/main/resources/assets/cobblemon/showdown
 # Generated files
 */generated/resources/*
 /fabric/src/generated/resources/cobblemon-common.accesswidener
-/.ignored/
-common/.fabric
-
-# MacOS
-.DS_Store

CHANGELOG.md

@@ -1,474 +1,38 @@
 # Changelog
-
-## [1.5.3](#1-5-3)
-### Fixes
-- Scaled down Amaura's fetus model to avoid clipping through the tank while animating
-- Added Polished Tumblestone and Tumblestone Brick block sets from Tumblestone, Black Tumblestone, and Sky Tumblestone.
-- Fixed Cubone's cry not having a sound.
-- Fixed the Seafloor spawning context not being a usable context.
-- Fixed Pokemon spawning in non-full blocks like slabs.
-- Fixed Gilded Chests not dropping the chest itself when broken, only the contents.
-- Fixed Pokémon losing their Hidden Ability through evolution if the middle stage did not have a Hidden Ability.
-- Fixed Crumbling Arch not blending in with the world.
-- Fixed Energy Root applying being usable on a fainted Pokemon.
-- Fixed Pokémon entity not spawning when starting a battle while recalling said Pokémon
-
+## [1.5.0](#1-5-0)
 ### Additions
-- Added extra visuals to early berry growth stages
-
-### Added cries to the following Pokémon
-- Timburr, Gurdurr, Conkeldurr
-- Golett, Golurk
-
-### Changes
-- Altered the item model for Medicinal Leeks and Roasted Leeks to be held like sticks and other rod items. 
-- Adjusted some berry balance values like yield and growth times
-- Changes to mulch buffs/durations
-
-### Developer
-
-### Data Pack & Resource Pack Creators
-- Added support for "shedders" similar to Shedinja's evolution logic.
-
-## [1.5.2 (May 27th, 2024)](#1-5-2)
-### Fixes
-- Fixed Wooloo and Dubwool dyeing making your game start dying. Only if you do it on a server.
-- Fixed Gimmighoul causing PCs and parties to look glitched out, also only in a server.
-- Fixed players being able to dye other people's sheep Pokémon.
-
-## [1.5.1 (May 27th, 2024)](#1-5-1)
-
-### Additions
-- Added unique send out particles for Cherish, Dream, Beast, and Ancient Origin balls.
-- Made Wooloo and Dubwool dye-able like sheep. So cute!
-- Added stat up and down particles.
-- Most status effects now have particles! These include: Paralysis, Poison, Sleep, Confusion, Infatuation.
-#### Move Particle Effects
-- Confusion
-- Cotton Guard
-- Growl
-- Ice Punch
-- Fire Punch
-- Thunder Punch
-- Minimize
-- Quick Attack
-- Protect
-- Swords Dance
-- Sand Attack
-- Poison Powder
-- Sleep Powder
-- Stun Spore
-- Powder
-- Rage Powder
-- Spore
-- Thunder Wave
-
-### Changes
-- Sounds for Relic Coin Sacks have been correctly renamed. Relic Coin Pouches received new sounds for breaking and placing.
-- Readjusted Petilil portraits so they fit a bit better.
-- Improved handling of Pokémon taken from the Restoration Tank block to be a bit more stable. 
-- Made Mulch cheaper to craft.
-
-### Fixes
-- Fixed a bug in which adding organic material to the restoration tank via right click was adding the full count of the stack currently in hand - but only taking 1 of the item.
-- Fixed a niche issue where some properties of entities were not initialized correctly, causing Pokémon that appeared to be level 1 until you battle them.
-- Fixed Fossilized Drake being missing from the Fossils item tag.
-- Fixed Gilded Chest block entity not being cleared on block break, creating spooky ghost blocks. Old ones can be fixed by placing something like a furnace where it was, then breaking the furnace.
-- Fixed sherd brokenness on Forge.
-- Fixed Supplementaries incompatibility.
-- Fixed Fossil Compartment crash with Jade / WAILA forks.
-- Fixed pasture block PC lookups when the player is offline.
-- Fixed an untranslated battle message that occurs when using a move that just ran out of PP (e.g. Fire Blast that just got spited mid-turn). 
-- Fixed held items being eaten even when the held item evolutions are already unlocked.
-- Fixed Hisuian Decidueye not being Grass/Fighting.
-- Fixed both Decidueye forms learning both Triple Arrows and Spirit Shackle.
-- Fixed Pineco being unable to evolve into Shulker Forretress.
-- Fixed Kabutops T-posing when underwater. It doesn't have proper swimming animations yet, though. 
-- Fixed Pidgey's missing walk animation.
-- Fixed Cyndaquil's hidden flames clipping if it was swimming.
-- Fixed Chimecho and Chingling being unable to spawn near bells. They are meant to!
-- Fixed Tyrantrum and Wailord Party Overlay models peeking through the chat box. It was kinda funny though.
-- Fixed hitbox sizes for Seedot, Nuzleaf, and Shiftry.
-- Fixed Budew and Lechonk sliding if they walked for too long. 
-- Fixed Shedinja T-posing in battle. 
-- Fixed recoil evolution condition not working, making things like Basculegion unobtainable.
-- Fixed issue where poser debug tools didn't work on JSON posers.
-- Fixed issue where gilded chests don't close when going far away.
-- Fixed issue where the restoration tank's renderer was reading old data, making it appear wrong.
-- Fixed issue where the lights on the restoration tank would not animate if it was facing east. Very specific.
-- Fixed client crash with the fossil machine when updating block state on a chunk that is unloaded in the client. I don't understand this but the devs are sure that all of those are real words.
-- Fixed Restoration Tank crash with Create upon the tank block's destruction.
-- Fixed Restoration Tank over consuming items when interacting with Create blocks.
-- Fixed addons that add very many moves to a learn-set causing disappearing Pokémon (visually) issues on servers.
-- Fixed Hyper Cutter and Big Pecks incorrectly stating that it prevented accuracy from being lowered in battle.
-- Fixed missing messages for Rough Skin and Iron Barbs in battle.
-- Fixed a bug where sometimes Pokémon sendouts wouldn't create an entity, or the entity would spawn at 0 0 0 which is not a good place for a Pokémon to be. Or any of us, really.
-- Fixed issue in which a locked gilded chest would animate to the open state when the client fails to open it, such as when it is locked.
-- Fixed a bug where aspects of a form would not be properly reflected on form changes (eg. Normal -> Hisui).
-- Fixed generic battle effect sounds not sounding the way they were intended to.
-- Fixed particle effects often not having access to some specific entity functions from MoLang.
-- Fixed particles sometimes lasting a single tick too long, causing (very quick) visual glitches.
-- Fixed particle rotations being inverted. 
-- Fixed particle events not spawning at the instigating particle's location.
-- Fixed a bunch of spam during world generation.
-- Fixed a bug in which throwing a Poké Ball at a player owned Pokémon with the ability Illusion would reveal its true species. Hilarious meta strategy.
-- Fixed root-part animations not working for JSON posed Pokémon. You didn't notice this but if we didn't fix this in this update then if you use Quick Attack a lot you'd have seen a whole lot of [this](https://cdn.discordapp.com/attachments/1076993968803434627/1242660506783715369/Minecraft__1.20.1_-_Singleplayer_2024-05-21_22-08-17.mp4?ex=66549408&is=66534288&hm=ff95ee293eb15634fd63e6546534ea279540a1c892605e8d561593ca2c5600c5&) which is damn funny but very unintended.
-
-### Developer
-- Changed SpawnAction#complete to return a nullable generic R (the spawn action result) instead of a boolean. Provides more information this way.
-- Added an event that fires when a fossil is revived, with or without a player.
-- Added IVS and EVS property extractors.
-- Fixed PCStore#resize not allowing PC boxes size reduction.
-
-### Data Pack & Resource Pack Creators
-- Added support for MoLang conditions for quirks and poses.
-- Changed the AttackDefenceRatio requirement to StatCompare and StatEqual. There is some backwards compatibility for AttackDefenceRatio, though.
-- Changed "dimensions" spawn condition to check with dimension IDs instead of effects, so custom dimension IDs can be used.
-- Added parametric motion and rotation support to particle effects.
-- Added entity_scale as a molang var for particles (likely only applicable to Pokemon)
-- Added support for primary quirk animations using the following format:
-```JSON
-{
-  "quirks": [
-    "q.bedrock_primary_quirk('<pokemon>', '<animation>', <minSeconds>, <maxSeconds>, <loopTimes>, '<excludedLabels>', q.curve('<waveFunction>'))"
-  ]
-}
-```
-
-### Localization
-- Updated translations for:
-  - Simplified and Traditional Chinese.
-  - Spanish.
-
-## [1.5.0 - The Ruins and Revival Update (May 12th, 2024)](#1-5-0)
-#### "You're telling me that Mojang has added archaeology to the game? Hmm... that gives me an idea."
-
-### Additions
-- Added 17 ruin structures, where you can find Pokémon-themed Armor Trims and Pottery Sherds, Tumblestones, and more.
-- Added 23 fossil structures, where you can brush Suspicious Sand/Gravel for [Fossils](https://wiki.cobblemon.com/index.php/Fossil). You can add [custom fossils using datapacks](https://wiki.cobblemon.com/index.php/Fossils_File).
-- Added the Data Monitor, Fossil Compartment, and Restoration Tank blocks. Placed in the correct formation, you can use these to create a [Restoration Machine](https://wiki.cobblemon.com/index.php/Resurrection_Machine) where you can bring fossils back to life. Use organic material to fill the tank first!
-- Added 3 variants of [Tumblestone](https://wiki.cobblemon.com/index.php/Tumblestone), which can be planted near Lava or Magma to grow harvestable Tumblestone Clusters.
+- Added 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 Tube. 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 Tumblestone Blocks, a storage block crafted from 9 Tumblestones.
 - Added Ancient Poké Balls, which are aesthetic variants crafted from Tumblestones.
 - Added the Ancient Feather, Wing, and Jet Balls, which fly further than regular Poké Balls.
-- Added the Ancient Heavy, Leaden, and Gigaton Balls, which are heavier and don't fly as far as regular Poké Balls. These will receive more functionality in a future update.
-- Added visual effects for many Poké Balls when sending out or capturing Pokémon.
-- Added a new send-out ball toss animation that showcases the ball used for the Pokémon.
-- Added simple move animations for Pokémon in battle with a proof of concept (Flamethrower) for more complicated animations. More and more specific animations will come in future updates.
-- Added Original Trainer to the summary menu. To edit the OT through commands, you must specify originaltrainertype=<Player/NPC>, and originaltrainer=<Username or UUID/NPC Name>
-- Added support for planting Apricorn trees, berries, and mints in [Botany Pots](https://modrinth.com/mod/botany-pots)
-- Added the hidden "True Vivillionaire" advancement.
-- Added the [Display Case](https://wiki.cobblemon.com/index.php/Display_Case) block. Use it to display your archaeological findings, Poké Balls, or other items.
-- Added 6 Pokémon-themed Pottery Sherds, obtained from ruin structures. Sherds... sh-erds. Weird word.
-- Added a Pokémon-themed armor trim, obtained from ruin structures.
-- Added Nether Fire Stone Ore to, surprisingly, the Nether.
-- Added Terracotta Sun Stone Ore to Badlands biomes.
-- Added the EV Boosting Feathers.
-- Added [Gilded Chests](https://wiki.cobblemon.com/index.php/Gilded_Chest), available in all Apricorn colors.
-- Added Relic Coins, Relic Coin Pouches, and Relic Coin Sacks. Gimmighoul might be interested in these.
-- Added Type Gems. These will have additional uses later, so you should start collecting them.
-- Added new held items: Ability Shield, Absorb Bulb, Air Balloon, Binding Band, Blunder Policy, Cell Battery, Covert Cloak, Damp Rock, Eject Button, Eviolite, Expert Belt, Float Stone, Focus Sash, Heat Rock, Icy Rock, Iron Ball, Light Ball, Loaded Dice, Red Card, Shell Bell, Sticky Barb, Smooth Rock, Soothe Bell and Weakness Policy.
-- Added Hisui starters to the starter selection menu. They come inside of ancient Poké Balls.
-- Added a bubble quirk to Krabby that only plays during clear sunsets. It looks familiar...
-- Added forfeit option to PVP battles.
-- Added visual changes for entities affected by Illusion, Imposter, or Transform in battle.
-- Added shoulder mounting for Squirtle, Ralts, Roggenrola, Charcadet, Sizzlipede, Litwick, Cutiefly, Flabebe, Flittle, and Scatterbug
-- Added species data for Hydrapple, Iron Boulder, Iron Crown, Pecharunt, Raging Bolt, and Terapagos
-- Added various new tags for search-ability and better mod compatibility.
-- Added the [Ability Capsule](https://bulbapedia.bulbagarden.net/wiki/Ability_Capsule) and [Patch](https://bulbapedia.bulbagarden.net/wiki/Ability_Patch). These have no way of getting them (for now) and only work as intended with the traditional ability format of 1 to 2 common abilities and 1 hidden ability.
-
-### Pokémon Added
-#### Gen 2
-- Sentret
-- Furret
-- Qwilfish
-- Heracross
-- Skarmory
-- Larvitar
-- Pupitar
-- Tyranitar
-
-#### Gen 3
-- Lileep
-- Cradily
-- Anorith
-- Armaldo
-- Tropius
-- Roselia
-- Aron
-- Lairon
-- Aggron
-- Solrock
-- Lunatone
-- Makuhita
-- Hariyama
-- Trapinch
-- Vibrava
-- Flygon
-
-#### Gen 4
-- Shieldon
-- Bastiodon
-- Cranidos
-- Rampardos
-- Budew
-- Roserade
-- Hippopotas
-- Hippowdon
-
-#### Gen 5
-- Tirtouga
-- Carracosta
-- Archen
-- Archeops
-- Zorua
-- Zoroark
-- Petilil
-- Lilligant
-- Darumaka
-- Darmanitan
-- Woobat
-- Swoobat
-- Sandile
-- Krokorok
-- Krookodile
-- Frillish
-- Jellicent
-- Cubchoo
-- Beartic
-- Deino
-- Zweilous
-- Hydreigon
-- Larvesta
-- Volcarona
-- Alomomola
-- Ferroseed
-- Ferrothorn
-
-#### Gen 6
-- Tyrunt
-- Tyrantrum
-- Amaura
-- Aurorus
-- Goomy
-- Sliggoo
-- Goodra
-- Carbink
-- Flabébé
-- Floette
-- Florges
-- Klefki
-
-#### Gen 7
-- Turtonator
-- Fomantis
-- Lurantis
-- Salandit
-- Salazzle
-- Jangmo-o
-- Hakamo-o
-- Kommo-o
-- Alolan Diglett
-- Alolan Dugtrio
-
-#### Gen 8
-- Gossifleur
-- Eldegoss
-- Arctozolt
-- Arctovish
-- Dracozolt
-- Dracovish
-- Basculegion
-- Hisuian Decidueye
-- Hisuian Typhlosion
-- Hisuian Samurott
-- Hisuian Lilligant
-- Hisuian Sliggoo
-- Hisuian Goodra
-- Hisuian Zorua
-- Hisuian Zoroark
-- Hisuian Voltorb
-- Hisuian Electrode
-- Hisuian Qwilfish
-- Overqwil
-- Hisuian Sneasel
-- Sneasler
-- Stonjourner
-- Cufant
-- Copperajah
-- Dreepy
-- Drakloak
-- Dragapult
-- Impidimp
-- Morgrem
-- Grimmsnarl
-
-#### Gen 9
-- Gimmighoul
-  - Using Relic Coins, you can increase Gimmighoul's Coin Stash. Upon reaching 999, it can be evolved into Gholdengo.
-  - Additionally, if you give Gimmighoul a Netherite Scrap, you can increase its Netherite Stash. But what will that do to when you evolve it?
-- Gholdengo
-
-#### Cobblemon Exclusives
-- Hisui Bias Rowlet
-- Hisui Bias Dartrix
-- Hisui Bias Cyndaquil
-- Hisui Bias Quilava
-- Hisui Bias Oshawott
-- Hisui Bias Dewott
-- Hisui Bias Goomy
-- Hisui Bias Petilil
-
-These are our compromise for having both regular and Hisuian forms of these Pokémon in the game. Hisui Biased variations will evolve into the Hisuian evolutions under most conditions. They are otherwise purely cosmetic differences.
-
-### Added cries to the following Pokémon
-- Alolan Raticate
-- Vulpix, Ninetales
-- Zubat, Golbat, Crobat
-- Meowth, Persian
-- Psyduck, Golduck
-- Growlithe, Arcanine
-- Geodude, Graveler, Golem
-- Doduo, Dodrio
-- Seel, Dewgong
-- Muk, Grimer
-- Krabby, Kingler
-- Voltorb, Electrode, Hisuian Voltorb, Hisuian Electrode
-- Tangela, Tangrowth
-- Snorlax
-- Cubone, Marowak
-- Koffing, Weezing
-- Aerodactyl
-- Elekid, Electabuzz, Electivire
-- Omanyte, Omastar
-- Kabuto, Kabutops
-- Lapras
-- Scyther
-- Hisui Bias Cyndaquil, Hisui Bias Quilava
-- Igglybuff
-- Yanma, Yanmega
-- Gligar, Gliscor
-- Qwilfish, Hisuian Qwilfish, Overqwil
-- Sneasel, Hisuian Sneasel, Weavile, Sneasler
-- Larvitar, Pupitar, Tyranitar
-- Swinub, Piloswine, Mamoswine
-- Aron, Lairon, Aggron
-- Trapinch, Vibrava, Flygon
-- Cacnea, Cacturne
-- Barboach, Whiscash
-- Lileep, Cradily
-- Anorith, Armaldo
-- Tropius
-- Chimecho
-- Bidoof, Bibarel
-- Buizel, Floatzel
-- Gible, Gabite, Garchomp
-- Hisui Bias Oshawott, Hisui Bias Dewott
-- Petilil, Lilligant, Hisui Bias Petilil, Hisuian Lilligant
-- Basculin, Basculegion
-- Sandile, Krokolok, Krookodile
-- Darumaka, Darmanitan
-- Archen, Archeops
-- Zorua, Zoroark, Hisuian Zorua, Hisuian Zoroark
-- Tyrunt, Tyrantrum
-- Amaura Aurorus
-- Carbink
-- Goomy, Sliggoo, Goodra, Hisui Bias Goomy, Hisuian Sliggoo, Hisuian Goodra
-- Klefki
-- Hisui Bias Rowlet, Hisui Bias Dartrix
-- Komala
-- Impidimp, Morgrem, Grimmsnarl
-- Cufant, Copperajah
-- Dreepy, Drakloak, Dragapult
-- Dracozolt, Arctozolt, Dracovish, Arctovish
-- Lechonk, Oinkologne
-- Maushold family of three and four
-
+- Added the Ancient Heavy, Leaden, and Gigaton Balls, which are heavier and don't fly as far as regular Poké Balls. These will recieve 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>
 
 ### Changes
-- Alolan Pikachu and Exeggcute changed to Alola Bias.
 - Pokémon now transition more smoothly between different poses.
-- Updated models for Mimikyu, Alcremie, Squirtle, Wartortle, Blastoise, Pidgey, Pidgeotto, Pidgeot, Omanyte, Omastar, Growlithe, Arcanine, Nidoran Male, Nidoran Female, Lapras, Swinub, Piloswine, Basculin, Rowlet, Dartrix, Decidueye, Kabuto, Kabutops, Piplup, Prinplup, Elekid, Electabuzz, Cubone, Marowak, Paras, Mawile, Drifloon, Drifblim, Venonat, Venomoth, Yanma, Yanmega, Psyduck, Dusknoir, Diglett, Dugtrio, Natu, Xatu, Oshawott, Samurott, Torchic, Grovyle, Sceptile, Sizzlipede, Mismagius, and Raboot.
-- Updated animations for Squirtle, Wartortle, Blastoise, Pidgey, Pidgeotto, Diglett, Dugtrio, Magikarp, Dragonite, Omanyte, Omastar, Kabuto, Pinsir, Chinchou, Lanturn, Ralts, Kirlia, Gardevoir, Gallade, Buizel, Garchomp, Pumpkaboo, Falinks, Lechonk, Litwick, Lampent, Chandelure, Carnivine, Galarian Meowth, Galarian Rapidash, Venonat, Venomoth, Phanphy, Donphan, Dratini, Dragonair, Happiny, Chansey, Blissey, Volbeat, Illumise, Numel, Sizzlipede, Centiskorch, Obstagoon, Timburr, Gurdurr, Conkeldurr, Drifloon, and Drifblim.
-- Resized Drifloon.
 - Added more held items to the held item tag, and Metal Coat to the held item tab.
 - Added all ores to the modloader ore tags, and added tags for each ore type to the mod (both blocks and items).
-- Changed the Destiny Knot to be crafted with a Ghast Tear rather than a diamond. We have big plans for the Destiny Knot...
-- You can now punch grown apricorns to harvest them. We saw so many content creators breaking apricorns with their fists that it was making us die inside.
-- The "Poké Ball" Vivillon variant is now obtainable by evolving a Spewpa after obtaining the "Aspiring Vivillionaire" advancement.
-- Renamed the "Vivillionaire" advancement to "Aspiring Vivillionaire"
-- Removed the Inferno, Forsaken, Poké Ball, and Void patterns from the Aspiring Vivillionaire advancement.
-- Updated the biome tags for Spewpa's evolutions into the various Vivillon patterns. You should mostly be getting one evolution option at a time now.
-- Apricorn Sprouts can now be planted directly on Apricorn leaves to create a new Apricorn of the same color.
-- Added tooltips to interaction GUIs to make it clearer what they do.
-- Poké Ball recipes now use tags for their center ingredient, rather than specifically Copper Ingots, Iron Ingots, Gold Ingots, and Diamonds, allowing for further datapack customisation and mod compatibility.
-- Starter Toast now closes once the corresponding button is pressed once.
-- Moved some items into the vanilla Food & Drinks category.
-- Stacked Cobblemon Potion Bases can now be quick moved into Brewing Stands.
-- Changed the Healing Machine recipe to swap the Max Revive for a Revive so that it is a bit easier to craft.
-- Upped the rate that Gastly drop Ghast Tears from 2.5% to 5%, further helping the crafting of a Healing Machine.
-- Pokémon with a low Blaze Powder drop chance now drop it more frequently in the Nether.
-- Reorganised a few advancements.
-- Pokémon entity shadows now scale when the Pokémon is being sent out or recalled.
-- Remade Torkoal particles, now they only appear when in battle.
-- Improved the shiny icon within summary and PC interfaces.
-- Changed the Poison Barb sprite so that it doesn't look like a sword when held. It's a Poison Barb, not a Poison Sword. Wait, that gives me an idea.
-- Moon Stone ore generates more frequently in Taigas and has been added to Magical and Spooky biomes. Ooo... Sorry.
-- Density, Season, and Nether biome tags have been moved and renamed within the biome tags directory.
-- Added particles to Lucario when in battle. Lucario is special.
-- Movesets updated for Blueberry DLC.
+- Changed the Destiny Knot to be crafted with a Ghast Tear, rather than a diamond.
+- You can now punch grown apricorns to harvest them.
 
 ### Fixes
-- Re-added the recipe for the Iron vitamin. Well, technically it's a mineral.
-- Fixed Exeggcute and Pikachu not being able to evolve.
-- Fixed evolution priority for Exeggcute and Pikachu regional evolutions. Using a thunder stone on Kantonian Pikachu on the beach will give Alolan Raichu. A second thunder stone would then give Kantonian Raichu.
-- Fixed battle text for the Poison Touch Ability.
-- Finally found Sudowoodo and Bonsly. They were missing spawn data. Same with Drifloon and Litwick. Uh... sorry about that.
+- 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 Cubone not being able to evolve into Alolan Marowak.
 - Fixed Squawkabilly forms not being recognized.
-- Fixed the bounce animation for Poké Balls being delayed by like, a full second. It's enough to drive you mad.
-- Note blocks now play the correct sound on the Apricorn Plank-based blocks.
-- Fixed an issue with transformed parts in posers causing whacky positional issues.
-- Fixed Poké Balls freezing in an open state if you're looking away at the moment that it's meant to close. This actually fixes some other things but it's hard to explain.
-- Fixed thrown Poké Balls technically having no name.
-- Fixed very many issues with Bedrock particle effects. There are probably many more. Life goes on.
-- Fixed Arbok patterns not being as specific in spawning as they were intended to be.
-- Fixed Pokémon not avoiding danger at all when pathfinding. 
-- Fixed Pokémon pathing over snow layers and carpets.
-- Fixed the Sobble line not being able to swim or breathe underwater.
-- Fixed mod incompatibility with [Just Enough Resources](https://modrinth.com/mod/just-enough-resources-jer).
-- Fixed mod incompatibility with [Visual Overhaul](https://modrinth.com/mod/visual-overhaul).
-- Fixed an issue that allowed Pokémon to spawn on rails.
-- Fixed the data set on Pokémon when abilities are given via properties such as in ``/spawnpokemon``.
-- Fixed Pokémon sometimes losing hidden abilities when evolving. This fix will only take effect for newly created Pokémon because of technical reasons that were explained to me but which I then forgot.
-- Fixed capture messages not displaying in battle.
-- Fixed the Illusion ability causing the wrong Pokémon to be targeted in battle. 
-- Fixed battles started with fainted party members causing a soft-lock on defeat.
-- Fixed some issues with eyes in the faint animations of Hitmonlee and Phantump
-- Fixed missing evolution moves, for example Stone Axe for Kleavor.
-- Cleaned up empty evolutions declaration in species data (And no, I'm not listing all 169. No I don't care what you pay me, I'm not doing it).
-- Fixed non-consumable held items being consumed or swapped in battle permanently.
 
 ### Developer
-- Significantly changed the way the properties in PokemonEntity work. This could break some plugins (not in a big way, but changes will be needed for some things).
-- Rebuilt the scheduling API to more clearly force side choices and temporal frames of reference for tasks. The developers say that how it works is cool but I stopped listening.
-- Added dialogue API and data registry. This is powerful, and there is a full example in the Cobblemon mod you can trigger using /opendialogue \<username\> cobblemon:example. The example JSON is inside the data folder of the mod.
+- Significantly changed the way properties in PokemonEntity work. This could break some plugins (albeit in a quick-fix way).
+- Rebuilt the scheduling API to more clearly force side choices and allow more local temporal frames of reference for tasks.
+- Added dialogue API.
 - Opened up the ItemDropEntry class to allow for it to be extended.
-- Added a new "advancement" evolution variant that takes an advancement identifier and succeeds if the player has the advancement.
-- Made the spawning API capable of non-entity spawning. You can make it 'spawn' commands if you want. Go nuts.
-- Made PokemonProperties.parse more interoperable with Java. Save yourself and stop using Java.
-- Added the ``HeldItemEvent``, this comes with 2 implementation ``HeldItemEvent.Pre`` and ``HeldItemEvent.Post``. 
-- Corrections to the ability implementation have been made that make ``Ability.forced`` function as intended and never reroll an ability for a Pokémon, please check your implementations to ensure the corrected behavior is intended for your use case.
-- ``Pokemon.ability`` no longer has a public setter. Please migrate to using ``Pokemon#updateAbility``, this handles the ability coordinate storage for you when necessary.
-- ``Ability.forced``, ``Ability.index`` and ``Ability.priority`` have all had their setters internalized, there is no longer any need to manually adjust these migrate to the method mentioned above to handle that process for you.
-- ``AbilityChanger`` has been added to API alongside some implementations, this is subject to change as the ability capsule and patch currently only expect the traditional behaviour in the Pokémon games of 1 or 2 regular abilities and 1 hidden ability.
-- ``Pokemon#rollAbility`` has been added which 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.
+- The maximum amount of fossils that can fit in the Fossil Compartment can be adjusted in the config.
 - Custom fossils can be defined using a list of items and the resulting Pokémon. An example of `aerodactyl.json`:
 ```JSON
 {
@@ -486,22 +50,9 @@ These are our compromise for having both regular and Hisuian forms of these Pok
   - `returnItem`: Identifier of an item to return to the player after consumption.
 - Added 3 new item tags: `ancient_poke_balls`, `fossils`, and `tumblestones`.
 - Added a spawn rules system to modify general spawning behaviour, see the [wiki](https://wiki.cobblemon.com/index.php/Spawn_Rules) for more information.
+- 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.
 - Added dialogue datapack folder and /opendialogue command.
-- Added the item tag ``cobblemon:held/leaves_leftovers`` this can be used to flag apple-like items that can create leftovers when eaten.
-- You can now add support for dynamic lighting implementations, Cobblemon ships with a default implementation for [LambDynamicLights](https://modrinth.com/mod/lambdynamiclights) and the [Dynamic Lights Reforged](https://www.curseforge.com/minecraft/mc-mods/dynamiclights-reforged), add the following to any species or form:
-```JSON
-{
-  "lightingData": {
-    "lightLevel": 14,
-    "_lightLevelCommentRemoveMe": "Above supports 0 to 15",
-    "liquidGlowMode": "LAND",
-    "_liquidGlowModeCommentRemoveMe": "Above supports LAND, UNDERWATER or BOTH"
-  }
-}
-```
-- Following up on this change ``light_source`` was removed as a possible shoulder effect due to becoming unnecessary and never having had a default implementation.
-- Added the item tag ``cobblemon:ability_changers``, contains the ``cobblemon:ability_capsule`` & ``cobblemon:ability_patch`` by default.
-- Added the item tag ``cobblemon:held/is_friendship_booster``, allows items to give the Soothe Bell effect of a boost of 1.5x Friendship gained, contains ``cobblemon:soothe_bell`` by default.
 
 ## [1.4.1 (December 23rd, 2023)](#1-4-1)
 
@@ -519,7 +70,6 @@ These are our compromise for having both regular and Hisuian forms of these Pok
 - Added cries to Beldum, Metang and Metagross.
 - Added a /bedrockparticle command to run Snowstorm-format particle effects.
 - Added data for Dipplin, Fezandipiti, Munkidori, Ogerpon, Okidogi, Poltchageist and Sinistcha.
-- Added additional nickname trigger "Grumm" for Inkay's evolution.
 
 ### Changes
 - Using Potions, Status Heals, Ethers, and Antidotes will now return a glass bottle
@@ -635,7 +185,6 @@ These are our compromise for having both regular and Hisuian forms of these Pok
 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).
@@ -1176,7 +725,6 @@ 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
@@ -1326,7 +874,6 @@ 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.
@@ -1440,4 +987,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.

build-logic/build.gradle.kts

@@ -11,13 +11,8 @@ repositories {
 
 dependencies {
     implementation(libs.kotlin)
-    implementation(libs.indra.common)
-
     implementation(libs.licenser)
     implementation(libs.shadow)
     implementation(libs.loom)
-    implementation(libs.architectury)
-
-    implementation(libs.blossom)
-    implementation(libs.ideaExt)
+    implementation(libs.architecturyPlugin)
 }

build-logic/settings.gradle.kts

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

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

@@ -9,31 +9,18 @@
  */
 
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-import utilities.ACCESS_WIDENER
+
+val accessWidenerFile = "src/main/resources/cobblemon-common.accesswidener"
 
 plugins {
-    id("java")
-    id("java-library")
-    id("net.kyori.indra")
-    id("net.kyori.indra.git")
-
+    java
+    `java-library`
     id("org.cadixdev.licenser")
     id("dev.architectury.loom")
     id("architectury-plugin")
     kotlin("jvm")
 }
 
-group = rootProject.group
-version = rootProject.version
-description = rootProject.description
-
-indra {
-    javaVersions {
-        minimumToolchain(17)
-        target(17)
-    }
-}
-
 repositories {
     mavenCentral()
     //JEI
@@ -45,6 +32,11 @@ license {
     header(rootProject.file("HEADER"))
 }
 
+java {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+}
+
 architectury {
     minecraft = project.property("mc_version").toString()
 }
@@ -65,7 +57,8 @@ dependencies {
 
 tasks {
     withType<JavaCompile> {
-        options.compilerArgs.add("-Xlint:-processing,-classfile,-serial")
+        options.encoding = "UTF-8"
+        options.release.set(17)
     }
 
     withType<KotlinCompile> {

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

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

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

@@ -1,9 +1,6 @@
-import utilities.VersionType
-import utilities.writeVersion
-
 plugins {
-    id("java")
-    id("java-library")
+    java
+    `java-library`
     id("maven-publish")
     id("dev.architectury.loom")
 }
@@ -34,7 +31,7 @@ publishing {
 
             groupId = "com.cobblemon"
             artifactId = project.findProperty("maven.artifactId")?.toString() ?: project.name
-            version = project.writeVersion(VersionType.PUBLISHING)
+            version = rootProject.version.toString()
         }
     }
 }

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

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

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

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

build.gradle.kts

@@ -1,12 +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) {
-    val fixedBranchName = versioning.info.branch.substringAfter("/")
-    version = "$version-${fixedBranchName}-${versioning.info.build}"
-}
+    version = "$version-SNAPSHOT"
+}

common/build.gradle.kts

@@ -1,9 +1,3 @@
-import utilities.isSnapshot
-import utilities.version
-import java.time.OffsetDateTime
-import java.time.ZoneOffset
-import java.time.format.DateTimeFormatter
-
 /*
  *
  *  * Copyright (C) 2023 Cobblemon Contributors
@@ -17,10 +11,6 @@ import java.time.format.DateTimeFormatter
 plugins {
     id("cobblemon.base-conventions")
     id("cobblemon.publish-conventions")
-
-    id("net.kyori.blossom")
-    id("org.jetbrains.gradle.plugin.idea-ext")
-    id("net.nemerosa.versioning") version "2.8.2"
 }
 
 architectury {
@@ -34,26 +24,31 @@ repositories {
 }
 
 dependencies {
-    implementation(libs.bundles.kotlin)
-    modImplementation(libs.fabric.loader)
+    implementation(libs.stdlib)
+    implementation(libs.reflect)
+
+    modImplementation(libs.fabricLoader)
+    //Flywheel has no common dep so just pick one and don't use any platform specific code in common
+//    modCompileOnly(libs.flywheelFabric)
     modApi(libs.molang)
+    compileOnlyApi(libs.jeiApi)
+    modCompileOnly(libs.adornFabric)
 
-    // 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
+    // For Showdown
     modCompileOnly(libs.graal)
 
-    // Data Storage
-    modCompileOnly(libs.bundles.mongo)
+    //shadowCommon group: 'commons-io', name: 'commons-io', version: '2.6'
 
-    // Unit Testing
-    testImplementation(libs.bundles.unitTesting)
+    // For datastore
+    modCompileOnly(libs.mongoDriverCore)
+    modCompileOnly(libs.mongoDriverSync)
+
+    testRuntimeOnly(libs.junitEngine)
+    testImplementation(libs.junitApi)
+    testImplementation(libs.junitParams)
+    testImplementation(libs.mockito)
+    testImplementation(libs.mockk)
+    testImplementation(libs.classgraph)
 }
 
 tasks.withType<Test> {
@@ -63,33 +58,3 @@ tasks.withType<Test> {
         setExceptionFormat("full")
     }
 }
-
-sourceSets {
-    main {
-        blossom {
-            kotlinSources {
-                fun generateLicenseHeader() : String {
-                    val builder = StringBuilder()
-                    builder.append("/*\n")
-                    rootProject.file("HEADER").forEachLine {
-                        if(it.isEmpty()) {
-                            builder.append(" *").append("\n")
-                        } else {
-                            builder.append(" * ").append(it).append("\n")
-                        }
-                    }
-
-                    return builder.append(" */").append("\n").toString()
-                }
-
-                property("license", generateLicenseHeader())
-                property("modid", "cobblemon")
-                property("version", project.version())
-                property("isSnapshot", if(rootProject.isSnapshot()) "true" else "false")
-                property("gitCommit", versioning.info.commit)
-                property("branch", versioning.info.branch)
-                System.getProperty("buildNumber")?.let { property("buildNumber", it) }
-            }
-        }
-    }
-}

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

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

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

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

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

@@ -1,30 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.mixin;
-
-import com.cobblemon.mod.common.sherds.CobblemonSherds;
-import net.minecraft.block.DecoratedPotPatterns;
-import net.minecraft.item.Item;
-import net.minecraft.registry.RegistryKey;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-
-@Mixin(DecoratedPotPatterns.class)
-public abstract class DecoratedPotPatternsMixin {
-    @Inject(method = "fromSherd", at=@At("HEAD"), cancellable = true)
-    private static void cobblemon$getCobblemonSherdTexture(Item sherd,
-        CallbackInfoReturnable<RegistryKey<String>> cir) {
-        if (CobblemonSherds.INSTANCE.getSherdToPattern().containsKey(sherd)) {
-            cir.setReturnValue(CobblemonSherds.INSTANCE.getSherdToPattern().get(sherd));
-            return;
-        }
-    }
-}

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

@@ -40,5 +40,4 @@ public class GameRendererMixin {
         }
         lastTime = newTime;
     }
-
 }

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

@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.mixin;
-
-import com.cobblemon.mod.common.api.snowstorm.ParticleMaterials;
-import com.google.common.collect.ImmutableList;
-import net.minecraft.client.particle.ParticleManager;
-import net.minecraft.client.particle.ParticleTextureSheet;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Mutable;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-import java.util.List;
-
-@Mixin(ParticleManager.class)
-final class ParticleManagerMixin {
-    @Mutable
-    @Final
-    @Shadow
-    private static List<ParticleTextureSheet> PARTICLE_TEXTURE_SHEETS;
-
-    @Inject(at = @At("RETURN"), method = "<clinit>")
-    private static void lodestone$addTypes(CallbackInfo ci) {
-        PARTICLE_TEXTURE_SHEETS = ImmutableList.<ParticleTextureSheet>builder().addAll(PARTICLE_TEXTURE_SHEETS)
-                .add(ParticleMaterials.INSTANCE.getADD(), ParticleMaterials.INSTANCE.getALPHA(), ParticleMaterials.INSTANCE.getBLEND(), ParticleMaterials.INSTANCE.getOPAQUE()).build();
-    }
-}

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

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

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

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

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

@@ -14,7 +14,6 @@ import com.cobblemon.mod.common.api.events.CobblemonEvents;
 import com.cobblemon.mod.common.api.events.item.LeftoversCreatedEvent;
 import com.cobblemon.mod.common.api.storage.NoPokemonStoreException;
 import com.cobblemon.mod.common.api.storage.party.PartyStore;
-import com.cobblemon.mod.common.api.tags.CobblemonItemTags;
 import com.cobblemon.mod.common.pokemon.Pokemon;
 import com.cobblemon.mod.common.util.CompoundTagExtensionsKt;
 import com.cobblemon.mod.common.util.DataKeys;
@@ -23,8 +22,11 @@ import net.minecraft.entity.ItemEntity;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
+import net.minecraft.item.Items;
 import net.minecraft.nbt.NbtCompound;
 import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.sound.SoundEvent;
+import net.minecraft.sound.SoundEvents;
 import net.minecraft.text.Text;
 import net.minecraft.world.World;
 import org.objectweb.asm.Opcodes;
@@ -38,6 +40,8 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 import java.util.Objects;
 import java.util.UUID;
 
+import static com.cobblemon.mod.common.util.LocalizationUtilsKt.lang;
+
 @Mixin(PlayerEntity.class)
 public abstract class PlayerMixin extends LivingEntity {
 
@@ -140,7 +144,7 @@ public abstract class PlayerMixin extends LivingEntity {
     )
     public void onEatFood(World world, ItemStack stack, CallbackInfoReturnable<ItemStack> cir) {
         if (!getWorld().isClient) {
-            if (stack.isIn(CobblemonItemTags.LEAVES_LEFTOVERS) && getWorld().random.nextDouble() < Cobblemon.config.getAppleLeftoversChance()) {
+            if (stack.getItem() == Items.APPLE && getWorld().random.nextDouble() < Cobblemon.config.getAppleLeftoversChance()) {
                 ItemStack leftovers = new ItemStack(CobblemonItems.LEFTOVERS);
                 ServerPlayerEntity player = Objects.requireNonNull(getServer()).getPlayerManager().getPlayer(uuid);
                 assert player != null;

common/src/main/java/com/cobblemon/mod/common/mixin/invoker/AdornRegisterInvoker.java

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

common/src/main/kotlin-templates/CobblemonBuildDetails.kt.peb

@@ -1,17 +0,0 @@
-{{ license }}
-
-package com.cobblemon.mod.common
-
-object CobblemonBuildDetails {
-
-    const val MOD_ID = "{{ modid }}"
-    const val VERSION = "{{ version }}"
-    const val SNAPSHOT = {{ isSnapshot }}
-
-    const val GIT_COMMIT = "{{ gitCommit | default("Not Specified") }}"
-    const val BRANCH = "{{ branch | default("Not Specified") }}"
-
-    fun smallCommitHash(): String {
-        return this.GIT_COMMIT.substring(0, 7)
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/Cobblemon.kt

@@ -8,7 +8,6 @@
 
 package com.cobblemon.mod.common
 
-import com.cobblemon.mod.common.CobblemonBuildDetails.smallCommitHash
 import com.cobblemon.mod.common.advancement.CobblemonCriteria
 import com.cobblemon.mod.common.advancement.criterion.EvolvePokemonContext
 import com.cobblemon.mod.common.api.Priority
@@ -17,14 +16,12 @@ import com.cobblemon.mod.common.api.data.DataProvider
 import com.cobblemon.mod.common.api.drop.CommandDropEntry
 import com.cobblemon.mod.common.api.drop.DropEntry
 import com.cobblemon.mod.common.api.drop.ItemDropEntry
-import com.cobblemon.mod.common.api.events.CobblemonEvents
 import com.cobblemon.mod.common.api.events.CobblemonEvents.BATTLE_VICTORY
 import com.cobblemon.mod.common.api.events.CobblemonEvents.DATA_SYNCHRONIZED
 import com.cobblemon.mod.common.api.events.CobblemonEvents.EVOLUTION_COMPLETE
 import com.cobblemon.mod.common.api.events.CobblemonEvents.LEVEL_UP_EVENT
 import com.cobblemon.mod.common.api.events.CobblemonEvents.POKEMON_CAPTURED
 import com.cobblemon.mod.common.api.events.CobblemonEvents.TRADE_COMPLETED
-import com.cobblemon.mod.common.api.net.serializers.IdentifierDataSerializer
 import com.cobblemon.mod.common.api.net.serializers.PoseTypeDataSerializer
 import com.cobblemon.mod.common.api.net.serializers.StringSetDataSerializer
 import com.cobblemon.mod.common.api.net.serializers.Vec3DataSerializer
@@ -38,7 +35,6 @@ import com.cobblemon.mod.common.api.pokemon.experience.ExperienceGroups
 import com.cobblemon.mod.common.api.pokemon.experience.StandardExperienceCalculator
 import com.cobblemon.mod.common.api.pokemon.feature.ChoiceSpeciesFeatureProvider
 import com.cobblemon.mod.common.api.pokemon.feature.FlagSpeciesFeatureProvider
-import com.cobblemon.mod.common.api.pokemon.feature.IntSpeciesFeatureProvider
 import com.cobblemon.mod.common.api.pokemon.feature.SpeciesFeatures
 import com.cobblemon.mod.common.api.pokemon.helditem.HeldItemProvider
 import com.cobblemon.mod.common.api.pokemon.stats.EvCalculator
@@ -66,7 +62,6 @@ import com.cobblemon.mod.common.api.storage.player.PlayerDataStoreManager
 import com.cobblemon.mod.common.api.storage.player.factory.JsonPlayerDataStoreFactory
 import com.cobblemon.mod.common.api.storage.player.factory.MongoPlayerDataStoreFactory
 import com.cobblemon.mod.common.api.tags.CobblemonEntityTypeTags
-import com.cobblemon.mod.common.api.tags.CobblemonItemTags
 import com.cobblemon.mod.common.battles.BagItems
 import com.cobblemon.mod.common.battles.BattleFormat
 import com.cobblemon.mod.common.battles.BattleRegistry
@@ -118,6 +113,15 @@ import com.mongodb.ConnectionString
 import com.mongodb.MongoClientSettings
 import com.mongodb.client.MongoClient
 import com.mongodb.client.MongoClients
+import java.io.File
+import java.io.FileReader
+import java.io.FileWriter
+import java.io.PrintWriter
+import java.util.UUID
+import kotlin.properties.Delegates
+import kotlin.reflect.full.memberProperties
+import kotlin.reflect.jvm.isAccessible
+import kotlin.reflect.jvm.javaField
 import net.minecraft.client.MinecraftClient
 import net.minecraft.command.argument.serialize.ConstantArgumentSerializer
 import net.minecraft.entity.data.TrackedDataHandlerRegistry
@@ -127,23 +131,12 @@ import net.minecraft.registry.RegistryKey
 import net.minecraft.util.WorldSavePath
 import net.minecraft.world.World
 import org.apache.logging.log4j.LogManager
-import org.apache.logging.log4j.Logger
-import java.io.File
-import java.io.FileReader
-import java.io.FileWriter
-import java.io.PrintWriter
-import java.util.*
-import kotlin.properties.Delegates
-import kotlin.reflect.full.memberProperties
-import kotlin.reflect.jvm.isAccessible
-import kotlin.reflect.jvm.javaField
-import kotlin.math.roundToInt
 
 object Cobblemon {
-    const val MODID = CobblemonBuildDetails.MOD_ID
-    const val VERSION = CobblemonBuildDetails.VERSION
+    const val MODID = "cobblemon"
+    const val VERSION = "1.4.0"
     const val CONFIG_PATH = "config/$MODID/main.json"
-    val LOGGER: Logger = LogManager.getLogger()
+    val LOGGER = LogManager.getLogger()
 
     lateinit var implementation: CobblemonImplementation
     @Deprecated("This field is now a config value", ReplaceWith("Cobblemon.config.captureCalculator"))
@@ -173,13 +166,6 @@ object Cobblemon {
 
     fun preInitialize(implementation: CobblemonImplementation) {
         this.implementation = implementation
-
-        this.LOGGER.info("Launching Cobblemon ${CobblemonBuildDetails.VERSION}${if(CobblemonBuildDetails.SNAPSHOT) "-SNAPSHOT" else ""} ")
-        if(CobblemonBuildDetails.SNAPSHOT) {
-            this.LOGGER.info("  - Git Commit: ${smallCommitHash()} (https://gitlab.com/cable-mc/cobblemon/-/commit/${CobblemonBuildDetails.GIT_COMMIT})")
-            this.LOGGER.info("  - Branch: ${CobblemonBuildDetails.BRANCH}")
-        }
-
         implementation.registerPermissionValidator()
         implementation.registerSoundEvents()
         implementation.registerBlocks()
@@ -234,7 +220,7 @@ object Cobblemon {
             val player = event.player
             val block = player.world.getBlockState(event.pos).block
             player.party().forEach { pokemon ->
-                pokemon.lockedEvolutions
+                pokemon.evolutions
                     .filterIsInstance<BlockClickEvolution>()
                     .forEach { evolution ->
                         evolution.attemptEvolution(pokemon, BlockClickEvolution.BlockInteractionContext(block, player.world))
@@ -242,9 +228,6 @@ object Cobblemon {
             }
         }
 
-        // Register the grow_tumblestone advancement
-        PlatformEvents.RIGHT_CLICK_BLOCK.subscribe { AdvancementHandler.onTumbleStonePlaced(it) }
-
         PlatformEvents.CHANGE_DIMENSION.subscribe {
             it.player.party().forEach { pokemon -> pokemon.entity?.recallWithAnimation() }
         }
@@ -252,17 +235,6 @@ object Cobblemon {
         TrackedDataHandlerRegistry.register(Vec3DataSerializer)
         TrackedDataHandlerRegistry.register(StringSetDataSerializer)
         TrackedDataHandlerRegistry.register(PoseTypeDataSerializer)
-        TrackedDataHandlerRegistry.register(IdentifierDataSerializer)
-
-        // Lowest priority because this applies after luxury ball bonus as of gen 4
-        CobblemonEvents.FRIENDSHIP_UPDATED.subscribe(Priority.LOWEST) { event ->
-            var increment = (event.newFriendship - event.pokemon.friendship).toFloat()
-            // Our Luxury ball spec is diff from official, but we will still assume these stack
-            if (event.pokemon.heldItemNoCopy().isIn(CobblemonItemTags.IS_FRIENDSHIP_BOOSTER)) {
-                increment += increment * 0.5F
-            }
-            event.newFriendship = event.pokemon.friendship + increment.roundToInt()
-        }
 
         HeldItemProvider.register(CobblemonHeldItemManager, Priority.LOWEST)
     }
@@ -278,7 +250,6 @@ object Cobblemon {
 
         SpeciesFeatures.types["choice"] = ChoiceSpeciesFeatureProvider::class.java
         SpeciesFeatures.types["flag"] = FlagSpeciesFeatureProvider::class.java
-        SpeciesFeatures.types["integer"] = IntSpeciesFeatureProvider::class.java
 
         SpeciesFeatures.register(
             DataKeys.CAN_BE_MILKED,
@@ -371,6 +342,36 @@ object Cobblemon {
         BATTLE_VICTORY.subscribe { AdvancementHandler.onWinBattle(it) }
         EVOLUTION_COMPLETE.subscribe(Priority.LOWEST) { event ->
             AdvancementHandler.onEvolve(event)
+            val pokemon = event.pokemon
+            val ninjaskIdentifier = cobblemonResource("ninjask")
+            // Ensure the config option is enabled and that the result was a ninjask and that shedinja exists
+            if (this.config.ninjaskCreatesShedinja && pokemon.species.resourceIdentifier == ninjaskIdentifier && PokemonSpecies.getByIdentifier(Pokemon.SHEDINJA) != null) {
+                val player = pokemon.getOwnerPlayer() ?: return@subscribe
+                if (player.isCreative || player.inventory.containsAny { it.item is PokeBallItem }) {
+                    var pokeball = Items.AIR
+                    player.inventory.combinedInventory.forEach {
+                        it.forEach {
+                            itemStack -> if (itemStack.item is PokeBallItem && pokeball == Items.AIR) {
+                                pokeball = itemStack.item as PokeBallItem
+                            }
+                        }
+                    }
+                    if (!player.isCreative) {
+                        player.inventory.removeAmountIf(1) { it.item is PokeBallItem }
+                    }
+                    if (pokeball == Items.AIR) {
+                        pokeball = CobblemonItems.POKE_BALL
+                    }
+                    val properties = event.evolution.result.copy()
+                    properties.species = Pokemon.SHEDINJA.toString()
+                    val product = pokemon.clone()
+                    product.removeHeldItem()
+                    properties.apply(product)
+                    product.caughtBall = (pokeball as PokeBallItem).pokeBall
+                    pokemon.storeCoordinates.get()?.store?.add(product)
+                    CobblemonCriteria.EVOLVE_POKEMON.trigger(player, EvolvePokemonContext(event.pokemon.preEvolution!!.species.resourceIdentifier, product.species.resourceIdentifier, playerData.get(player).advancementData.totalEvolvedCount))
+                }
+            }
         }
         LEVEL_UP_EVENT.subscribe { AdvancementHandler.onLevelUp(it) }
         TRADE_COMPLETED.subscribe { AdvancementHandler.onTradeCompleted(it) }
@@ -384,7 +385,6 @@ object Cobblemon {
                 true
             ).ifSuccessful { it.mute = true }
         }
-
     }
 
     fun getLevel(dimension: RegistryKey<World>): World? {

common/src/main/kotlin/com/cobblemon/mod/common/CobblemonBlockEntities.kt

@@ -12,12 +12,11 @@ import com.cobblemon.mod.common.block.entity.BerryBlockEntity
 import com.cobblemon.mod.common.block.entity.HealingMachineBlockEntity
 import com.cobblemon.mod.common.block.entity.PCBlockEntity
 import com.cobblemon.mod.common.block.entity.PokemonPastureBlockEntity
-import com.cobblemon.mod.common.block.entity.FossilAnalyzerBlockEntity
-import com.cobblemon.mod.common.block.entity.FossilMultiblockEntity
-import com.cobblemon.mod.common.block.entity.RestorationTankBlockEntity
+import com.cobblemon.mod.common.block.entity.fossil.FossilCompartmentBlockEntity
+import com.cobblemon.mod.common.block.entity.fossil.FossilMultiblockEntity
+import com.cobblemon.mod.common.block.entity.fossil.FossilTubeBlockEntity
 import com.cobblemon.mod.common.block.multiblock.FossilMultiblockBuilder
 import com.cobblemon.mod.common.block.entity.*
-import com.cobblemon.mod.common.block.entity.DisplayCaseBlockEntity
 import com.cobblemon.mod.common.platform.PlatformRegistry
 import net.minecraft.block.entity.BlockEntityType
 import net.minecraft.registry.Registries
@@ -46,41 +45,24 @@ object CobblemonBlockEntities : PlatformRegistry<Registry<BlockEntityType<*>>, R
     @JvmField
     val HANGING_SIGN: BlockEntityType<CobblemonHangingSignBlockEntity> = this.create("hanging_sign", BlockEntityType.Builder.create(::CobblemonHangingSignBlockEntity, CobblemonBlocks.APRICORN_HANGING_SIGN, CobblemonBlocks.APRICORN_WALL_HANGING_SIGN).build(null))
 
-    @JvmField
-    val GILDED_CHEST: BlockEntityType<GildedChestBlockEntity> = this.create("chest", BlockEntityType.Builder.create(::GildedChestBlockEntity,
-        CobblemonBlocks.GILDED_CHEST,
-        CobblemonBlocks.BLUE_GILDED_CHEST,
-        CobblemonBlocks.YELLOW_GILDED_CHEST,
-        CobblemonBlocks.PINK_GILDED_CHEST,
-        CobblemonBlocks.BLACK_GILDED_CHEST,
-        CobblemonBlocks.WHITE_GILDED_CHEST,
-        CobblemonBlocks.GREEN_GILDED_CHEST,
-        CobblemonBlocks.GIMMIGHOUL_CHEST
-    ).build(null))
-
     @JvmField
     val FOSSIL_MULTIBLOCK: BlockEntityType<FossilMultiblockEntity> = this.create("fossil_multiblock",
         BlockEntityType.Builder.create({ pos, state -> FossilMultiblockEntity(pos, state, FossilMultiblockBuilder(pos)) },
-            CobblemonBlocks.MONITOR
+            CobblemonBlocks.FOSSIL_MONITOR
         ).build(null)
     )
 
     @JvmField
-    val RESTORATION_TANK: BlockEntityType<RestorationTankBlockEntity> = this.create("restoration_tank",
-        BlockEntityType.Builder.create({ pos, state -> RestorationTankBlockEntity(pos, state, FossilMultiblockBuilder(pos)) },
-            CobblemonBlocks.RESTORATION_TANK
+    val FOSSIL_TUBE: BlockEntityType<FossilTubeBlockEntity> = this.create("fossil_tube",
+        BlockEntityType.Builder.create({ pos, state -> FossilTubeBlockEntity(pos, state, FossilMultiblockBuilder(pos)) },
+            CobblemonBlocks.FOSSIL_TUBE
         ).build(null)
     )
 
     @JvmField
-    val FOSSIL_ANALYZER: BlockEntityType<FossilAnalyzerBlockEntity> = this.create("fossil_analyzer",
-        BlockEntityType.Builder.create({ pos, state -> FossilAnalyzerBlockEntity(pos, state, FossilMultiblockBuilder(pos)) },
-            CobblemonBlocks.FOSSIL_ANALYZER
+    val FOSSIL_COMPARTMENT: BlockEntityType<FossilCompartmentBlockEntity> = this.create("fossil_compartment",
+        BlockEntityType.Builder.create({ pos, state -> FossilCompartmentBlockEntity(pos, state, FossilMultiblockBuilder(pos)) },
+            CobblemonBlocks.FOSSIL_COMPARTMENT
         ).build(null)
     )
-
-    @JvmField
-    val DISPLAY_CASE: BlockEntityType<DisplayCaseBlockEntity> = this.create("display_case",
-        BlockEntityType.Builder.create(::DisplayCaseBlockEntity, CobblemonBlocks.DISPLAY_CASE).build(null)
-    )
 }

common/src/main/kotlin/com/cobblemon/mod/common/CobblemonBlocks.kt

@@ -11,9 +11,9 @@ package com.cobblemon.mod.common
 import com.cobblemon.mod.common.api.apricorn.Apricorn
 import com.cobblemon.mod.common.block.*
 import com.cobblemon.mod.common.block.MintBlock.MintType
-import com.cobblemon.mod.common.block.FossilAnalyzerBlock
-import com.cobblemon.mod.common.block.MonitorBlock
-import com.cobblemon.mod.common.block.RestorationTankBlock
+import com.cobblemon.mod.common.block.fossilmachine.FossilCompartmentBlock
+import com.cobblemon.mod.common.block.fossilmachine.FossilMonitorBlock
+import com.cobblemon.mod.common.block.fossilmachine.FossilTubeBlock
 import com.cobblemon.mod.common.mixin.invoker.DoorBlockInvoker
 import com.cobblemon.mod.common.mixin.invoker.PressurePlateBlockInvoker
 import com.cobblemon.mod.common.mixin.invoker.StairsBlockInvoker
@@ -22,13 +22,11 @@ import com.cobblemon.mod.common.mixin.invoker.*
 import com.cobblemon.mod.common.platform.PlatformRegistry
 import com.cobblemon.mod.common.util.cobblemonResource
 import com.cobblemon.mod.common.block.BerryBlock
-import com.cobblemon.mod.common.block.chest.GildedChestBlock
 import com.cobblemon.mod.common.block.sign.CobblemonHangingSignBlock
 import com.cobblemon.mod.common.block.sign.CobblemonSignBlock
 import com.cobblemon.mod.common.block.sign.CobblemonWallHangingSignBlock
 import com.cobblemon.mod.common.block.sign.CobblemonWallSignBlock
 import net.minecraft.block.*
-import net.minecraft.block.enums.Instrument
 import net.minecraft.block.piston.PistonBehavior
 import net.minecraft.entity.effect.StatusEffects
 import net.minecraft.registry.Registries
@@ -58,8 +56,6 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, RegistryKey<Registry<
     @JvmField
     val FIRE_STONE_ORE = evolutionStoneOre("fire_stone_ore")
     @JvmField
-    val NETHER_FIRE_STONE_ORE = evolutionStoneOre("nether_fire_stone_ore")
-    @JvmField
     val ICE_STONE_ORE = evolutionStoneOre("ice_stone_ore")
     @JvmField
     val LEAF_STONE_ORE = evolutionStoneOre("leaf_stone_ore")
@@ -72,8 +68,6 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, RegistryKey<Registry<
     @JvmField
     val SUN_STONE_ORE = evolutionStoneOre("sun_stone_ore")
     @JvmField
-    val TERRACOTTA_SUN_STONE_ORE = evolutionStoneOre("terracotta_sun_stone_ore")
-    @JvmField
     val THUNDER_STONE_ORE = evolutionStoneOre("thunder_stone_ore")
     @JvmField
     val WATER_STONE_ORE = evolutionStoneOre("water_stone_ore")
@@ -109,17 +103,17 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, RegistryKey<Registry<
     @JvmField
     val STRIPPED_APRICORN_WOOD = log("stripped_apricorn_wood")
     @JvmField
-    val APRICORN_PLANKS = this.create("apricorn_planks", Block(AbstractBlock.Settings.create().mapColor(MapColor.DIRT_BROWN).instrument(Instrument.BASS).strength(2.0f, 3.0f).sounds(BlockSoundGroup.WOOD)))
+    val APRICORN_PLANKS = this.create("apricorn_planks", Block(AbstractBlock.Settings.create().mapColor(MapColor.DIRT_BROWN).strength(2.0f, 3.0f).sounds(BlockSoundGroup.WOOD)))
     @JvmField
     val APRICORN_LEAVES = leaves("apricorn_leaves")
     @JvmField
-    val APRICORN_FENCE = this.create("apricorn_fence", FenceBlock(AbstractBlock.Settings.create().mapColor(APRICORN_PLANKS.defaultMapColor).instrument(Instrument.BASS).strength(2.0f, 3.0f).sounds(BlockSoundGroup.WOOD)))
+    val APRICORN_FENCE = this.create("apricorn_fence", FenceBlock(AbstractBlock.Settings.create().mapColor(APRICORN_PLANKS.defaultMapColor).strength(2.0f, 3.0f).sounds(BlockSoundGroup.WOOD)))
     @JvmField
-    val APRICORN_FENCE_GATE = this.create("apricorn_fence_gate", FenceGateBlock(AbstractBlock.Settings.create().mapColor(APRICORN_PLANKS.defaultMapColor).instrument(Instrument.BASS).strength(2.0f, 3.0f).sounds(BlockSoundGroup.WOOD), APRICORN_WOOD_TYPE))
+    val APRICORN_FENCE_GATE = this.create("apricorn_fence_gate", FenceGateBlock(AbstractBlock.Settings.create().mapColor(APRICORN_PLANKS.defaultMapColor).strength(2.0f, 3.0f).sounds(BlockSoundGroup.WOOD), APRICORN_WOOD_TYPE))
     @JvmField // Note At the time of 1.20.0 we don't need our own BlockSetType for Apricorn wood
     val APRICORN_BUTTON = this.create("apricorn_button", BlocksInvoker.createWoodenButtonBlock(BlockSetType.OAK))
     @JvmField
-    val APRICORN_PRESSURE_PLATE = this.create("apricorn_pressure_plate", PressurePlateBlockInvoker.`cobblemon$create`(PressurePlateBlock.ActivationRule.EVERYTHING, AbstractBlock.Settings.create().mapColor(APRICORN_PLANKS.defaultMapColor).instrument(Instrument.BASS).noCollision().strength(0.5f).sounds(BlockSoundGroup.WOOD), APRICORN_BLOCK_SET_TYPE))
+    val APRICORN_PRESSURE_PLATE = this.create("apricorn_pressure_plate", PressurePlateBlockInvoker.`cobblemon$create`(PressurePlateBlock.ActivationRule.EVERYTHING, AbstractBlock.Settings.create().mapColor(APRICORN_PLANKS.defaultMapColor).noCollision().strength(0.5f).sounds(BlockSoundGroup.WOOD), APRICORN_BLOCK_SET_TYPE))
     @JvmField
     val APRICORN_SIGN = this.create("apricorn_sign", CobblemonSignBlock(AbstractBlock.Settings.copy(Blocks.OAK_SIGN), APRICORN_WOOD_TYPE))
     @JvmField
@@ -129,13 +123,13 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, RegistryKey<Registry<
     @JvmField
     val APRICORN_WALL_HANGING_SIGN = this.create("apricorn_wall_hanging_sign", CobblemonWallHangingSignBlock(AbstractBlock.Settings.copy(Blocks.OAK_HANGING_SIGN), APRICORN_WOOD_TYPE))
     @JvmField
-    val APRICORN_SLAB = this.create("apricorn_slab", SlabBlock(AbstractBlock.Settings.create().mapColor(MapColor.OAK_TAN).instrument(Instrument.BASS).strength(2.0f, 3.0f).sounds(BlockSoundGroup.WOOD)))
+    val APRICORN_SLAB = this.create("apricorn_slab", SlabBlock(AbstractBlock.Settings.create().mapColor(MapColor.OAK_TAN).strength(2.0f, 3.0f).sounds(BlockSoundGroup.WOOD)))
     @JvmField
     val APRICORN_STAIRS = this.create("apricorn_stairs", StairsBlockInvoker.`cobblemon$create`(APRICORN_PLANKS.defaultState, AbstractBlock.Settings.copy(APRICORN_PLANKS)))
     @JvmField
-    val APRICORN_DOOR = this.create("apricorn_door", DoorBlockInvoker.`cobblemon$create`(AbstractBlock.Settings.create().mapColor(APRICORN_PLANKS.defaultMapColor).instrument(Instrument.BASS).strength(3.0F).sounds(BlockSoundGroup.WOOD).nonOpaque(), APRICORN_BLOCK_SET_TYPE))
+    val APRICORN_DOOR = this.create("apricorn_door", DoorBlockInvoker.`cobblemon$create`(AbstractBlock.Settings.create().mapColor(APRICORN_PLANKS.defaultMapColor).strength(3.0F).sounds(BlockSoundGroup.WOOD).nonOpaque(), APRICORN_BLOCK_SET_TYPE))
     @JvmField
-    val APRICORN_TRAPDOOR = this.create("apricorn_trapdoor", TrapdoorBlockInvoker.`cobblemon$create`(AbstractBlock.Settings.create().mapColor(MapColor.OAK_TAN).instrument(Instrument.BASS).strength(3.0F).sounds(BlockSoundGroup.WOOD).nonOpaque().allowsSpawning { _, _, _, _ -> false }, APRICORN_BLOCK_SET_TYPE))
+    val APRICORN_TRAPDOOR = this.create("apricorn_trapdoor", TrapdoorBlockInvoker.`cobblemon$create`(AbstractBlock.Settings.create().mapColor(MapColor.OAK_TAN).strength(3.0F).sounds(BlockSoundGroup.WOOD).nonOpaque().allowsSpawning { _, _, _, _ -> false }, APRICORN_BLOCK_SET_TYPE))
 
     private val PLANT_PROPERTIES = AbstractBlock.Settings.create().mapColor(MapColor.DARK_GREEN).noCollision().ticksRandomly().breakInstantly().sounds(BlockSoundGroup.GRASS).pistonBehavior(PistonBehavior.DESTROY)
     @JvmField
@@ -154,271 +148,58 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, RegistryKey<Registry<
     val YELLOW_APRICORN_SAPLING = this.create("yellow_apricorn_sapling", ApricornSaplingBlock(PLANT_PROPERTIES, Apricorn.YELLOW))
 
     @JvmField
-    val MEDICINAL_LEEK = this.create("medicinal_leek", MedicinalLeekBlock(AbstractBlock.Settings.create().pistonBehavior(PistonBehavior.DESTROY).burnable().mapColor(MapColor.DULL_RED).noCollision().ticksRandomly().breakInstantly().sounds(CobblemonSounds.MEDICINAL_LEEK_SOUNDS)))
+    val MEDICINAL_LEEK = this.create("medicinal_leek", MedicinalLeekBlock(AbstractBlock.Settings.create().pistonBehavior(PistonBehavior.DESTROY).burnable().mapColor(MapColor.DULL_RED).noCollision().ticksRandomly().breakInstantly().sounds(BlockSoundGroup.CROP)))
     @JvmField
-    val ENERGY_ROOT = this.create("energy_root", EnergyRootBlock(AbstractBlock.Settings.create().pistonBehavior(PistonBehavior.DESTROY).burnable().mapColor(MapColor.DIRT_BROWN).noCollision().ticksRandomly().breakInstantly().sounds(CobblemonSounds.ENERGY_ROOT_SOUNDS)))
+    val ENERGY_ROOT = this.create("energy_root", EnergyRootBlock(AbstractBlock.Settings.create().pistonBehavior(PistonBehavior.DESTROY).burnable().mapColor(MapColor.DIRT_BROWN).noCollision().ticksRandomly().breakInstantly().sounds(BlockSoundGroup.ROOTS)))
     @JvmField
-    val BIG_ROOT = this.create("big_root", BigRootBlock(AbstractBlock.Settings.create().pistonBehavior(PistonBehavior.DESTROY).burnable().mapColor(MapColor.DARK_GREEN).noCollision().ticksRandomly().breakInstantly().sounds(CobblemonSounds.BIG_ROOT_SOUNDS)))
+    val BIG_ROOT = this.create("big_root", BigRootBlock(AbstractBlock.Settings.create().pistonBehavior(PistonBehavior.DESTROY).burnable().mapColor(MapColor.DARK_GREEN).noCollision().ticksRandomly().breakInstantly().sounds(BlockSoundGroup.ROOTS)))
     @JvmField
-    val REVIVAL_HERB = this.create("revival_herb", RevivalHerbBlock(AbstractBlock.Settings.create().pistonBehavior(PistonBehavior.DESTROY).mapColor(MapColor.DARK_GREEN).burnable().noCollision().breakInstantly().sounds(CobblemonSounds.REVIVAL_HERB_SOUNDS)))
+    val REVIVAL_HERB = this.create("revival_herb", RevivalHerbBlock(AbstractBlock.Settings.create().pistonBehavior(PistonBehavior.DESTROY).mapColor(MapColor.DARK_GREEN).burnable().noCollision().breakInstantly().sounds(BlockSoundGroup.CROP)))
 
     @JvmField
-    val TUMBLESTONE_CLUSTER = tumblestoneBlock("tumblestone_cluster", GrowableStoneBlock.STAGE_3, 7, 3, null)
+    val TUMBLESTONE_CLUSTER = tumblestoneBlock("tumblestone_cluster", TumblestoneBlock.STAGE_3, 7, 3, null)
     @JvmField
-    val LARGE_BUDDING_TUMBLESTONE = tumblestoneBlock("large_budding_tumblestone", GrowableStoneBlock.STAGE_2, 5, 3, TUMBLESTONE_CLUSTER)
+    val LARGE_BUDDING_TUMBLESTONE = tumblestoneBlock("large_budding_tumblestone", TumblestoneBlock.STAGE_2, 5, 3, TUMBLESTONE_CLUSTER)
     @JvmField
-    val MEDIUM_BUDDING_TUMBLESTONE = tumblestoneBlock("medium_budding_tumblestone", GrowableStoneBlock.STAGE_1, 4, 3, LARGE_BUDDING_TUMBLESTONE)
+    val MEDIUM_BUDDING_TUMBLESTONE = tumblestoneBlock("medium_budding_tumblestone", TumblestoneBlock.STAGE_1, 4, 3, LARGE_BUDDING_TUMBLESTONE)
     @JvmField
-    val SMALL_BUDDING_TUMBLESTONE = tumblestoneBlock("small_budding_tumblestone", GrowableStoneBlock.STAGE_0, 3, 4, MEDIUM_BUDDING_TUMBLESTONE)
+    val SMALL_BUDDING_TUMBLESTONE = tumblestoneBlock("small_budding_tumblestone", TumblestoneBlock.STAGE_0, 3, 4, MEDIUM_BUDDING_TUMBLESTONE)
 
     @JvmField
-    val SKY_TUMBLESTONE_CLUSTER = tumblestoneBlock("sky_tumblestone_cluster", GrowableStoneBlock.STAGE_3, 7, 3, null)
+    val SKY_TUMBLESTONE_CLUSTER = tumblestoneBlock("sky_tumblestone_cluster", TumblestoneBlock.STAGE_3, 7, 3, null)
     @JvmField
-    val LARGE_BUDDING_SKY_TUMBLESTONE = tumblestoneBlock("large_budding_sky_tumblestone", GrowableStoneBlock.STAGE_2, 5, 3, SKY_TUMBLESTONE_CLUSTER)
+    val LARGE_BUDDING_SKY_TUMBLESTONE = tumblestoneBlock("large_budding_sky_tumblestone", TumblestoneBlock.STAGE_2, 5, 3, SKY_TUMBLESTONE_CLUSTER)
     @JvmField
-    val MEDIUM_BUDDING_SKY_TUMBLESTONE = tumblestoneBlock("medium_budding_sky_tumblestone", GrowableStoneBlock.STAGE_1, 4, 3, LARGE_BUDDING_SKY_TUMBLESTONE)
+    val MEDIUM_BUDDING_SKY_TUMBLESTONE = tumblestoneBlock("medium_budding_sky_tumblestone", TumblestoneBlock.STAGE_1, 4, 3, LARGE_BUDDING_SKY_TUMBLESTONE)
     @JvmField
-    val SMALL_BUDDING_SKY_TUMBLESTONE = tumblestoneBlock("small_budding_sky_tumblestone", GrowableStoneBlock.STAGE_0, 3, 4, MEDIUM_BUDDING_SKY_TUMBLESTONE)
+    val SMALL_BUDDING_SKY_TUMBLESTONE = tumblestoneBlock("small_budding_sky_tumblestone", TumblestoneBlock.STAGE_0, 3, 4, MEDIUM_BUDDING_SKY_TUMBLESTONE)
 
     @JvmField
-    val BLACK_TUMBLESTONE_CLUSTER = tumblestoneBlock("black_tumblestone_cluster", GrowableStoneBlock.STAGE_3, 7, 3, null)
+    val BLACK_TUMBLESTONE_CLUSTER = tumblestoneBlock("black_tumblestone_cluster", TumblestoneBlock.STAGE_3, 7, 3, null)
     @JvmField
-    val LARGE_BUDDING_BLACK_TUMBLESTONE = tumblestoneBlock("large_budding_black_tumblestone", GrowableStoneBlock.STAGE_2, 5, 3, BLACK_TUMBLESTONE_CLUSTER)
+    val LARGE_BUDDING_BLACK_TUMBLESTONE = tumblestoneBlock("large_budding_black_tumblestone", TumblestoneBlock.STAGE_2, 5, 3, BLACK_TUMBLESTONE_CLUSTER)
     @JvmField
-    val MEDIUM_BUDDING_BLACK_TUMBLESTONE = tumblestoneBlock("medium_budding_black_tumblestone", GrowableStoneBlock.STAGE_1, 4, 3, LARGE_BUDDING_BLACK_TUMBLESTONE)
+    val MEDIUM_BUDDING_BLACK_TUMBLESTONE = tumblestoneBlock("medium_budding_black_tumblestone", TumblestoneBlock.STAGE_1, 4, 3, LARGE_BUDDING_BLACK_TUMBLESTONE)
     @JvmField
-    val SMALL_BUDDING_BLACK_TUMBLESTONE = tumblestoneBlock("small_budding_black_tumblestone", GrowableStoneBlock.STAGE_0, 3, 4, MEDIUM_BUDDING_BLACK_TUMBLESTONE)
+    val SMALL_BUDDING_BLACK_TUMBLESTONE = tumblestoneBlock("small_budding_black_tumblestone", TumblestoneBlock.STAGE_0, 3, 4, MEDIUM_BUDDING_BLACK_TUMBLESTONE)
 
     @JvmField
     val TUMBLESTONE_BLOCK = this.create("tumblestone_block", Block(AbstractBlock.Settings.create()
         .mapColor(MapColor.TERRACOTTA_ORANGE)
         .strength(1.0F)
         .sounds(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS)
-        .requiresTool()
-        .instrument(Instrument.BASEDRUM)
     ))
     @JvmField
     val SKY_TUMBLESTONE_BLOCK = this.create("sky_tumblestone_block", Block(AbstractBlock.Settings.create()
         .mapColor(MapColor.LIGHT_BLUE)
         .strength(1.0F)
         .sounds(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS)
-        .requiresTool()
-        .instrument(Instrument.BASEDRUM)
     ))
     @JvmField
     val BLACK_TUMBLESTONE_BLOCK = this.create("black_tumblestone_block", Block(AbstractBlock.Settings.create()
         .mapColor(MapColor.TERRACOTTA_BLACK)
         .strength(1.0F)
         .sounds(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS)
-        .requiresTool()
-        .instrument(Instrument.BASEDRUM)
-    ))
-
-    @JvmField
-    val POLISHED_TUMBLESTONE = this.create("polished_tumblestone", Block(AbstractBlock.Settings.create()
-        .mapColor(MapColor.TERRACOTTA_ORANGE)
-        .strength(1.0F)
-        .sounds(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS)
-        .requiresTool()
-        .instrument(Instrument.BASEDRUM)
-    ))
-    @JvmField
-    val POLISHED_TUMBLESTONE_STAIRS = this.create("polished_tumblestone_stairs", StairsBlockInvoker.`cobblemon$create`(POLISHED_TUMBLESTONE.defaultState, AbstractBlock.Settings.copy(POLISHED_TUMBLESTONE)))
-    @JvmField
-    val POLISHED_TUMBLESTONE_SLAB = this.create("polished_tumblestone_slab", SlabBlock(AbstractBlock.Settings.create()
-        .mapColor(MapColor.TERRACOTTA_ORANGE)
-        .strength(1.0F)
-        .sounds(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS)
-        .requiresTool()
-        .instrument(Instrument.BASEDRUM)
-    ))
-    @JvmField
-    val POLISHED_TUMBLESTONE_WALL = this.create("polished_tumblestone_wall", WallBlock(AbstractBlock.Settings.create()
-        .mapColor(MapColor.TERRACOTTA_ORANGE)
-        .strength(1.0F)
-        .sounds(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS)
-        .requiresTool()
-        .instrument(Instrument.BASEDRUM)
-    ))
-    @JvmField
-    val CHISELED_POLISHED_TUMBLESTONE = this.create("chiseled_polished_tumblestone", Block(AbstractBlock.Settings.create()
-        .mapColor(MapColor.TERRACOTTA_ORANGE)
-        .strength(1.0F)
-        .sounds(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS)
-        .requiresTool()
-        .instrument(Instrument.BASEDRUM)
-    ))
-    @JvmField
-    val TUMBLESTONE_BRICKS = this.create("tumblestone_bricks", Block(AbstractBlock.Settings.create()
-        .mapColor(MapColor.TERRACOTTA_ORANGE)
-        .strength(1.0F)
-        .sounds(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS)
-        .requiresTool()
-        .instrument(Instrument.BASEDRUM)
-    ))
-    @JvmField
-    val TUMBLESTONE_BRICK_STAIRS = this.create("tumblestone_brick_stairs", StairsBlockInvoker.`cobblemon$create`(TUMBLESTONE_BRICKS.defaultState, AbstractBlock.Settings.copy(TUMBLESTONE_BRICKS)))
-    @JvmField
-    val TUMBLESTONE_BRICK_SLAB = this.create("tumblestone_brick_slab", SlabBlock(AbstractBlock.Settings.create()
-        .mapColor(MapColor.TERRACOTTA_ORANGE)
-        .strength(1.0F)
-        .sounds(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS)
-        .requiresTool()
-        .instrument(Instrument.BASEDRUM)
-    ))
-@JvmField
-    val TUMBLESTONE_BRICK_WALL = this.create("tumblestone_brick_wall", WallBlock(AbstractBlock.Settings.create()
-        .mapColor(MapColor.TERRACOTTA_ORANGE)
-        .strength(1.0F)
-        .sounds(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS)
-        .requiresTool()
-        .instrument(Instrument.BASEDRUM)
-    ))
-    @JvmField
-    val CHISELED_TUMBLESTONE_BRICKS = this.create("chiseled_tumblestone_bricks", Block(AbstractBlock.Settings.create()
-        .mapColor(MapColor.TERRACOTTA_ORANGE)
-        .strength(1.0F)
-        .sounds(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS)
-        .requiresTool()
-        .instrument(Instrument.BASEDRUM)
-    ))
-    @JvmField
-    val POLISHED_SKY_TUMBLESTONE = this.create("polished_sky_tumblestone", Block(AbstractBlock.Settings.create()
-        .mapColor(MapColor.LIGHT_BLUE)
-        .strength(1.0F)
-        .sounds(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS)
-        .requiresTool()
-        .instrument(Instrument.BASEDRUM)
-    ))
-    @JvmField
-    val POLISHED_SKY_TUMBLESTONE_STAIRS = this.create("polished_sky_tumblestone_stairs", StairsBlockInvoker.`cobblemon$create`(POLISHED_SKY_TUMBLESTONE.defaultState, AbstractBlock.Settings.copy(POLISHED_SKY_TUMBLESTONE)))
-    @JvmField
-    val POLISHED_SKY_TUMBLESTONE_SLAB = this.create("polished_sky_tumblestone_slab", SlabBlock(AbstractBlock.Settings.create()
-        .mapColor(MapColor.LIGHT_BLUE)
-        .strength(1.0F)
-        .sounds(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS)
-        .requiresTool()
-        .instrument(Instrument.BASEDRUM)
-    ))
-@JvmField
-    val POLISHED_SKY_TUMBLESTONE_WALL = this.create("polished_sky_tumblestone_wall", WallBlock(AbstractBlock.Settings.create()
-        .mapColor(MapColor.LIGHT_BLUE)
-        .strength(1.0F)
-        .sounds(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS)
-        .requiresTool()
-        .instrument(Instrument.BASEDRUM)
-    ))
-    @JvmField
-    val CHISELED_POLISHED_SKY_TUMBLESTONE = this.create("chiseled_polished_sky_tumblestone", Block(AbstractBlock.Settings.create()
-        .mapColor(MapColor.LIGHT_BLUE)
-        .strength(1.0F)
-        .sounds(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS)
-        .requiresTool()
-        .instrument(Instrument.BASEDRUM)
-    ))
-    @JvmField
-    val SKY_TUMBLESTONE_BRICKS = this.create("sky_tumblestone_bricks", Block(AbstractBlock.Settings.create()
-        .mapColor(MapColor.LIGHT_BLUE)
-        .strength(1.0F)
-        .sounds(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS)
-        .requiresTool()
-        .instrument(Instrument.BASEDRUM)
-    ))
-    @JvmField
-    val SKY_TUMBLESTONE_BRICK_STAIRS = this.create("sky_tumblestone_brick_stairs", StairsBlockInvoker.`cobblemon$create`(
-        SKY_TUMBLESTONE_BRICKS.defaultState, AbstractBlock.Settings.copy(SKY_TUMBLESTONE_BRICKS)))
-    @JvmField
-    val SKY_TUMBLESTONE_BRICK_SLAB = this.create("sky_tumblestone_brick_slab", SlabBlock(AbstractBlock.Settings.create()
-        .mapColor(MapColor.LIGHT_BLUE)
-        .strength(1.0F)
-        .sounds(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS)
-        .requiresTool()
-        .instrument(Instrument.BASEDRUM)
-    ))
-    @JvmField
-    val SKY_TUMBLESTONE_BRICK_WALL = this.create("sky_tumblestone_brick_wall", WallBlock(AbstractBlock.Settings.create()
-        .mapColor(MapColor.LIGHT_BLUE)
-        .strength(1.0F)
-        .sounds(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS)
-        .requiresTool()
-        .instrument(Instrument.BASEDRUM)
-    ))
-    @JvmField
-    val CHISELED_SKY_TUMBLESTONE_BRICKS = this.create("chiseled_sky_tumblestone_bricks", Block(AbstractBlock.Settings.create()
-        .mapColor(MapColor.LIGHT_BLUE)
-        .strength(1.0F)
-        .sounds(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS)
-        .requiresTool()
-        .instrument(Instrument.BASEDRUM)
-    ))
-    @JvmField
-    val POLISHED_BLACK_TUMBLESTONE = this.create("polished_black_tumblestone", Block(AbstractBlock.Settings.create()
-        .mapColor(MapColor.TERRACOTTA_BLACK)
-        .strength(1.0F)
-        .sounds(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS)
-        .requiresTool()
-        .instrument(Instrument.BASEDRUM)
-    ))
-    @JvmField
-    val POLISHED_BLACK_TUMBLESTONE_STAIRS = this.create("polished_black_tumblestone_stairs", StairsBlockInvoker.`cobblemon$create`(POLISHED_BLACK_TUMBLESTONE.defaultState, AbstractBlock.Settings.copy(POLISHED_BLACK_TUMBLESTONE)))
-    @JvmField
-    val POLISHED_BLACK_TUMBLESTONE_SLAB = this.create("polished_black_tumblestone_slab", SlabBlock(AbstractBlock.Settings.create()
-        .mapColor(MapColor.TERRACOTTA_BLACK)
-        .strength(1.0F)
-        .sounds(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS)
-        .requiresTool()
-        .instrument(Instrument.BASEDRUM)
-    ))
- @JvmField
-    val POLISHED_BLACK_TUMBLESTONE_WALL = this.create("polished_black_tumblestone_wall", WallBlock(AbstractBlock.Settings.create()
-        .mapColor(MapColor.TERRACOTTA_BLACK)
-        .strength(1.0F)
-        .sounds(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS)
-        .requiresTool()
-        .instrument(Instrument.BASEDRUM)
-    ))
-    @JvmField
-    val CHISELED_POLISHED_BLACK_TUMBLESTONE = this.create("chiseled_polished_black_tumblestone", Block(AbstractBlock.Settings.create()
-        .mapColor(MapColor.TERRACOTTA_BLACK)
-        .strength(1.0F)
-        .sounds(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS)
-        .requiresTool()
-        .instrument(Instrument.BASEDRUM)
-    ))
-    @JvmField
-    val BLACK_TUMBLESTONE_BRICKS = this.create("black_tumblestone_bricks", Block(AbstractBlock.Settings.create()
-        .mapColor(MapColor.TERRACOTTA_BLACK)
-        .strength(1.0F)
-        .sounds(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS)
-        .requiresTool()
-        .instrument(Instrument.BASEDRUM)
-    ))
-    @JvmField
-    val BLACK_TUMBLESTONE_BRICK_STAIRS = this.create("black_tumblestone_brick_stairs", StairsBlockInvoker.`cobblemon$create`(
-        BLACK_TUMBLESTONE_BRICKS.defaultState, AbstractBlock.Settings.copy(BLACK_TUMBLESTONE_BRICKS)))
-    @JvmField
-    val BLACK_TUMBLESTONE_BRICK_SLAB = this.create("black_tumblestone_brick_slab", SlabBlock(AbstractBlock.Settings.create()
-        .mapColor(MapColor.TERRACOTTA_BLACK)
-        .strength(1.0F)
-        .sounds(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS)
-        .requiresTool()
-        .instrument(Instrument.BASEDRUM)
-    ))
-    @JvmField
-    val BLACK_TUMBLESTONE_BRICK_WALL = this.create("black_tumblestone_brick_wall", WallBlock(AbstractBlock.Settings.create()
-        .mapColor(MapColor.TERRACOTTA_BLACK)
-        .strength(1.0F)
-        .sounds(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS)
-        .requiresTool()
-        .instrument(Instrument.BASEDRUM)
-    ))
-    @JvmField
-    val CHISELED_BLACK_TUMBLESTONE_BRICKS = this.create("chiseled_black_tumblestone_bricks", Block(AbstractBlock.Settings.create()
-        .mapColor(MapColor.TERRACOTTA_BLACK)
-        .strength(1.0F)
-        .sounds(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS)
-        .requiresTool()
-        .instrument(Instrument.BASEDRUM)
     ))
 
     @JvmField
@@ -437,134 +218,38 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, RegistryKey<Registry<
     val YELLOW_APRICORN = apricornBlock("yellow_apricorn", Apricorn.YELLOW)
 
     @JvmField
-    val RELIC_COIN_POUCH = create(
-        "relic_coin_pouch",
-        CoinPouchBlock(
-            AbstractBlock.Settings.create()
-                .sounds(CobblemonSounds.RELIC_COIN_POUCH_SOUNDS)
-                .pistonBehavior(PistonBehavior.DESTROY)
-                .strength(0.4f)
-                .nonOpaque(), true
-        )
-    )
-    @JvmField
-    val RELIC_COIN_SACK = create(
-        "relic_coin_sack",
-        CoinPouchBlock(
-            AbstractBlock.Settings.create()
-                .sounds(CobblemonSounds.RELIC_COIN_SACK_SOUNDS)
-                .pistonBehavior(PistonBehavior.DESTROY)
-                .strength(0.4f), false
-        ))
-
-    @JvmField
-    val GILDED_CHEST = create(
-        "gilded_chest",
-        GildedChestBlock(
-            AbstractBlock.Settings.copy(Blocks.CHEST).nonOpaque().sounds(CobblemonSounds.GILDED_CHEST_SOUNDS),
-            GildedChestBlock.Type.RED
-        )
-    )
-
-    @JvmField
-    val BLUE_GILDED_CHEST = create(
-        "blue_gilded_chest",
-        GildedChestBlock(
-            AbstractBlock.Settings.copy(Blocks.CHEST).nonOpaque().sounds(CobblemonSounds.GILDED_CHEST_SOUNDS),
-            GildedChestBlock.Type.BLUE
-        )
-    )
-
-    @JvmField
-    val BLACK_GILDED_CHEST = create(
-        "black_gilded_chest",
-        GildedChestBlock(
-            AbstractBlock.Settings.copy(Blocks.CHEST).nonOpaque().sounds(CobblemonSounds.GILDED_CHEST_SOUNDS),
-            GildedChestBlock.Type.BLACK
-        )
-    )
-
-    @JvmField
-    val YELLOW_GILDED_CHEST = create(
-        "yellow_gilded_chest",
-        GildedChestBlock(
-            AbstractBlock.Settings.copy(Blocks.CHEST).nonOpaque().sounds(CobblemonSounds.GILDED_CHEST_SOUNDS),
-            GildedChestBlock.Type.YELLOW
-        )
-    )
-
-    @JvmField
-    val WHITE_GILDED_CHEST = create(
-        "white_gilded_chest",
-        GildedChestBlock(
-            AbstractBlock.Settings.copy(Blocks.CHEST).nonOpaque().sounds(CobblemonSounds.GILDED_CHEST_SOUNDS),
-            GildedChestBlock.Type.WHITE
-        )
-    )
-
-    @JvmField
-    val GREEN_GILDED_CHEST = create(
-        "green_gilded_chest",
-        GildedChestBlock(
-            AbstractBlock.Settings.copy(Blocks.CHEST).nonOpaque().sounds(CobblemonSounds.GILDED_CHEST_SOUNDS),
-            GildedChestBlock.Type.GREEN
-        )
-    )
-
-    @JvmField
-    val PINK_GILDED_CHEST = create(
-        "pink_gilded_chest",
-        GildedChestBlock(
-            AbstractBlock.Settings.copy(Blocks.CHEST).nonOpaque().sounds(CobblemonSounds.GILDED_CHEST_SOUNDS),
-            GildedChestBlock.Type.PINK
-        )
-    )
-
-    @JvmField
-    val GIMMIGHOUL_CHEST = create(
-        "gimmighoul_chest",
-        GildedChestBlock(
-            AbstractBlock.Settings.copy(Blocks.CHEST).nonOpaque().sounds(CobblemonSounds.GILDED_CHEST_SOUNDS),
-            GildedChestBlock.Type.FAKE
-        )
-    )
-
-    @JvmField
-    val MONITOR = create(
-        "monitor",
-        MonitorBlock(
+    val FOSSIL_MONITOR = create(
+        "fossil_monitor",
+        FossilMonitorBlock(
             AbstractBlock.Settings.create()
                 .mapColor(MapColor.IRON_GRAY)
                 .sounds(BlockSoundGroup.METAL)
                 .pistonBehavior(PistonBehavior.BLOCK)
-                .requiresTool()
-                .strength(5.0F, 6.0F)
-                .luminance { if (it.get(MonitorBlock.SCREEN) != MonitorBlock.MonitorScreen.OFF) 15 else 0 }
+                .strength(2f)
+                .luminance { if (it.get(FossilMonitorBlock.PROGRESS) > 0) 15 else 0 }
         )
     )
     @JvmField
-    val FOSSIL_ANALYZER = create(
-        "fossil_analyzer",
-        FossilAnalyzerBlock(
+    val FOSSIL_COMPARTMENT = create(
+        "fossil_compartment",
+        FossilCompartmentBlock(
             AbstractBlock.Settings.create()
                 .mapColor(MapColor.IRON_GRAY)
                 .sounds(BlockSoundGroup.METAL)
                 .pistonBehavior(PistonBehavior.BLOCK)
-                .requiresTool()
-                .strength(5.0F, 6.0F)
+                .strength(2f)
                 .nonOpaque()
         )
     )
     @JvmField
-    val RESTORATION_TANK = create(
-        "restoration_tank",
-        RestorationTankBlock(
+    val FOSSIL_TUBE = create(
+        "fossil_tube",
+        FossilTubeBlock(
             AbstractBlock.Settings.create()
                 .mapColor(MapColor.IRON_GRAY)
-                .sounds(BlockSoundGroup.GLASS)
+                .sounds(BlockSoundGroup.METAL)
                 .pistonBehavior(PistonBehavior.BLOCK)
-                .requiresTool()
-                .strength(5.0F, 6.0F)
+                .strength(2f)
                 .nonOpaque()
         )
     )
@@ -596,29 +281,17 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, RegistryKey<Registry<
     )
 
     @JvmField
-    val DISPLAY_CASE = create(
-        "display_case",
-        DisplayCaseBlock(
-            AbstractBlock.Settings.create()
-                .sounds(CobblemonSounds.DISPLAY_CASE_SOUNDS)
-                .nonOpaque()
-                .pistonBehavior(PistonBehavior.BLOCK)
-                .mapColor(MapColor.STONE_GRAY)
-                .strength(0.3f)
-        )
-    )
-
-    val RED_MINT = create("red_mint", MintBlock(MintType.RED, AbstractBlock.Settings.create().mapColor(MapColor.RED).noCollision().ticksRandomly().breakInstantly().sounds(CobblemonSounds.MINT_SOUNDS)))
+    val RED_MINT = create("red_mint", MintBlock(MintType.RED, AbstractBlock.Settings.create().mapColor(MapColor.RED).noCollision().ticksRandomly().breakInstantly().sounds(BlockSoundGroup.CROP)))
     @JvmField
-    val BLUE_MINT = create("blue_mint", MintBlock(MintType.BLUE, AbstractBlock.Settings.create().mapColor(MapColor.BLUE).noCollision().ticksRandomly().breakInstantly().sounds(CobblemonSounds.MINT_SOUNDS)))
+    val BLUE_MINT = create("blue_mint", MintBlock(MintType.BLUE, AbstractBlock.Settings.create().mapColor(MapColor.BLUE).noCollision().ticksRandomly().breakInstantly().sounds(BlockSoundGroup.CROP)))
     @JvmField
-    val CYAN_MINT = create("cyan_mint", MintBlock(MintType.CYAN, AbstractBlock.Settings.create().mapColor(MapColor.CYAN).noCollision().ticksRandomly().breakInstantly().sounds(CobblemonSounds.MINT_SOUNDS)))
+    val CYAN_MINT = create("cyan_mint", MintBlock(MintType.CYAN, AbstractBlock.Settings.create().mapColor(MapColor.CYAN).noCollision().ticksRandomly().breakInstantly().sounds(BlockSoundGroup.CROP)))
     @JvmField
-    val PINK_MINT = create("pink_mint", MintBlock(MintType.PINK, AbstractBlock.Settings.create().mapColor(MapColor.PINK).noCollision().ticksRandomly().breakInstantly().sounds(CobblemonSounds.MINT_SOUNDS)))
+    val PINK_MINT = create("pink_mint", MintBlock(MintType.PINK, AbstractBlock.Settings.create().mapColor(MapColor.PINK).noCollision().ticksRandomly().breakInstantly().sounds(BlockSoundGroup.CROP)))
     @JvmField
-    val GREEN_MINT = create("green_mint", MintBlock(MintType.GREEN, AbstractBlock.Settings.create().mapColor(MapColor.GREEN).noCollision().ticksRandomly().breakInstantly().sounds(CobblemonSounds.MINT_SOUNDS)))
+    val GREEN_MINT = create("green_mint", MintBlock(MintType.GREEN, AbstractBlock.Settings.create().mapColor(MapColor.GREEN).noCollision().ticksRandomly().breakInstantly().sounds(BlockSoundGroup.CROP)))
     @JvmField
-    val WHITE_MINT = create("white_mint", MintBlock(MintType.WHITE, AbstractBlock.Settings.create().mapColor(MapColor.WHITE).noCollision().ticksRandomly().breakInstantly().sounds(CobblemonSounds.MINT_SOUNDS)))
+    val WHITE_MINT = create("white_mint", MintBlock(MintType.WHITE, AbstractBlock.Settings.create().mapColor(MapColor.WHITE).noCollision().ticksRandomly().breakInstantly().sounds(BlockSoundGroup.CROP)))
 
     @JvmField
     val PASTURE = create(
@@ -635,7 +308,7 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, RegistryKey<Registry<
     )
 
     @JvmField
-    val VIVICHOKE_SEEDS = this.create("vivichoke_seeds", VivichokeBlock(AbstractBlock.Settings.create().pistonBehavior(PistonBehavior.DESTROY).burnable().mapColor(MapColor.DARK_GREEN).noCollision().ticksRandomly().breakInstantly().sounds(CobblemonSounds.VIVICHOKE_SOUNDS)))
+    val VIVICHOKE_SEEDS = this.create("vivichoke_seeds", VivichokeBlock(AbstractBlock.Settings.create().pistonBehavior(PistonBehavior.DESTROY).burnable().mapColor(MapColor.DARK_GREEN).noCollision().ticksRandomly().breakInstantly().sounds(BlockSoundGroup.CROP)))
     @JvmField
     val PEP_UP_FLOWER = this.create("pep_up_flower", FlowerBlock(StatusEffects.LEVITATION, 10, AbstractBlock.Settings.create().mapColor(MapColor.DARK_GREEN).noCollision().breakInstantly().sounds(BlockSoundGroup.GRASS).offset(AbstractBlock.OffsetType.XZ).pistonBehavior(PistonBehavior.DESTROY)))
     @JvmField
@@ -735,7 +408,6 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, RegistryKey<Registry<
     val WEPEAR_BERRY = this.berryBlock("wepear")
     val WIKI_BERRY = this.berryBlock("wiki")
     val YACHE_BERRY = this.berryBlock("yache")
-    //val BINDING_SOIL = this.create("binding_soil", BindingSoilBlock(AbstractBlock.Settings.create()))
 
     init {
         /**
@@ -760,7 +432,7 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, RegistryKey<Registry<
 
     private fun berryBlock(name: String): BerryBlock {
         val identifier = cobblemonResource("${name}_berry")
-        val block = this.create(identifier.path, BerryBlock(identifier, AbstractBlock.Settings.copy(Blocks.WHEAT).dynamicBounds().sounds(CobblemonSounds.BERRY_BUSH_SOUNDS).strength(0.2F)))
+        val block = this.create(identifier.path, BerryBlock(identifier, AbstractBlock.Settings.copy(Blocks.WHEAT).dynamicBounds().sounds(BlockSoundGroup.CROP).strength(0.2F)))
         this.berries[identifier] = block
         return block
     }

common/src/main/kotlin/com/cobblemon/mod/common/CobblemonCommands.kt

@@ -46,11 +46,8 @@ object CobblemonCommands {
         ClearPartyCommand.register(dispatcher)
         ClearPCCommand.register(dispatcher)
         PokemonRestartCommand.register(dispatcher)
+        RandomBattleCommand.register(dispatcher)
         BedrockParticleCommand.register(dispatcher)
         OpenDialogueCommand.register(dispatcher)
-
-        // Possibly lock down registration if and only if under dev environment or running in an environment
-        // with a certain system environment variable set
-        CobblemonInfoCommand.register(dispatcher)
     }
 }

common/src/main/kotlin/com/cobblemon/mod/common/CobblemonEntities.kt

@@ -11,7 +11,6 @@ package com.cobblemon.mod.common
 import com.cobblemon.mod.common.api.pokeball.PokeBalls
 import com.cobblemon.mod.common.entity.boat.CobblemonBoatEntity
 import com.cobblemon.mod.common.entity.boat.CobblemonChestBoatEntity
-import com.cobblemon.mod.common.entity.generic.GenericBedrockEntity
 import com.cobblemon.mod.common.entity.pokeball.EmptyPokeBallEntity
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.platform.PlatformRegistry
@@ -66,15 +65,6 @@ object CobblemonEntities : PlatformRegistry<Registry<EntityType<*>>, RegistryKey
             .build(CHEST_BOAT_KEY.toString())
     )
 
-    @JvmField
-    val GENERIC_BEDROCK_ENTITY_KEY = cobblemonResource("generic_bedrock")
-    @JvmField
-    val GENERIC_BEDROCK_ENTITY: EntityType<GenericBedrockEntity> = this.create(
-        GENERIC_BEDROCK_ENTITY_KEY.path,
-        EntityType.Builder.create({ _, world -> GenericBedrockEntity(world) }, SpawnGroup.MISC)
-            .build(GENERIC_BEDROCK_ENTITY_KEY.toString())
-    )
-
     fun registerAttributes(consumer: (EntityType<out LivingEntity>, DefaultAttributeContainer.Builder) -> Unit) {
         consumer(POKEMON, PokemonEntity.createAttributes())
     }

common/src/main/kotlin/com/cobblemon/mod/common/CobblemonItems.kt

@@ -8,7 +8,6 @@
 
 package com.cobblemon.mod.common
 
-import com.cobblemon.mod.common.api.item.ability.AbilityChanger
 import com.cobblemon.mod.common.api.mulch.MulchVariant
 import com.cobblemon.mod.common.api.pokeball.PokeBalls
 import com.cobblemon.mod.common.api.pokemon.Natures
@@ -19,11 +18,9 @@ import com.cobblemon.mod.common.block.MintBlock
 import com.cobblemon.mod.common.block.MintBlock.MintType
 import com.cobblemon.mod.common.entity.boat.CobblemonBoatType
 import com.cobblemon.mod.common.item.*
-import com.cobblemon.mod.common.item.armor.CobblemonArmorTrims
 import com.cobblemon.mod.common.item.battle.DireHitItem
 import com.cobblemon.mod.common.item.battle.GuardSpecItem
 import com.cobblemon.mod.common.item.battle.XStatItem
-import com.cobblemon.mod.common.item.berry.BerryItem
 import com.cobblemon.mod.common.item.berry.FriendshipRaisingBerryItem
 import com.cobblemon.mod.common.item.berry.HealingBerryItem
 import com.cobblemon.mod.common.item.berry.PPRestoringBerryItem
@@ -31,8 +28,6 @@ import com.cobblemon.mod.common.item.berry.PortionHealingBerryItem
 import com.cobblemon.mod.common.item.berry.StatusCuringBerryItem
 import com.cobblemon.mod.common.item.berry.VolatileCuringBerryItem
 import com.cobblemon.mod.common.item.interactive.*
-import com.cobblemon.mod.common.item.interactive.PotionItem
-import com.cobblemon.mod.common.item.interactive.ability.AbilityChangeItem
 import com.cobblemon.mod.common.platform.PlatformRegistry
 import com.cobblemon.mod.common.pokeball.PokeBall
 import com.cobblemon.mod.common.pokemon.helditem.CobblemonHeldItemManager
@@ -41,7 +36,13 @@ import net.minecraft.block.Block
 import net.minecraft.entity.LivingEntity
 import net.minecraft.entity.effect.StatusEffectInstance
 import net.minecraft.entity.effect.StatusEffects
-import net.minecraft.item.*
+import net.minecraft.item.BlockItem
+import net.minecraft.item.FoodComponent
+import net.minecraft.item.HangingSignItem
+import net.minecraft.item.Item
+import net.minecraft.item.ItemStack
+import net.minecraft.item.SignItem
+import net.minecraft.item.StewItem
 import net.minecraft.registry.Registries
 import net.minecraft.registry.Registry
 import net.minecraft.registry.RegistryKey
@@ -175,19 +176,19 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, RegistryKey<Registry<It
     val WHITE_APRICORN = apricornItem("white", ApricornItem(CobblemonBlocks.WHITE_APRICORN))
 
     @JvmField
-    val RED_APRICORN_SEED = apricornSeedItem("red", ApricornSeedItem(CobblemonBlocks.RED_APRICORN_SAPLING, CobblemonBlocks.RED_APRICORN))
+    val RED_APRICORN_SEED = apricornSeedItem("red", ApricornSeedItem(CobblemonBlocks.RED_APRICORN_SAPLING))
     @JvmField
-    val YELLOW_APRICORN_SEED = apricornSeedItem("yellow", ApricornSeedItem(CobblemonBlocks.YELLOW_APRICORN_SAPLING, CobblemonBlocks.YELLOW_APRICORN))
+    val YELLOW_APRICORN_SEED = apricornSeedItem("yellow", ApricornSeedItem(CobblemonBlocks.YELLOW_APRICORN_SAPLING))
     @JvmField
-    val GREEN_APRICORN_SEED = apricornSeedItem("green", ApricornSeedItem(CobblemonBlocks.GREEN_APRICORN_SAPLING, CobblemonBlocks.GREEN_APRICORN))
+    val GREEN_APRICORN_SEED = apricornSeedItem("green", ApricornSeedItem(CobblemonBlocks.GREEN_APRICORN_SAPLING))
     @JvmField
-    val BLUE_APRICORN_SEED = apricornSeedItem("blue", ApricornSeedItem(CobblemonBlocks.BLUE_APRICORN_SAPLING, CobblemonBlocks.BLUE_APRICORN))
+    val BLUE_APRICORN_SEED = apricornSeedItem("blue", ApricornSeedItem(CobblemonBlocks.BLUE_APRICORN_SAPLING))
     @JvmField
-    val PINK_APRICORN_SEED = apricornSeedItem("pink", ApricornSeedItem(CobblemonBlocks.PINK_APRICORN_SAPLING, CobblemonBlocks.PINK_APRICORN))
+    val PINK_APRICORN_SEED = apricornSeedItem("pink", ApricornSeedItem(CobblemonBlocks.PINK_APRICORN_SAPLING))
     @JvmField
-    val BLACK_APRICORN_SEED = apricornSeedItem("black", ApricornSeedItem(CobblemonBlocks.BLACK_APRICORN_SAPLING, CobblemonBlocks.BLACK_APRICORN))
+    val BLACK_APRICORN_SEED = apricornSeedItem("black", ApricornSeedItem(CobblemonBlocks.BLACK_APRICORN_SAPLING))
     @JvmField
-    val WHITE_APRICORN_SEED = apricornSeedItem("white", ApricornSeedItem(CobblemonBlocks.WHITE_APRICORN_SAPLING, CobblemonBlocks.WHITE_APRICORN))
+    val WHITE_APRICORN_SEED = apricornSeedItem("white", ApricornSeedItem(CobblemonBlocks.WHITE_APRICORN_SAPLING))
 
     @JvmField
     val APRICORN_LOG = blockItem("apricorn_log", CobblemonBlocks.APRICORN_LOG)
@@ -226,37 +227,19 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, RegistryKey<Registry<It
     val APRICORN_SIGN = this.create("apricorn_sign", SignItem(Item.Settings().maxCount(16), CobblemonBlocks.APRICORN_SIGN, CobblemonBlocks.APRICORN_WALL_SIGN))
     @JvmField
     val APRICORN_HANGING_SIGN = this.create("apricorn_hanging_sign", HangingSignItem(CobblemonBlocks.APRICORN_HANGING_SIGN, CobblemonBlocks.APRICORN_WALL_HANGING_SIGN, Item.Settings().maxCount(16)))
-    @JvmField
-    val GILDED_CHEST = this.create("gilded_chest", BlockItem(CobblemonBlocks.GILDED_CHEST, Item.Settings()))
-    @JvmField
-    val BLUE_GILDED_CHEST = this.create("blue_gilded_chest", BlockItem(CobblemonBlocks.BLUE_GILDED_CHEST, Item.Settings()))
-    @JvmField
-    val YELLOW_GILDED_CHEST = this.create("yellow_gilded_chest", BlockItem(CobblemonBlocks.YELLOW_GILDED_CHEST, Item.Settings()))
-    @JvmField
-    val PINK_GILDED_CHEST = this.create("pink_gilded_chest", BlockItem(CobblemonBlocks.PINK_GILDED_CHEST, Item.Settings()))
-    @JvmField
-    val BLACK_GILDED_CHEST = this.create("black_gilded_chest", BlockItem(CobblemonBlocks.BLACK_GILDED_CHEST, Item.Settings()))
-    @JvmField
-    val WHITE_GILDED_CHEST = this.create("white_gilded_chest", BlockItem(CobblemonBlocks.WHITE_GILDED_CHEST, Item.Settings()))
-    @JvmField
-    val GREEN_GILDED_CHEST = this.create("green_gilded_chest", BlockItem(CobblemonBlocks.GREEN_GILDED_CHEST, Item.Settings()))
-    @JvmField
-    val GIMMIGHOUL_CHEST = this.create("gimmighoul_chest", BlockItem(CobblemonBlocks.GIMMIGHOUL_CHEST, Item.Settings()))
 
     @JvmField
-    val RESTORATION_TANK = blockItem("restoration_tank", CobblemonBlocks.RESTORATION_TANK)
+    val FOSSIL_TUBE = blockItem("fossil_tube", CobblemonBlocks.FOSSIL_TUBE)
     @JvmField
-    val FOSSIL_ANALYZER = blockItem("fossil_analyzer", CobblemonBlocks.FOSSIL_ANALYZER)
+    val FOSSIL_COMPARTMENT = blockItem("fossil_compartment", CobblemonBlocks.FOSSIL_COMPARTMENT)
     @JvmField
-    val MONITOR = blockItem("monitor", CobblemonBlocks.MONITOR)
+    val FOSSIL_MONITOR = blockItem("fossil_monitor", CobblemonBlocks.FOSSIL_MONITOR)
     @JvmField
     val HEALING_MACHINE = blockItem("healing_machine", CobblemonBlocks.HEALING_MACHINE)
     @JvmField
     val PC = blockItem("pc", CobblemonBlocks.PC)
     @JvmField
     val PASTURE = blockItem("pasture", CobblemonBlocks.PASTURE)
-    @JvmField
-    val DISPLAY_CASE = blockItem("display_case", CobblemonBlocks.DISPLAY_CASE)
 
     // Evolution items
     @JvmField val LINK_CABLE = create("link_cable", LinkCableItem())
@@ -284,8 +267,6 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, RegistryKey<Registry<It
     @JvmField val RIBBON_SWEET = noSettingsItem("ribbon_sweet")
     @JvmField val CHIPPED_POT = noSettingsItem("chipped_pot")
     @JvmField val CRACKED_POT = noSettingsItem("cracked_pot")
-    @JvmField val MASTERPIECE_TEACUP = noSettingsItem("masterpiece_teacup")
-    @JvmField val UNREMARKABLE_TEACUP = noSettingsItem("unremarkable_teacup")
     @JvmField val SWEET_APPLE = noSettingsItem("sweet_apple")
     @JvmField val TART_APPLE = noSettingsItem("tart_apple")
     @JvmField val GALARICA_CUFF = noSettingsItem("galarica_cuff")
@@ -397,19 +378,7 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, RegistryKey<Registry<It
     @JvmField
     val ZINC = create("zinc", VitaminItem(Stats.SPECIAL_DEFENCE))
     @JvmField
-    val GENIUS_FEATHER = create("genius_feather", FeatherItem(Stats.SPECIAL_ATTACK))
-    @JvmField
-    val SWIFT_FEATHER = create("swift_feather", FeatherItem(Stats.SPEED))
-    @JvmField
-    val HEALTH_FEATHER = create("health_feather", FeatherItem(Stats.HP))
-    @JvmField
-    val RESIST_FEATHER = create("resist_feather", FeatherItem(Stats.DEFENCE))
-    @JvmField
-    val MUSCLE_FEATHER = create("muscle_feather", FeatherItem(Stats.ATTACK))
-    @JvmField
-    val CLEVER_FEATHER = create("clever_feather", FeatherItem(Stats.SPECIAL_DEFENCE))
-    @JvmField
-    val MEDICINAL_LEEK = heldItem("medicinal_leek", MedicinalLeekItem(CobblemonBlocks.MEDICINAL_LEEK, Item.Settings().food(FoodComponent.Builder().snack().hunger(1).saturationModifier(0.2f).build())), "leek")
+    val MEDICINAL_LEEK = create("medicinal_leek", MedicinalLeekItem(CobblemonBlocks.MEDICINAL_LEEK, Item.Settings().food(FoodComponent.Builder().snack().hunger(1).saturationModifier(0.2f).build())))
     @JvmField
     val ROASTED_LEEK = create("roasted_leek", Item(Item.Settings().food(FoodComponent.Builder().snack().hunger(3).saturationModifier(0.3f).build())))
     @JvmField
@@ -559,11 +528,6 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, RegistryKey<Registry<It
     @JvmField val ELIXIR = create("elixir", ElixirItem(max = false))
     @JvmField val MAX_ELIXIR = create("max_elixir", ElixirItem(max = true))
 
-    @JvmField
-    val ABILITY_CAPSULE = this.create("ability_capsule", AbilityChangeItem(AbilityChanger.COMMON_ABILITY))
-    @JvmField
-    val ABILITY_PATCH = this.create("ability_patch", AbilityChangeItem(AbilityChanger.HIDDEN_ABILITY))
-
     /**
      * Evolution Ores and Stones
      */
@@ -584,8 +548,6 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, RegistryKey<Registry<It
     @JvmField
     val SUN_STONE_ORE = blockItem("sun_stone_ore", CobblemonBlocks.SUN_STONE_ORE)
     @JvmField
-    val TERRACOTTA_SUN_STONE_ORE = blockItem("terracotta_sun_stone_ore", CobblemonBlocks.TERRACOTTA_SUN_STONE_ORE)
-    @JvmField
     val THUNDER_STONE_ORE = blockItem("thunder_stone_ore", CobblemonBlocks.THUNDER_STONE_ORE)
     @JvmField
     val WATER_STONE_ORE = blockItem("water_stone_ore", CobblemonBlocks.WATER_STONE_ORE)
@@ -611,9 +573,6 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, RegistryKey<Registry<It
     val DEEPSLATE_WATER_STONE_ORE = blockItem("deepslate_water_stone_ore", CobblemonBlocks.DEEPSLATE_WATER_STONE_ORE)
     @JvmField
     val DRIPSTONE_MOON_STONE_ORE = blockItem("dripstone_moon_stone_ore", CobblemonBlocks.DRIPSTONE_MOON_STONE_ORE)
-    @JvmField
-    val NETHER_FIRE_STONE_ORE = blockItem("nether_fire_stone_ore", CobblemonBlocks.NETHER_FIRE_STONE_ORE)
-
     @JvmField
     val DAWN_STONE = noSettingsItem("dawn_stone")
     @JvmField
@@ -668,8 +627,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
@@ -698,16 +657,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
@@ -720,12 +679,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
@@ -748,10 +707,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
@@ -760,16 +719,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
@@ -783,27 +742,25 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, RegistryKey<Registry<It
     @JvmField
     val SMOKE_BALL = heldItem("smoke_ball")
     @JvmField
-    val SOOTHE_BELL = heldItem("soothe_bell")
-    @JvmField
     val STICKY_BARB = heldItem("sticky_barb")
-   // @JvmField
-   // val TERRAIN_EXTENDER = heldItem("terrain_extender")
-   // @JvmField
-   // val THROAT_SPRAY = heldItem("throat_spray")
+    @JvmField
+    val 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
@@ -851,19 +808,19 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, RegistryKey<Registry<It
     @JvmField
     val ARMOR_FOSSIL = noSettingsItem("armor_fossil")
     @JvmField
-    val FOSSILIZED_BIRD = noSettingsItem("fossilized_bird")
+    val BIRD_FOSSIL = noSettingsItem("bird_fossil")
     @JvmField
     val CLAW_FOSSIL = noSettingsItem("claw_fossil")
     @JvmField
     val COVER_FOSSIL = noSettingsItem("cover_fossil")
     @JvmField
-    val FOSSILIZED_DINO = noSettingsItem("fossilized_dino")
+    val DINO_FOSSIL = noSettingsItem("dino_fossil")
     @JvmField
     val DOME_FOSSIL = noSettingsItem("dome_fossil")
     @JvmField
-    val FOSSILIZED_DRAKE = noSettingsItem("fossilized_drake")
+    val DRAKE_FOSSIL = noSettingsItem("drake_fossil")
     @JvmField
-    val FOSSILIZED_FISH = noSettingsItem("fossilized_fish")
+    val FISH_FOSSIL = noSettingsItem("fish_fossil")
     @JvmField
     val HELIX_FOSSIL = noSettingsItem("helix_fossil")
     @JvmField
@@ -889,8 +846,6 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, RegistryKey<Registry<It
     val HELIX_SHERD = noSettingsItem("helix_sherd")
     @JvmField
     val NOSTALGIC_SHERD = noSettingsItem("nostalgic_sherd")
-    @JvmField
-    val SUSPICIOUS_SHERD = noSettingsItem("suspicious_sherd")
 
     @JvmField
     val TUMBLESTONE = this.create("tumblestone", TumblestoneItem(Item.Settings(), CobblemonBlocks.SMALL_BUDDING_TUMBLESTONE))
@@ -933,122 +888,9 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, RegistryKey<Registry<It
     @JvmField
     val BLACK_TUMBLESTONE_BLOCK = blockItem("black_tumblestone_block", CobblemonBlocks.BLACK_TUMBLESTONE_BLOCK)
 
-    @JvmField
-    val POLISHED_TUMBLESTONE = blockItem("polished_tumblestone", CobblemonBlocks.POLISHED_TUMBLESTONE)
-    @JvmField
-    val POLISHED_TUMBLESTONE_STAIRS = blockItem("polished_tumblestone_stairs", CobblemonBlocks.POLISHED_TUMBLESTONE_STAIRS)
-    @JvmField
-    val POLISHED_TUMBLESTONE_SLAB = blockItem("polished_tumblestone_slab", CobblemonBlocks.POLISHED_TUMBLESTONE_SLAB)
-    @JvmField
-    val POLISHED_TUMBLESTONE_WALL = blockItem("polished_tumblestone_wall", CobblemonBlocks.POLISHED_TUMBLESTONE_WALL)
-    @JvmField
-    val CHISELED_POLISHED_TUMBLESTONE = blockItem("chiseled_polished_tumblestone", CobblemonBlocks.CHISELED_POLISHED_TUMBLESTONE)
-    @JvmField
-    val TUMBLESTONE_BRICKS = blockItem("tumblestone_bricks", CobblemonBlocks.TUMBLESTONE_BRICKS)
-    @JvmField
-    val TUMBLESTONE_BRICK_STAIRS = blockItem("tumblestone_brick_stairs", CobblemonBlocks.TUMBLESTONE_BRICK_STAIRS)
-    @JvmField
-    val TUMBLESTONE_BRICK_SLAB = blockItem("tumblestone_brick_slab", CobblemonBlocks.TUMBLESTONE_BRICK_SLAB)
-    @JvmField
-    val TUMBLESTONE_BRICK_WALL = blockItem("tumblestone_brick_wall", CobblemonBlocks.TUMBLESTONE_BRICK_WALL)
-    @JvmField
-    val CHISELED_TUMBLESTONE_BRICKS = blockItem("chiseled_tumblestone_bricks", CobblemonBlocks.CHISELED_TUMBLESTONE_BRICKS)
-    @JvmField
-    val POLISHED_SKY_TUMBLESTONE = blockItem("polished_sky_tumblestone", CobblemonBlocks.POLISHED_SKY_TUMBLESTONE)
-    @JvmField
-    val POLISHED_SKY_TUMBLESTONE_STAIRS = blockItem("polished_sky_tumblestone_stairs", CobblemonBlocks.POLISHED_SKY_TUMBLESTONE_STAIRS)
-    @JvmField
-    val POLISHED_SKY_TUMBLESTONE_SLAB = blockItem("polished_sky_tumblestone_slab", CobblemonBlocks.POLISHED_SKY_TUMBLESTONE_SLAB)
-    @JvmField
-    val POLISHED_SKY_TUMBLESTONE_WALL = blockItem("polished_sky_tumblestone_wall", CobblemonBlocks.POLISHED_SKY_TUMBLESTONE_WALL)
-    @JvmField
-    val CHISELED_POLISHED_SKY_TUMBLESTONE = blockItem("chiseled_polished_sky_tumblestone", CobblemonBlocks.CHISELED_POLISHED_SKY_TUMBLESTONE)
-    @JvmField
-    val SKY_TUMBLESTONE_BRICKS = blockItem("sky_tumblestone_bricks", CobblemonBlocks.SKY_TUMBLESTONE_BRICKS)
-    @JvmField
-    val SKY_TUMBLESTONE_BRICK_STAIRS = blockItem("sky_tumblestone_brick_stairs", CobblemonBlocks.SKY_TUMBLESTONE_BRICK_STAIRS)
-    @JvmField
-    val SKY_TUMBLESTONE_BRICK_SLAB = blockItem("sky_tumblestone_brick_slab", CobblemonBlocks.SKY_TUMBLESTONE_BRICK_SLAB)
-    @JvmField
-    val SKY_TUMBLESTONE_BRICK_WALL = blockItem("sky_tumblestone_brick_wall", CobblemonBlocks.SKY_TUMBLESTONE_BRICK_WALL)
-    @JvmField
-    val CHISELED_SKY_TUMBLESTONE_BRICKS = blockItem("chiseled_sky_tumblestone_bricks", CobblemonBlocks.CHISELED_SKY_TUMBLESTONE_BRICKS)
-    @JvmField
-    val POLISHED_BLACK_TUMBLESTONE = blockItem("polished_black_tumblestone", CobblemonBlocks.POLISHED_BLACK_TUMBLESTONE)
-    @JvmField
-    val POLISHED_BLACK_TUMBLESTONE_STAIRS = blockItem("polished_black_tumblestone_stairs", CobblemonBlocks.POLISHED_BLACK_TUMBLESTONE_STAIRS)
-    @JvmField
-    val POLISHED_BLACK_TUMBLESTONE_SLAB = blockItem("polished_black_tumblestone_slab", CobblemonBlocks.POLISHED_BLACK_TUMBLESTONE_SLAB)
-    @JvmField
-    val POLISHED_BLACK_TUMBLESTONE_WALL = blockItem("polished_black_tumblestone_wall", CobblemonBlocks.POLISHED_BLACK_TUMBLESTONE_WALL)
-    @JvmField
-    val CHISELED_POLISHED_BLACK_TUMBLESTONE = blockItem("chiseled_polished_black_tumblestone", CobblemonBlocks.CHISELED_POLISHED_BLACK_TUMBLESTONE)
-    @JvmField
-    val BLACK_TUMBLESTONE_BRICKS = blockItem("black_tumblestone_bricks", CobblemonBlocks.BLACK_TUMBLESTONE_BRICKS)
-    @JvmField
-    val BLACK_TUMBLESTONE_BRICK_STAIRS = blockItem("black_tumblestone_brick_stairs", CobblemonBlocks.BLACK_TUMBLESTONE_BRICK_STAIRS)
-    @JvmField
-    val BLACK_TUMBLESTONE_BRICK_SLAB = blockItem("black_tumblestone_brick_slab", CobblemonBlocks.BLACK_TUMBLESTONE_BRICK_SLAB)
-    @JvmField
-    val BLACK_TUMBLESTONE_BRICK_WALL = blockItem("black_tumblestone_brick_wall", CobblemonBlocks.BLACK_TUMBLESTONE_BRICK_WALL)
-    @JvmField
-    val CHISELED_BLACK_TUMBLESTONE_BRICKS = blockItem("chiseled_black_tumblestone_bricks", CobblemonBlocks.CHISELED_BLACK_TUMBLESTONE_BRICKS)
-
-    @JvmField
-    val AUTOMATON_ARMOR_TRIM_SMITHING_TEMPLATE: SmithingTemplateItem = this.create(
-        "automaton_armor_trim_smithing_template",
-        SmithingTemplateItem.of(CobblemonArmorTrims.AUTOMATON)
-    )
-
     // Misc
     @JvmField
     val POKEMON_MODEL = this.create("pokemon_model", PokemonItem())
-    @JvmField
-    val RELIC_COIN = noSettingsItem("relic_coin")
-    @JvmField
-    val RELIC_COIN_POUCH = blockItem("relic_coin_pouch", CobblemonBlocks.RELIC_COIN_POUCH)
-    @JvmField
-    val RELIC_COIN_SACK = blockItem("relic_coin_sack", CobblemonBlocks.RELIC_COIN_SACK)
-
-    // Type Gems
-    @JvmField
-    val NORMAL_GEM = noSettingsItem("normal_gem")
-    @JvmField
-    val FIRE_GEM = noSettingsItem("fire_gem")
-    @JvmField
-    val WATER_GEM = noSettingsItem("water_gem")
-    @JvmField
-    val GRASS_GEM = noSettingsItem("grass_gem")
-    @JvmField
-    val ELECTRIC_GEM = noSettingsItem("electric_gem")
-    @JvmField
-    val ICE_GEM = noSettingsItem("ice_gem")
-    @JvmField
-    val FIGHTING_GEM = noSettingsItem("fighting_gem")
-    @JvmField
-    val POISON_GEM = noSettingsItem("poison_gem")
-    @JvmField
-    val GROUND_GEM = noSettingsItem("ground_gem")
-    @JvmField
-    val FLYING_GEM = noSettingsItem("flying_gem")
-    @JvmField
-    val PSYCHIC_GEM = noSettingsItem("psychic_gem")
-    @JvmField
-    val BUG_GEM = noSettingsItem("bug_gem")
-    @JvmField
-    val ROCK_GEM = noSettingsItem("rock_gem")
-    @JvmField
-    val GHOST_GEM = noSettingsItem("ghost_gem")
-    @JvmField
-    val DRAGON_GEM = noSettingsItem("dragon_gem")
-    @JvmField
-    val DARK_GEM = noSettingsItem("dark_gem")
-    @JvmField
-    val STEEL_GEM = noSettingsItem("steel_gem")
-    @JvmField
-    val FAIRY_GEM = noSettingsItem("fairy_gem")
-    //@JvmField
-    //val BINDING_SOIL = blockItem("binding_soil", CobblemonBlocks.BINDING_SOIL)
 
     private fun blockItem(name: String, block: Block): BlockItem = this.create(name, BlockItem(block, Item.Settings()))
 
@@ -1075,16 +917,6 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, RegistryKey<Registry<It
             }
         }
     )
-    private fun heldItem(name: String, item: Item, remappedName: String? = null) = create(
-        name = name,
-        entry = item.also {
-            if (remappedName != null) {
-                CobblemonHeldItemManager.registerRemap(it, remappedName)
-                CobblemonHeldItemManager.registerRemap(Items.BONE, "thickclub")
-                CobblemonHeldItemManager.registerRemap(Items.SNOWBALL, "snowball")
-            }
-        }
-    )
 
     private fun compostable(item: Item, increaseLevelChance: Float) = Cobblemon.implementation.registerCompostable(item, increaseLevelChance)
 

common/src/main/kotlin/com/cobblemon/mod/common/CobblemonNetwork.kt

@@ -13,17 +13,32 @@ import com.cobblemon.mod.common.api.net.NetworkPacket
 import com.cobblemon.mod.common.api.net.ServerNetworkPacketHandler
 import com.cobblemon.mod.common.client.net.PlayerInteractOptionsHandler
 import com.cobblemon.mod.common.client.net.SetClientPlayerDataHandler
-import com.cobblemon.mod.common.client.net.animation.PlayPoseableAnimationHandler
-import com.cobblemon.mod.common.client.net.battle.*
+import com.cobblemon.mod.common.client.net.battle.BattleApplyPassResponseHandler
+import com.cobblemon.mod.common.client.net.battle.BattleCaptureEndHandler
+import com.cobblemon.mod.common.client.net.battle.BattleCaptureShakeHandler
+import com.cobblemon.mod.common.client.net.battle.BattleCaptureStartHandler
+import com.cobblemon.mod.common.client.net.battle.BattleChallengeExpiredHandler
+import com.cobblemon.mod.common.client.net.battle.BattleChallengeNotificationHandler
+import com.cobblemon.mod.common.client.net.battle.BattleEndHandler
+import com.cobblemon.mod.common.client.net.battle.BattleFaintHandler
+import com.cobblemon.mod.common.client.net.battle.BattleHealthChangeHandler
+import com.cobblemon.mod.common.client.net.battle.BattleInitializeHandler
+import com.cobblemon.mod.common.client.net.battle.BattleMadeInvalidChoiceHandler
+import com.cobblemon.mod.common.client.net.battle.BattleMakeChoiceHandler
+import com.cobblemon.mod.common.client.net.battle.BattleMessageHandler
+import com.cobblemon.mod.common.client.net.battle.BattleMusicHandler
+import com.cobblemon.mod.common.client.net.battle.BattlePersistentStatusHandler
+import com.cobblemon.mod.common.client.net.battle.BattleQueueRequestHandler
+import com.cobblemon.mod.common.client.net.battle.BattleSetTeamPokemonHandler
+import com.cobblemon.mod.common.client.net.battle.BattleSwitchPokemonHandler
+import com.cobblemon.mod.common.client.net.battle.BattleUpdateTeamPokemonHandler
 import com.cobblemon.mod.common.client.net.callback.move.OpenMoveCallbackHandler
 import com.cobblemon.mod.common.client.net.callback.party.OpenPartyCallbackHandler
 import com.cobblemon.mod.common.client.net.callback.partymove.OpenPartyMoveCallbackHandler
 import com.cobblemon.mod.common.client.net.data.DataRegistrySyncPacketHandler
 import com.cobblemon.mod.common.client.net.data.UnlockReloadPacketHandler
-import com.cobblemon.mod.common.client.net.effect.RunPosableMoLangHandler
 import com.cobblemon.mod.common.client.net.dialogue.DialogueClosedHandler
 import com.cobblemon.mod.common.client.net.dialogue.DialogueOpenedHandler
-import com.cobblemon.mod.common.client.net.effect.SpawnSnowstormEntityParticleHandler
 import com.cobblemon.mod.common.client.net.effect.SpawnSnowstormParticleHandler
 import com.cobblemon.mod.common.client.net.gui.InteractPokemonUIPacketHandler
 import com.cobblemon.mod.common.client.net.gui.SummaryUIPacketHandler
@@ -33,6 +48,7 @@ import com.cobblemon.mod.common.client.net.pasture.PokemonPasturedHandler
 import com.cobblemon.mod.common.client.net.pasture.PokemonUnpasturedHandler
 import com.cobblemon.mod.common.client.net.pokemon.update.PokemonUpdatePacketHandler
 import com.cobblemon.mod.common.client.net.settings.ServerSettingsPacketHandler
+import com.cobblemon.mod.common.client.net.sound.PokemonCryHandler
 import com.cobblemon.mod.common.client.net.sound.UnvalidatedPlaySoundS2CPacketHandler
 import com.cobblemon.mod.common.client.net.spawn.SpawnExtraDataEntityHandler
 import com.cobblemon.mod.common.client.net.starter.StarterUIPacketHandler
@@ -57,24 +73,18 @@ import com.cobblemon.mod.common.client.net.trade.TradeOfferNotificationHandler
 import com.cobblemon.mod.common.client.net.trade.TradeStartedHandler
 import com.cobblemon.mod.common.client.net.trade.TradeUpdatedHandler
 import com.cobblemon.mod.common.net.messages.client.PlayerInteractOptionsPacket
-import com.cobblemon.mod.common.net.messages.client.animation.PlayPoseableAnimationPacket
 import com.cobblemon.mod.common.net.messages.client.battle.*
 import com.cobblemon.mod.common.net.messages.client.callback.OpenMoveCallbackPacket
 import com.cobblemon.mod.common.net.messages.client.callback.OpenPartyCallbackPacket
 import com.cobblemon.mod.common.net.messages.client.callback.OpenPartyMoveCallbackPacket
 import com.cobblemon.mod.common.net.messages.client.data.AbilityRegistrySyncPacket
 import com.cobblemon.mod.common.net.messages.client.data.BerryRegistrySyncPacket
-import com.cobblemon.mod.common.net.messages.client.data.GlobalSpeciesFeatureSyncPacket
 import com.cobblemon.mod.common.net.messages.client.data.MovesRegistrySyncPacket
 import com.cobblemon.mod.common.net.messages.client.data.PropertiesCompletionRegistrySyncPacket
-import com.cobblemon.mod.common.net.messages.client.data.SpeciesFeatureAssignmentSyncPacket
 import com.cobblemon.mod.common.net.messages.client.data.SpeciesRegistrySyncPacket
-import com.cobblemon.mod.common.net.messages.client.data.StandardSpeciesFeatureSyncPacket
 import com.cobblemon.mod.common.net.messages.client.data.UnlockReloadPacket
 import com.cobblemon.mod.common.net.messages.client.dialogue.DialogueClosedPacket
 import com.cobblemon.mod.common.net.messages.client.dialogue.DialogueOpenedPacket
-import com.cobblemon.mod.common.net.messages.client.effect.RunPosableMoLangPacket
-import com.cobblemon.mod.common.net.messages.client.effect.SpawnSnowstormEntityParticlePacket
 import com.cobblemon.mod.common.net.messages.client.effect.SpawnSnowstormParticlePacket
 import com.cobblemon.mod.common.net.messages.client.fossil.FossilRegistrySyncPacket
 import com.cobblemon.mod.common.net.messages.client.fossil.NaturalMaterialRegistrySyncPacket
@@ -87,8 +97,8 @@ import com.cobblemon.mod.common.net.messages.client.pokemon.update.evolution.Add
 import com.cobblemon.mod.common.net.messages.client.pokemon.update.evolution.ClearEvolutionsPacket
 import com.cobblemon.mod.common.net.messages.client.pokemon.update.evolution.RemoveEvolutionPacket
 import com.cobblemon.mod.common.net.messages.client.settings.ServerSettingsPacket
+import com.cobblemon.mod.common.net.messages.client.sound.PokemonCryPacket
 import com.cobblemon.mod.common.net.messages.client.sound.UnvalidatedPlaySoundS2CPacket
-import com.cobblemon.mod.common.net.messages.client.spawn.SpawnGenericBedrockPacket
 import com.cobblemon.mod.common.net.messages.client.spawn.SpawnPokeballPacket
 import com.cobblemon.mod.common.net.messages.client.spawn.SpawnPokemonPacket
 import com.cobblemon.mod.common.net.messages.client.starter.OpenStarterUIPacket
@@ -233,9 +243,7 @@ object CobblemonNetwork : NetworkManager {
         this.createClientBound(PokemonStateUpdatePacket.ID, PokemonStateUpdatePacket::decode, PokemonUpdatePacketHandler())
         this.createClientBound(TetheringUpdatePacket.ID, TetheringUpdatePacket::decode, PokemonUpdatePacketHandler())
         this.createClientBound(TradeableUpdatePacket.ID, TradeableUpdatePacket::decode, PokemonUpdatePacketHandler())
-        this.createClientBound(SpeciesFeatureUpdatePacket.ID, SpeciesFeatureUpdatePacket::decode, PokemonUpdatePacketHandler())
         this.createClientBound(OriginalTrainerUpdatePacket.ID, OriginalTrainerUpdatePacket::decode, PokemonUpdatePacketHandler())
-        this.createClientBound(FormUpdatePacket.ID, FormUpdatePacket::decode, PokemonUpdatePacketHandler())
 
         // Evolution start
         this.createClientBound(AddEvolutionPacket.ID, AddEvolutionPacket::decode, PokemonUpdatePacketHandler())
@@ -288,8 +296,6 @@ object CobblemonNetwork : NetworkManager {
         this.createClientBound(BattleMadeInvalidChoicePacket.ID, BattleMadeInvalidChoicePacket::decode, BattleMadeInvalidChoiceHandler)
         this.createClientBound(BattleMusicPacket.ID, BattleMusicPacket::decode, BattleMusicHandler)
         this.createClientBound(BattleChallengeExpiredPacket.ID, BattleChallengeExpiredPacket::decode, BattleChallengeExpiredHandler)
-        this.createClientBound(BattleReplacePokemonPacket.ID, BattleReplacePokemonPacket::decode, BattleReplacePokemonHandler)
-        this.createClientBound(BattleTransformPokemonPacket.ID, BattleTransformPokemonPacket::decode, BattleTransformPokemonHandler)
 
 
 
@@ -303,23 +309,17 @@ object CobblemonNetwork : NetworkManager {
         this.createClientBound(PropertiesCompletionRegistrySyncPacket.ID, PropertiesCompletionRegistrySyncPacket::decode, DataRegistrySyncPacketHandler())
         this.createClientBound(UnlockReloadPacket.ID, UnlockReloadPacket::decode, UnlockReloadPacketHandler)
         this.createClientBound(BerryRegistrySyncPacket.ID, BerryRegistrySyncPacket::decode, DataRegistrySyncPacketHandler())
-        this.createClientBound(StandardSpeciesFeatureSyncPacket.ID, StandardSpeciesFeatureSyncPacket::decode, DataRegistrySyncPacketHandler())
-        this.createClientBound(GlobalSpeciesFeatureSyncPacket.ID, GlobalSpeciesFeatureSyncPacket::decode, DataRegistrySyncPacketHandler())
-        this.createClientBound(SpeciesFeatureAssignmentSyncPacket.ID, SpeciesFeatureAssignmentSyncPacket::decode, DataRegistrySyncPacketHandler())
         this.createClientBound(NaturalMaterialRegistrySyncPacket.ID, NaturalMaterialRegistrySyncPacket::decode, DataRegistrySyncPacketHandler())
         this.createClientBound(FossilRegistrySyncPacket.ID, FossilRegistrySyncPacket::decode, DataRegistrySyncPacketHandler())
 
         // Effects
         this.createClientBound(SpawnSnowstormParticlePacket.ID, SpawnSnowstormParticlePacket::decode, SpawnSnowstormParticleHandler)
-        this.createClientBound(SpawnSnowstormEntityParticlePacket.ID, SpawnSnowstormEntityParticlePacket::decode, SpawnSnowstormEntityParticleHandler)
-        this.createClientBound(RunPosableMoLangPacket.ID, RunPosableMoLangPacket::decode, RunPosableMoLangHandler)
 
         // Hax
         this.createClientBound(UnvalidatedPlaySoundS2CPacket.ID, UnvalidatedPlaySoundS2CPacket::decode, UnvalidatedPlaySoundS2CPacketHandler)
         this.createClientBound(SpawnPokemonPacket.ID, SpawnPokemonPacket::decode, SpawnExtraDataEntityHandler())
         this.createClientBound(SpawnPokeballPacket.ID, SpawnPokeballPacket::decode, SpawnExtraDataEntityHandler())
         this.createClientBound(ToastPacket.ID, ToastPacket::decode, ToastPacketHandler)
-        this.createClientBound(SpawnGenericBedrockPacket.ID, SpawnGenericBedrockPacket::decode, SpawnExtraDataEntityHandler())
 
         // Trade packets
         this.createClientBound(TradeAcceptanceChangedPacket.ID, TradeAcceptanceChangedPacket::decode, TradeAcceptanceChangedHandler)
@@ -337,7 +337,7 @@ object CobblemonNetwork : NetworkManager {
         this.createClientBound(PokemonUnpasturedPacket.ID, PokemonUnpasturedPacket::decode, PokemonUnpasturedHandler)
 
         // Behaviours
-        this.createClientBound(PlayPoseableAnimationPacket.ID, PlayPoseableAnimationPacket::decode, PlayPoseableAnimationHandler)
+        this.createClientBound(PokemonCryPacket.ID, PokemonCryPacket::decode, PokemonCryHandler)
 
         // Move select packets
         this.createClientBound(OpenMoveCallbackPacket.ID, OpenMoveCallbackPacket::decode, OpenMoveCallbackHandler)

common/src/main/kotlin/com/cobblemon/mod/common/CobblemonSounds.kt

@@ -16,7 +16,6 @@ import net.minecraft.registry.RegistryKey
 import net.minecraft.registry.RegistryKeys
 import net.minecraft.sound.BlockSoundGroup
 import net.minecraft.sound.SoundEvent
-import net.minecraft.sound.SoundEvents
 
 object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, RegistryKey<Registry<SoundEvent>>, SoundEvent>() {
 
@@ -56,10 +55,6 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, RegistryKey<Regi
     val POKE_BALL_SEND_OUT = this.create("poke_ball.send_out")
     @JvmField
     val POKE_BALL_RECALL = this.create("poke_ball.recall")
-    @JvmField
-    val POKE_BALL_THROW = this.create("poke_ball.throw")
-    @JvmField
-    val POKE_BALL_TRAIL = this.create("poke_ball.trail")
 
     @JvmField
     val ITEM_USE = this.create("item.use")
@@ -67,8 +62,6 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, RegistryKey<Regi
     val CAN_EVOLVE = this.create("pokemon.can_evolve")
     @JvmField
     val EVOLVING = this.create("pokemon.evolving")
-    @JvmField
-    val EVOLVE = this.create("evolution.evolve")
 
     @JvmField
     val PVN_BATTLE = this.create("battle.pvn.default")
@@ -85,8 +78,6 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, RegistryKey<Regi
     val MEDICINE_PILLS_USE = this.create("medicine_pills.use")
     @JvmField
     val MEDICINE_SPRAY_USE = this.create("medicine_spray.use")
-    @JvmField
-    val MEDICINE_FEATHER_USE = this.create("medicine_feather.use")
 
     @JvmField
     val BERRY_HARVEST = this.create("berry.harvest")
@@ -99,40 +90,27 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, RegistryKey<Regi
     val MULCH_REMOVE = this.create("mulch.remove")
 
     @JvmField
-    val FOSSIL_MACHINE_ACTIVATE = this.create("fossil_machine.activate")
+    val FOSSIL_MACHINE_ACTIVATE = this.create("fossilmachine.activate")
     @JvmField
-    val FOSSIL_MACHINE_ACTIVE_LOOP = this.create("fossil_machine.active_loop")
+    val FOSSIL_MACHINE_ACTIVE_LOOP = this.create("fossilmachine.active_loop")
     @JvmField
-    val FOSSIL_MACHINE_ASSEMBLE = this.create("fossil_machine.assemble")
+    val FOSSIL_MACHINE_ASSEMBLE = this.create("fossilmachine.assemble")
     @JvmField
-    val FOSSIL_MACHINE_DNA_FULL = this.create("fossil_machine.dna_full")
+    val FOSSIL_MACHINE_DNA_FULL = this.create("fossilmachine.dna_full")
     @JvmField
-    val FOSSIL_MACHINE_FINISHED = this.create("fossil_machine.finished")
+    val FOSSIL_MACHINE_FINISHED = this.create("fossilmachine.finished")
     @JvmField
-    val FOSSIL_MACHINE_INSERT_DNA = this.create("fossil_machine.insert_dna")
+    val FOSSIL_MACHINE_INSERT_DNA = this.create("fossilmachine.insert_dna")
     @JvmField
-    val FOSSIL_MACHINE_INSERT_DNA_SMALL = this.create("fossil_machine.insert_dna_small")
+    val FOSSIL_MACHINE_INSERT_DNA_SMALL = this.create("fossilmachine.insert_dna_small")
     @JvmField
-    val FOSSIL_MACHINE_INSERT_FOSSIL = this.create("fossil_machine.insert_fossil")
+    val FOSSIL_MACHINE_INSERT_FOSSIL = this.create("fossilmachine.insert_fossil")
     @JvmField
-    val FOSSIL_MACHINE_RETRIEVE_FOSSIL = this.create("fossil_machine.retrieve_fossil")
+    val FOSSIL_MACHINE_RETRIEVE_FOSSIL = this.create("fossilmachine.retrieve_fossil")
     @JvmField
-    val FOSSIL_MACHINE_RETRIEVE_POKEMON = this.create("fossil_machine.retrieve_pokemon")
+    val FOSSIL_MACHINE_RETRIEVE_POKEMON = this.create("fossilmachine.retrieve_pokemon")
     @JvmField
-    val FOSSIL_MACHINE_UNPROTECTED = this.create("fossil_machine.unprotected")
-
-    @JvmField
-    val RELIC_COIN_SACK_BREAK = this.create("relic_coin_sack.break")
-    @JvmField
-    val RELIC_COIN_SACK_HIT = this.create("relic_coin_sack.hit")
-    @JvmField
-    val RELIC_COIN_SACK_STEP = this.create("relic_coin_sack.step")
-    @JvmField
-    val RELIC_COIN_SACK_PLACE = this.create("relic_coin_sack.place")
-    @JvmField
-    val RELIC_COIN_POUCH_BREAK = this.create("relic_coin_pouch.break")
-    @JvmField
-    val RELIC_COIN_POUCH_PLACE = this.create("relic_coin_pouch.place")
+    val FOSSIL_MACHINE_UNPROTECTED = this.create("fossilmachine.unprotected")
 
     @JvmField
     val TUMBLESTONE_BREAK = this.create("tumblestone.break")
@@ -145,108 +123,6 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, RegistryKey<Regi
     @JvmField
     val TUMBLESTONE_STEP = this.create("tumblestone.step")
 
-    @JvmField
-    val GIMMIGHOUL_GIVE_ITEM_SMALL = this.create("gimmighoul.give_item_small")
-    @JvmField
-    val GIMMIGHOUL_REVEAL = this.create("gimmighoul.reveal")
-
-    @JvmField
-    val BERRY_BUSH_BREAK = this.create("berry_bush.break")
-    @JvmField
-    val BERRY_BUSH_PLACE = this.create("berry_bush.place")
-
-    @JvmField
-    val BIG_ROOT_BREAK = this.create("big_root.break")
-    @JvmField
-    val ENERGY_ROOT_PLACE = this.create("energy_root.place")
-
-    @JvmField
-    val VIVICHOKE_BREAK = this.create("vivichoke.break")
-    @JvmField
-    val VIVICHOKE_PLACE = this.create("vivichoke.place")
-
-    @JvmField
-    val MINT_BREAK = this.create("mint.break")
-    @JvmField
-    val MINT_PLACE = this.create("mint.place")
-
-    @JvmField
-    val REVIVAL_HERB_BREAK = this.create("revival_herb.break")
-    @JvmField
-    val REVIVAL_HERB_PLACE = this.create("revival_herb.place")
-
-    @JvmField
-    val MEDICINAL_LEEK_BREAK = this.create("medicinal_leek.break")
-    @JvmField
-    val MEDICINAL_LEEK_PLACE = this.create("medicinal_leek.plant")
-
-    @JvmField
-    val GILDED_CHEST_OPEN = this.create("gilded_chest.open")
-    @JvmField
-    val GILDED_CHEST_CLOSE = this.create("gilded_chest.close")
-    @JvmField
-    val GILDED_CHEST_STEP = this.create("gilded_chest.step")
-    @JvmField
-    val GILDED_CHEST_HIT = this.create("gilded_chest.hit")
-    @JvmField
-    val GILDED_CHEST_BREAK = this.create("gilded_chest.break")
-    @JvmField
-    val GILDED_CHEST_PLACE = this.create("gilded_chest.place")
-
-    @JvmField
-    val RELIC_COIN_SACK_SOUNDS = BlockSoundGroup(1f, 1f,
-        RELIC_COIN_SACK_BREAK,
-        RELIC_COIN_SACK_STEP,
-        RELIC_COIN_SACK_PLACE,
-        RELIC_COIN_SACK_HIT,
-        RELIC_COIN_SACK_STEP
-    )
-    @JvmField
-    val RELIC_COIN_POUCH_SOUNDS = BlockSoundGroup(1f, 1f,
-        RELIC_COIN_POUCH_BREAK,
-        RELIC_COIN_SACK_STEP,
-        RELIC_COIN_POUCH_PLACE,
-        RELIC_COIN_SACK_HIT,
-        RELIC_COIN_SACK_STEP
-    )
-
-    @JvmField
-    val IMPACT_NORMAL = this.create("impact.normal")
-    @JvmField
-    val IMPACT_BUG = this.create("impact.bug")
-    @JvmField
-    val IMPACT_DARK = this.create("impact.dark")
-    @JvmField
-    val IMPACT_DRAGON = this.create("impact.dragon")
-    @JvmField
-    val IMPACT_ELECTRIC = this.create("impact.electric")
-    @JvmField
-    val IMPACT_FAIRY = this.create("impact.fairy")
-    @JvmField
-    val IMPACT_FIGHTING = this.create("impact.fighting")
-    @JvmField
-    val IMPACT_FIRE = this.create("impact.fire")
-    @JvmField
-    val IMPACT_FLYING = this.create("impact.flying")
-    @JvmField
-    val IMPACT_GHOST = this.create("impact.ghost")
-    @JvmField
-    val IMPACT_GRASS = this.create("impact.grass")
-    @JvmField
-    val IMPACT_GROUND = this.create("impact.ground")
-    @JvmField
-    val IMPACT_ICE = this.create("impact.ice")
-    @JvmField
-    val IMPACT_POISON = this.create("impact.poison")
-    @JvmField
-    val IMPACT_PSYCHIC = this.create("impact.psychic")
-    @JvmField
-    val IMPACT_ROCK = this.create("impact.rock")
-    @JvmField
-    val IMPACT_STEEL = this.create("impact.steel")
-    @JvmField
-    val IMPACT_WATER = this.create("impact.water")
-
     @JvmField
     val TUMBLESTONE_SOUNDS = BlockSoundGroup(1f, 1f,
         TUMBLESTONE_BREAK,
@@ -265,99 +141,5 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, RegistryKey<Regi
         TUMBLESTONE_STEP
     )
 
-    @JvmField
-    val BERRY_BUSH_SOUNDS = BlockSoundGroup(1f, 1f,
-        BERRY_BUSH_BREAK,
-        SoundEvents.BLOCK_GRASS_STEP,
-        BERRY_BUSH_PLACE,
-        SoundEvents.BLOCK_GRASS_HIT,
-        SoundEvents.BLOCK_GRASS_STEP
-    )
-
-    @JvmField
-    val BIG_ROOT_SOUNDS = BlockSoundGroup(1f, 1f,
-        BIG_ROOT_BREAK,
-        SoundEvents.BLOCK_ROOTS_STEP,
-        SoundEvents.BLOCK_ROOTS_PLACE,
-        SoundEvents.BLOCK_ROOTS_HIT,
-        SoundEvents.BLOCK_ROOTS_FALL
-    )
-
-    @JvmField
-    val ENERGY_ROOT_SOUNDS = BlockSoundGroup(1f, 1f,
-        SoundEvents.BLOCK_ROOTS_BREAK,
-        SoundEvents.BLOCK_ROOTS_STEP,
-        ENERGY_ROOT_PLACE,
-        SoundEvents.BLOCK_ROOTS_HIT,
-        SoundEvents.BLOCK_ROOTS_FALL
-    )
-
-    @JvmField
-    val MEDICINAL_LEEK_SOUNDS = BlockSoundGroup(1f, 1f,
-        MEDICINAL_LEEK_BREAK,
-        SoundEvents.BLOCK_GRASS_STEP,
-        MEDICINAL_LEEK_PLACE,
-        SoundEvents.BLOCK_GRASS_HIT,
-        SoundEvents.BLOCK_GRASS_FALL
-    )
-
-    @JvmField
-    val VIVICHOKE_SOUNDS = BlockSoundGroup(1f, 1f,
-        VIVICHOKE_BREAK,
-        SoundEvents.BLOCK_GRASS_STEP,
-        VIVICHOKE_PLACE,
-        SoundEvents.BLOCK_GRASS_HIT,
-        SoundEvents.BLOCK_GRASS_FALL
-    )
-
-    @JvmField
-    val MINT_SOUNDS = BlockSoundGroup(1f, 1f,
-        MINT_BREAK,
-        SoundEvents.BLOCK_GRASS_STEP,
-        MINT_PLACE,
-        SoundEvents.BLOCK_GRASS_HIT,
-        SoundEvents.BLOCK_GRASS_FALL
-    )
-
-    @JvmField
-    val REVIVAL_HERB_SOUNDS = BlockSoundGroup(1f, 1f,
-        REVIVAL_HERB_BREAK,
-        SoundEvents.BLOCK_GRASS_STEP,
-        REVIVAL_HERB_PLACE,
-        SoundEvents.BLOCK_GRASS_HIT,
-        SoundEvents.BLOCK_GRASS_FALL
-    )
-
-    @JvmField
-    val GILDED_CHEST_SOUNDS = BlockSoundGroup(1f, 1f,
-        GILDED_CHEST_BREAK,
-        GILDED_CHEST_STEP,
-        GILDED_CHEST_PLACE,
-        GILDED_CHEST_HIT,
-        GILDED_CHEST_STEP
-    )
-
-    @JvmField
-    val DISPLAY_CASE_ADD_ITEM = this.create("display_case.add_item")
-    @JvmField
-    val DISPLAY_CASE_REMOVE_ITEM = this.create("display_case.remove_item")
-    @JvmField
-    val DISPLAY_CASE_BREAK = this.create("display_case.break")
-    @JvmField
-    val DISPLAY_CASE_HIT = this.create("display_case.hit")
-    @JvmField
-    val DISPLAY_CASE_PLACE = this.create("display_case.place")
-    @JvmField
-    val DISPLAY_CASE_STEP = this.create("display_case.step")
-
-    @JvmField
-    val DISPLAY_CASE_SOUNDS = BlockSoundGroup(1f, 1f,
-        DISPLAY_CASE_BREAK,
-        DISPLAY_CASE_STEP,
-        DISPLAY_CASE_PLACE,
-        DISPLAY_CASE_HIT,
-        DISPLAY_CASE_STEP
-    )
-
     private fun create(name: String): SoundEvent = this.create(name, SoundEvent.of(cobblemonResource(name)))
 }

common/src/main/kotlin/com/cobblemon/mod/common/advancement/CobblemonCriteria.kt

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

common/src/main/kotlin/com/cobblemon/mod/common/advancement/criterion/PlantTumblestoneCriterionCondition.kt

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

common/src/main/kotlin/com/cobblemon/mod/common/api/abilities/Ability.kt

@@ -9,7 +9,6 @@
 package com.cobblemon.mod.common.api.abilities
 
 import com.cobblemon.mod.common.api.Priority
-import com.cobblemon.mod.common.pokemon.Pokemon
 import com.cobblemon.mod.common.util.DataKeys
 import com.google.gson.JsonObject
 import net.minecraft.nbt.NbtCompound
@@ -22,7 +21,7 @@ import net.minecraft.nbt.NbtCompound
  * @author Qu
  * @since January 9th, 2022
  */
-open class Ability internal constructor(var template: AbilityTemplate, forced: Boolean) {
+open class Ability internal constructor(var template: AbilityTemplate, var forced: Boolean) {
 
     val name: String
         get() = template.name
@@ -35,26 +34,16 @@ open class Ability internal constructor(var template: AbilityTemplate, forced: B
 
     /**
      * This represents the last known index of this backing ability in the species data.
-     * @see [Pokemon.updateAbility].
-     */
-    var forced: Boolean = forced
-        internal set
-
-    /**
-     * This represents the last known index of this backing ability in the species data.
-     *
-     * @see [Pokemon.updateAbility].
+     * If -1 the ability will attempt to find the correct index or reroll itself, this is done in order to be compatible with existing data
+     * The value can be mutated however this is not recommended by API users.
      */
     var index: Int = -1
-        internal set
 
     /**
      * The last known priority of this ability in the species data.
-     *
-     * @see [Pokemon.updateAbility].
+     * The value can be mutated however this is not recommended by API users.
      */
     var priority = Priority.LOWEST
-        internal set
 
     open fun saveToNBT(nbt: NbtCompound): NbtCompound {
         nbt.putString(DataKeys.POKEMON_ABILITY_NAME, name)
@@ -73,23 +62,19 @@ open class Ability internal constructor(var template: AbilityTemplate, forced: B
     }
 
     open fun loadFromNBT(nbt: NbtCompound): Ability {
-        this.template = Abilities.getOrException(nbt.getString(DataKeys.POKEMON_ABILITY_NAME))
-        this.forced = nbt.getBoolean(DataKeys.POKEMON_ABILITY_FORCED)
+        forced = nbt.getBoolean(DataKeys.POKEMON_ABILITY_FORCED)
         if (nbt.contains(DataKeys.POKEMON_ABILITY_INDEX) && nbt.contains(DataKeys.POKEMON_ABILITY_PRIORITY)) {
             this.index = nbt.getInt(DataKeys.POKEMON_ABILITY_INDEX)
             this.priority = Priority.valueOf(nbt.getString(DataKeys.POKEMON_ABILITY_PRIORITY))
         }
         return this
     }
-
     open fun loadFromJSON(json: JsonObject): Ability {
-        this.template = Abilities.getOrException(json.get(DataKeys.POKEMON_ABILITY_NAME).asString)
-        this.forced = json.get(DataKeys.POKEMON_ABILITY_FORCED)?.asBoolean ?: false
+        forced = json.get(DataKeys.POKEMON_ABILITY_FORCED)?.asBoolean ?: false
         if (json.has(DataKeys.POKEMON_ABILITY_INDEX) && json.has(DataKeys.POKEMON_ABILITY_PRIORITY)) {
             this.index = json.get(DataKeys.POKEMON_ABILITY_INDEX).asInt
             this.priority = Priority.valueOf(json.get(DataKeys.POKEMON_ABILITY_PRIORITY).asString)
         }
         return this
     }
-
 }

common/src/main/kotlin/com/cobblemon/mod/common/api/abilities/AbilityTemplate.kt

@@ -28,6 +28,7 @@ class AbilityTemplate(
      */
     fun create(forced: Boolean = false) = builder(this, forced)
 
+
     /**
      * Returns the Ability and loads the given NBT Tag into it.
      *
@@ -41,5 +42,4 @@ class AbilityTemplate(
      * Ability extensions need to write and read their needed data from here.
      */
     fun create(json: JsonObject) = create().loadFromJSON(json)
-
 }

common/src/main/kotlin/com/cobblemon/mod/common/api/battles/interpreter/BattleMessage.kt

@@ -135,31 +135,28 @@ class BattleMessage(rawMessage: String) {
         return this.actorAndActivePokemon(pnx, battle)
     }
 
-    /**
-     * Queries an argument at the given [index] for a 'pnx' and uuid that will be parsed into a [BattlePokemon].
-     *
-     * @param index The index of the argument referencing the [BattlePokemon].
-     * @param battle The [PokemonBattle] being queried.
-     * @return The [BattlePokemon] if the argument exists and is successfully parsed; otherwise null.
+    /*
+        Example:
+        |-curestatus|p1: a8e5710e-6835-4387-99d3-331b45f848e6|slp|[msg]
+        |-curestatus|p1: 0686b20d-3019-4167-92e2-786834245743|slp|[msg]
+        // Function used to grab BattlePokemon (As we need to be able to grab non active pokemon to cure their status)
+        // by using playerNumber(actorID) and pokemon uuid(pokemonID)
      */
-    fun battlePokemon(index: Int, battle: PokemonBattle): BattlePokemon? {
-        val (actorID, pokemonID) = this.pnxAndUuid(index) ?: return null
-        return this.battlePokemon(actorID, pokemonID, battle)
+    fun getBattlePokemon(index: Int, battle: PokemonBattle): BattlePokemon? {
+        val actorAndPokemonID = this.argumentAt(index)?.takeIf { it.length >= 2 }?.split(": ") ?: return null
+        if (actorAndPokemonID.count() < 2) return null
+        val actorID = actorAndPokemonID[0]
+        val pokemonID = actorAndPokemonID[1]
+        return this.getBattlePokemon(actorID, pokemonID, battle)
     }
 
-    /**
-     * Queries an optional argument identified by [optionalArg] for a 'pnx' and uuid that will be parsed into a [BattlePokemon].
-     *
-     * @param optionalArg The id of the optional argument referencing the [BattlePokemon].
-     * @param battle The [PokemonBattle] being queried.
-     * @return The [BattlePokemon] if the argument exists and is successfully parsed; otherwise null.
-     */
-    fun battlePokemonFromOptional(battle: PokemonBattle, optionalArg: String = "of"): BattlePokemon? {
-        val optional = this.optionalArguments.get(optionalArg) ?: return null
-        val pokemonID = optional.takeIf { it.length >= 2 }?.split(":")?.takeIf { it.size == 2 } ?: return null
-        val pnx = pokemonID[0].takeIf { it.matches(PNX_MATCHER) || it.matches(PN_MATCHER) } ?: return null
-        val uuid = pokemonID[1].trim()
-        return this.battlePokemon(pnx, uuid, battle)
+    fun getSourceBattlePokemon(battle: PokemonBattle): BattlePokemon? {
+        val sourcePokemonArgument = this.optionalArguments.get("of") ?: return null
+        val actorAndPokemonID = sourcePokemonArgument.takeIf { it.length >= 2 }?.split(": ") ?: return null
+        if (actorAndPokemonID.count() < 2) return null
+        val actorID = actorAndPokemonID[0]
+        val pokemonID = actorAndPokemonID[1]
+        return this.getBattlePokemon(actorID, pokemonID, battle)
     }
 
     /**
@@ -170,7 +167,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) || it.matches(PN_MATCHER) } ?: return null
+        val pnx = argument[0].takeIf { it.matches(PNX_MATCHER) } ?: return null
         val uuid = argument[1].trim()
         return pnx to uuid
     }
@@ -237,7 +234,7 @@ class BattleMessage(rawMessage: String) {
         null
     }
 
-    private fun battlePokemon(pnx: String, pokemonID: String, battle: PokemonBattle): BattlePokemon? = try {
+    private fun getBattlePokemon(pnx: String, pokemonID: String, battle: PokemonBattle): BattlePokemon? = try {
         battle.getBattlePokemon(pnx, pokemonID)
     } catch (_: Exception) {
         null

common/src/main/kotlin/com/cobblemon/mod/common/api/battles/model/PokemonBattle.kt

@@ -8,8 +8,6 @@
 
 package com.cobblemon.mod.common.api.battles.model
 
-import com.bedrockk.molang.runtime.struct.QueryStruct
-import com.bedrockk.molang.runtime.value.DoubleValue
 import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.Cobblemon.LOGGER
 import com.cobblemon.mod.common.CobblemonNetwork
@@ -37,10 +35,10 @@ import com.cobblemon.mod.common.battles.dispatch.WaitDispatch
 import com.cobblemon.mod.common.battles.interpreter.ContextManager
 import com.cobblemon.mod.common.battles.pokemon.BattlePokemon
 import com.cobblemon.mod.common.battles.runner.ShowdownService
-import com.cobblemon.mod.common.battles.ForfeitActionResponse
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.net.messages.client.battle.BattleEndPacket
 import com.cobblemon.mod.common.net.messages.client.battle.BattleMessagePacket
+import com.cobblemon.mod.common.net.messages.client.battle.BattleMusicPacket
 import com.cobblemon.mod.common.pokemon.evolution.progress.DefeatEvolutionProgress
 import com.cobblemon.mod.common.pokemon.evolution.progress.LastBattleCriticalHitsEvolutionProgress
 import com.cobblemon.mod.common.pokemon.evolution.requirements.DefeatRequirement
@@ -98,16 +96,12 @@ open class PokemonBattle(
     val chatLog = mutableListOf<Text>()
     var started = false
     var ended = false
+    var simulation = false
     // TEMP battle showcase stuff
     var announcingRules = false
     var turn: Int = 1
         private set
 
-    private var ticks: Int = 0
-        set(value) { field = value.coerceAtMost(Int.MAX_VALUE) } // go outside
-
-    /** The current duration of the battle in seconds. */
-    val time: Int get() = ticks % 20
 
     var dispatchResult = GO
     val dispatches = ConcurrentLinkedDeque<BattleDispatch>()
@@ -167,7 +161,7 @@ open class PokemonBattle(
     fun getActor(player: ServerPlayerEntity) = actors.firstOrNull { it.isForPlayer(player) }
 
     /**
-     * Gets a [BattleActor] and an [ActiveBattlePokemon] from a pnx key, e.g. p2a
+     * Gets a BattleActor and an [ActiveBattlePokemon] from a pnx key, e.g. p2a
      *
      * Returns null if either the pn or x is invalid.
      */
@@ -180,11 +174,6 @@ open class PokemonBattle(
         return actor to pokemon
     }
 
-    /**
-     * Gets a [BattlePokemon] from a pnx key and uuid.
-     *
-     * Returns null if the pnx key is invalid or the uuid does not exist.
-     */
     fun getBattlePokemon(pnx: String, pokemonID: String): BattlePokemon {
         val actor = actors.find { it.showdownId == pnx.substring(0, 2) }
             ?: throw IllegalStateException("Invalid pnx: $pnx - unknown actor")
@@ -217,7 +206,8 @@ open class PokemonBattle(
 
     fun end() {
         ended = true
-        this.actors.forEach { actor ->
+        // award XP if it is not a simulation battle
+        if (simulation == false) this.actors.forEach { actor ->
             val faintedPokemons = actor.pokemonList.filter { it.health <= 0 }
             actor.getSide().getOppositeSide().actors.forEach { opponent ->
                 val opponentNonFaintedPokemons = opponent.pokemonList.filter { it.health > 0 }
@@ -226,7 +216,7 @@ open class PokemonBattle(
                         val facedFainted = opponentPokemon.facedOpponents.contains(faintedPokemon)
                         val pokemon = opponentPokemon.effectedPokemon
                         if (facedFainted) {
-                            pokemon.lockedEvolutions.forEach { evolution ->
+                            pokemon.evolutions.forEach { evolution ->
                                 evolution.requirements.filterIsInstance<DefeatRequirement>().forEach { defeatRequirement ->
                                     if (defeatRequirement.target.matches(faintedPokemon.effectedPokemon)) {
                                         val progress = pokemon.evolutionProxy.current().progressFirstOrCreate({ it is DefeatEvolutionProgress && it.currentProgress().target == defeatRequirement.target }) { DefeatEvolutionProgress() }
@@ -396,9 +386,8 @@ open class PokemonBattle(
             return
         }
 
-        if (started) {
-            ticks++
-            if (isPvW && !ended && dispatches.isEmpty()) checkFlee()
+        if (started && isPvW && !ended && dispatches.isEmpty()) {
+            checkFlee()
         }
     }
 
@@ -440,24 +429,13 @@ open class PokemonBattle(
     }
 
     fun checkForInputDispatch() {
-        if (checkForfeit()) return  // ignore actors that are still choosing, their choices don't matter anymore
-        val readyToInput = (actors.any { !it.mustChoose && it.responses.isNotEmpty() } && actors.none { it.mustChoose })
+        val readyToInput = actors.any { !it.mustChoose && it.responses.isNotEmpty() } && actors.none { it.mustChoose }
         if (readyToInput && captureActions.isEmpty()) {
             actors.filter { it.responses.isNotEmpty() }.forEach { it.writeShowdownResponse() }
             actors.forEach { it.responses.clear() ; it.request = null }
         }
     }
 
-    /** Forces Showdown to end the battle when a [BattleActor] chooses to forfeit. */
-    private fun checkForfeit(): Boolean {
-        val forfeit = actors.find { it.responses.any { it is ForfeitActionResponse } }
-        return forfeit?.let {
-            this.dispatchWaiting { this.broadcastChatMessage(battleLang("forfeit", it.getName()).red()) }
-            writeShowdownAction(">forcelose ${it.showdownId}")
-            true
-        } ?: false
-    }
-
     /**
      * Creates a [Text] representation of an error to interpret a battle message.
      * This also logs the error, the goal of this function is to make sure users see missing interpretations and report them to us.
@@ -488,13 +466,4 @@ open class PokemonBattle(
         LOGGER.error("Missing interpretation on '{}' action: \nPublic » {}\nPrivate » {}", publicMessage.id, publicMessage.rawMessage, privateMessage.rawMessage)
         return Text.literal("Missing interpretation on '${publicMessage.id}' action please report to the developers").red()
     }
-
-    fun addQueryFunctions(queryStruct: QueryStruct): QueryStruct {
-        queryStruct.addFunction("pvp") { DoubleValue(isPvP) }
-        queryStruct.addFunction("pvn") { DoubleValue(isPvN) }
-        queryStruct.addFunction("pvw") { DoubleValue(isPvW) }
-        queryStruct.addFunction("has_rule") { params -> DoubleValue(params.getString(0) in format.ruleSet) }
-
-        return queryStruct
-    }
 }

common/src/main/kotlin/com/cobblemon/mod/common/api/battles/model/actor/AIBattleActor.kt

@@ -12,6 +12,7 @@ import com.cobblemon.mod.common.Cobblemon.LOGGER
 import com.cobblemon.mod.common.api.battles.model.ai.BattleAI
 import com.cobblemon.mod.common.api.net.NetworkPacket
 import com.cobblemon.mod.common.battles.PassActionResponse
+import com.cobblemon.mod.common.battles.ai.StrongBattleAI
 import com.cobblemon.mod.common.battles.pokemon.BattlePokemon
 import com.cobblemon.mod.common.exception.IllegalActionChoiceException
 import com.cobblemon.mod.common.net.messages.client.battle.BattleMakeChoicePacket
@@ -20,7 +21,7 @@ import java.util.UUID
 abstract class AIBattleActor(
     gameId: UUID,
     pokemonList: List<BattlePokemon>,
-    val battleAI: BattleAI
+    val battleAI: BattleAI = StrongBattleAI(0)
 ) : BattleActor(gameId, pokemonList.toMutableList()) {
     override fun sendUpdate(packet: NetworkPacket<*>) {
         super.sendUpdate(packet)

common/src/main/kotlin/com/cobblemon/mod/common/api/berry/Berry.kt

@@ -16,7 +16,7 @@ import com.cobblemon.mod.common.api.events.berry.BerryYieldCalculationEvent
 import com.cobblemon.mod.common.api.mulch.MulchVariant
 import com.cobblemon.mod.common.block.BerryBlock
 import com.cobblemon.mod.common.block.entity.BerryBlockEntity
-import com.cobblemon.mod.common.item.berry.BerryItem
+import com.cobblemon.mod.common.item.BerryItem
 import com.cobblemon.mod.common.pokemon.Nature
 import com.cobblemon.mod.common.util.readBox
 import com.cobblemon.mod.common.util.writeBox
@@ -45,8 +45,9 @@ import net.minecraft.world.biome.Biome
  * @property identifier The [Identifier] of this berry.
  * @property baseYield The [IntRange] possible for the berry tree before [bonusYield] is calculated.
  * @property preferredBiomeTags The [TagKey]s of the berries preffered biomes. Determines spawning and yield
- * @property growthTime The [IntRange] possible in minutes for how long the berry tree takes to grow frome age 0 to age 3
- * @property refreshRate The [IntRange] possible in minutes for how long the berry tree takes to grow from age 3 to age 5
+ * @property growthTime The [IntRange] possible in minutes for how long the berry tree takes to grow.
+ * @property refreshRate The [IntRange] possible in minutes for how long the berry tree takes to regrow its berries once it has been harvested.
+ * @depreciated @property lifeCycles The [IntRange] possible for the berry to live for between harvests.
  * @property favoriteMulches The types of mulches that benefit this berries yield
  * @property growthFactors An array of [GrowthFactor]s that will affect this berry. The client is not aware of these.
  * @property mutations A map of the partner berry as the key and the value as the resulting mutation with this berry.
@@ -59,7 +60,6 @@ import net.minecraft.world.biome.Biome
  * @property flowerTexture The [Identifier] for the texture of the berry in flower form. This is resolved into a [ModelPart] on the client.
  * @property fruitModelIdentifier The [Identifier] for the model of the berry in flower form. This is resolved into a [ModelPart] on the client.
  * @property fruitTexture The [Identifier] for the texture of the berry in flower form.
- * @property stageOnePositioning Transformation of the berry model for age 0
  *
  * @throws IllegalArgumentException if the any yield range argument is not a positive range.
  */
@@ -69,6 +69,7 @@ class Berry(
     val preferredBiomeTags: List<TagKey<Biome>>,
     val growthTime: IntRange,
     val refreshRate: IntRange,
+    //val lifeCycles: IntRange,
     val favoriteMulches: EnumSet<MulchVariant>,
     val growthFactors: Collection<GrowthFactor>,
     val spawnConditions: List<BerrySpawnCondition>,
@@ -87,9 +88,7 @@ class Berry(
     @SerializedName("fruitModel")
     val fruitModelIdentifier: Identifier,
     val fruitTexture: Identifier,
-    val stageOnePositioning: GrowthPoint,
-    val weight: Float,
-    val boneMealChance: Float
+    val weight: Float
 ) {
 
     @Transient
@@ -162,9 +161,8 @@ class Berry(
         val bonus = this.bonusYield(world, state, pos)
         var yield = base + bonus.first
         val treeEntity = world.getBlockEntity(pos) as BerryBlockEntity
-        if (BerryBlock.getMulch(treeEntity) == MulchVariant.RICH) {
-            //I hope the upper bound isnt exclusive, especially when there's a method called nextBetweenExclusive
-            yield += world.random.nextBetween(1, 3)
+        if (BerryBlock.getMulch(state) == MulchVariant.RICH) {
+            yield = min(yield + 1, maxYield())
             treeEntity.decrementMulchDuration(world, pos, state)
         }
         val event = BerryYieldCalculationEvent(this, world, state, pos, placer, yield, bonus.second)
@@ -281,13 +279,6 @@ class Berry(
         buffer.writeIdentifier(this.flowerTexture)
         buffer.writeIdentifier(this.fruitModelIdentifier)
         buffer.writeIdentifier(this.fruitTexture)
-        buffer.writeDouble(stageOnePositioning.position.x)
-        buffer.writeDouble(stageOnePositioning.position.y)
-        buffer.writeDouble(stageOnePositioning.position.z)
-        buffer.writeDouble(stageOnePositioning.rotation.x)
-        buffer.writeDouble(stageOnePositioning.rotation.y)
-        buffer.writeDouble(stageOnePositioning.rotation.z)
-        buffer.writeFloat(boneMealChance)
     }
 
     /**
@@ -301,8 +292,7 @@ class Berry(
     private fun bonusYield(world: World, state: BlockState, pos: BlockPos): Pair<Int, Collection<GrowthFactor>> {
         var bonus = 0
         val passed = arrayListOf<GrowthFactor>()
-        val treeEntity = world.getBlockEntity(pos) as? BerryBlockEntity ?: return 0 to passed
-        val mulchVariant = BerryBlock.getMulch(treeEntity)
+        val mulchVariant = BerryBlock.getMulch(state)
         val hasBiomeMulch = mulchVariant in favoriteMulches
         this.growthFactors.forEach { factor ->
             if (factor.isValid(world, state, pos)) {
@@ -349,9 +339,7 @@ class Berry(
             val flowerTexture = buffer.readIdentifier()
             val fruitModelIdentifier = buffer.readIdentifier()
             val fruitTexture = buffer.readIdentifier()
-            val stageOneYPos = GrowthPoint(Vec3d(buffer.readDouble(), buffer.readDouble(), buffer.readDouble()), Vec3d(buffer.readDouble(), buffer.readDouble(), buffer.readDouble()))
-            val boneMealChance = buffer.readFloat()
-            return Berry(identifier, baseYield, emptyList(), growthTime, refreshRate, favMulchs, emptySet(), emptyList(), growthPoints, randomizedGrowthPoints, mutations, sproutShapeBoxes, matureShapeBoxes, flavors, tintIndexes, flowerModelIdentifier, flowerTexture, fruitModelIdentifier, fruitTexture, stageOneYPos, 0F, boneMealChance)
+            return Berry(identifier, baseYield, emptyList(), growthTime, refreshRate, favMulchs, emptySet(), emptyList(), growthPoints, randomizedGrowthPoints, mutations, sproutShapeBoxes, matureShapeBoxes, flavors, tintIndexes, flowerModelIdentifier, flowerTexture, fruitModelIdentifier, fruitTexture, 0F)
         }
 
     }

common/src/main/kotlin/com/cobblemon/mod/common/api/drop/DropTable.kt

@@ -10,7 +10,6 @@ package com.cobblemon.mod.common.api.drop
 
 import com.cobblemon.mod.common.api.events.CobblemonEvents.LOOT_DROPPED
 import com.cobblemon.mod.common.api.events.drops.LootDroppedEvent
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import net.minecraft.entity.LivingEntity
 import net.minecraft.server.network.ServerPlayerEntity
 import net.minecraft.server.world.ServerWorld
@@ -89,8 +88,6 @@ class DropTable {
         amount: IntRange = this.amount
     ) {
         val drops = getDrops(amount).toMutableList()
-        val heldItem = (entity as PokemonEntity).pokemon.heldItemNoCopy()
-        if (!heldItem.isEmpty) entity.dropItem(heldItem.item)
         LOOT_DROPPED.postThen(
             event = LootDroppedEvent(this, player, entity, drops),
             ifSucceeded = { it.drops.forEach { it.drop(entity, world, pos, player) } }

common/src/main/kotlin/com/cobblemon/mod/common/api/entity/pokemon/EntityEffect.kt

@@ -1,97 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.entity.pokemon
-
-import com.cobblemon.mod.common.api.pokemon.PokemonProperties
-import com.cobblemon.mod.common.api.pokemon.PokemonSpecies
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
-import com.cobblemon.mod.common.entity.pokemon.effects.IllusionEffect
-import com.cobblemon.mod.common.entity.pokemon.effects.TransformEffect
-import com.cobblemon.mod.common.pokemon.FormData
-import com.cobblemon.mod.common.pokemon.Species
-import com.cobblemon.mod.common.util.DataKeys
-import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
-import net.minecraft.nbt.NbtCompound
-import java.util.concurrent.CompletableFuture
-import kotlin.reflect.KClass
-
-/**
- * Represents a temporary alteration to how a [PokemonEntity] is rendered and behaves. May include a temporary visual effect
- * when applied.
- *
- * @author Segfault Guy
- * @since March 5th, 2024
- */
-interface EntityEffect {
-
-    /**
-     * Starts this effect for the provided [PokemonEntity].
-     *
-     * @return A [CompletableFuture] that completes after the effect has been applied. Or null if the effect failed to start.
-     */
-    fun start(entity: PokemonEntity): CompletableFuture<PokemonEntity>?
-
-    /**
-     * Ends this effect for the provided [PokemonEntity].
-     *
-     * @return A [CompletableFuture] that completes after the effect has been reverted. Or null if the effect failed to end.
-     */
-    fun end(entity: PokemonEntity): CompletableFuture<PokemonEntity>?
-
-    /** Saves this effect to NBT. */
-    fun saveToNbt(): NbtCompound
-
-    /** Loads this effect from NBT. */
-    fun loadFromNBT(nbt: NbtCompound)
-
-    companion object {
-
-        private val effects = mutableMapOf<String, KClass<out EntityEffect>>()
-        private val defaults = mutableMapOf<String, () -> EntityEffect>()
-
-        init {
-            register(IllusionEffect.ID, IllusionEffect::class, ::IllusionEffect)
-            register(TransformEffect.ID, TransformEffect::class, ::TransformEffect)
-        }
-
-        fun <T : EntityEffect> register(id: String, type: KClass<T>, default: () -> T) {
-            effects[id] = type
-            defaults[id] = default
-        }
-
-        fun createDefault(id: String): EntityEffect? = defaults[id]?.invoke()
-
-        fun loadFromNbt(nbt: NbtCompound): EntityEffect? {
-            if (nbt.contains(DataKeys.ENTITY_EFFECT_ID)) {
-                val id = nbt.getString(DataKeys.ENTITY_EFFECT_ID)
-                return createDefault(id)?.also { it.loadFromNBT(nbt) }
-            }
-            return null
-        }
-    }
-}
-
-
-/** An [EntityEffect] that modifies the dimensions of a [PokemonEntity]. */
-interface PhysicalEffect : EntityEffect {
-    val scale: Float
-}
-
-/** An [EntityEffect] that alters the physical appearance of a [PokemonEntity] to match a [mock]. */
-interface MocKEffect : PhysicalEffect {
-    val mock: PokemonProperties
-
-    val exposedSpecies: Species?
-        get() = this.mock.species?.let { PokemonSpecies.getByIdentifier(it.asIdentifierDefaultingNamespace()) }
-
-    val exposedForm: FormData?
-        get() = this.mock.form?.let {
-            formID -> this.exposedSpecies?.forms?.firstOrNull { it.formOnlyShowdownId().equals(formID, true) } }
-                ?: this.exposedSpecies?.standardForm
-}

common/src/main/kotlin/com/cobblemon/mod/common/api/events/CobblemonEvents.kt

@@ -33,8 +33,6 @@ import com.cobblemon.mod.common.api.events.pokemon.evolution.EvolutionCompleteEv
 import com.cobblemon.mod.common.api.events.pokemon.evolution.EvolutionDisplayEvent
 import com.cobblemon.mod.common.api.events.pokemon.evolution.EvolutionTestedEvent
 import com.cobblemon.mod.common.api.events.pokemon.interaction.ExperienceCandyUseEvent
-import com.cobblemon.mod.common.api.events.pokemon.interaction.HeldItemUpdatedEvent
-import com.cobblemon.mod.common.api.events.pokemon.interaction.PokemonInteractionGUICreationEvent
 import com.cobblemon.mod.common.api.events.starter.StarterChosenEvent
 import com.cobblemon.mod.common.api.events.storage.ReleasePokemonEvent
 import com.cobblemon.mod.common.api.events.world.BigRootPropagatedEvent
@@ -67,8 +65,6 @@ object CobblemonEvents {
     val EVOLUTION_COMPLETE = EventObservable<EvolutionCompleteEvent>()
     @JvmField
     val POKEMON_NICKNAMED = CancelableObservable<PokemonNicknamedEvent>()
-    @JvmField
-    val HELD_ITEM_UPDATED = CancelableObservable<HeldItemUpdatedEvent>()
 
     @JvmField
     val THROWN_POKEBALL_HIT = CancelableObservable<ThrownPokeballHitEvent>()
@@ -78,8 +74,6 @@ object CobblemonEvents {
     val POKE_BALL_CAPTURE_CALCULATED = EventObservable<PokeBallCaptureCalculatedEvent>()
     @JvmField
     val POKEMON_CAPTURED = EventObservable<PokemonCapturedEvent>()
-    @JvmField
-    val FOSSIL_REVIVED = EventObservable<FossilRevivedEvent>()
 //    @JvmField
 //    val EGG_HATCH = EventObservable<HatchEggEvent>()
     @JvmField
@@ -106,9 +100,6 @@ object CobblemonEvents {
     @JvmField
     val LEVEL_UP_EVENT = EventObservable<LevelUpEvent>()
 
-    @JvmField
-    /** CLIENT ONLY! */
-    val POKEMON_INTERACTION_GUI_CREATION = EventObservable<PokemonInteractionGUICreationEvent>()
     @JvmField
     val POKEMON_ENTITY_SAVE = EventObservable<PokemonEntitySaveEvent>()
     @JvmField
@@ -162,8 +153,4 @@ object CobblemonEvents {
     val LEFTOVERS_CREATED = CancelableObservable<LeftoversCreatedEvent>()
     @JvmField
     val BIG_ROOT_PROPAGATED = CancelableObservable<BigRootPropagatedEvent>()
-    @JvmField
-    val HELD_ITEM_PRE = CancelableObservable<HeldItemEvent.Pre>()
-    @JvmField
-    val HELD_ITEM_POST = EventObservable<HeldItemEvent.Post>()
 }

common/src/main/kotlin/com/cobblemon/mod/common/api/events/pokemon/FossilRevivedEvent.kt

@@ -1,17 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.events.pokemon
-
-import com.cobblemon.mod.common.pokemon.Pokemon
-import net.minecraft.server.network.ServerPlayerEntity
-
-data class FossilRevivedEvent (
-    val pokemon: Pokemon,
-    val player: ServerPlayerEntity?
-)

common/src/main/kotlin/com/cobblemon/mod/common/api/events/pokemon/HeldItemEvent.kt

@@ -1,56 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.events.pokemon
-
-import com.cobblemon.mod.common.api.events.Cancelable
-import com.cobblemon.mod.common.pokemon.Pokemon
-import net.minecraft.item.ItemStack
-
-/**
- * The base for all the events related to held items.
- *
- * @see [Pre]
- * @see [Post]
- */
-interface HeldItemEvent {
-
-    /**
-     * The [Pokemon] triggering this event.
-     */
-    val pokemon: Pokemon
-
-    /**
-     * Fired at the start of [Pokemon.swapHeldItem].
-     *
-     * This event should be used to mutate the results of this transaction.
-     *
-     * Canceling this event will prevent the operation and causes the return to be item attempted to be given originally.
-     *
-     * @property pokemon The [Pokemon] triggering this event.
-     * @property receiving The [ItemStack] being sent received from the transaction. By default, this is the item that triggered the interaction.
-     * @property returning The [ItemStack] being sent back from the transaction. By default, this is the currently held item.
-     * @property decrement If the operation should decrement the [receiving] [ItemStack.count], this is handled in the implementation.
-     *
-     * @see [Post]
-     */
-    data class Pre(override val pokemon: Pokemon, var receiving: ItemStack, var returning: ItemStack, var decrement: Boolean) : HeldItemEvent, Cancelable()
-
-    /**
-     * Fired at the end of [Pokemon.swapHeldItem].
-     *
-     * @property pokemon The [Pokemon] triggering this event.
-     * @property received The [ItemStack] considered as received and set to the [pokemon]. This is a copy and mutation will not be taken into account.
-     * @property returned The [ItemStack] returned by the method call. This is a copy and mutation will not be taken into account.
-     * @property decremented If the [received] [ItemStack] got decremented.
-     *
-     * @see [Pre]
-     */
-    data class Post(override val pokemon: Pokemon, val received: ItemStack, val returned: ItemStack, val decremented: Boolean) : HeldItemEvent
-
-}

common/src/main/kotlin/com/cobblemon/mod/common/api/events/pokemon/interaction/HeldItemUpdatedEvent.kt

@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.events.pokemon.interaction
-
-import com.cobblemon.mod.common.api.events.Cancelable
-import com.cobblemon.mod.common.pokemon.Pokemon
-import net.minecraft.entity.LivingEntity
-import net.minecraft.item.ItemStack
-
-/**
- * Event published when a held item is being updated on a [Pokemon].
- * Cancelling the event will prevent any action from being taken on
- * the Pokémon.
- *
- * [newItem] differs from [originalStack] in that the former is a
- * one-sized version of the original (Pokémon cannot hold stacks) and
- * changing it in any way will not affect the original item held by
- * the player.
- *
- * @author Whatsy, Hiroku
- * @since November 13th, 2023
- */
-data class HeldItemUpdatedEvent(
-    val cause: LivingEntity?,
-    val pokemon: Pokemon,
-    val originalStack: ItemStack,
-    val decrement: Boolean,
-    val oldItem: ItemStack,
-    val newItem: ItemStack
-) : Cancelable()

common/src/main/kotlin/com/cobblemon/mod/common/api/events/pokemon/interaction/PokemonInteractionGUICreationEvent.kt

@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.events.pokemon.interaction
-
-import com.cobblemon.mod.common.client.gui.interact.wheel.InteractWheelOption
-import com.cobblemon.mod.common.client.gui.interact.wheel.Orientation
-import com.google.common.collect.Multimap
-import java.util.UUID
-
-data class PokemonInteractionGUICreationEvent(
-    val pokemonID: UUID,
-    val mountShoulder: Boolean,
-    val options: Multimap<Orientation, InteractWheelOption>
-) {
-    fun addFillingOption(option: InteractWheelOption) {
-        options.put(getNextFreeOrientation(), option)
-    }
-
-    fun addOption(orientation: Orientation, option: InteractWheelOption) {
-        options.put(orientation, option)
-    }
-
-    private fun getNextFreeOrientation(): Orientation {
-        var largest = Orientation.TOP_LEFT
-        for(orientation in Orientation.values()) {
-            if(!options.containsKey(orientation)) {
-                return orientation
-            } else {
-                if(options.get(orientation).size < options.get(largest).size) {
-                    largest = orientation
-                }
-            }
-        }
-        return largest
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/api/item/ability/AbilityChanger.kt

@@ -1,74 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.item.ability
-
-import com.cobblemon.mod.common.api.abilities.*
-import com.cobblemon.mod.common.item.interactive.ability.AbilityTypeChanger
-import com.cobblemon.mod.common.pokemon.Pokemon
-import com.cobblemon.mod.common.pokemon.abilities.HiddenAbility
-import com.cobblemon.mod.common.pokemon.abilities.HiddenAbilityType
-
-/**
- * Represents a change operation for a [Pokemon.ability].
- * This is backed by the associated [PotentialAbility].
- *
- * @param T The type of [PotentialAbility].
- */
-interface AbilityChanger<T : PotentialAbility> {
-
-    /**
-     * The [PotentialAbilityType] of type [T].
-     */
-    val type: PotentialAbilityType<T>
-
-    /**
-     * Collects all the possible targets for the [type] and the given [pokemon].
-     *
-     * @param pokemon The [Pokemon] being queried.
-     * @return A set containing all their legal abilities associated with [type], can be empty.
-     */
-    fun queryPossible(pokemon: Pokemon): Set<AbilityTemplate>
-
-    /**
-     * Attempts to update the ability of the given [pokemon].
-     *
-     * @param pokemon The [Pokemon] attempting to change an ability.
-     * @return If the operation was successful.
-     */
-    fun performChange(pokemon: Pokemon): Boolean
-
-    /**
-     * Checks if the current [PotentialAbilityType] of a [Pokemon.ability] is possible to swap from with this.
-     *
-     * @param type The [PotentialAbilityType] or null if the ability is forced and/or illegal.
-     * @return If the operation can be performed.
-     */
-    fun canChangeFrom(type: PotentialAbilityType<*>?): Boolean
-
-    companion object {
-
-        /**
-         * An implementation of [AbilityChanger] for [CommonAbility].
-         *
-         * While this can be used in custom data scenarios this functions most "game-like" if the Pokémon only has 2 common abilities.
-         */
-        @JvmStatic
-        val COMMON_ABILITY: AbilityChanger<CommonAbility> = AbilityTypeChanger(CommonAbilityType) { other -> other == CommonAbilityType }
-
-        /**
-         * An implementation of [AbilityChanger] for [HiddenAbility].
-         *
-         * While this can be used in custom data scenarios this functions most "game-like" if the Pokémon only has 1 hidden ability.
-         */
-        @JvmStatic
-        val HIDDEN_ABILITY: AbilityChanger<HiddenAbility> = AbilityTypeChanger(HiddenAbilityType) { other -> other == CommonAbilityType || other == HiddenAbilityType }
-
-    }
-
-}

common/src/main/kotlin/com/cobblemon/mod/common/api/molang/MoLangFunctions.kt

@@ -19,8 +19,7 @@ import com.bedrockk.molang.runtime.value.MoValue
 import com.bedrockk.molang.runtime.value.StringValue
 import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.api.dialogue.PlayerDialogueFaceProvider
-import com.cobblemon.mod.common.client.render.models.blockbench.wavefunction.WaveFunction
-import com.cobblemon.mod.common.client.render.models.blockbench.wavefunction.WaveFunctions
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMoLangValue
 import com.cobblemon.mod.common.util.isInt
 import com.cobblemon.mod.common.util.itemRegistry
 import net.minecraft.block.Block
@@ -52,30 +51,7 @@ object MoLangFunctions {
         "is_number" to java.util.function.Function { params -> DoubleValue(params.get<MoValue>(0).asString().toDoubleOrNull() != null) },
         "to_number" to java.util.function.Function { params -> DoubleValue(params.get<MoValue>(0).asString().toDoubleOrNull() ?: 0.0) },
         "to_int" to java.util.function.Function { params -> DoubleValue(params.get<MoValue>(0).asString().toIntOrNull() ?: 0) },
-        "to_string" to java.util.function.Function { params -> StringValue(params.get<MoValue>(0).asString()) },
-        "do_effect_walks" to java.util.function.Function { _ ->
-            DoubleValue(Cobblemon.config.walkingInBattleAnimations)
-        },
-        "random" to java.util.function.Function { params ->
-            val options = mutableListOf<MoValue>()
-            var index = 0
-            while (params.contains(index)) {
-                options.add(params.get(index))
-                index++
-            }
-            return@Function options.random() // Can throw an exception if they specified no args. They'd be idiots though.
-        },
-        "curve" to java.util.function.Function { params ->
-            val curveName = params.getString(0)
-            val curve = WaveFunctions.functions[curveName] ?: throw IllegalArgumentException("Unknown curve: $curveName")
-            return@Function ObjectValue(curve)
-        },
-        "array" to java.util.function.Function { params ->
-            val values = params.params
-            val array = ArrayStruct(hashMapOf())
-            values.forEachIndexed { index, moValue -> array.setDirectly("$index", moValue) }
-            return@Function array
-        }
+        "to_string" to java.util.function.Function { params -> StringValue(params.get<MoValue>(0).asString()) }
     )
     val biomeFunctions = hashMapOf<String, java.util.function.Function<MoParams, Any>>()
     val worldFunctions = hashMapOf<String, java.util.function.Function<MoParams, Any>>()
@@ -134,11 +110,6 @@ object MoLangFunctions {
         return this
     }
 
-    fun <T : QueryStruct> T.addFunction(name: String, function: java.util.function.Function<MoParams, Any>): T {
-        this.functions[name] = function
-        return this
-    }
-
     fun MoLangEnvironment.getQueryStruct(name: String = "query") = structs.getOrPut(name) { QueryStruct(hashMapOf()) } as QueryStruct
 
     fun MoLangRuntime.setup(): MoLangRuntime {

common/src/main/kotlin/com/cobblemon/mod/common/api/moves/MoveTemplate.kt

@@ -8,18 +8,14 @@
 
 package com.cobblemon.mod.common.api.moves
 
-import com.bedrockk.molang.runtime.struct.MoStruct
-import com.bedrockk.molang.runtime.struct.QueryStruct
-import com.bedrockk.molang.runtime.value.DoubleValue
-import com.bedrockk.molang.runtime.value.StringValue
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.addFunction
-import com.cobblemon.mod.common.api.moves.animations.ActionEffectTimeline
 import com.cobblemon.mod.common.api.moves.categories.DamageCategories
 import com.cobblemon.mod.common.api.moves.categories.DamageCategory
 import com.cobblemon.mod.common.api.types.ElementalType
 import com.cobblemon.mod.common.api.types.ElementalTypes
 import com.cobblemon.mod.common.battles.MoveTarget
+import com.cobblemon.mod.common.battles.runner.ShowdownService
 import com.cobblemon.mod.common.util.lang
+import com.google.gson.JsonObject
 import com.google.gson.annotations.SerializedName
 import net.minecraft.text.MutableText
 
@@ -52,21 +48,8 @@ open class MoveTemplate(
     val priority: Int,
     val critRatio: Double,
     val effectChances: Array<Double>,
-    val actionEffect: ActionEffectTimeline?
+    val flags: Set<String>
 ) {
-    val struct: MoStruct by lazy {
-        QueryStruct(hashMapOf())
-            .addFunction("name") { StringValue(name) }
-            .addFunction("type") { StringValue(elementalType.name) }
-            .addFunction("damage_category") { StringValue(damageCategory.name) }
-            .addFunction("power") { DoubleValue(power) }
-            .addFunction("target") { StringValue(target.name) }
-            .addFunction("accuracy") { DoubleValue(accuracy) }
-            .addFunction("pp") { DoubleValue(pp) }
-            .addFunction("priority") { DoubleValue(priority) }
-            .addFunction("crit_ratio") { DoubleValue(critRatio) }
-    }
-
 
     val displayName: MutableText
         get() = lang("move.$name")
@@ -86,7 +69,7 @@ open class MoveTemplate(
         priority = 0,
         critRatio = 0.0,
         effectChances = emptyArray(),
-        actionEffect = null
+        flags = emptySet()
     )
 
     companion object {
@@ -113,4 +96,9 @@ open class MoveTemplate(
             template = this
         )
     }
+
+    /**
+     * Returns this move's showdown data as a [JsonObject]
+     */
+    fun showdownJson() = ShowdownService.service.getMoves()[num].asJsonObject
 }

common/src/main/kotlin/com/cobblemon/mod/common/api/moves/Moves.kt

@@ -10,15 +10,12 @@ package com.cobblemon.mod.common.api.moves
 
 import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.api.data.DataRegistry
-import com.cobblemon.mod.common.api.moves.animations.ActionEffectTimeline
-import com.cobblemon.mod.common.api.moves.animations.ActionEffects
 import com.cobblemon.mod.common.api.moves.categories.DamageCategories
 import com.cobblemon.mod.common.api.reactive.SimpleObservable
 import com.cobblemon.mod.common.api.types.ElementalTypes
 import com.cobblemon.mod.common.battles.MoveTarget
 import com.cobblemon.mod.common.battles.runner.ShowdownService
 import com.cobblemon.mod.common.net.messages.client.data.MovesRegistrySyncPacket
-import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
 import com.cobblemon.mod.common.util.cobblemonResource
 import com.google.gson.JsonArray
 import com.google.gson.JsonObject
@@ -75,18 +72,22 @@ object Moves : DataRegistry {
                         effectChances += secondaryMember.get("chance").asDouble
                     }
                 }
-                val actionEffect = ActionEffects.actionEffects[id.asIdentifierDefaultingNamespace()]
-                    ?: run {
-                        ActionEffects.actionEffects["generic_move".asIdentifierDefaultingNamespace()]
-//                        if (damageCategory == DamageCategories.STATUS) {
-//                            ActionEffects.actionEffects[cobblemonResource("status")]
-//                        } else {
-//                            val type = elementalType.name.lowercase()
-//                            val category = damageCategory.name.lowercase()
-//                            ActionEffects.actionEffects["${category}_$type".asIdentifierDefaultingNamespace()]
-//                        }
-                    }
-                val move = MoveTemplate(id, num, elementalType, damageCategory, power, target, accuracy, pp, priority, critRatio, effectChances.toTypedArray(), actionEffect)
+                val flags = mutableSetOf<String>()
+                jsMove["flags"].asJsonObject.asMap().forEach { flags.add(it.key) }
+                val move = MoveTemplate(
+                    id,
+                    num,
+                    elementalType,
+                    damageCategory,
+                    power,
+                    target,
+                    accuracy,
+                    pp,
+                    priority,
+                    critRatio,
+                    effectChances.toTypedArray(),
+                    flags
+                )
                 this.register(move)
             } catch (e: Exception) {
                 Cobblemon.LOGGER.error("Caught exception trying to resolve the move '{}'", id, e)

common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/ActionEffectTimeline.kt

@@ -1,96 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.moves.animations
-
-import com.bedrockk.molang.Expression
-import com.bedrockk.molang.runtime.MoLangRuntime
-import com.cobblemon.mod.common.api.moves.animations.keyframes.ActionEffectKeyframe
-import com.cobblemon.mod.common.util.asExpression
-import com.cobblemon.mod.common.util.resolveBoolean
-import java.util.concurrent.CompletableFuture
-import net.minecraft.entity.Entity
-
-/**
- * An action effect will run and execute a series of 'keyframes', with each running once
- * the previous has completed. The entire effect is considered complete for the given context
- * once all the 'holds' provided in the context have been cleared or once every keyframe
- * has finished.
- *
- * @author Hiroku
- * @since October 20th, 2023
- */
-class ActionEffectTimeline(
-    val timeline: List<ActionEffectKeyframe> = mutableListOf(),
-    val condition: Expression = "true".asExpression()
-) {
-    companion object {
-        val NONE = ActionEffectTimeline()
-    }
-
-    fun run(context: ActionEffectContext): CompletableFuture<Unit> {
-        return if (timeline.isEmpty() || !context.runtime.resolveBoolean(condition)) {
-            CompletableFuture.completedFuture(Unit)
-        } else {
-            val finalFuture = CompletableFuture<Unit>()
-            // .toList copy because I'm paranoid about iterators being trying to share between identical effects playing
-            chainKeyframes(context, timeline.toList().iterator(), finalFuture)
-            finalFuture
-        }.exceptionallyCompose {
-            it.printStackTrace()
-            CompletableFuture.completedFuture(Unit)
-        }
-    }
-
-    fun chainKeyframes(context: ActionEffectContext, iterator: Iterator<ActionEffectKeyframe>, finalFuture: CompletableFuture<Unit>) {
-        if (!iterator.hasNext()) {
-            finalFuture.complete(Unit)
-        } else {
-            val keyframe = iterator.next()
-            context.currentKeyframes.add(keyframe)
-            keyframe.play(context)
-                .thenRun { context.currentKeyframes.remove(keyframe) }
-                .thenApply { chainKeyframes(context, iterator, finalFuture) }
-                .exceptionally { finalFuture.completeExceptionally(it) }
-        }
-    }
-}
-
-class ActionEffectContext(
-    val actionEffect: ActionEffectTimeline,
-    val holds: MutableSet<String> = mutableSetOf(),
-    val providers: MutableList<Any> = mutableListOf(),
-    val runtime: MoLangRuntime,
-    var canBeInterrupted: Boolean = false,
-    var interrupted: Boolean = false,
-    var currentKeyframes: MutableList<ActionEffectKeyframe> = mutableListOf()
-) {
-    inline fun <reified T> findOneProvider() = providers.filterIsInstance<T>().firstOrNull()
-
-
-}
-
-class UsersProvider(users: List<Entity>): EntityProvider {
-    override val entities = users
-    constructor(vararg users: Entity): this(users.toList())
-}
-
-class TargetsProvider(targets: List<Entity>): EntityProvider {
-    override val entities = targets
-    constructor(vararg targets: Entity): this(targets.toList())
-}
-
-interface EntityProvider {
-    val entities: List<Entity>
-}
-
-//class MoveAnimationKeyframe(
-//    val sound: Identifier? = null,
-//    val animation: List<AnimationWithMoments> = listOf(),
-//    val effects: List<ActionEffect> = listOf()
-//)

common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/ActionEffects.kt

@@ -1,95 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.moves.animations
-
-import com.bedrockk.molang.Expression
-import com.cobblemon.mod.common.api.data.JsonDataRegistry
-import com.cobblemon.mod.common.api.molang.ExpressionLike
-import com.cobblemon.mod.common.api.moves.animations.keyframes.*
-import com.cobblemon.mod.common.api.pokemon.stats.Stat
-import com.cobblemon.mod.common.api.reactive.SimpleObservable
-import com.cobblemon.mod.common.pokemon.adapters.CobblemonStatTypeAdapter
-import com.cobblemon.mod.common.util.adapters.*
-import com.cobblemon.mod.common.util.cobblemonResource
-import com.google.gson.GsonBuilder
-import com.google.gson.reflect.TypeToken
-import java.awt.Color
-import net.minecraft.predicate.NumberRange
-import net.minecraft.resource.ResourceType
-import net.minecraft.server.network.ServerPlayerEntity
-import net.minecraft.util.Identifier
-import net.minecraft.util.math.Box
-import net.minecraft.util.math.Vec3d
-
-/**
- * Data registry containing all of the [ActionEffectTimeline]s that can be triggered from various actions.
- *
- * @author Hiroku
- * @since October 21st, 2023
- */
-object ActionEffects : JsonDataRegistry<ActionEffectTimeline> {
-    override val id: Identifier = cobblemonResource("action_effects")
-    override val type: ResourceType = ResourceType.SERVER_DATA
-    override val observable = SimpleObservable<ActionEffects>()
-
-    init {
-        ActionEffectKeyframe.register<AnimationActionEffectKeyframe>("animation")
-        ActionEffectKeyframe.register<EntityMoLangActionEffectKeyframe>("entity_molang")
-        ActionEffectKeyframe.register<MoLangActionEffectKeyframe>("molang")
-        ActionEffectKeyframe.register<ParallelActionEffectKeyframe>("parallel")
-        ActionEffectKeyframe.register<CanInterruptActionEffectKeyframe>("can_interrupt")
-        ActionEffectKeyframe.register<CannotInterruptActionEffectKeyframe>("cannot_interrupt")
-        ActionEffectKeyframe.register<RemoveHoldsActionEffectKeyframe>("remove_holds")
-        ActionEffectKeyframe.register<AddHoldsActionEffectKeyframe>("add_holds")
-        ActionEffectKeyframe.register<MoveToTargetActionEffectKeyframe>("move_to_target")
-        ActionEffectKeyframe.register<ReturnToPositionActionEffectKeyframe>("return_to_position")
-        ActionEffectKeyframe.register<PauseActionEffectKeyframe>("pause")
-        ActionEffectKeyframe.register<SavePositionActionEffectKeyframe>("save_position")
-        ActionEffectKeyframe.register<ForkActionEffectKeyframe>("fork")
-        ActionEffectKeyframe.register<SequenceActionEffectKeyframe>("sequence")
-        ActionEffectKeyframe.register<RunActionEffectKeyframe>("run_action_effect")
-        ActionEffectKeyframe.register<EntityParticlesActionEffectKeyframe>("entity_particles")
-        ActionEffectKeyframe.register<EntitySoundActionEffectKeyframe>("entity_sound")
-    }
-
-    override val gson = GsonBuilder()
-        .disableHtmlEscaping()
-        .setPrettyPrinting()
-        .registerTypeAdapter(ActionEffectKeyframe::class.java, ActionEffectKeyframeAdapter)
-        .registerTypeAdapter(NumberRange.FloatRange::class.java, FloatNumberRangeAdapter)
-        .registerTypeAdapter(TypeToken.getParameterized(Collection::class.java, Box::class.java).type, BoxCollectionAdapter)
-        .registerTypeAdapter(Box::class.java, BoxAdapter)
-        .registerTypeAdapter(Vec3d::class.java, VerboseVec3dAdapter)
-        .registerTypeAdapter(Identifier::class.java, IdentifierAdapter)
-        .registerTypeAdapter(IntRange::class.java, VerboseIntRangeAdapter)
-        .registerTypeAdapter(Color::class.java, LiteralHexColorAdapter)
-        .registerTypeAdapter(Stat::class.java, CobblemonStatTypeAdapter)
-        .registerTypeAdapter(Expression::class.java, ExpressionAdapter)
-        .registerTypeAdapter(ExpressionLike::class.java, ExpressionLikeAdapter)
-        .registerTypeAdapter(
-            TypeToken.getParameterized(
-                TypeToken.get(List::class.java).type,
-                TypeToken.get(ActionEffectKeyframe::class.java).type
-            ).type,
-            SingleToPluralAdapter(ActionEffectKeyframe::class.java) { it }
-        )
-        .create()
-
-    override val typeToken: TypeToken<ActionEffectTimeline> = TypeToken.get(ActionEffectTimeline::class.java)
-    override val resourcePath = "action_effects"
-
-    val actionEffects = mutableMapOf<Identifier, ActionEffectTimeline>()
-    override fun reload(data: Map<Identifier, ActionEffectTimeline>) {
-        actionEffects.clear()
-        actionEffects.putAll(data)
-        observable.emit(this)
-    }
-
-    override fun sync(player: ServerPlayerEntity) {}
-}

common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/ActionEffectKeyframe.kt

@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.moves.animations.keyframes
-
-import com.cobblemon.mod.common.api.moves.animations.ActionEffectContext
-import java.util.concurrent.CompletableFuture
-
-/**
- * A single component of an action effect. When played it must return a completable future that completes
- * when the action this keyframe represents is finished. [interrupt] is provided for when something successfully
- * interrupts the effect so that if any cancellation logic is necessary, it can be provided.
- *
- * @author Hiroku
- * @since October 26th, 2023
- */
-interface ActionEffectKeyframe {
-    companion object {
-        val types = mutableMapOf<String, Class<out ActionEffectKeyframe>>()
-
-        inline fun <reified T : ActionEffectKeyframe> register(type: String) {
-            types[type] = T::class.java
-        }
-    }
-
-    fun play(context: ActionEffectContext): CompletableFuture<Unit>
-    fun interrupt(context: ActionEffectContext) {}
-    fun skip(): CompletableFuture<Unit> = CompletableFuture.completedFuture(Unit)
-}

common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/AddHoldsActionEffectKeyframe.kt

@@ -1,27 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.moves.animations.keyframes
-
-import com.cobblemon.mod.common.api.moves.animations.ActionEffectContext
-import java.util.concurrent.CompletableFuture
-
-/**
- * An [ActionEffectKeyframe] that adds some holds from the context for future code to recognize as blocking some
- * functionality from proceeding.
- *
- * @author Hiroku
- * @since October 27th, 2023
- */
-class AddHoldsActionEffectKeyframe : ActionEffectKeyframe {
-    val holds = mutableSetOf<String>()
-    override fun play(context: ActionEffectContext): CompletableFuture<Unit> {
-        context.holds.addAll(holds)
-        return CompletableFuture.completedFuture(Unit)
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/AnimationActionEffectKeyframe.kt

@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.moves.animations.keyframes
-
-import com.bedrockk.molang.Expression
-import com.cobblemon.mod.common.CobblemonNetwork.sendPacket
-import com.cobblemon.mod.common.api.moves.animations.ActionEffectContext
-import com.cobblemon.mod.common.api.moves.animations.EntityProvider
-import com.cobblemon.mod.common.api.moves.animations.UsersProvider
-import com.cobblemon.mod.common.api.scheduling.delayedFuture
-import com.cobblemon.mod.common.net.messages.client.animation.PlayPoseableAnimationPacket
-import com.cobblemon.mod.common.util.asExpressionLike
-import java.util.concurrent.CompletableFuture
-import net.minecraft.server.world.ServerWorld
-
-class AnimationActionEffectKeyframe : ConditionalActionEffectKeyframe(), EntityConditionalActionEffectKeyframe {
-    var delay = "0".asExpressionLike()
-    var visibilityRange = 200
-    var animation: Set<String> = setOf("physical")
-    var variables: List<Expression> = listOf()
-    override val entityCondition = "q.entity.is_user".asExpressionLike()
-
-    override fun playWhenTrue(context: ActionEffectContext): CompletableFuture<Unit> {
-        val entities = context.providers
-            .filterIsInstance<EntityProvider>()
-            .flatMap { prov -> prov.entities.filter { test(context, it, isUser = prov is UsersProvider) } }
-
-        val expressions = variables.map { it.originalString }.toSet()
-
-        // Treat them as expressions if possible but otherwise yeah just send them as strings
-        val animation = animation.map {
-            try {
-                it.asExpressionLike().resolveString(context.runtime).takeIf { it != "0.0" } ?: it
-            } catch (e: Exception) {
-                it
-            }
-        }.toSet()
-
-        for (entity in entities) {
-            val world = entity.world as ServerWorld
-            val players = world.getPlayers { it.distanceTo(entity) <= visibilityRange }
-            val pkt = PlayPoseableAnimationPacket(entity.id, animation = animation, expressions = expressions)
-            players.forEach { it.sendPacket(pkt) }
-        }
-
-        return delayedFuture(seconds = delay.resolveFloat(context.runtime), serverThread = true)
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/CanInterruptActionEffectKeyframe.kt

@@ -1,19 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.moves.animations.keyframes
-
-import com.cobblemon.mod.common.api.moves.animations.ActionEffectContext
-import java.util.concurrent.CompletableFuture
-
-class CanInterruptActionEffectKeyframe : ConditionalActionEffectKeyframe() {
-    override fun playWhenTrue(context: ActionEffectContext): CompletableFuture<Unit> {
-        context.canBeInterrupted = true
-        return CompletableFuture.completedFuture(Unit)
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/CannotInterruptActionEffectKeyframe.kt

@@ -1,19 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.moves.animations.keyframes
-
-import com.cobblemon.mod.common.api.moves.animations.ActionEffectContext
-import java.util.concurrent.CompletableFuture
-
-class CannotInterruptActionEffectKeyframe : ConditionalActionEffectKeyframe() {
-    override fun playWhenTrue(context: ActionEffectContext): CompletableFuture<Unit> {
-        context.canBeInterrupted = true
-        return CompletableFuture.completedFuture(Unit)
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/ConditionalActionEffectKeyframe.kt

@@ -1,27 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.moves.animations.keyframes
-
-import com.cobblemon.mod.common.api.molang.ExpressionLike
-import com.cobblemon.mod.common.api.moves.animations.ActionEffectContext
-import com.cobblemon.mod.common.util.asExpressionLike
-import java.util.concurrent.CompletableFuture
-
-abstract class ConditionalActionEffectKeyframe : ActionEffectKeyframe {
-    var condition: ExpressionLike = "true".asExpressionLike()
-    override fun play(context: ActionEffectContext): CompletableFuture<Unit> {
-        return if (condition.resolveBoolean(context.runtime)) {
-            playWhenTrue(context)
-        } else {
-            skip()
-        }
-    }
-
-    abstract fun playWhenTrue(context: ActionEffectContext): CompletableFuture<Unit>
-}

common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/EntityConditionalActionEffectKeyframe.kt

@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.moves.animations.keyframes
-
-import com.bedrockk.molang.runtime.struct.QueryStruct
-import com.bedrockk.molang.runtime.value.DoubleValue
-import com.bedrockk.molang.runtime.value.StringValue
-import com.cobblemon.mod.common.api.molang.ExpressionLike
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.getQueryStruct
-import com.cobblemon.mod.common.api.moves.animations.ActionEffectContext
-import net.minecraft.entity.Entity
-
-/**
- * An action effect keyframe that plays for all entities for which the condition is true.
- *
- * @author Hiroku
- * @since January 21st, 2024
- */
-interface EntityConditionalActionEffectKeyframe {
-    val entityCondition: ExpressionLike
-    fun test(context: ActionEffectContext, entity: Entity, isUser: Boolean): Boolean {
-        // TODO this should use the entity's own query struct
-        context.runtime.environment.getQueryStruct().addFunction("entity") {
-            QueryStruct(hashMapOf())
-                .addFunction("uuid") { StringValue(entity.uuidAsString) }
-                .addFunction("is_user") { DoubleValue(isUser) }
-        }
-        return entityCondition.resolveBoolean(context.runtime)
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/EntityMoLangActionEffectKeyframe.kt

@@ -1,51 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.moves.animations.keyframes
-
-import com.cobblemon.mod.common.CobblemonNetwork.sendPacket
-import com.cobblemon.mod.common.api.molang.ExpressionLike
-import com.cobblemon.mod.common.api.moves.animations.ActionEffectContext
-import com.cobblemon.mod.common.api.moves.animations.EntityProvider
-import com.cobblemon.mod.common.api.moves.animations.UsersProvider
-import com.cobblemon.mod.common.api.scheduling.delayedFuture
-import com.cobblemon.mod.common.net.messages.client.effect.RunPosableMoLangPacket
-import com.cobblemon.mod.common.util.asExpressionLike
-import java.util.concurrent.CompletableFuture
-import net.minecraft.server.world.ServerWorld
-
-/**
- * An action effect keyframe that will run client-side MoLang for all entities that fit the entity condition.
- *
- * This MoLang executes within that entity's runtime, meaning you can trigger animations or locational particles
- * or sounds.
- *
- * @author Hiroku
- * @since October 30th, 2023
- */
-class EntityMoLangActionEffectKeyframe : ConditionalActionEffectKeyframe(), EntityConditionalActionEffectKeyframe {
-    var delay = "0".asExpressionLike()
-    val expressions = mutableSetOf<String>()
-    val visibilityRange = 200
-    override val entityCondition: ExpressionLike = "q.entity.is_user".asExpressionLike()
-
-    override fun playWhenTrue(context: ActionEffectContext): CompletableFuture<Unit> {
-        val entities = context.providers
-            .filterIsInstance<EntityProvider>()
-            .flatMap { prov -> prov.entities.filter { test(context, it, isUser = prov is UsersProvider) } }
-
-        for (entity in entities) {
-            val world = entity.world as ServerWorld
-            val players = world.getPlayers { it.distanceTo(entity) <= visibilityRange }
-            val pkt = RunPosableMoLangPacket(entityId = entity.id, expressions = expressions)
-            players.forEach { it.sendPacket(pkt) }
-        }
-
-        return delayedFuture(seconds = delay.resolveFloat(context.runtime), serverThread = true)
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/EntityParticlesActionEffectKeyframe.kt

@@ -1,55 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.moves.animations.keyframes
-
-import com.cobblemon.mod.common.api.molang.ExpressionLike
-import com.cobblemon.mod.common.api.moves.animations.ActionEffectContext
-import com.cobblemon.mod.common.api.moves.animations.EntityProvider
-import com.cobblemon.mod.common.api.moves.animations.UsersProvider
-import com.cobblemon.mod.common.api.scheduling.delayedFuture
-import com.cobblemon.mod.common.entity.Poseable
-import com.cobblemon.mod.common.net.messages.client.effect.SpawnSnowstormEntityParticlePacket
-import com.cobblemon.mod.common.util.asExpressionLike
-import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
-import java.util.concurrent.CompletableFuture
-import net.minecraft.server.world.ServerWorld
-
-/**
- * Spawns particles on the entity based on the given particle effect and locator.
- *
- * @author Hiroku
- * @since January 21st, 2024
- */
-class EntityParticlesActionEffectKeyframe : ConditionalActionEffectKeyframe(), EntityConditionalActionEffectKeyframe {
-    override val entityCondition = "q.entity.is_user".asExpressionLike()
-    var effect: String? = null
-    var locator: String = "root"
-    val delay: ExpressionLike = "0".asExpressionLike()
-    val visibilityRange = 200
-
-    override fun playWhenTrue(context: ActionEffectContext): CompletableFuture<Unit> {
-        val entities = context.providers
-            .filterIsInstance<EntityProvider>()
-            .flatMap { prov -> prov.entities.filter { test(context, it, isUser = prov is UsersProvider) } }
-
-        val effectIdentifier = try {
-            effect?.asExpressionLike()?.resolveString(context.runtime)?.takeIf { it != "0.0" } ?: effect
-        } catch (e: Exception) {
-            effect
-        }?.asIdentifierDefaultingNamespace() ?: return skip()
-
-        entities.filter { it is Poseable }.forEach { entity ->
-            val packet = SpawnSnowstormEntityParticlePacket(effectIdentifier, entity.id, locator)
-            val players = (entity.world as ServerWorld).getPlayers { it.distanceTo(entity) <= visibilityRange }
-            packet.sendToPlayers(players)
-        }
-
-        return delayedFuture(seconds = delay.resolveFloat(context.runtime), serverThread = true)
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/EntitySoundActionEffectKeyframe.kt

@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.moves.animations.keyframes
-
-import com.cobblemon.mod.common.api.molang.ExpressionLike
-import com.cobblemon.mod.common.api.moves.animations.ActionEffectContext
-import com.cobblemon.mod.common.api.moves.animations.EntityProvider
-import com.cobblemon.mod.common.api.moves.animations.UsersProvider
-import com.cobblemon.mod.common.api.scheduling.delayedFuture
-import com.cobblemon.mod.common.util.asExpressionLike
-import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
-import java.util.concurrent.CompletableFuture
-import net.minecraft.registry.RegistryKeys
-
-/**
- * An action effect keyframe that plays a positioned sound for all matching entities.
- *
- * @author Hiroku
- * @since January 21st, 2024
- */
-class EntitySoundActionEffectKeyframe : ConditionalActionEffectKeyframe(), EntityConditionalActionEffectKeyframe {
-    override val entityCondition = "q.entity.is_user".asExpressionLike()
-    var sound: String? = null
-    val delay: ExpressionLike = "0".asExpressionLike()
-
-    override fun playWhenTrue(context: ActionEffectContext): CompletableFuture<Unit> {
-        val entities = context.providers
-            .filterIsInstance<EntityProvider>()
-            .flatMap { prov -> prov.entities.filter { test(context, it, isUser = prov is UsersProvider) } }
-
-        val soundIdentifier = try {
-            sound?.asExpressionLike()?.resolveString(context.runtime)?.takeIf { it != "0.0" } ?: sound
-        } catch (e: Exception) {
-            sound
-        }?.asIdentifierDefaultingNamespace() ?: return skip()
-
-        entities.forEach { entity ->
-            val soundEvent = entity.world.registryManager.get(RegistryKeys.SOUND_EVENT).get(soundIdentifier) ?: return skip()
-            entity.playSound(soundEvent, 1f, 1f)
-        }
-
-        return delayedFuture(seconds = delay.resolveFloat(context.runtime), serverThread = true)
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/ForkActionEffectKeyframe.kt

@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.moves.animations.keyframes
-
-import com.cobblemon.mod.common.api.molang.ExpressionLike
-import com.cobblemon.mod.common.api.moves.animations.ActionEffectContext
-import com.cobblemon.mod.common.util.asExpressionLike
-import java.util.concurrent.CompletableFuture
-
-class ForkActionEffectKeyframe(
-    val condition: ExpressionLike = "true".asExpressionLike(),
-    val ifTrue: List<ActionEffectKeyframe> = listOf(),
-    val ifFalse: List<ActionEffectKeyframe> = listOf()
-) : ActionEffectKeyframe {
-    override fun play(context: ActionEffectContext): CompletableFuture<Unit> {
-        val future = CompletableFuture<Unit>()
-        /*
-         * Using .toList() before running chainKeyframes because iterators can be weird about sharing,
-         * .toList() creates a copy of the list and then grabs its iterator so much safer (three parachutes)
-         */
-        if (!condition.resolveBoolean(context.runtime)) {
-            context.actionEffect.chainKeyframes(context, ifFalse.toList().iterator(), future)
-        } else {
-            context.actionEffect.chainKeyframes(context, ifTrue.toList().iterator(), future)
-        }
-
-        return future
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/MoLangActionEffectKeyframe.kt

@@ -1,30 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.moves.animations.keyframes
-
-import com.cobblemon.mod.common.api.molang.ExpressionLike
-import com.cobblemon.mod.common.api.moves.animations.ActionEffectContext
-import com.cobblemon.mod.common.api.scheduling.delayedFuture
-import com.cobblemon.mod.common.util.asExpressionLike
-import java.util.concurrent.CompletableFuture
-
-/**
- * An action effect keyframe that simply executes some MoLang on the effect context's runtime.
- *
- * @author Hiroku
- * @since January 21st, 2024
- */
-class MoLangActionEffectKeyframe : ActionEffectKeyframe {
-    val expressions: ExpressionLike = "0".asExpressionLike()
-    val delay: ExpressionLike = "0".asExpressionLike()
-    override fun play(context: ActionEffectContext): CompletableFuture<Unit> {
-        expressions.resolve(context.runtime)
-        return delayedFuture(seconds = delay.resolveFloat(context.runtime), serverThread = true)
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/MoveToTargetActionEffectKeyframe.kt

@@ -1,75 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.moves.animations.keyframes
-
-import com.cobblemon.mod.common.api.moves.animations.ActionEffectContext
-import com.cobblemon.mod.common.api.moves.animations.ActionEffectTimeline
-import com.cobblemon.mod.common.api.moves.animations.ActionEffects
-import com.cobblemon.mod.common.api.moves.animations.TargetsProvider
-import com.cobblemon.mod.common.api.moves.animations.UsersProvider
-import com.cobblemon.mod.common.api.scheduling.afterOnServer
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
-import com.cobblemon.mod.common.entity.pokemon.ai.PokemonNavigation
-import com.cobblemon.mod.common.util.asExpressionLike
-import java.util.concurrent.CompletableFuture
-import kotlin.math.pow
-import kotlin.math.sqrt
-import net.minecraft.util.Identifier
-
-class MoveToTargetActionEffectKeyframe : ActionEffectKeyframe {
-    val speed = 1F
-    val timeout = "4".asExpressionLike()
-    var proximity = -1F
-    val timeoutActionEffect: Identifier? = null
-
-    override fun play(context: ActionEffectContext): CompletableFuture<Unit> {
-        val user = context.findOneProvider<UsersProvider>()?.entities?.firstOrNull() as? PokemonEntity ?: return CompletableFuture.completedFuture(Unit)
-        val target = context.findOneProvider<TargetsProvider>()?.entities?.firstOrNull() ?: return CompletableFuture.completedFuture(Unit)
-
-        val future = CompletableFuture<Unit>()
-
-        var timedOut = false
-
-        val proximity = this.proximity.takeIf { it != -1F } ?: (sqrt(2 * user.boundingBox.xLength.pow(2)) + 1.5F + sqrt(2 * target.boundingBox.xLength.pow(2))).toFloat()
-
-        if (target.distanceTo(user) !in proximity..20F) {
-            future.complete(Unit)
-            return future
-        }
-
-        val timeoutEffect = timeoutActionEffect?.let { ActionEffects.actionEffects[it] } ?: ActionEffectTimeline.NONE
-
-        val nav = user.navigation
-        val navContext = PokemonNavigation.NavigationContext(
-            destinationProximity = proximity,
-            onArrival = {
-                if (!future.isDone && !timedOut) {
-                    future.complete(Unit)
-                }
-            },
-            onCannotReach = {
-                if (!future.isDone && !timedOut) {
-                    timedOut = true
-                    timeoutEffect.run(context).thenApply { future.complete(Unit) }
-                }
-            }
-        )
-
-        afterOnServer(seconds = timeout.resolveFloat(context.runtime)) {
-            if (!future.isDone && !timedOut) {
-                timedOut = true
-                timeoutEffect.run(context).thenApply { future.complete(Unit) }
-                nav.stop()
-            }
-        }
-
-        nav.startMovingTo(target.x, target.y, target.z, speed.toDouble(), navContext)
-        return future
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/ParallelActionEffectKeyframe.kt

@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.moves.animations.keyframes
-
-import com.cobblemon.mod.common.api.moves.animations.ActionEffectContext
-import java.util.concurrent.CompletableFuture
-
-class ParallelActionEffectKeyframe : ConditionalActionEffectKeyframe() {
-    var keyframes: MutableList<ActionEffectKeyframe> = mutableListOf()
-
-    override fun playWhenTrue(context: ActionEffectContext): CompletableFuture<Unit> {
-        return CompletableFuture.allOf(
-            *keyframes.map {
-                context.currentKeyframes.add(it)
-                it.play(context).thenRun { context.currentKeyframes.remove(it) }
-            }.toTypedArray()
-        ).thenApply {} // Map Void -> Unit at the end
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/PauseActionEffectKeyframe.kt

@@ -1,18 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.moves.animations.keyframes
-
-import com.cobblemon.mod.common.api.moves.animations.ActionEffectContext
-import com.cobblemon.mod.common.api.scheduling.delayedFuture
-import com.cobblemon.mod.common.util.asExpressionLike
-
-class PauseActionEffectKeyframe : ConditionalActionEffectKeyframe() {
-    val pause = "1".asExpressionLike()
-    override fun playWhenTrue(context: ActionEffectContext) = delayedFuture(seconds = pause.resolveFloat(context.runtime), serverThread = true)
-}

common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/RemoveHoldsActionEffectKeyframe.kt

@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.moves.animations.keyframes
-
-import com.cobblemon.mod.common.api.moves.animations.ActionEffectContext
-import com.cobblemon.mod.common.api.scheduling.delayedFuture
-import java.util.concurrent.CompletableFuture
-
-/**
- * An [ActionEffectKeyframe] that clears some holds from the context, potentially marking the effect as
- * complete as far as any blocked actions are concerned. If no holds are specified, then all holds are
- * removed.
- *
- * @author Hiroku
- * @since October 27th, 2023
- */
-class RemoveHoldsActionEffectKeyframe : ActionEffectKeyframe {
-    val delay = 0F
-    val holds = mutableSetOf<String>()
-    override fun play(context: ActionEffectContext): CompletableFuture<Unit> {
-        return delayedFuture(seconds = delay, serverThread = true).thenApply {
-            if (holds.isEmpty()) {
-                context.holds.clear()
-            } else {
-                context.holds.removeAll(holds)
-            }
-        }
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/ReturnToPositionActionEffectKeyframe.kt

@@ -1,70 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.moves.animations.keyframes
-
-import com.cobblemon.mod.common.api.molang.ObjectValue
-import com.cobblemon.mod.common.api.moves.animations.ActionEffectContext
-import com.cobblemon.mod.common.api.moves.animations.ActionEffectTimeline
-import com.cobblemon.mod.common.api.moves.animations.ActionEffects
-import com.cobblemon.mod.common.api.moves.animations.UsersProvider
-import com.cobblemon.mod.common.api.scheduling.after
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
-import com.cobblemon.mod.common.entity.pokemon.ai.PokemonNavigation
-import com.cobblemon.mod.common.util.asExpressionLike
-import java.util.concurrent.CompletableFuture
-import net.minecraft.util.Identifier
-import net.minecraft.util.math.Vec3d
-
-class ReturnToPositionActionEffectKeyframe : ActionEffectKeyframe {
-    val speed = 1F
-    val timeout = "4".asExpressionLike()
-    val timeoutActionEffect: Identifier? = null
-
-    override fun play(context: ActionEffectContext): CompletableFuture<Unit> {
-        val user = context.findOneProvider<UsersProvider>()?.entities?.firstOrNull() as? PokemonEntity ?: return skip()
-        val future = CompletableFuture<Unit>()
-
-        val pos = (context.runtime.environment.getValue(setOf("${user.uuidAsString}-pos").iterator())?.value() as? ObjectValue<*>)?.obj as? Vec3d ?: return skip()
-
-        var timedOut = false
-
-        if (pos.distanceTo(user.pos) > 20) {
-            future.complete(Unit)
-            return future
-        }
-
-        val timeoutEffect = timeoutActionEffect?.let { ActionEffects.actionEffects[it] } ?: ActionEffectTimeline.NONE
-
-        val nav = user.navigation
-        val navContext = PokemonNavigation.NavigationContext(
-            onArrival = {
-                if (!future.isDone && !timedOut) {
-                    future.complete(Unit)
-                }
-            },
-            onCannotReach = {
-                if (!future.isDone && !timedOut) {
-                    timedOut = true
-                    timeoutEffect.run(context).thenApply { future.complete(Unit) }
-                }
-            }
-        )
-
-        after(seconds = timeout.resolveFloat(context.runtime), serverThread = true) {
-            if (!future.isDone && !timedOut) {
-                timedOut = true
-                timeoutEffect.run(context).thenApply { future.complete(Unit) }
-                nav.stop()
-            }
-        }
-
-        nav.startMovingTo(pos.x, pos.y, pos.z, speed.toDouble(), navContext)
-        return future
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/RunActionEffectKeyframe.kt

@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.moves.animations.keyframes
-
-import com.cobblemon.mod.common.api.moves.animations.ActionEffectContext
-import com.cobblemon.mod.common.api.moves.animations.ActionEffects
-import java.util.concurrent.CompletableFuture
-import net.minecraft.util.Identifier
-
-/**
- * An action effect keyframe that simply runs another action effect based on an identifier. This action
- * effect is marked complete only when the action effect it runs is complete unless [waitForActionEffect] is
- * false.
- *
- * @author Hiroku
- * @since January 21st, 2024
- */
-class RunActionEffectKeyframe : ConditionalActionEffectKeyframe() {
-    val actionEffect: Identifier? = null
-    val waitForActionEffect = true
-    override fun playWhenTrue(context: ActionEffectContext): CompletableFuture<Unit> {
-        return if (actionEffect != null) {
-            ActionEffects.actionEffects[actionEffect]?.run(context)?.takeIf { waitForActionEffect } ?: skip()
-        } else {
-            skip()
-        }
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/SavePositionActionEffectKeyframe.kt

@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.moves.animations.keyframes
-
-import com.cobblemon.mod.common.api.molang.ObjectValue
-import com.cobblemon.mod.common.api.moves.animations.ActionEffectContext
-import com.cobblemon.mod.common.api.moves.animations.UsersProvider
-import java.util.concurrent.CompletableFuture
-
-class SavePositionActionEffectKeyframe: ConditionalActionEffectKeyframe() {
-    override fun playWhenTrue(context: ActionEffectContext): CompletableFuture<Unit> {
-        val user = context.findOneProvider<UsersProvider>()?.entities?.firstOrNull() ?: return skip()
-        context.runtime.environment.setSimpleVariable("${user.uuidAsString}-pos", ObjectValue(user.pos))
-        return skip()
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/SequenceActionEffectKeyframe.kt

@@ -1,26 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.moves.animations.keyframes
-
-import com.cobblemon.mod.common.api.moves.animations.ActionEffectContext
-import java.util.concurrent.CompletableFuture
-
-/**
- * A sequence of action effects that are dependent on a condition.
- *
- * @author Hiroku
- * @since October 29th, 2023
- */
-class SequenceActionEffectKeyframe(val keyframes: List<ActionEffectKeyframe> = listOf()) : ConditionalActionEffectKeyframe() {
-    override fun playWhenTrue(context: ActionEffectContext): CompletableFuture<Unit> {
-        val future = CompletableFuture<Unit>()
-        context.actionEffect.chainKeyframes(context, keyframes.toList().iterator(), future)
-        return future
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/api/moves/tags/MoveTag.kt

@@ -6,6 +6,10 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-package com.cobblemon.mod.common.battles.dispatch
+package com.cobblemon.mod.common.api.moves.tags
 
-interface CauserInstruction
+import com.cobblemon.mod.common.api.moves.MoveTemplate
+
+class MoveTag(
+    val moves: List<MoveTemplate>
+)

common/src/main/kotlin/com/cobblemon/mod/common/api/moves/tags/MoveTags.kt

@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.moves.tags
+
+import com.cobblemon.mod.common.api.moves.Moves
+
+object MoveTags {
+
+    private val moves = Moves.all()
+
+    val PRIORITY_ZERO = MoveTag(moves.filter { it.priority == 0 })
+
+    /* Showdown flags */
+    val PROTECT = MoveTag(moves.filter { it.flags.contains("protect") })
+    val CONTACT = MoveTag(moves.filter { it.flags.contains("contact") })
+    val DISTANCE = MoveTag(moves.filter { it.flags.contains("distance") })
+    val ALLY_ANIM = MoveTag(moves.filter { it.flags.contains("allyanim") })
+    val FAIL_ENCORE = MoveTag(moves.filter { it.flags.contains("failencore") })
+    val FAIL_COPYCAT = MoveTag(moves.filter { it.flags.contains("failcopycat") })
+    val REFLECTABLE = MoveTag(moves.filter { it.flags.contains("reflectable") })
+    val BITE = MoveTag(moves.filter { it.flags.contains("bite") })
+    val NON_SKY = MoveTag(moves.filter { it.flags.contains("nonsky") })
+    val GRAVITY = MoveTag(moves.filter { it.flags.contains("gravity") })
+    val POWDER = MoveTag(moves.filter { it.flags.contains("powder") })
+    val PLEDGE_COMBO = MoveTag(moves.filter { it.flags.contains("pledgecombo") })
+    val MIRROR = MoveTag(moves.filter { it.flags.contains("mirror") })
+    val SNATCH = MoveTag(moves.filter { it.flags.contains("snatch") })
+    val SLICING = MoveTag(moves.filter { it.flags.contains("slicing") })
+    val WIND = MoveTag(moves.filter { it.flags.contains("wind") })
+    val NO_SLEEP_TALK = MoveTag(moves.filter { it.flags.contains("nosleeptalk") })
+    val FAIL_INSTRUCT = MoveTag(moves.filter { it.flags.contains("failinstruct") })
+    val PULSE = MoveTag(moves.filter { it.flags.contains("pulse") })
+    val RECHARGE = MoveTag(moves.filter { it.flags.contains("recharge") })
+    val SOUND = MoveTag(moves.filter { it.flags.contains("sound") })
+    val PUNCH = MoveTag(moves.filter { it.flags.contains("punch") })
+    val FUTURE_MOVE = MoveTag(moves.filter { it.flags.contains("futuremove") })
+    val MUST_PRESSURE = MoveTag(moves.filter { it.flags.contains("mustpressure") })
+    val HEAL = MoveTag(moves.filter { it.flags.contains("heal") })
+    val BULLET = MoveTag(moves.filter { it.flags.contains("bullet") })
+    val BYPASS_SUB = MoveTag(moves.filter { it.flags.contains("bypasssub") })
+    val DANCE = MoveTag(moves.filter { it.flags.contains("dance") })
+    val NO_ASSIST = MoveTag(moves.filter { it.flags.contains("noassist") })
+    val FAIL_MIMIC = MoveTag(moves.filter { it.flags.contains("failmimic") })
+    val FAIL_ME_FIRST = MoveTag(moves.filter { it.flags.contains("failmefirst") })
+    val CANT_USE_TWICE = MoveTag(moves.filter { it.flags.contains("cantusetwice") })
+    val CHARGE = MoveTag(moves.filter { it.flags.contains("charge") })
+    val DEFROST = MoveTag(moves.filter { it.flags.contains("defrost") })
+    val NO_PARENTAL_BOND = MoveTag(moves.filter { it.flags.contains("noparentalbond") })
+}

common/src/main/kotlin/com/cobblemon/mod/common/api/mulch/MulchVariant.kt

@@ -8,30 +8,24 @@
 
 package com.cobblemon.mod.common.api.mulch
 
-import com.cobblemon.mod.common.BakingOverride
-import com.cobblemon.mod.common.client.CobblemonBakingOverrides
 import net.minecraft.util.StringIdentifiable
 
 /**
  * Represents the different types of Mulch implemented in the mod.
  *
  */
-enum class MulchVariant(val model: BakingOverride?, val duration: Int = -1) : StringIdentifiable {
-    COARSE(CobblemonBakingOverrides.COARSE_MULCH),
-    GROWTH(CobblemonBakingOverrides.GROWTH_MULCH, 5),
-    HUMID(CobblemonBakingOverrides.HUMID_MULCH),
-    LOAMY(CobblemonBakingOverrides.LOAMY_MULCH),
-    PEAT(CobblemonBakingOverrides.PEAT_MULCH),
-    RICH(CobblemonBakingOverrides.RICH_MULCH, 5),
-    SANDY(CobblemonBakingOverrides.SANDY_MULCH),
-    SURPRISE(CobblemonBakingOverrides.SURPRISE_MULCH, 3),
-    NONE(null);
+enum class MulchVariant(val duration: Int = -1) : StringIdentifiable {
+    COARSE,
+    GROWTH(3),
+    HUMID,
+    LOAMY,
+    PEAT,
+    RICH(3),
+    SANDY,
+    SURPRISE(3),
+    NONE;
 
     override fun asString(): String {
         return name.lowercase()
     }
-
-    companion object {
-        const val GROWTH_TIME_MULTIPLIER = 0.5
-    }
 }

common/src/main/kotlin/com/cobblemon/mod/common/api/multiblock/MultiblockBlock.kt

@@ -8,7 +8,7 @@
 
 package com.cobblemon.mod.common.api.multiblock
 
-import com.cobblemon.mod.common.block.entity.FossilMultiblockEntity
+import com.cobblemon.mod.common.block.entity.fossil.FossilMultiblockEntity
 import net.minecraft.block.*
 import net.minecraft.block.entity.BlockEntity
 import net.minecraft.entity.LivingEntity
@@ -19,7 +19,6 @@ import net.minecraft.util.ActionResult
 import net.minecraft.util.Hand
 import net.minecraft.util.hit.BlockHitResult
 import net.minecraft.util.math.BlockPos
-import net.minecraft.world.BlockView
 import net.minecraft.world.World
 
 /**
@@ -35,8 +34,8 @@ abstract class MultiblockBlock(properties: Settings) : BlockWithEntity(propertie
         itemStack: ItemStack?
     ) {
         if (world is ServerWorld) {
-            val multiblockEntity = world.getBlockEntity(pos) as? MultiblockEntity
-            multiblockEntity?.multiblockBuilder?.validate(world)
+            val multiblockEntity = world.getBlockEntity(pos) as MultiblockEntity
+            multiblockEntity.multiblockBuilder?.validate(world)
         }
         super.onPlaced(world, pos, state, placer, itemStack)
     }
@@ -52,22 +51,21 @@ abstract class MultiblockBlock(properties: Settings) : BlockWithEntity(propertie
         if(hand == Hand.OFF_HAND) {
             return ActionResult.SUCCESS
         }
-        val entity = world.getBlockEntity(pos) as MultiblockEntity?
-        if (entity?.multiblockStructure != null) {
+        val entity = world.getBlockEntity(pos) as MultiblockEntity
+        if (entity.multiblockStructure != null) {
             return entity.multiblockStructure!!.onUse(state, world, pos, player, hand, hit)
         }
         return super.onUse(state, world, pos, player, hand, hit)
     }
 
     override fun onBreak(world: World, pos: BlockPos, state: BlockState, player: PlayerEntity?) {
+        super.onBreak(world, pos, state, player)
         if (!world.isClient) {
             val entity = world.getBlockEntity(pos)
             if (entity is MultiblockEntity && entity.multiblockStructure != null) {
                 entity.multiblockStructure!!.onBreak(world, pos, state, player)
             }
-            entity?.markRemoved()
         }
-        super.onBreak(world, pos, state, player)
     }
 
     override fun createBlockEntity(pos: BlockPos, state: BlockState): BlockEntity? {
@@ -79,12 +77,6 @@ abstract class MultiblockBlock(properties: Settings) : BlockWithEntity(propertie
         return BlockRenderType.MODEL
     }
 
-    //This is done so a block picked with NBT doesnt absolutely DESTROY multiblocks
-    override fun getPickStack(world: BlockView, pos: BlockPos, state: BlockState): ItemStack {
-        val blockEntity = world.getBlockEntity(pos) as? MultiblockEntity ?: return ItemStack.EMPTY
-        return if (blockEntity.multiblockStructure == null) super.getPickStack(world, pos, state) else ItemStack.EMPTY
-    }
-
     abstract fun createMultiBlockEntity(pos: BlockPos, state: BlockState): FossilMultiblockEntity
 
 }

common/src/main/kotlin/com/cobblemon/mod/common/api/multiblock/MultiblockStructure.kt

@@ -42,7 +42,5 @@ interface MultiblockStructure {
     fun getComparatorOutput(state: BlockState, world: World?, pos: BlockPos?): Int {
         return 0
     }
-
-    fun markRemoved(world: World):Unit
     fun onTriggerEvent(state: BlockState?, world: ServerWorld?, pos: BlockPos?, random: Random?)
 }

common/src/main/kotlin/com/cobblemon/mod/common/api/net/serializers/IdentifierDataSerializer.kt

@@ -1,28 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.net.serializers
-
-import net.minecraft.entity.data.TrackedDataHandler
-import net.minecraft.network.PacketByteBuf
-import net.minecraft.util.Identifier
-
-/**
- * Data serializer of [Identifier] for DataTracker things.
- *
- * @author Hiroku
- * @since May 22nd, 2023
- */
-object IdentifierDataSerializer : TrackedDataHandler<Identifier> {
-    override fun copy(value: Identifier) = Identifier(value.namespace, value.path)
-    override fun read(buf: PacketByteBuf) = Identifier(buf.readString(), buf.readString())
-    override fun write(buf: PacketByteBuf, value: Identifier) {
-        buf.writeString(value.namespace)
-        buf.writeString(value.path)
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/api/permission/CobblemonPermissions.kt

@@ -70,6 +70,9 @@ object CobblemonPermissions {
     val CLEAR_PARTY = this.create("${COMMAND_PREFIX}clearparty", PermissionLevel.CHEAT_COMMANDS_AND_COMMAND_BLOCKS)
     val CLEAR_PC = this.create("${COMMAND_PREFIX}clearpc", PermissionLevel.CHEAT_COMMANDS_AND_COMMAND_BLOCKS)
 
+    // Test for starting a random battle with AI Player
+    val RANDOM_BATTLE = this.create("${COMMAND_PREFIX}randombattle", PermissionLevel.CHEAT_COMMANDS_AND_COMMAND_BLOCKS)
+
     fun all(): Iterable<Permission> = this.permissions
 
     private fun create(node: String, level: PermissionLevel): Permission {

common/src/main/kotlin/com/cobblemon/mod/common/api/pokeball/PokeBalls.kt

@@ -204,9 +204,9 @@ object PokeBalls : JsonDataRegistry<PokeBall> {
         createDefault("ancient_feather_ball", throwPower = 2.5f, ancient = true)
         createDefault("ancient_wing_ball", throwPower = 2.5f, ancient = true)
         createDefault("ancient_jet_ball", throwPower = 2.5f, ancient = true)
-        createDefault("ancient_origin_ball", GuaranteedModifier(), ancient = true)
-        // Luxury ball effect, low priority as it must be triggered before soothe bell as of gen 4
-        CobblemonEvents.FRIENDSHIP_UPDATED.subscribe(priority = Priority.LOW) { event ->
+        createDefault("ancient_origin_ball", ancient = true)
+        // Luxury ball effect
+        CobblemonEvents.FRIENDSHIP_UPDATED.subscribe(priority = Priority.LOWEST) { event ->
             var increment = (event.newFriendship - event.pokemon.friendship).toFloat()
             if (increment <= 1F) {
                 event.pokemon.caughtBall.effects.filterIsInstance<FriendshipEarningBoostEffect>()

common/src/main/kotlin/com/cobblemon/mod/common/api/pokemon/PokemonProperties.kt

@@ -13,14 +13,13 @@ import com.bedrockk.molang.runtime.value.DoubleValue
 import com.bedrockk.molang.runtime.value.StringValue
 import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.api.abilities.Abilities
-import com.cobblemon.mod.common.api.abilities.Ability
+import com.cobblemon.mod.common.api.moves.Moves
 import com.cobblemon.mod.common.api.pokeball.PokeBalls
 import com.cobblemon.mod.common.api.pokemon.aspect.AspectProvider
 import com.cobblemon.mod.common.api.pokemon.stats.Stats
 import com.cobblemon.mod.common.api.pokemon.status.Statuses
 import com.cobblemon.mod.common.api.properties.CustomPokemonProperty
 import com.cobblemon.mod.common.api.types.ElementalTypes
-import com.cobblemon.mod.common.api.types.tera.TeraTypes
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.pokemon.*
 import com.cobblemon.mod.common.pokemon.status.PersistentStatus
@@ -54,7 +53,6 @@ import java.util.UUID
  */
 open class PokemonProperties {
     companion object {
-        @JvmOverloads
         fun parse(string: String, delimiter: String = " ", assigner: String = "="): PokemonProperties {
             val props = PokemonProperties()
             props.originalString = string
@@ -95,6 +93,10 @@ open class PokemonProperties {
             props.dmaxLevel = parseIntProperty(keyPairs, listOf("dmax_level", "dmax"))?.coerceIn(0, Cobblemon.config.maxDynamaxLevel)
             props.gmaxFactor = parseBooleanProperty(keyPairs, listOf("gmax_factor", "gmax"))
             props.tradeable = parseBooleanProperty(keyPairs, listOf("tradeable", "tradable"))
+            props.move1 = parseStringOfRegistry(keyPairs, listOf("move1", "m1")) { Moves.getByName(it)?.name }
+            props.move2 = parseStringOfRegistry(keyPairs, listOf("move2", "m2")) { Moves.getByName(it)?.name }
+            props.move3 = parseStringOfRegistry(keyPairs, listOf("move3", "m3")) { Moves.getByName(it)?.name }
+            props.move4 = parseStringOfRegistry(keyPairs, listOf("move4", "m4")) { Moves.getByName(it)?.name }
             props.originalTrainerType = OriginalTrainerType.values().toList().parsePropertyOfCollection(keyPairs, listOf("originaltrainertype", "ottype"), labelsOptional = true) { it.name.lowercase() }
             props.originalTrainer = parsePlayerProperty(keyPairs, listOf("originaltrainer", "ot"))
 
@@ -277,9 +279,14 @@ open class PokemonProperties {
     var dmaxLevel: Int? = null
     var gmaxFactor: Boolean? = null
     var tradeable: Boolean? = null
+    var move1: String? = null
+    var move2: String? = null
+    var move3: String? = null
+    var move4: String? = null
     var originalTrainerType: OriginalTrainerType? = null
     var originalTrainer: String? = null // Original Trainer by Username or UUID
 
+
     var ivs: IVs? = null
     var evs: EVs? = null
     var customProperties = mutableListOf<CustomPokemonProperty>()
@@ -296,18 +303,6 @@ open class PokemonProperties {
     )
 
     fun apply(pokemon: Pokemon) {
-        // Custom properties check could be duplicated but can't assume 3rd party hasn't done anything type specific
-        this.customProperties.forEach { it.apply(pokemon) }
-        this.commonApply(pokemon)
-    }
-
-    fun apply(pokemonEntity: PokemonEntity) {
-        // Custom properties check could be duplicated but can't assume 3rd party hasn't done anything type specific
-        this.customProperties.forEach { it.apply(pokemonEntity) }
-        this.commonApply(pokemonEntity.pokemon)
-    }
-
-    private fun commonApply(pokemon: Pokemon) {
         species?.let {
             return@let try {
                 if (it == "random") {
@@ -327,8 +322,8 @@ open class PokemonProperties {
         friendship?.let { pokemon.setFriendship(it) }
         pokeball?.let { PokeBalls.getPokeBall(it.asIdentifierDefaultingNamespace())?.let { pokeball -> pokemon.caughtBall = pokeball } }
         nature?.let  { Natures.getNature(it.asIdentifierDefaultingNamespace())?.let { nature -> pokemon.nature = nature } }
-        ability?.let { this.createAbility(it, pokemon.form)?.let(pokemon::updateAbility) }
-        status?.let { Statuses.getStatus(it)?.let { status -> if (status is PersistentStatus) pokemon.applyStatus(status) } }
+        ability?.let { Abilities.getOrException(it).create(true).let { ability -> pokemon.ability = ability } }
+        status?.let { Statuses.getStatus(it)?.let { pokemon.applyStatus(it as PersistentStatus) } }
         customProperties.forEach { it.apply(pokemon) }
         ivs?.let { ivs ->
             ivs.forEach { stat ->
@@ -340,10 +335,14 @@ open class PokemonProperties {
                 pokemon.setEV(stat.key, stat.value)
             }
         }
-        teraType?.let { TeraTypes.get(it.asIdentifierDefaultingNamespace())?.let { type -> pokemon.teraType = type } }
+        teraType?.let { ElementalTypes.get(it)?.let { type -> pokemon.teraType = type } }
         dmaxLevel?.let { pokemon.dmaxLevel = it }
         gmaxFactor?.let { pokemon.gmaxFactor = it }
         tradeable?.let { pokemon.tradeable = it }
+        move1?.let { pokemon.setMove(it, 0) }
+        move2?.let { pokemon.setMove(it, 1) }
+        move3?.let { pokemon.setMove(it, 2) }
+        move4?.let { pokemon.setMove(it, 3) }
         // If it has been explicitly set to NONE, clear the stored information, including the originalTrainer property
         originalTrainerType?.let {
             if (it == OriginalTrainerType.NONE) {
@@ -369,17 +368,73 @@ open class PokemonProperties {
         pokemon.updateAspects()
     }
 
+    fun apply(pokemonEntity: PokemonEntity) {
+        species?.let {
+            return@let try {
+                if (it == "random") {
+                    PokemonSpecies.species.random()
+                } else {
+                    PokemonSpecies.getByIdentifier(it.asIdentifierDefaultingNamespace())
+                }
+            } catch (e: InvalidIdentifierException) {
+                null
+            }
+        }?.let { pokemonEntity.pokemon.species = it }
+        nickname?.let { pokemonEntity.pokemon.nickname = it }
+        form?.let { formID -> pokemonEntity.pokemon.species.forms.firstOrNull { it.formOnlyShowdownId().equals(formID, true) } }?.let { form -> pokemonEntity.pokemon.form = form }
+        level?.let { pokemonEntity.pokemon.level = it }
+        shiny?.let { pokemonEntity.pokemon.shiny = it }
+        gender?.let { pokemonEntity.pokemon.gender = it }
+        friendship?.let { pokemonEntity.pokemon.setFriendship(it) }
+        pokeball?.let { PokeBalls.getPokeBall(it.asIdentifierDefaultingNamespace())?.let { pokeball -> pokemonEntity.pokemon.caughtBall = pokeball } }
+        nature?.let { Natures.getNature(it.asIdentifierDefaultingNamespace())?.let { nature -> pokemonEntity.pokemon.nature = nature } }
+        ability?.let { Abilities.getOrException(it).create(true).let { ability -> pokemonEntity.pokemon.ability = ability } }
+        status?.let { Statuses.getStatus(it)?.let { pokemonEntity.pokemon.applyStatus(it as PersistentStatus) } }
+        customProperties.forEach { it.apply(pokemonEntity) }
+        ivs?.let { ivs ->
+            ivs.forEach { stat ->
+                pokemonEntity.pokemon.setIV(stat.key, stat.value)
+            }
+        }
+        evs?.let { evs ->
+            evs.forEach { stat ->
+                pokemonEntity.pokemon.setEV(stat.key, stat.value)
+            }
+        }
+        teraType?.let { ElementalTypes.get(it)?.let { type -> pokemonEntity.pokemon.teraType = type } }
+        dmaxLevel?.let { pokemonEntity.pokemon.dmaxLevel = it }
+        gmaxFactor?.let { pokemonEntity.pokemon.gmaxFactor = it }
+        tradeable?.let { pokemonEntity.pokemon.tradeable = it }
+        move1?.let { pokemonEntity.pokemon.setMove(it, 0) }
+        move2?.let { pokemonEntity.pokemon.setMove(it, 1) }
+        move3?.let { pokemonEntity.pokemon.setMove(it, 2) }
+        move4?.let { pokemonEntity.pokemon.setMove(it, 3) }
+        // If it has been explicitly set to NONE, clear the stored information, including the originalTrainer property
+        originalTrainerType?.let {
+            if (it == OriginalTrainerType.NONE) {
+                pokemonEntity.pokemon.removeOriginalTrainer()
+                originalTrainer = null
+            }
+        }
+        originalTrainer?.let { ot ->
+            val type = originalTrainerType ?: pokemonEntity.pokemon.originalTrainerType
+            when (type) {
+                OriginalTrainerType.PLAYER -> {
+                    when (ot.length) {
+                        in 3..16 -> server()?.userCache?.findByName(ot)?.get()?.id // OT is a Username
+                        36 -> UUID.fromString(ot) // OT is a UUID
+                        else -> null // OT is invalid
+                    }?.let { uuid -> pokemonEntity.pokemon.setOriginalTrainer(uuid) }
+                }
+                OriginalTrainerType.NPC -> pokemonEntity.pokemon.setOriginalTrainer(ot)
+                else -> {}
+            }
+            pokemonEntity.pokemon.refreshOriginalTrainer()
+        }
+        pokemonEntity.pokemon.updateAspects()
+    }
+
     fun matches(pokemon: Pokemon): Boolean {
-        // Custom properties check could be duplicated but can't assume 3rd party hasn't done anything type specific
-        return this.commonMatches(pokemon) && this.customProperties.none { !it.matches(pokemon) }
-    }
-
-    fun matches(pokemonEntity: PokemonEntity): Boolean {
-        // Custom properties check could be duplicated but can't assume 3rd party hasn't done anything type specific
-        return this.commonMatches(pokemonEntity.pokemon) && this.customProperties.none { !it.matches(pokemonEntity) }
-    }
-
-    private fun commonMatches(pokemon: Pokemon): Boolean {
         level?.takeIf { it != pokemon.level }?.let { return false }
         shiny?.takeIf { it != pokemon.shiny }?.let { return false }
         gender?.takeIf { it != pokemon.gender }?.let { return false }
@@ -397,7 +452,7 @@ open class PokemonProperties {
                 return false
             }
         }
-        nickname?.takeIf { it.string != pokemon.nickname?.string }?.let { return false }
+        nickname?.takeIf { it != pokemon.nickname }?.let { return false }
         form?.takeIf { !it.equals(pokemon.form.name, true) }?.let { return false }
         friendship?.takeIf { it != pokemon.friendship }?.let { return false }
         pokeball?.takeIf { it != pokemon.caughtBall.name.toString() }?.let { return false }
@@ -410,23 +465,67 @@ open class PokemonProperties {
         evs?.forEach{ stat ->
             if (stat.value != pokemon.evs[stat.key]) { return false }
         }
-        teraType?.takeIf { it.asIdentifierDefaultingNamespace() != pokemon.teraType.id }?.let { return false }
+        teraType?.takeIf { it != pokemon.teraType.name }?.let { return false }
         dmaxLevel?.takeIf { it != pokemon.dmaxLevel }?.let { return false }
         gmaxFactor?.takeIf { it != pokemon.gmaxFactor }?.let { return false }
         tradeable?.takeIf { it != pokemon.tradeable }?.let { return false }
+        move1?.takeIf { move -> pokemon.moveSet.getMoves().none { it.name == move } }?.let { return false }
+        move2?.takeIf { move -> pokemon.moveSet.getMoves().none { it.name == move } }?.let { return false }
+        move3?.takeIf { move -> pokemon.moveSet.getMoves().none { it.name == move } }?.let { return false }
+        move4?.takeIf { move -> pokemon.moveSet.getMoves().none { it.name == move } }?.let { return false }
         originalTrainer?.takeIf { it != pokemon.originalTrainer }?.let{ return false }
         originalTrainerType?.takeIf { it != pokemon.originalTrainerType }?.let{ return false }
-        return true
+        return customProperties.none { !it.matches(pokemon) }
+    }
+
+    fun matches(pokemonEntity: PokemonEntity): Boolean {
+        level?.takeIf { it != pokemonEntity.pokemon.level }?.let { return false }
+        shiny?.takeIf { it != ("shiny" in pokemonEntity.pokemon.aspects) }?.let { return false }
+        gender?.takeIf { it != pokemonEntity.pokemon.gender }?.let { return false }
+        species?.run {
+            try {
+                val species = if (this == "random") {
+                    PokemonSpecies.species.random()
+                } else {
+                    PokemonSpecies.getByIdentifier(this.asIdentifierDefaultingNamespace()) ?: return@run
+                }
+                if (pokemonEntity.pokemon.species != species) {
+                    return false
+                }
+            } catch (e: InvalidIdentifierException) {}
+        }
+        nickname?.takeIf { it != pokemonEntity.pokemon.nickname }?.let { return false }
+        form?.takeIf { !it.equals(pokemonEntity.pokemon.form.name, true) }?.let { return false }
+        friendship?.takeIf { it != pokemonEntity.pokemon.friendship }?.let { return false }
+        pokeball?.takeIf { it != pokemonEntity.pokemon.caughtBall.name.toString() }?.let { return false }
+        nature?.takeIf { it != pokemonEntity.pokemon.nature.name.toString() }?.let { return false }
+        ability?.takeIf { it != pokemonEntity.pokemon.ability.name }?.let { return false }
+        status?.takeIf { it != pokemonEntity.pokemon.status?.status?.showdownName }?.let { return false }
+        ivs?.forEach{ stat ->
+            if (stat.value != pokemonEntity.pokemon.ivs[stat.key]) { return false }
+        }
+        evs?.forEach{ stat ->
+            if (stat.value != pokemonEntity.pokemon.evs[stat.key]) { return false }
+        }
+        teraType?.takeIf { it != pokemonEntity.pokemon.teraType.name }?.let { return false }
+        dmaxLevel?.takeIf { it != pokemonEntity.pokemon.dmaxLevel }?.let { return false }
+        gmaxFactor?.takeIf { it != pokemonEntity.pokemon.gmaxFactor }?.let { return false }
+        tradeable?.takeIf { it != pokemonEntity.pokemon.tradeable }?.let { return false }
+        move1?.takeIf { move -> pokemonEntity.pokemon.moveSet.getMoves().none { it.name == move } }?.let { return false }
+        move2?.takeIf { move -> pokemonEntity.pokemon.moveSet.getMoves().none { it.name == move } }?.let { return false }
+        move3?.takeIf { move -> pokemonEntity.pokemon.moveSet.getMoves().none { it.name == move } }?.let { return false }
+        move4?.takeIf { move -> pokemonEntity.pokemon.moveSet.getMoves().none { it.name == move } }?.let { return false }
+        originalTrainer?.takeIf { it != pokemonEntity.pokemon.originalTrainer }?.let{ return false }
+        originalTrainerType?.takeIf { it != pokemonEntity.pokemon.originalTrainerType }?.let{ return false }
+        return customProperties.none { !it.matches(pokemonEntity) }
     }
 
-    // TODO Review the need for this, usage for us is in commands that deviate from the behavior established by multiple Pokémon query equivalent
     fun isSubSetOf(properties: PokemonProperties): Boolean {
         level?.takeIf { it != properties.level }?.let { return false }
         shiny?.takeIf { it != ("shiny" in properties.aspects) }?.let { return false }
         gender?.takeIf { it != properties.gender }?.let { return false }
         species?.run {
             try {
-                // TODO get context on this bit, it's highly unlikely two randoms would result in the same Pokémon, doesn't mean the prop is not equal?
                 val species = if (this == "random") {
                     PokemonSpecies.species.random()
                 } else {
@@ -435,9 +534,9 @@ open class PokemonProperties {
                 if (properties.species != species.toString()) {
                     return false
                 }
-            } catch (_: InvalidIdentifierException) {}
+            } catch (e: InvalidIdentifierException) {}
         }
-        nickname?.takeIf { it.string != properties.nickname?.string }?.let { return false }
+        nickname?.takeIf { it != properties.nickname }?.let { return false }
         form?.takeIf { !it.equals(properties.form, true) }?.let { return false }
         friendship?.takeIf { it != properties.friendship }?.let { return false }
         pokeball?.takeIf { it != properties.pokeball }?.let { return false }
@@ -462,6 +561,10 @@ open class PokemonProperties {
         dmaxLevel?.takeIf { it != properties.dmaxLevel }?.let { return false }
         gmaxFactor?.takeIf { it != properties.gmaxFactor }?.let { return false }
         tradeable?.takeIf { it != properties.tradeable }?.let { return false }
+        move1?.takeIf { it != properties.move1 }?.let { return false }
+        move2?.takeIf { it != properties.move2 }?.let { return false }
+        move3?.takeIf { it != properties.move3 }?.let { return false }
+        move4?.takeIf { it != properties.move4 }?.let { return false }
         originalTrainer?.takeIf { it != properties.originalTrainer }?.let{ return false }
         originalTrainerType?.takeIf { it != properties.originalTrainerType }?.let{ return false }
         return true
@@ -470,25 +573,28 @@ open class PokemonProperties {
     fun create(): Pokemon {
         val pokemon = Pokemon()
         apply(pokemon)
-        pokemon.initialize()
+        if (move1 == null) //if there is not a move1 or later specific moves stated then initialize
+            pokemon.initialize()
         roll(pokemon)
         return pokemon
     }
 
     // TEST YOUR LUCK!
     fun roll(pokemon: Pokemon) {
-        val baseTypes = pokemon.form.types.toList()
+        val baseTypes = pokemon.species.types.toList()
         if (this.shiny == null) pokemon.shiny = Cobblemon.config.shinyRate.checkRate()
         if (this.teraType == null) pokemon.teraType =
-            if (Cobblemon.config.teraTypeRate.checkRate()) TeraTypes.random(true)
-            else TeraTypes.forElementalType(baseTypes.random())
+            if (Cobblemon.config.teraTypeRate.checkRate()) ElementalTypes.all().filter { !baseTypes.contains(it) }.random()
+            else baseTypes.random()
     }
 
+    // If the config value is at least 1, then do 1/x and use that as the property chance
+    private fun Float.checkRate(): Boolean = this >= 1 && (Random.Default.nextFloat() < 1 / this)
+
     fun createEntity(world: World): PokemonEntity {
         return PokemonEntity(world, create())
     }
 
-    // TODO Codecs at some point
     fun saveToNBT(): NbtCompound {
         val nbt = NbtCompound()
         originalString.let { nbt.putString(DataKeys.POKEMON_PROPERTIES_ORIGINAL_TEXT, it) }
@@ -517,7 +623,6 @@ open class PokemonProperties {
         return nbt
     }
 
-    // TODO Codecs at some point
     fun loadFromNBT(tag: NbtCompound): PokemonProperties {
         originalString = tag.getString(DataKeys.POKEMON_PROPERTIES_ORIGINAL_TEXT)
         level = if (tag.contains(DataKeys.POKEMON_LEVEL)) tag.getInt(DataKeys.POKEMON_LEVEL) else null
@@ -546,7 +651,6 @@ open class PokemonProperties {
         return this
     }
 
-    // TODO Codecs at some point
     fun saveToJSON(): JsonObject {
         val json = JsonObject()
         originalString.let { json.addProperty(DataKeys.POKEMON_PROPERTIES_ORIGINAL_TEXT, it) }
@@ -576,7 +680,6 @@ open class PokemonProperties {
         return json
     }
 
-    // TODO Codecs at some point
     fun loadFromJSON(json: JsonObject): PokemonProperties {
         originalString = json.get(DataKeys.POKEMON_PROPERTIES_ORIGINAL_TEXT)?.asString ?: ""
         level = json.get(DataKeys.POKEMON_LEVEL)?.asInt
@@ -654,21 +757,4 @@ open class PokemonProperties {
     fun copy(): PokemonProperties {
         return PokemonProperties().loadFromJSON(saveToJSON())
     }
-
-    // If the config value is at least 1, then do 1/x and use that as the property chance
-    private fun Float.checkRate(): Boolean = this >= 1 && (Random.Default.nextFloat() < 1 / this)
-
-    /**
-     * Attempts to find an ability by ID and resolve if it should be forced or if it's legal for the given form.
-     *
-     * @param id The literal ID of the [Ability] being mapped.
-     * @param form The [FormData] whose [FormData.abilities] is queried for legality.
-     * @return The [Ability] with the [Ability.forced] state necessary for the given [form].
-     */
-    private fun createAbility(id: String, form: FormData): Ability? {
-        val ability = Abilities.get(id) ?: return null
-        val potentialAbility = form.abilities.firstOrNull { potential -> potential.template == ability } ?: return ability.create(true)
-        return potentialAbility.template.create(false)
-    }
-
 }

common/src/main/kotlin/com/cobblemon/mod/common/api/pokemon/PokemonPropertyExtractor.kt

@@ -47,15 +47,6 @@ fun interface PokemonPropertyExtractor {
         val NICKNAME = add { pokemon, properties -> properties.nickname = pokemon.nickname }
         @JvmField
         val STATUS = add { pokemon, properties -> properties.status = pokemon.status?.status?.showdownName }
-        @JvmField
-        val IVS = add { pokemon, properties -> properties.ivs = pokemon.ivs }
-        @JvmField
-        val EVS = add { pokemon, properties -> properties.evs = pokemon.evs }
-
-        @JvmField
-        val ILLUSION = mutableListOf(SPECIES, FORM, ASPECTS, GENDER, NICKNAME, SHINY)
-        @JvmField
-        val TRANSFORM = mutableListOf(SPECIES, FORM, ASPECTS, GENDER)
 
         fun add(extractor: PokemonPropertyExtractor): PokemonPropertyExtractor {
             ALL.add(extractor)

common/src/main/kotlin/com/cobblemon/mod/common/api/pokemon/PokemonSpecies.kt

@@ -33,6 +33,7 @@ import com.cobblemon.mod.common.api.pokemon.stats.Stats
 import com.cobblemon.mod.common.api.reactive.SimpleObservable
 import com.cobblemon.mod.common.api.spawning.TimeRange
 import com.cobblemon.mod.common.api.types.ElementalType
+import com.cobblemon.mod.common.api.types.ElementalTypes
 import com.cobblemon.mod.common.api.types.adapters.ElementalTypeAdapter
 import com.cobblemon.mod.common.net.messages.client.data.SpeciesRegistrySyncPacket
 import com.cobblemon.mod.common.pokemon.FormData
@@ -171,6 +172,9 @@ object PokemonSpecies : JsonDataRegistry<Species> {
      */
     fun random(): Species = this.implemented.random()
 
+    // overloaded function to give random pokemon species of a certain type
+    fun random(type: ElementalType): Species = this.implemented.filter { it.primaryType == type || it.secondaryType == type }.random()
+
     override fun reload(data: Map<Identifier, Species>) {
         this.speciesByIdentifier.clear()
         this.implemented.clear()

common/src/main/kotlin/com/cobblemon/mod/common/api/pokemon/effect/ShoulderEffectRegistry.kt

@@ -11,6 +11,7 @@ package com.cobblemon.mod.common.api.pokemon.effect
 import com.cobblemon.mod.common.api.scheduling.ServerTaskTracker
 import com.cobblemon.mod.common.platform.events.PlatformEvents
 import com.cobblemon.mod.common.pokemon.activestate.ShoulderedState
+import com.cobblemon.mod.common.pokemon.effects.LightSourceEffect
 import com.cobblemon.mod.common.pokemon.effects.PotionBaseEffect
 import com.cobblemon.mod.common.util.party
 import net.minecraft.server.network.ServerPlayerEntity
@@ -28,6 +29,7 @@ object ShoulderEffectRegistry {
     private val effects = mutableMapOf<String, Class<out ShoulderEffect>>()
 
     // Effects - START
+    val LIGHT_SOURCE = register("light_source", LightSourceEffect::class.java)
     val POTION_EFFECT = register("potion_effect", PotionBaseEffect::class.java)
     // Effects - END
 

common/src/main/kotlin/com/cobblemon/mod/common/api/pokemon/evolution/Evolution.kt

@@ -8,11 +8,7 @@
 
 package com.cobblemon.mod.common.api.pokemon.evolution
 
-import com.cobblemon.mod.common.Cobblemon.playerData
-import com.cobblemon.mod.common.CobblemonItems
 import com.cobblemon.mod.common.CobblemonSounds
-import com.cobblemon.mod.common.advancement.CobblemonCriteria
-import com.cobblemon.mod.common.advancement.criterion.EvolvePokemonContext
 import com.cobblemon.mod.common.api.events.CobblemonEvents
 import com.cobblemon.mod.common.api.events.pokemon.evolution.EvolutionCompleteEvent
 import com.cobblemon.mod.common.api.events.pokemon.evolution.EvolutionTestedEvent
@@ -20,18 +16,12 @@ import com.cobblemon.mod.common.api.moves.BenchedMove
 import com.cobblemon.mod.common.api.moves.MoveTemplate
 import com.cobblemon.mod.common.api.pokemon.PokemonProperties
 import com.cobblemon.mod.common.api.pokemon.evolution.requirement.EvolutionRequirement
-import com.cobblemon.mod.common.api.scheduling.afterOnServer
-import com.cobblemon.mod.common.api.tags.CobblemonItemTags
-import com.cobblemon.mod.common.entity.generic.GenericBedrockEntity
-import com.cobblemon.mod.common.item.PokeBallItem
 import com.cobblemon.mod.common.pokemon.Pokemon
 import com.cobblemon.mod.common.pokemon.activestate.ShoulderedState
 import com.cobblemon.mod.common.pokemon.evolution.variants.ItemInteractionEvolution
 import com.cobblemon.mod.common.pokemon.evolution.variants.LevelUpEvolution
 import com.cobblemon.mod.common.pokemon.evolution.variants.TradeEvolution
-import com.cobblemon.mod.common.util.cobblemonResource
 import com.cobblemon.mod.common.util.lang
-import com.cobblemon.mod.common.util.party
 import net.minecraft.item.ItemStack
 import net.minecraft.sound.SoundCategory
 
@@ -51,11 +41,6 @@ interface Evolution : EvolutionLike {
      */
     val result: PokemonProperties
 
-    /**
-     * The shed result of this evolution.
-     */
-    val shedder: PokemonProperties?
-
     /**
      * If this evolution allows the user to choose when to start it or not.
      */
@@ -107,37 +92,6 @@ interface Evolution : EvolutionLike {
         return true
     }
 
-    fun shed(pokemon: Pokemon): Boolean {
-        val innerShedder = shedder ?: return false
-
-        val owner = pokemon.getOwnerPlayer() ?: return false
-        // If the player has at least one Pokeball in their inventory.
-        var pokeballStack: ItemStack? = null
-        if (!owner.isCreative) {
-            for (i in 0 until owner.inventory.size()) {
-                val stackI = owner.inventory.getStack(i)
-                if (stackI.isIn(CobblemonItemTags.POKE_BALLS)) {
-                    pokeballStack = stackI
-                }
-            }
-            if (pokeballStack == null) return false
-        }
-        // If the player has at least one empty spot in their party.
-        val emptySlot = owner.party().getFirstAvailablePosition() ?: return false
-
-        // Add shed Pokemon to player's party
-        val shedPokemon = pokemon.clone()
-        shedPokemon.removeHeldItem()
-        innerShedder.apply(shedPokemon)
-        shedPokemon.caughtBall = ((pokeballStack?.item ?: CobblemonItems.POKE_BALL) as PokeBallItem).pokeBall
-        pokemon.storeCoordinates.get()?.store?.add(shedPokemon)
-        CobblemonCriteria.EVOLVE_POKEMON.trigger(owner, EvolvePokemonContext(pokemon.preEvolution!!.species.resourceIdentifier, shedPokemon.species.resourceIdentifier, playerData.get(owner).advancementData.totalEvolvedCount))
-        // Consume one of the balls
-        pokeballStack?.decrement(1)
-
-        return true
-    }
-
     /**
      * Starts this evolution as soon as possible.
      * This will not present a choice to the client regardless of [optional].
@@ -145,59 +99,26 @@ interface Evolution : EvolutionLike {
      * @param pokemon The [Pokemon] being evolved.
      */
     fun forceEvolve(pokemon: Pokemon) {
-        // This is a switch to enable/disable the evolution effect while we get particles improved
-        val useEvolutionEffect = false
-
         if (pokemon.state is ShoulderedState) {
             pokemon.tryRecallWithAnimation()
         }
-
-        val pokemonEntity = pokemon.entity
-        if (pokemonEntity == null || !useEvolutionEffect) {
-            evolutionMethod(pokemon)
-        } else {
-            pokemonEntity.evolutionEntity = pokemon.getOwnerPlayer()?.let { GenericBedrockEntity(world = it.world) }
-            val evolutionEntity = pokemon.entity!!.evolutionEntity
-            evolutionEntity?.apply {
-                category = cobblemonResource("evolution")
-                colliderHeight = pokemonEntity.height
-                colliderWidth = pokemonEntity.width
-                scale = pokemonEntity.scaleFactor
-                syncAge = true // Otherwise particle animation will be starting from zero even if you come along partway through
-                setPosition(pokemonEntity.x, pokemonEntity.y, pokemonEntity.z)
-            }
-            pokemon.getOwnerPlayer()?.world?.spawnEntity(evolutionEntity)
-            afterOnServer(seconds = 9F) {
-                if (!pokemonEntity.isRemoved) {
-                    evolutionMethod(pokemon)
-                    afterOnServer(seconds = 1.5F) { pokemonEntity.cry() }
-                    afterOnServer(seconds = 3F) {
-                        if (evolutionEntity != null) {
-                            evolutionEntity.kill()
-                            if (!pokemonEntity.isRemoved) {
-                                pokemonEntity.evolutionEntity = null
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    fun evolutionMethod(pokemon: Pokemon) {
+        // ToDo Once implemented queue evolution for a pokemon state that is not in battle, start animation instead of instantly doing all of this
         this.result.apply(pokemon)
         this.learnableMoves.forEach { move ->
             if (pokemon.moveSet.hasSpace()) {
                 pokemon.moveSet.add(move.create())
-            } else {
+            }
+            else {
                 pokemon.benchedMoves.add(BenchedMove(move, 0))
             }
             pokemon.getOwnerPlayer()?.sendMessage(lang("experience.learned_move", pokemon.getDisplayName(), move.displayName))
         }
         // we want to instantly tick for example you might only evolve your Bulbasaur at level 34 so Venusaur should be immediately available
-        pokemon.lockedEvolutions.filterIsInstance<PassiveEvolution>().forEach { evolution -> evolution.attemptEvolution(pokemon) }
+        pokemon.evolutions.filterIsInstance<PassiveEvolution>()
+            .forEach { evolution ->
+                evolution.attemptEvolution(pokemon)
+            }
         pokemon.getOwnerPlayer()?.playSound(CobblemonSounds.EVOLVING, SoundCategory.NEUTRAL, 1F, 1F)
-        this.shed(pokemon)
         CobblemonEvents.EVOLUTION_COMPLETE.post(EvolutionCompleteEvent(pokemon, this))
     }
 

common/src/main/kotlin/com/cobblemon/mod/common/api/pokemon/evolution/PassiveEvolution.kt

@@ -34,10 +34,4 @@ interface PassiveEvolution : Evolution {
         return false
     }
 
-    /**
-     * If the evolution will disappear once the conditions are no longer met.
-     */
-    val permanent: Boolean
-
-
 }

common/src/main/kotlin/com/cobblemon/mod/common/api/pokemon/feature/ChoiceSpeciesFeatureProvider.kt

@@ -11,12 +11,10 @@ package com.cobblemon.mod.common.api.pokemon.feature
 import com.cobblemon.mod.common.api.pokemon.PokemonProperties
 import com.cobblemon.mod.common.api.pokemon.aspect.AspectProvider
 import com.cobblemon.mod.common.api.properties.CustomPokemonPropertyType
-import com.cobblemon.mod.common.client.gui.summary.featurerenderers.SummarySpeciesFeatureRenderer
 import com.cobblemon.mod.common.pokemon.Pokemon
 import com.cobblemon.mod.common.util.substitute
 import com.google.gson.JsonObject
 import net.minecraft.nbt.NbtCompound
-import net.minecraft.network.PacketByteBuf
 
 /**
  * A [SpeciesFeatureProvider] which is a string value selected from a fixed list of choices. Parameters exist
@@ -26,46 +24,15 @@ import net.minecraft.network.PacketByteBuf
  * @since November 30th, 2022
  */
 open class ChoiceSpeciesFeatureProvider(
-    override var keys: List<String>,
+    override val keys: List<String>,
     var default: String? = null,
     var choices: List<String> = listOf(),
     var isAspect: Boolean = true,
     var aspectFormat: String = "{{choice}}"
-) : SynchronizedSpeciesFeatureProvider<StringSpeciesFeature>, CustomPokemonPropertyType<StringSpeciesFeature>, AspectProvider {
-    override var needsKey = true
-    override var visible = false
+) : SpeciesFeatureProvider<StringSpeciesFeature>, CustomPokemonPropertyType<StringSpeciesFeature>, AspectProvider {
+    override val needsKey = true
     fun getAspect(feature: StringSpeciesFeature) = aspectFormat.substitute("choice", feature.value)
 
-    override fun encode(buffer: PacketByteBuf) {
-        buffer.writeCollection(keys) { _, value -> buffer.writeString(value) }
-        buffer.writeNullable(default) { _, value -> buffer.writeString(value) }
-        buffer.writeCollection(choices) { _, value -> buffer.writeString(value) }
-        buffer.writeBoolean(isAspect)
-        buffer.writeString(aspectFormat)
-        buffer.writeBoolean(needsKey)
-    }
-
-    override fun decode(buffer: PacketByteBuf) {
-        keys = buffer.readList { buffer.readString() }
-        default = buffer.readNullable { buffer.readString() }
-        choices = buffer.readList { buffer.readString() }
-        isAspect = buffer.readBoolean()
-        aspectFormat = buffer.readString()
-        needsKey = buffer.readBoolean()
-    }
-
-    override fun getRenderer(pokemon: Pokemon): SummarySpeciesFeatureRenderer<StringSpeciesFeature>? {
-        return null
-    }
-
-    override fun invoke(buffer: PacketByteBuf, name: String): StringSpeciesFeature? {
-        return if (name in keys) {
-            StringSpeciesFeature(name, "").also { it.decode(buffer) }
-        } else {
-            null
-        }
-    }
-
     fun getAllAspects(): MutableList<String> {
         val aspects = choices.toMutableList()
         choices.forEach {
@@ -78,10 +45,10 @@ open class ChoiceSpeciesFeatureProvider(
 
     internal constructor(): this(emptyList())
 
-    override fun get(pokemon: Pokemon) = pokemon.getFeature<StringSpeciesFeature>(keys.first())
+    fun get(pokemon: Pokemon) = pokemon.getFeature<StringSpeciesFeature>(keys.first())
 
     override fun invoke(pokemon: Pokemon): StringSpeciesFeature? {
-        val existing = get(pokemon)
+        val existing = pokemon.getFeature<StringSpeciesFeature>(keys.first())
         return if (existing != null && existing.value in choices) {
             existing
         } else {
@@ -121,7 +88,7 @@ open class ChoiceSpeciesFeatureProvider(
 
     override fun provide(pokemon: Pokemon): Set<String> {
         return if (isAspect) {
-            get(pokemon)?.let { setOf(getAspect(it)) } ?: emptySet()
+            pokemon.getFeature<StringSpeciesFeature>(keys.first())?.let { setOf(getAspect(it)) } ?: emptySet()
         } else {
             emptySet()
         }

common/src/main/kotlin/com/cobblemon/mod/common/api/pokemon/feature/FlagSpeciesFeature.kt

@@ -12,12 +12,10 @@ import com.cobblemon.mod.common.api.pokemon.PokemonProperties
 import com.cobblemon.mod.common.api.pokemon.aspect.AspectProvider
 import com.cobblemon.mod.common.api.properties.CustomPokemonProperty
 import com.cobblemon.mod.common.api.properties.CustomPokemonPropertyType
-import com.cobblemon.mod.common.client.gui.summary.featurerenderers.SummarySpeciesFeatureRenderer
 import com.cobblemon.mod.common.pokemon.Pokemon
 import com.google.gson.JsonObject
 import kotlin.random.Random
 import net.minecraft.nbt.NbtCompound
-import net.minecraft.network.PacketByteBuf
 
 /**
  * A simple [SpeciesFeature] that is a true/false flag value. It implements [CustomPokemonProperty] for use in
@@ -28,7 +26,7 @@ import net.minecraft.network.PacketByteBuf
  * @author Hiroku
  * @since May 13th, 2022
  */
-open class FlagSpeciesFeature(override val name: String) : SynchronizedSpeciesFeature, CustomPokemonProperty {
+open class FlagSpeciesFeature(override val name: String) : SpeciesFeature, CustomPokemonProperty {
     constructor(name: String, enabled: Boolean): this(name) {
         this.enabled = enabled
     }
@@ -55,14 +53,6 @@ open class FlagSpeciesFeature(override val name: String) : SynchronizedSpeciesFe
         return this
     }
 
-    override fun encode(buffer: PacketByteBuf) {
-        buffer.writeBoolean(enabled)
-    }
-
-    override fun decode(buffer: PacketByteBuf) {
-        enabled = buffer.readBoolean()
-    }
-
     override fun asString() = "$name=$enabled"
 
     override fun apply(pokemon: Pokemon) {
@@ -81,37 +71,11 @@ open class FlagSpeciesFeature(override val name: String) : SynchronizedSpeciesFe
     override fun matches(pokemon: Pokemon) = pokemon.getFeature<FlagSpeciesFeature>(name)?.enabled == enabled
 }
 
-class FlagSpeciesFeatureProvider : SynchronizedSpeciesFeatureProvider<FlagSpeciesFeature>, CustomPokemonPropertyType<FlagSpeciesFeature>, AspectProvider {
-    override var keys: List<String> = emptyList()
-    // Uses get() = true because that way there's no backing field. It MUST be true, this way no JSON trickery will overwrite it
+class FlagSpeciesFeatureProvider : SpeciesFeatureProvider<FlagSpeciesFeature>, CustomPokemonPropertyType<FlagSpeciesFeature>, AspectProvider {
+    override val keys: List<String>
     override val needsKey get() = true
     var default: String? = null
-    var isAspect = true
-    override var visible: Boolean = false
-
-    override fun invoke(buffer: PacketByteBuf, name: String): FlagSpeciesFeature? {
-        return if (name in keys) {
-            FlagSpeciesFeature(name).also { it.decode(buffer) }
-        } else {
-            null
-        }
-    }
-
-    override fun encode(buffer: PacketByteBuf) {
-        buffer.writeCollection(keys) { _, value -> buffer.writeString(value) }
-        buffer.writeNullable(default) { _, value -> buffer.writeString(value) }
-        buffer.writeBoolean(isAspect)
-    }
-
-    override fun decode(buffer: PacketByteBuf) {
-        keys = buffer.readList { it.readString() }
-        default = buffer.readNullable { it.readString() }
-        isAspect = buffer.readBoolean()
-    }
-
-    override fun getRenderer(pokemon: Pokemon): SummarySpeciesFeatureRenderer<FlagSpeciesFeature>? {
-        return null
-    }
+    val isAspect = true
 
     override fun examples() = setOf("true", "false")
 
@@ -130,10 +94,8 @@ class FlagSpeciesFeatureProvider : SynchronizedSpeciesFeatureProvider<FlagSpecie
 
     constructor(vararg keys: String) : this(keys.toList())
 
-    override fun get(pokemon: Pokemon) = pokemon.getFeature<FlagSpeciesFeature>(keys.first())
-
     override fun invoke(pokemon: Pokemon): FlagSpeciesFeature? {
-        return get(pokemon)
+        return pokemon.getFeature(keys.first())
             ?: when (default) {
                 "random" -> FlagSpeciesFeature(keys.first(), Random.Default.nextBoolean())
                 in setOf("true", "false") -> FlagSpeciesFeature(keys.first(), default.toBoolean())

common/src/main/kotlin/com/cobblemon/mod/common/api/pokemon/feature/GlobalSpeciesFeatures.kt

@@ -8,17 +8,13 @@
 
 package com.cobblemon.mod.common.api.pokemon.feature
 
-import com.cobblemon.mod.common.CobblemonNetwork.sendPacket
 import com.cobblemon.mod.common.api.data.JsonDataRegistry
 import com.cobblemon.mod.common.api.pokemon.aspect.AspectProvider
 import com.cobblemon.mod.common.api.properties.CustomPokemonProperty
 import com.cobblemon.mod.common.api.properties.CustomPokemonPropertyType
 import com.cobblemon.mod.common.api.reactive.SimpleObservable
-import com.cobblemon.mod.common.net.messages.client.data.GlobalSpeciesFeatureSyncPacket
 import com.cobblemon.mod.common.pokemon.Pokemon
-import com.cobblemon.mod.common.util.adapters.IdentifierAdapter
 import com.cobblemon.mod.common.util.adapters.SpeciesFeatureProviderAdapter
-import com.cobblemon.mod.common.util.adapters.Vec3dAdapter
 import com.cobblemon.mod.common.util.cobblemonResource
 import com.google.gson.Gson
 import com.google.gson.GsonBuilder
@@ -28,7 +24,6 @@ import net.minecraft.nbt.NbtCompound
 import net.minecraft.resource.ResourceType
 import net.minecraft.server.network.ServerPlayerEntity
 import net.minecraft.util.Identifier
-import net.minecraft.util.math.Vec3d
 
 /**
  * A registry very similar to [SpeciesFeatures] but the [SpeciesFeatureProvider] contained within it
@@ -47,15 +42,11 @@ object GlobalSpeciesFeatures : JsonDataRegistry<SpeciesFeatureProvider<*>> {
     override val gson: Gson = GsonBuilder()
         .setPrettyPrinting()
         .registerTypeAdapter(SpeciesFeatureProvider::class.java, SpeciesFeatureProviderAdapter)
-        .registerTypeAdapter(Vec3d::class.java, Vec3dAdapter)
-        .registerTypeAdapter(Identifier::class.java, IdentifierAdapter)
         .create()
     override val typeToken: TypeToken<SpeciesFeatureProvider<*>> = TypeToken.get(SpeciesFeatureProvider::class.java)
     override val resourcePath: String = "global_species_features"
 
-    override fun sync(player: ServerPlayerEntity) {
-        player.sendPacket(GlobalSpeciesFeatureSyncPacket(codeFeatures + resourceFeatures))
-    }
+    override fun sync(player: ServerPlayerEntity) {}
 
     override fun reload(data: Map<Identifier, SpeciesFeatureProvider<*>>) {
         resourceFeatures.keys.toList().forEach(this::unregister)
@@ -68,10 +59,6 @@ object GlobalSpeciesFeatures : JsonDataRegistry<SpeciesFeatureProvider<*>> {
 
     fun getFeatures() = (resourceFeatures.keys + codeFeatures.keys).mapNotNull(this::getFeature)
 
-    fun loadOnClient(entries: Collection<Map.Entry<String, SpeciesFeatureProvider<*>>>) {
-        codeFeatures.putAll(entries.map { it.toPair() })
-    }
-
     private fun register(name: String, provider: SpeciesFeatureProvider<*>, isCoded: Boolean) {
         val mapping = if (isCoded) codeFeatures else resourceFeatures
         if (provider is AspectProvider) {

common/src/main/kotlin/com/cobblemon/mod/common/api/pokemon/feature/IntSpeciesFeature.kt

@@ -1,181 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.pokemon.feature
-
-import com.cobblemon.mod.common.api.net.Decodable
-import com.cobblemon.mod.common.api.net.Encodable
-import com.cobblemon.mod.common.api.properties.CustomPokemonProperty
-import com.cobblemon.mod.common.api.properties.CustomPokemonPropertyType
-import com.cobblemon.mod.common.client.gui.summary.featurerenderers.BarSummarySpeciesFeatureRenderer
-import com.cobblemon.mod.common.client.gui.summary.featurerenderers.SummarySpeciesFeatureRenderer
-import com.cobblemon.mod.common.pokemon.Pokemon
-import com.cobblemon.mod.common.util.asTranslated
-import com.cobblemon.mod.common.util.cobblemonResource
-import com.google.gson.JsonObject
-import com.google.gson.annotations.SerializedName
-import net.minecraft.nbt.NbtCompound
-import net.minecraft.network.PacketByteBuf
-import net.minecraft.util.Identifier
-import net.minecraft.util.math.Vec3d
-
-/**
- * A species feature value that's just an integer. Complex stuff.
- * @author Hiroku
- */
-class IntSpeciesFeature(override var name: String) : SynchronizedSpeciesFeature, CustomPokemonProperty {
-    var value = 0
-
-    constructor(): this("")
-    constructor(name: String, value: Int): this(name) {
-        this.value = value
-    }
-
-    override fun saveToNBT(pokemonNBT: NbtCompound): NbtCompound {
-        pokemonNBT.putInt(name, value)
-        return pokemonNBT
-    }
-
-    override fun loadFromNBT(pokemonNBT: NbtCompound): SynchronizedSpeciesFeature {
-        value = pokemonNBT.getInt(name)
-        return this
-    }
-
-    override fun saveToJSON(pokemonJSON: JsonObject): JsonObject {
-        pokemonJSON.addProperty(name, value)
-        return pokemonJSON
-    }
-
-    override fun loadFromJSON(pokemonJSON: JsonObject): SpeciesFeature {
-        value = pokemonJSON.get(name).asInt
-        return this
-    }
-
-    override fun encode(buffer: PacketByteBuf) {
-        buffer.writeInt(value)
-    }
-
-    override fun decode(buffer: PacketByteBuf) {
-        value = buffer.readInt()
-    }
-
-    override fun asString() = "$name=$value"
-    override fun apply(pokemon: Pokemon) {
-        val featureProvider = SpeciesFeatures.getFeature(name) ?: return
-        if (featureProvider in SpeciesFeatures.getFeaturesFor(pokemon.species)) {
-            val existingFeature = pokemon.getFeature<IntSpeciesFeature>(name)
-            if (existingFeature != null) {
-                existingFeature.value = value
-            } else {
-                pokemon.features.add(IntSpeciesFeature(name, value))
-            }
-            pokemon.updateAspects()
-        }
-    }
-
-    override fun matches(pokemon: Pokemon) = pokemon.getFeature<IntSpeciesFeature>(name)?.value == value
-}
-
-class IntSpeciesFeatureProvider : SynchronizedSpeciesFeatureProvider<IntSpeciesFeature>, CustomPokemonPropertyType<IntSpeciesFeature> {
-    class DisplayData : Encodable, Decodable {
-        var name: String = ""
-        @SerializedName(value = "colour" /* fuck you we use real english */, alternate = ["color"])
-        var colour = Vec3d(255.0, 255.0, 255.0)
-        var underlay: Identifier? = null
-        var overlay: Identifier? = null
-
-        override fun decode(buffer: PacketByteBuf) {
-            name = buffer.readString()
-            colour = Vec3d(buffer.readDouble(), buffer.readDouble(), buffer.readDouble())
-            underlay = buffer.readNullable { buffer.readIdentifier() }
-            overlay = buffer.readNullable { buffer.readIdentifier() }
-        }
-
-        override fun encode(buffer: PacketByteBuf) {
-            buffer.writeString(name)
-            buffer.writeDouble(colour.x)
-            buffer.writeDouble(colour.y)
-            buffer.writeDouble(colour.z)
-            buffer.writeNullable(underlay) { _, value -> buffer.writeIdentifier(value) }
-            buffer.writeNullable(overlay) { _, value -> buffer.writeIdentifier(value) }
-        }
-    }
-
-    override var keys = listOf<String>()
-    // Uses get() = true because that way there's no backing field. It MUST be true, this way no JSON trickery will overwrite it
-    override val needsKey get() = true
-    override var visible = false
-    var default: Int? = null
-    var min = 0
-    var max = 100
-    var display: DisplayData? = null
-
-    override fun fromString(value: String?) = value?.toIntOrNull()?.takeIf { it in min..max }?.let { IntSpeciesFeature(keys.first(), it) }
-
-    override fun examples() = emptyList<String>()
-    override fun invoke(buffer: PacketByteBuf, name: String): IntSpeciesFeature? {
-        return if (name in keys) {
-            IntSpeciesFeature(name, buffer.readInt())
-        } else {
-            null
-        }
-    }
-
-    override fun invoke(pokemon: Pokemon): IntSpeciesFeature? {
-        return get(pokemon) ?: default?.let { IntSpeciesFeature(keys.first(), it) }
-    }
-
-    override fun invoke(nbt: NbtCompound): IntSpeciesFeature? {
-        return if (nbt.contains(keys.first())) {
-            IntSpeciesFeature(keys.first(), nbt.getInt(keys.first()))
-        } else {
-            null
-        }
-    }
-
-    override fun invoke(json: JsonObject): IntSpeciesFeature? {
-        return if (json.has(keys.first())) {
-            IntSpeciesFeature(keys.first(), json.get(keys.first()).asInt)
-        } else {
-            null
-        }
-    }
-
-    override fun get(pokemon: Pokemon) = pokemon.features.filterIsInstance<IntSpeciesFeature>().find { it.name in keys }
-
-    override fun encode(buffer: PacketByteBuf) {
-        buffer.writeCollection(keys) { _, value -> buffer.writeString(value) }
-        buffer.writeNullable(default) { _, value -> buffer.writeInt(value) }
-        buffer.writeInt(min)
-        buffer.writeInt(max)
-        buffer.writeNullable(display) { _, value -> value.encode(buffer) }
-    }
-
-    override fun decode(buffer: PacketByteBuf) {
-        keys = buffer.readList { buffer.readString() }
-        default = buffer.readNullable { buffer.readInt() }
-        min = buffer.readInt()
-        max = buffer.readInt()
-        display = buffer.readNullable { DisplayData().also { it.decode(buffer) } }
-    }
-
-    override fun getRenderer(pokemon: Pokemon): SummarySpeciesFeatureRenderer<IntSpeciesFeature>? {
-        return display?.let {
-            BarSummarySpeciesFeatureRenderer(
-                name = keys.first(),
-                displayName = it.name.asTranslated(),
-                min = min,
-                max = max,
-                colour = it.colour,
-                underlay = it.underlay ?: cobblemonResource("textures/gui/summary/summary_stats_other_bar.png"),
-                overlay = it.overlay ?: cobblemonResource("textures/gui/summary/summary_stats_generic_overlay.png"),
-                pokemon = pokemon
-            )
-        }
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/api/pokemon/feature/SpeciesFeatureAssignments.kt

@@ -8,13 +8,10 @@
 
 package com.cobblemon.mod.common.api.pokemon.feature
 
-import com.cobblemon.mod.common.CobblemonNetwork.sendPacket
 import com.cobblemon.mod.common.api.data.JsonDataRegistry
 import com.cobblemon.mod.common.api.pokemon.PokemonSpecies
 import com.cobblemon.mod.common.api.reactive.SimpleObservable
-import com.cobblemon.mod.common.net.messages.client.data.SpeciesFeatureAssignmentSyncPacket
 import com.cobblemon.mod.common.pokemon.Species
-import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
 import com.cobblemon.mod.common.util.cobblemonResource
 import com.google.gson.Gson
 import com.google.gson.GsonBuilder
@@ -41,24 +38,17 @@ object SpeciesFeatureAssignments : JsonDataRegistry<SpeciesFeatureAssignment> {
     override val typeToken = TypeToken.get(SpeciesFeatureAssignment::class.java)
     override val resourcePath = "species_feature_assignments"
 
-    private val assignments = mutableMapOf<Identifier, MutableSet<String>>()
+    private val assignments = mutableMapOf<String, MutableSet<String>>()
 
-    override fun sync(player: ServerPlayerEntity) {
-        player.sendPacket(SpeciesFeatureAssignmentSyncPacket(assignments))
-    }
+    override fun sync(player: ServerPlayerEntity) {}
     override fun reload(data: Map<Identifier, SpeciesFeatureAssignment>) {
         data.values.forEach {
             it.pokemon.forEach { pokemon ->
-                assignments.getOrPut(pokemon.asIdentifierDefaultingNamespace()) { mutableSetOf() }.addAll(it.features)
+                assignments.getOrPut(pokemon) { mutableSetOf() }.addAll(it.features)
             }
         }
         this.observable.emit(this)
     }
 
-    fun loadOnClient(data: Map<Identifier, MutableSet<String>>) {
-        this.assignments.clear()
-        this.assignments.putAll(data)
-    }
-
-    fun getFeatures(species: Species) = assignments[species.resourceIdentifier] ?: emptySet()
+    fun getFeatures(species: Species) = assignments[species.showdownId()] ?: emptySet()
 }

common/src/main/kotlin/com/cobblemon/mod/common/api/pokemon/feature/SpeciesFeatureProvider.kt

@@ -11,7 +11,6 @@ package com.cobblemon.mod.common.api.pokemon.feature
 import com.cobblemon.mod.common.pokemon.Pokemon
 import com.google.gson.JsonObject
 import net.minecraft.nbt.NbtCompound
-import net.minecraft.network.PacketByteBuf
 
 /**
  * A provider of [SpeciesFeature]s. These must be registered via [SpeciesFeatures] either programmatically or

common/src/main/kotlin/com/cobblemon/mod/common/api/pokemon/feature/SpeciesFeatures.kt

@@ -8,17 +8,13 @@
 
 package com.cobblemon.mod.common.api.pokemon.feature
 
-import com.cobblemon.mod.common.CobblemonNetwork.sendPacket
 import com.cobblemon.mod.common.api.data.JsonDataRegistry
 import com.cobblemon.mod.common.api.pokemon.aspect.AspectProvider
 import com.cobblemon.mod.common.api.properties.CustomPokemonProperty
 import com.cobblemon.mod.common.api.properties.CustomPokemonPropertyType
 import com.cobblemon.mod.common.api.reactive.SimpleObservable
-import com.cobblemon.mod.common.net.messages.client.data.StandardSpeciesFeatureSyncPacket
 import com.cobblemon.mod.common.pokemon.Species
-import com.cobblemon.mod.common.util.adapters.IdentifierAdapter
 import com.cobblemon.mod.common.util.adapters.SpeciesFeatureProviderAdapter
-import com.cobblemon.mod.common.util.adapters.Vec3dAdapter
 import com.cobblemon.mod.common.util.cobblemonResource
 import com.google.gson.Gson
 import com.google.gson.GsonBuilder
@@ -26,7 +22,6 @@ import com.google.gson.reflect.TypeToken
 import net.minecraft.resource.ResourceType
 import net.minecraft.server.network.ServerPlayerEntity
 import net.minecraft.util.Identifier
-import net.minecraft.util.math.Vec3d
 
 /**
  * A registry for [SpeciesFeatureProvider]s. This is the backbone of species-specific data such as
@@ -53,15 +48,11 @@ object SpeciesFeatures : JsonDataRegistry<SpeciesFeatureProvider<*>> {
     override val gson: Gson = GsonBuilder()
         .setPrettyPrinting()
         .registerTypeAdapter(SpeciesFeatureProvider::class.java, SpeciesFeatureProviderAdapter)
-        .registerTypeAdapter(Vec3d::class.java, Vec3dAdapter)
-        .registerTypeAdapter(Identifier::class.java, IdentifierAdapter)
         .create()
     override val typeToken: TypeToken<SpeciesFeatureProvider<*>> = TypeToken.get(SpeciesFeatureProvider::class.java)
     override val resourcePath: String = "species_features"
 
-    override fun sync(player: ServerPlayerEntity) {
-        player.sendPacket(StandardSpeciesFeatureSyncPacket(codeFeatures + resourceFeatures))
-    }
+    override fun sync(player: ServerPlayerEntity) {}
 
     override fun reload(data: Map<Identifier, SpeciesFeatureProvider<*>>) {
         resourceFeatures.keys.toList().forEach(this::unregister)
@@ -71,9 +62,6 @@ object SpeciesFeatures : JsonDataRegistry<SpeciesFeatureProvider<*>> {
     fun getCodeFeature(name: String) = resourceFeatures[name]
     fun getResourceFeature(name: String) = codeFeatures[name]
     fun getFeature(name: String) = getCodeFeature(name) ?: getResourceFeature(name)
-    fun loadOnClient(entries: Collection<Map.Entry<String, SpeciesFeatureProvider<*>>>) {
-        codeFeatures.putAll(entries.map { it.toPair() })
-    }
 
     fun getFeatures() = (resourceFeatures.keys + codeFeatures.keys).mapNotNull(this::getFeature)
     fun getFeaturesFor(species: Species): List<SpeciesFeatureProvider<*>> {

common/src/main/kotlin/com/cobblemon/mod/common/api/pokemon/feature/StringSpeciesFeature.kt

@@ -12,7 +12,6 @@ import com.cobblemon.mod.common.api.properties.CustomPokemonProperty
 import com.cobblemon.mod.common.pokemon.Pokemon
 import com.google.gson.JsonObject
 import net.minecraft.nbt.NbtCompound
-import net.minecraft.network.PacketByteBuf
 
 /**
  * A species feature value that is a string value.
@@ -23,7 +22,7 @@ import net.minecraft.network.PacketByteBuf
 class StringSpeciesFeature(
     override val name: String,
     var value: String
-) : SynchronizedSpeciesFeature, CustomPokemonProperty {
+) : SpeciesFeature, CustomPokemonProperty {
     override fun saveToNBT(pokemonNBT: NbtCompound): NbtCompound {
         pokemonNBT.putString(name, value)
         return pokemonNBT
@@ -44,14 +43,6 @@ class StringSpeciesFeature(
         return this
     }
 
-    override fun encode(buffer: PacketByteBuf) {
-        buffer.writeString(value)
-    }
-
-    override fun decode(buffer: PacketByteBuf) {
-        value = buffer.readString()
-    }
-
     override fun asString() = "$name=$value"
 
     override fun apply(pokemon: Pokemon) {

common/src/main/kotlin/com/cobblemon/mod/common/api/pokemon/feature/SynchronizedSpeciesFeature.kt

@@ -1,20 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.pokemon.feature
-
-import com.cobblemon.mod.common.api.net.Decodable
-import com.cobblemon.mod.common.api.net.Encodable
-
-/**
- * A species feature that can be synchronized to the client. These must be managed by a [SynchronizedSpeciesFeatureProvider].
- *
- * @author Hiroku
- * @since November 13th, 2023
- */
-interface SynchronizedSpeciesFeature : SpeciesFeature, Encodable, Decodable

common/src/main/kotlin/com/cobblemon/mod/common/api/pokemon/feature/SynchronizedSpeciesFeatureProvider.kt

@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.pokemon.feature
-
-import com.cobblemon.mod.common.api.net.Decodable
-import com.cobblemon.mod.common.api.net.Encodable
-import com.cobblemon.mod.common.client.gui.summary.featurerenderers.SummarySpeciesFeatureRenderer
-import com.cobblemon.mod.common.pokemon.Pokemon
-import net.minecraft.network.PacketByteBuf
-
-/**
- * A species feature provider that will be synchronized to the client. For it to be renderable in the summary
- * screen of a Pokémon it must also provide a [SummarySpeciesFeatureRenderer] in [getRenderer]. Note that you
- * really don't want to initialize a renderer outside of that function call because if the server ever initializes
- * it then you're going to get crashes on dedicated servers (this is a bad thing).
- *
- * @author Hiroku
- * @since November 13th, 2023
- */
-interface SynchronizedSpeciesFeatureProvider<T : SynchronizedSpeciesFeature> : SpeciesFeatureProvider<T>, Encodable, Decodable {
-    var visible: Boolean
-    operator fun invoke(buffer: PacketByteBuf, name: String): T?
-    /** Gets the feature from this Pokémon, if it has been created yet. */
-    fun get(pokemon: Pokemon): T?
-    /** Only run this from the client. */
-    fun getRenderer(pokemon: Pokemon): SummarySpeciesFeatureRenderer<T>?
-}

common/src/main/kotlin/com/cobblemon/mod/common/api/pokemon/moves/Learnset.kt

@@ -101,7 +101,7 @@ open class Learnset : ClientDataSynchronizer<Learnset> {
         repeat(times = buffer.readSizedInt(IntSize.U_BYTE)) {
             val level = buffer.readSizedInt(IntSize.U_SHORT)
             val moves = mutableListOf<MoveTemplate>()
-            repeat(times = buffer.readSizedInt(IntSize.U_SHORT)) {
+            repeat(times = buffer.readSizedInt(IntSize.U_BYTE)) {
                 Moves.getByNumericalId(buffer.readInt())?.let(moves::add)
             }
             levelUpMoves[level] = moves
@@ -112,7 +112,7 @@ open class Learnset : ClientDataSynchronizer<Learnset> {
         buffer.writeSizedInt(IntSize.U_BYTE, levelUpMoves.size)
         for ((level, moves) in levelUpMoves) {
             buffer.writeSizedInt(IntSize.U_SHORT, level)
-            buffer.writeSizedInt(IntSize.U_SHORT, moves.size)
+            buffer.writeSizedInt(IntSize.U_BYTE, moves.size)
             for (move in moves) {
                 buffer.writeInt(move.num)
             }

common/src/main/kotlin/com/cobblemon/mod/common/api/pokemon/stats/Stats.kt

@@ -49,25 +49,6 @@ enum class Stats(override val identifier: Identifier, override val displayName:
          */
         val BATTLE_ONLY: Set<Stat> = EnumSet.of(EVASION, ACCURACY)
 
-        /** Gets the [Stat] from the respective Showdown id. */
-        fun getStat(statKey: String) = when(statKey) {
-            "atk", "Attack" -> ATTACK // Hyper Cutter states the full stat name "Attack"
-            "def", "Defense" -> DEFENCE // Big Pecks states the full stat name "Defense"
-            "spa" -> SPECIAL_ATTACK
-            "spd" -> SPECIAL_DEFENCE
-            "spe" -> SPEED
-            "evasion" -> EVASION
-            else -> ACCURACY
-        }
-
-        /** Gets the severity lang key from the respective boost/unboost stage. */
-        fun getSeverity(stages: Int) = when(stages) {
-            0 -> "cap.single"
-            1 -> "slight"
-            2 -> "sharp"
-            else -> "severe"
-        }
-
     }
 
 }

common/src/main/kotlin/com/cobblemon/mod/common/api/pokemon/status/Status.kt

@@ -8,9 +8,6 @@
 
 package com.cobblemon.mod.common.api.pokemon.status
 
-import com.cobblemon.mod.common.api.moves.animations.ActionEffectTimeline
-import com.cobblemon.mod.common.api.moves.animations.ActionEffects
-import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
 import net.minecraft.util.Identifier
 
 /**
@@ -23,6 +20,4 @@ open class Status(
     val showdownName: String = "",
     val applyMessage: String,
     val removeMessage: String
-) {
-    fun getActionEffect() = ActionEffects.actionEffects[name]
-}
+)

common/src/main/kotlin/com/cobblemon/mod/common/api/pokemon/status/Statuses.kt

@@ -9,29 +9,21 @@
 package com.cobblemon.mod.common.api.pokemon.status
 
 import com.cobblemon.mod.common.pokemon.status.PersistentStatus
-import com.cobblemon.mod.common.pokemon.status.VolatileStatus
-import com.cobblemon.mod.common.pokemon.status.statuses.persistent.BurnStatus
-import com.cobblemon.mod.common.pokemon.status.statuses.persistent.FrozenStatus
-import com.cobblemon.mod.common.pokemon.status.statuses.persistent.ParalysisStatus
-import com.cobblemon.mod.common.pokemon.status.statuses.persistent.PoisonBadlyStatus
-import com.cobblemon.mod.common.pokemon.status.statuses.persistent.PoisonStatus
-import com.cobblemon.mod.common.pokemon.status.statuses.persistent.SleepStatus
-import com.cobblemon.mod.common.pokemon.status.statuses.nonpersistent.ConfuseStatus
-import com.cobblemon.mod.common.pokemon.status.statuses.nonpersistent.AttractStatus
+import com.cobblemon.mod.common.pokemon.status.statuses.BurnStatus
+import com.cobblemon.mod.common.pokemon.status.statuses.FrozenStatus
+import com.cobblemon.mod.common.pokemon.status.statuses.ParalysisStatus
+import com.cobblemon.mod.common.pokemon.status.statuses.PoisonBadlyStatus
+import com.cobblemon.mod.common.pokemon.status.statuses.PoisonStatus
+import com.cobblemon.mod.common.pokemon.status.statuses.SleepStatus
 import net.minecraft.util.Identifier
 
 /**
  * Main API point for Statuses
  * Get or register Statuses
  *
- * NOTE: May seem weird to have so many things called volatile statuses but the package is called nonpersistent.
- * Its because volatile is a reserved keyword in Java. Cant use it in a package name
- *
  * @author Deltric
  */
 object Statuses {
-    private val persistentStatuses = mutableListOf<Status>()
-    private val volatileStatuses = mutableListOf<Status>()
     private val allStatuses = mutableListOf<Status>()
 
     val POISON = registerStatus(PoisonStatus())
@@ -40,23 +32,13 @@ object Statuses {
     val SLEEP = registerStatus(SleepStatus())
     val FROZEN = registerStatus(FrozenStatus())
     val BURN = registerStatus(BurnStatus())
-    val ATTRACT = registerStatus(AttractStatus())
-    val CONFUSE = registerStatus(ConfuseStatus())
-
-
 
     fun <T: Status> registerStatus(status: T) : T {
-        if (status is PersistentStatus) {
-            persistentStatuses.add(status)
-        }
-        else if (status is VolatileStatus) {
-            volatileStatuses.add(status)
-        }
         allStatuses.add(status)
         return status
     }
 
     fun getStatus(name: Identifier) = allStatuses.find { status -> status.name == name }
     fun getStatus(showdownName: String) = allStatuses.find { it.showdownName == showdownName }
-    fun getPersistentStatuses() = persistentStatuses
+    fun getPersistentStatuses() = allStatuses.filterIsInstance<PersistentStatus>()
 }

common/src/main/kotlin/com/cobblemon/mod/common/api/scheduling/SchedulingFunctions.kt

@@ -8,27 +8,13 @@
 
 package com.cobblemon.mod.common.api.scheduling
 
-import java.util.concurrent.CompletableFuture
-
 @Deprecated("Use afterOnServer or afterOnClient; ambiguous side is not good for your health")
 @JvmOverloads
-
-
 fun after(ticks: Int = 0, seconds: Float = 0F, serverThread: Boolean = false, action: () -> Unit) {
     val scheduler = if (serverThread) ServerTaskTracker else ClientTaskTracker
     scheduler.after(seconds = seconds + ticks / 20F, action)
 }
 
-fun delayedFuture(ticks: Int = 0, seconds: Float = 0F, serverThread: Boolean = false): CompletableFuture<Unit> {
-    val future = CompletableFuture<Unit>()
-    if (ticks == 0 && seconds == 0F) {
-        future.complete(Unit)
-    } else {
-        after(ticks = ticks, seconds = seconds, serverThread = serverThread) { future.complete(Unit) }
-    }
-    return future
-}
-
 /**
  * Delayed task is created to run on the main thread. This is for when the task
  * being completed after the delay does things like entity removal or other thread-unsafe actions.