Work on form registry appender

.gitignore

@@ -31,5 +31,4 @@ forge*changelog.txt
 common/src/main/resources/assets/cobblemon/showdown
 
 # Generated files
-*/generated/resources/*
-/fabric/src/generated/resources/cobblemon-common.accesswidener
+*/generated/resources/*

.gitlab-ci.yml

@@ -10,7 +10,7 @@ stages:
 build-job:
   stage: build
   script:
-      - export GRADLE_OPTS="-Xmx4G -Xms4G"
+      - export GRADLE_OPTS="-Xmx3G -Xms3G"
       - chmod +x ./gradlew
       - ./gradlew build
   cache:
@@ -32,12 +32,12 @@ deploy-job:
       - fabric/build/libs/*.jar
   script: 
     - echo "Collecting artifacts..."
-    - mv forge/build/libs/*+*.jar ./
-    - mv fabric/build/libs/*+*.jar ./
-    - for f in *.jar; do mv "$f" "$(echo "$f" | sed s/+/b$CI_PIPELINE_IID+/)"; done
+    - mv forge/build/libs/*-remap.jar ./
+    - mv fabric/build/libs/*-remap.jar ./
+    - for f in *.jar; do mv "$f" "$(echo "$f" | sed s/+/b$CI_PIPELINE_IID+/ | sed s/-remap//)"; done
   artifacts:
     expire_in: 28 days
     paths:
       - ./*.jar
-#      - forge/build/libs/*+*.jar
-#      - fabric/build/libs/*+*.jar
+#      - forge/build/libs/*-forge.jar
+#      - fabric/build/libs/*-remap.jar

CHANGELOG.md

@@ -1,305 +1,30 @@
 # Changelog
-## [1.3.1 (March 31st, 2023)](#1-3-1)
 
+## 1.1.2
 ### Additions
-- Added Slugma, Magcargo, Nosepass, and Probopass.
-- Elgyem family now drops Chorus Fruit, Geodude family now drops Black Augurite.
-- Added missing spawn files for Golett and Bergmite family.
-- Apricorns can now be smelted into dyes.
-- Added animations to Staryu line and Porygon line.
-- Added faint animations to Klink line.
-- Add lava surface spawn preset.
-- Added an ``any`` evolution requirement allowing you to define ``possibilities`` of other evolution requirements, for example, this allows you to create an evolution that requires the Pokémon to be shiny or a female.
-- Added the `/spawnpokemonfrompool [amount]` or `/forcespawn [amount]` command to spawn Pokémon(s) in the surrounding area using the natural spawn rates/pool of that area, this will be a cheat command in the Minecraft permission system or use the permission `cobblemon.command.spawnpokemon` if a permission mod is present. On a successful execution of the command, the amount of Pokémon spawned will be the output.
-- Added the `/pokebox` and `/pokeboxall` commands to move Pokemon(s) to the PC from a Player's party, this will be a cheat command in the Minecraft permission system or use the permission `cobblemon.command.pokebox` if a permission mod is present. On a successful execution of the command the output will be the number of pokemon moved to the Player's PC.
-- Added the `/pc` command which opens up the PC UI the same way interacting with the block would, this will be a cheat command in the Minecraft permission system or use the permission `cobblemon.command.pc` if a permission mod is present.
+- Reworked customisation of models, textures, and animations to make fakemon very easy to create.
+- Added 'nature' and 'pokeball' options to commands such as /spawnpokemon and /givepokemon.
+- Added support for datapack spawn files and spawn file presets.
 
 ### Changes
-- You can now click the portraits of other Pokémon in the starter selection screen to navigate directly to them.
-- You can now click the right and left arrow keys to navigate PC boxes.
-- Link Cables will now require Pokémon to hold any held item normally required for their evolution.
-- After a battle, the last Pokémon used now becomes the selected one in your party.
-- The `/teach` command can now only allow the Pokémon to be given moves in their learnset, this can be controlled with the permission `cobblemon.command.teach.bypass`, to account for that change the base command now requires the permission `cobblemon.command.teach.base`, this change is meant only for people using a mod capable of providing permissions such as [LuckPerms](https://luckperms.net/).
-- Apricorns will no longer collide with their block form when picked, this should improve the experience in automatic farms.
-- Increased spawn chances for many Pokémon requiring specific blocks to be nearby.
-- Put Cryogonal in more snowy biomes.
-- Ditto as well as the Eevee, Gible, and Riolu families have been made more common.
-- Lowered spawn rate of Gyarados on the surface of water.
-- Apricorn leaves can now be used in the [Composter](https://minecraft.fandom.com/wiki/Composter) block, these have the same chance to raise the compost pile the Minecraft leaves do.
-- Updated Gengar's model and texture.
-- Updated Swinub line model and animations.
-- Tweaked portrait frames for the Pidgey line and for Walking Wake.
-- Changed all buff shoulder effects to only give a level 1 buff instead of level 2.
-- Made Weavile a little bigger.
-- Changed the recipes for Mystic Water, Miracle Seed, and Charcoal Stick to utilise the evolution stones, as well as Never-Melt Ice having an alternate recipe using the Ice Stone.
-- Replaced the `Failed to handle` battle messages to `Missing interpretation` to make it more clear that mechanics do work just still pending dedicated messages.
-
-### Fixes
-- Fixed killing a Dodrio killing your game. Dodrio will never look the same to us.
-- Fixed non-Fire-type Pokémon being immune to lava.
-- Fixed custom Pokémon not being usable in battle, properly. A last minute fix caused this to break again; what are these devs not paid for?
-- Fixed being locked in an endless healing queue if you broke the healing machine during use.
-- Fixed an issue with the experience calculation when the Exp. Share is held.
-- Fixed Friendship-based attacks not using friendship values from your Pokémon.
-- Fixed Link Cables consuming held items they shouldn't due to not validating the held item of a Pokémon.
-- Fixed a crash when Aromatherapy cured the status of party members.
-- Fixed moves learnt on evolution not being given when said evolution happens. If you were affected by this issue your existing Pokémon will now be able to relearn those moves.
-- Fixed console spam when rendering Pokémon model items.
-- Fixed battle messages for 50+ moves and abilities and items.
-- Fixed the possible duplicate when capturing Pokémon (probably, this one's hard to reproduce to confirm it's fixed).
-  - Previously duplicated Pokémon are cleaned from PCs and parties on restart. 
-- Fixed an issue with some particle effects applying after a Pokémon has died or on top of the wrong Pokémon when using specific mods.
-- Fixed Pokémon not looking at each other in battle.
-- Fixed Experience Candy and Experience Share attempting to bring Pokémon above level cap causing crashes.
-- Fixed level 100 Pokémon having experience go over the cap total amount they should have.
-- Fixed `/pokemonspawnat` having the argument positions reverted making it impossible for Brigadier to understand when to suggest coordinates. It is now the intended `/spawnpokemonat <pos> <properties>`.
-- Fixed performance issues with shouldered Pokémon in certain systems.
-- Fixed learnset issues for Pokémon whose only modern debut was LGPE/BDSP/LA.
-- Fixed shiny Zubat, Grimer, Omanyte, Elgyem, Delphox and Aegislash displaying their normal texture.
-- Fixed sleeping in beds allowing fainted Pokémon to receive experience after a battle ends somehow.
-- Fixed an issue where a Pokémon will claim to have learnt a new move they already have in their moveset when learnt at an earlier level in their previous evolution. I realize that's confusing.
-- Fixed Dispensers not being able to shear Wooloo. This will also extend to other mods that check if an entity is valid to shear.
-- Fixed the currently held item of your Pokémon not dropping to the ground when removing it if your inventory was full.
-- Fixed creative mode allowing you to make your Pokémon hold more than 1 of the same item.
-- Fixed a Pokémon duplication glitch when teleporting between worlds.
-- Fixed dedicated servers being able to reload Cobblemon data with the vanilla `/reload` command causing unintended behavior for clients.
-- Fixed underground Pokémon spawning above ground.
-- Fixed Pokémon portrait not reverting back to the Pokémon after a failed capture during battle.
-- Fixed edge texture artifacts on pane elements for Tentacool and Tentacruel models.
-- Fixed crash caused by Pokémon pathing
-- Fixed Pokémon not returning to their balls when being healed in a healing machine
-- Fixed all Gen IX Pokémon as well as forms added in PLA and Wyrdeer, Kleavor, Ursaluna, Basculegion, Sneasler, Overqwil, and Enamorus having 0 exp yields.
-- Fixed Irons Leaves having bluetooth back legs. If you saw it, you know what I mean.
-- Fixed Golurk not having shoulder plates on its shoulders.
-- Fixed some water Pokémon walking onto land from the water even though they are fish.
-- Fixed Porygon2 and PorygonZ being too small.
-- Fixed Snivy line head look animation.
-- Fixed Staryu line not being able to swim.
-- Fixed an incompatibility with [Thorium](https://modrinth.com/mod/thorium) patch for [MC-84873](https://bugs.mojang.com/browse/MC-84873).
-- Fixed Pidgeotto wings when walking.
-- Fixed Delphox walk animation.
-- Fixed Froakie line sleep animations in battle.
-- Fixed Pokémon missing the non-level up moves they could relearn when rejoining a world until a new move was added to their relearn list.
-- Fixed instantly fleeing from Pokémon set to be unfleeable.
-- Fixed Pumpkaboo line forms not working. (Currently sizes aren't visual but check base stats to see which size you have.)
-- Fixed a bug that caused already interpreted messages for moves to be mistaken as uninterpreted.
-
-### Developer
-- Add events that are fired just before and after a Pokémon is released (ReleasePokemonEvent.Pre and .Post)
-
-### Localization
-- Added complete translations for Japanese, Thai, and Canadian French.
-- Added partial translations for Russian, Ukrainian, Mexican Spanish, and Korean.
-- Updated every existing language's translation.
-- All the translators that contributed are amazing.
-
-## [1.3.0 - The Foundation Update (March 17th, 2023)](#1-3-0)
-
-### Dependencies
-- Upgraded Fabric API dependence to 0.75.1+1.19.2
-- Upgraded Architectury API dependence to 6.5.69
-- Cobblemon Forge now depends on Kotlin for Forge.
-
-### Additions
-- Added new models and animations for Poké Balls and reworked their mechanics to feel much smoother instead of being pure frustration.
-- Added party scrolling via holding R and using the mouse wheel so you don't need to take your hand off your mouse.
-- Added a cap of Pokémon spawns in an area because waiting a while made things insane. This is controlled by a new `pokemonPerChunk` config option.
-- Added models and animations for heaps of Pokémon (101): Riolu, Lucario, Chimchar, Monferno, Infernape, Turtwig, Grotle, Torterra, Popplio, Brionne, Primarina, Treeko, Grovyle, Sceptile, Snivy, Servine, Serperior, Tepig, Pignite, Emboar, Oshawott, Dewott, Samurott, Grookey, Thwackey, Rillaboom, Scorbunny, Raboot, Cinderace, Sobble, Drizzile, Inteleon, Fennekin, Braixen, Delphox, Froakie, Frogadier, Greninja, Chespin, Quilladin, Chesnaught, Miltank, Torkoal, Kricketot, Kricketune, Heatmor, Durant, Wooloo, Dubwool, Pumpkaboo, Gourgeist, Sigilyph, Cryogonal, Whismur, Loudred, Exploud, Misdreavus, Mismagius, Tatsugiri, Eiscue, Luvdisc, Stantler, Wyrdeer, Gible, Gabite, Garchomp, Sneasel, Weavile, Elgyem, Beheeyem, Baltoy, Claydol, Nacli, Naclstack, Alcremie, Milcery, Dhelmise, Morelull, Shiinotic, Xerneas, Klink, Klang, Klinklang, Joltik, Galvantula, Honedge, Duoblade, Aegislash, Spiritomb, Mawile, Carvanha, Sharpedo, Seedot, Nuzleaf, Shiftry, Lotad, Lombre, Ludicolo, Pineco, Forretress, and Spinda.
-- Added generation 3, 4, 5, 6, 7, and 8 Starter Pokémon to the starter select screen.
-- Added particle effect support for model animations
-- Added particle effect and animation for Gastly.
-- Added sleep and faint animations to many Pokémon.
-- Added item holding for Pokémon. Any Minecraft item can be given to a Pokémon by holding shift and right-clicking them. Traditional Pokémon held items will have their expected battle effects.
-- Added heaps of held items with crafting recipes: Assault Vest, Big Root, Black Belt, Black Sludge, Charcoal, Choice Band, Choice Scarf, Choice Specs, Dragon Fang, Exp. Share, Focus Band, Hard Stone, Heavy-Duty Boots, Leftovers, Light Clay, Lucky Egg, Magnet, Miracle Seed, Muscle Band, Mystic Water, Never-Melt Ice, Poison Barb, Quick Claw, Rocky Helmet, Safety Goggles, Sharp Beak, Silk Scarf, Silver Powder, Soft Sand, Spell Tag, Twisted Spoon, and Wise Glasses.
-- Added heaps of evolution items with crafting recipes: Milcery's sweets items, Chipped Pot, Cracked Pot, Deep Sea Scale, Deep Sea Tooth, Dragon Scale, Galarica Cuff, Galarica Wreath, Peat Block, Prism Scale, Razor Claw, Razor Fang, Reaper Cloth, Sachet, Sweet Apple, Tart Apple, and Whipped Dream.
-- Existing evolution items all now either have a crafting recipe or drop from Pokémon.
-- Added the Item [tags](https://minecraft.fandom.com/wiki/Tag) `cobblemon:held/experience_share` and `cobblemon:held/lucky_egg` allowing you to mark any items you desire to have the effects implied in the tag name.
-- Added an interface that appears when interacting with your Pokémon while sneaking. The interface allows for interactive options such as shouldering and exchanging held items.
-- Added blinking animations to many Pokémon.
-- Added animated texture support.
-- Added translucent option for aspect layers.
-- Added glowing textures to many Pokémon and it looks amazing.
-- Added the Saturation shoulder effect.
-- Added the Haste shoulder effect, initially for Joltik.
-- Added the Water Breathing shoulder effect, initially for Wooper.
-- Added the Speed shoulder effect, initially for Pichu and Pikachu.
-- [Dispensers](https://minecraft.fandom.com/wiki/Dispenser) can now use shears to automatically harvest fully grown Apricorns.
-- Added milking to Miltank.
-- Added shearing to Wooloo and Dubwool.
-- Added data for generation 9 Pokémon species, moves, and ability data. They're all still Substitute models, but their moves and abilities work.
-- Added support for custom Pokémon to implement 'quirks' such as blinks.
-- Added sound effect for harvesting Apricorns.
-- Added icon to summary and PC interfaces to indicated if a Pokémon is shiny.
-- Added the ``/spawnpokemonat <pos> <properties>`` command, the ``pos`` argument uses the same syntax as the Minecraft [summon](https://minecraft.fandom.com/wiki/Commands/summon) command.
-- Added the `/giveallpokemon` command which is definitely safe and not insane.
-- Added compatibility with Carry On by preventing the mod being able to interact with Cobblemon entities, the mod caused too many gameplay detrimental features to stay enabled.
-- Added healing to your party when you sleep in a bed.
-- Added the 'ability' Pokémon Property so commands can specify the ability.
-- Added block tag support to the 'neededBaseBlocks' and 'neededNearbyBlocks' spawn condition.
-- Added a config option for disallowing players from damaging Pokémon by hand.
-- Apricorn seeds can now be used with the [Composter](https://minecraft.fandom.com/wiki/Composter), these have the layer increase chance of 65% like Apricorns and various Minecraft crops.
-- Added support for Pokémon species data appending making it so datapack developers no longer need to overwrite files.
-- Added an implementation of every [catch rate](https://bulbapedia.bulbagarden.net/wiki/Catch_rate) from generation 1 to 9, these can be used by changing the ``captureCalculator`` config value:
-  - ``generation_1`` Sets the calculator to the generation 1 implementation.
-  - ``generation_2`` Sets the calculator to the generation 2 implementation.
-  - ``generation_2_fixed`` Sets the calculator to the generation 2 implementation with the status multiplier bug fixed.
-  - ``generation_3_4`` Sets the calculator to the generation 3 and 4 implementation.
-  - ``generation_5`` Sets the calculator to the generation 5 implementation.
-  - ``generation_6`` Sets the calculator to the generation 6 implementation.
-  - ``generation_7`` Sets the calculator to the generation 7 implementation.
-  - ``generation_8`` Sets the calculator to the generation 8 implementation.
-  - ``generation_9`` Sets the calculator to the generation 9 implementation.
-  - ``cobblemon`` Sets the calculator to the custom Cobblemon implementation. This is the default value.
-  - ``debug`` Sets the calculator to the debug/cheat implementation, every attempt will be a successful critical capture.
- 
-### Changes
-- Pokémon now save to the world by default, meaning the same Pokémon will remain in the world and not disappear after you log out and log back in. They still despawn over time though.
-- Significantly sped up the Poké Ball shake animation so it takes less time to try to catch Pokémon.
-- Update the PC and Healing Machine models and bounding boxes.
-- The Healing Machine and PC now emit light when fully charged or when turned on respectively.
-- The PC block screen will now turn on when being used.
-- The Healing Machine will now visually display its charge level using 6 stages.
-- The Healing Machine will now emit a redstone signal with the strength of 1 for every 10% charge it has when attached to a [Redstone Comparator](https://minecraft.fandom.com/wiki/Redstone_Comparator).
-- Made it so that particles are not shown whenever you have a shoulder Pokémon that gives potion effects.
-- Changed hitbox and size definitions for Decidueye, Blastoise, and Magmortar
-- Apricorns can now be harvested with Axes, the speed will scale with enchantments and tool material, only dropping the Apricorn if fully grown, these will still destroy the Apricorn so the manual harvest still is recommended unless you're just keen on destroying trees.
-- Apricorns are now a part of the vanilla tag ``minecraft:blocks/mineable/axe``.
-- Apricorns are now compatible with any mod that breaks a whole tree at once.
-- Apricorns no longer have a config value for the seed drop chance these are now a part of their loot table which can be found in ``cobblemon/loot_tables/blocks/<color>_apricorn.json``.
-- Advancements were redone to be slightly more interesting, with improved names, descriptions, and sorting.
-- Updated models and textures for Tentacool line, Gengar, Slowpoke line, Tyrogue line, Doduo line, Dratini, Dragonair, Quagsire, and Piplup line. There were probably others, the team lost track.
-- Improved sending out Pokémon at the start of battle so that they are positioned in a less annoying way.
-- Name Tags will no longer be used on Pokémon and Poke Ball entities, this prevents the item from being wasted.
-- Lowered spawn rate of Tauros.
-- Sableye now spawns near gem ores as well as amethyst.
-- Added evolution stones and items to item tags
-
-### Fixes
-- Fixed catch rates being entirely too difficult.
-- Fixed various strange battle issues such as Flying types being vulnerable to Ground type moves and status effects hitting despite vulnerabilities.
-- Fixed shiny Gyarados not using the red Gyarados texture.
-- Improved the framing of all in-game Pokémon in the party and PC GUIs so they aren't halfway out of the screen or something else crazy.
-- Fixed incompatibility with Kotlin for Forge (by depending on Kotlin for Forge ourselves)
-- Fixed Gengar, Goodra, and many other Pokémon showing the types of an alternate form despite those not being modelled yet.
-- Fixed datapack Pokémon not being able to battle.
-- Fixed Pokémon always being created with a moveset as if they're level 1 instead of their current level.
-- Fixed an issue of Pokémon not rendering in GUIs on some Mac displays.
-- Fixed a soft-duplicate that could occur when a party Pokémon is pushed through a Nether Portal or left in a boat.
-- Fixed Pokémon that faint from poison appearing to be on full health and suckering you into false hope.
-- Fixed incorrect spawns of Tentacool, Tentacruel, Dragonite, Politoed, Tangrowth, Lickilicky, Electivire, and Magmortar.
-- Fixed crashes involving opening the Pokémon summary GUI with an empty party.
-- Fixed lower brightness settings causing Pokémon to appear much too dark in menus such as the party and PC.
-- Fixed Showdown sometimes failing to start, causing crashes.
-- Fixed Showdown initialization happening several times when you login, more depending on how many times you have relogged this session.
-- Fixed Showdown failing to update on first attempt. We totally weren't accidentally deleting our target directory or anything, nope.
-- Fixed HP recovery related battle actions not animating for the client nor updating the in-game Pokémon HP.
-- Fixed moves that force a switch such as Teleport and U-Turn soft locking battles.
-- Fixed missing battle text for Bide, Speed Boost, Belly Drum, Anger Point, and Haze.
-- Fixed battle messages for many field effects starting, ending, and actions caused by them such as blocking certain moves.
-- Improved battle messages for effects that prevent a move from being executed such as a Taunt, requiring a recharge, flinched, etc.
-- Fixed move names not being translated in battle messages.
-- Fixed stat change messages for boosts over 3 stages.
-- Fixed experience calculation not being completely accurate.
-- Fixed positioning of Poké Balls when rendered in Healing Machines.
-- Fixed a desync issue on servers where all Pokémon seemed like they were special forms when they weren't.
-- Fixed an incompatibility with [Exordium](https://www.curseforge.com/minecraft/mc-mods/exordium).
-- Fixed datapack Pokémon language key generation. A Pokémon under the namespace ``example`` named ``Pogemon`` will now correctly look for the lang key ``example.species.pogemon.name``.
-- Fixed client not receiving messages for the different "stages" for the move Bide.
-- Fixed the Medium Slow and Medium Fast experience group IDs, they're now ```medium_slow``` and ``medium_fast``. Any custom datapack Pokémon will require an update.
-- Fixed Pokémon friendship being capped to the maximum level config value instead of the friendship one when loading Pokémon data.
-- Fixed Poké Balls taking forever to capture Pokémon if you are underwater or up in the air where it takes a long time to hit the ground.
-- Fixed Pokémon being unable to spawn on blocks such as snow layers.
-- Fixed Pokémon spawning inside of trees.
-- Fixed Pokémon experience not loading after a restart and instead going back to the minimal amount for the current level.
-- Fixed being able to use ``/healpokemon`` in battle.
-- Fixed being able to select fainted party members in the switch menu causing the battle to lock.
-- Fixed ``/spawnpokemon`` command not supporting any command source other than players.
-- Fixed issues with Charizard's sleep pose.
-- Fixed players being able to use multiple healer machines at once.
-- Fixed Pokémon layers not rendering when a Pokémon is on your shoulder.
-- Fixed Caterpie and Weedle not moving or looking at players. That was meant to be Metapod and Kakuna; how embarrassing.
-- Fixed Pokémon not carrying over the correct equivalent original ability when evolving from stages that only had one ability.
-- Fixed Deerling and Sawsbuck not spawning with the correct season.
-- Fixed issue of not being able to drag the scroll bar in summary and battle interfaces.
-- Fixed optional aspects not saving and loading properly.
-- Fixed layering logic so multiple texture layers can exist on a Pokémon (probably).
-- Fixed not all Poké Balls being associated with the `cobblemon:pokeballs` item tag.
-- Fixed the `/pokemoneditother` command not working.
-- Fixed ambient sound file path for Porygon2.
-- Fixed forms not being able to unset the secondary type of a Pokémon in the stat JSON.
-- Fixed moves that haven't carried over from generation 8 onwards having the description they did in the generation 8 games instead of their last valid one.
-- Fixed shoulder mounted pokemon not returning to party on healer use and on evolution 
-
-### Developer
-- Reworked CatchRateModifier, as such, existing implementations need to be updated.
-- Fixed minimumDistanceBetweenEntities option being half of what it's set as.
-- Fixed the contents of CobblemonEvents, CobblemonBlocks etc having getters instead of just being public static properties.
-- Added ApricornHarvestEvent.
-- Added a new item for representing Pokémon within native UI menus or item frames which display as the Pokémon's model. It's called a PokemonItem, with static functions to build one.
-
-### Localization
-- Added complete translations for French, German, Simplified Mandarin, Brazilian Portuguese, and Pirate English.
-- Added partial translations for Traditional Mandarin, Italian, and Spanish. We'd love more help with this!
-- 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)
-### Additions
-- Added models for Natu and Xatu, Murkrow and Honchkrow, Wailmer and Wailord.
-- Added new PC interface and it is beautiful.
-- Reworked the battle system so that battles load faster, cause fewer bugs, and can run on shared server hosts. This is a very big change that also reduced the size of the mod by 50mb!
-- Added full resource pack / data pack customization of models, textures, animations, spawning, and spawn file presets to make custom Pokémon species and variations very easy to create. You can find the guide for creating custom Pokémon on [our website](https://cobblemon.com/guides/custompokemon.html)!
-- Added water surface spawning for Pokémon like Lapras.
-- Added emissive texture support to Pokémon render layers.
-- Added compatibility for Mod Menu ([CurseForge](https://www.curseforge.com/minecraft/mc-mods/modmenu), [Modrinth](https://modrinth.com/mod/modmenu)).
-- Added blank ambient Pokémon cries so cries can be added via resource packs.
-- Added new sounds for GUIs and item uses.
-- Added `nature` and `pokeball` options to commands such as `/spawnpokemon` and `/givepokemon`.
-
-### Changes
-- Reinforced party and PC saving to make data corruption from crashes less bad.
-- Added a config option for whether the starter config will be exported, making it more maintainable as we add starter Pokémon.
-- Battles now start with the options menu open for convenience.
-- Doubled the default charge rate of healers. You'd need to reset your config under `./config/cobblemon/main.json` to see this change!
-- Changed the default Apricorn seed chance config value from 6% to 10%.
-- The mod now correctly reports our dependency on Architectury API so people don't get super confused when things don't work.
-- Pokémon now look at their opponents during battle.
-- Updated Sableye's animations to be super freaky.
 - Changed the healer advancements to make the healing machine's mechanics more obvious.
 
 ### Fixes
 - Fixed an incompatibility with [Porting Lib](https://github.com/Fabricators-of-Create/Porting-Lib) used by Fabric ports of mods such as Create or Twilight Forest.
 - Fixed HP and max HP values in the battle GUI not being correct.
-- Fixed some animations on snake-type Pokémon being super slow.
+- Fixed some animations on snake-type Pokémon being mega slow.
 - Fixed a typo in the English name for Calcium. Calcuim.
 - Fixed Pokémon gradually becoming rarer around you if you move long distances.
-- Fixed a shoulder mount crash on Fabric.
-- Fixed a rare issue where chunks would take a really long time to generate.
-- Fixed a singleplayer bug where battles wouldn't work after leaving then rejoining a world.
-- Fixed stat calculations for everything except HP. HP was fine though :).
-- Fixed a randomized Pokémon spawning in mountains that corrupted the data of whatever party or PC it got into. Yikes.
-- Fixed a rare crash involving literally random number generation. A random crash involving random numbers.
-- Fixed all regular Mewtwo having the stats and types of Mega Mewtwo X - same deal with many other Pokémon. 
-- Fixed the framing of many Pokémon in GUIs.
-- Fixed texture glitches with Rattata and Nidoqueen (again!).
-- Fixed dropped item forms of all Pokéballs and the Healing Machine, and slightly adjusted all other display settings
-- Fixed issues with forms not showing the correct evolution in the evolution menu.
-- Fixed some alternate forms not having the alternate stats and types.
-- Fixed moves that only work in double battles not being selectable at all (such as Helping Hand and Aromatic Mist).
-- Fixed abilities not remaining legal in some forms.
-- Fixed Poké Ball capture effects not triggering after a successful capture, such as the Heal Ball's healing effect.
-- Fixed multiple-hit moves sending gibberish into the battle chat.
-- Fixed Pyukumuku not being appropriately scaled.
-- Fixed shiny and other variations of Pokémon not showing in the battle GUI.
-- Fixed Eevee being poorly positioned and un-animated on shoulders.
-- Fixed a Pokémon's hitbox not updating when it evolves while sent out.
-- Fixed a Pokémon's PP going from zero to above the maximum when entering another battle.
 
-## [1.1.1 (November 27th, 2022)](#1-1-1)
+## 1.1.1 (November 27th, 2022)
+
 ### Fixes
 - Fixed a critical issue with servers where Pokémon data didn't properly synchronize and so you couldn't see any.
 
-## [1.1.0 - The Swim and Sleep Update (November 27th, 2022)](#1-1-0)
+## 1.1.0 - The Swim and Sleep Update (November 27th, 2022)
 #### "Ideally not at the same time."
+
+
 ### Additions
 - Added a new GUI for viewing party information, rearranging moves, and evolving Pokémon. It looks too good.
 - Starter Pokémon will sleep on top of you if sent out when you get on a bed.
@@ -353,7 +78,6 @@
     - Statuses like sleep and frozen no longer last forever if it was carried over from a previous battle.
 
 ### Localization
-- Added species, ability, and move translations for `ko_ko`, `jp_jp`, `fr_fr`, `es_es`, `it_it`, and `zh_cn`.
-
-## [1.0.0 (November 12th, 2022)](#1-0-0)
-- Initial release.
+- Added species, ability, and move translations for ko_ko, jp_jp, fr_fr, es_es, it_it, and zh_cn. 
+## 1.0.0 (2022-11-12)
+- Initial release.

HEADER

@@ -1,4 +1,4 @@
-Copyright (C) 2023 Cobblemon Contributors
+Copyright (C) 2022 Cobblemon Contributors
 
 This Source Code Form is subject to the terms of the Mozilla Public
 License, v. 2.0. If a copy of the MPL was not distributed with this

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

@@ -39,6 +39,7 @@ loom {
 dependencies {
     minecraft("net.minecraft:minecraft:${rootProject.property("mc_version")}")
     mappings("net.fabricmc:yarn:${rootProject.property("yarn_version")}")
+
 }
 
 tasks {

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

@@ -19,14 +19,13 @@ tasks {
         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}")
+        archiveClassifier.set("${rootProject.version}-remap")
     }
 
 }

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

@@ -1,37 +0,0 @@
-plugins {
-    java
-    `java-library`
-    id("maven-publish")
-    id("dev.architectury.loom")
-}
-
-java {
-    withSourcesJar()
-    withJavadocJar()
-}
-
-publishing {
-    repositories {
-        maven("https://maven.impactdev.net/repository/development/") {
-            name = "ImpactDev-Public"
-            credentials {
-                username = System.getenv("NEXUS_USER")
-                password = System.getenv("NEXUS_PW")
-            }
-        }
-    }
-
-    publications {
-        create<MavenPublication>(project.name) {
-            artifact(tasks.remapJar)
-            artifact(tasks.remapSourcesJar)
-
-            @Suppress("UnstableApiUsage")
-            loom.disableDeprecatedPomGeneration(this)
-
-            groupId = "com.cobblemon"
-            artifactId = project.findProperty("maven.artifactId")?.toString() ?: project.name
-            version = rootProject.version.toString()
-        }
-    }
-}

build.gradle.kts

@@ -1,3 +1,4 @@
+
 plugins {
     base
     id("cobblemon.root-conventions")

common/build.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
     id("cobblemon.base-conventions")
-    id("cobblemon.publish-conventions")
+    id("maven-publish")
 }
 
 architectury {
@@ -8,8 +8,8 @@ architectury {
 }
 
 repositories {
-    maven(url = "${rootProject.projectDir}/deps")
-    mavenLocal()
+    maven(url = "https://dl.cloudsmith.io/public/geckolib3/geckolib/maven/")
+    maven(url = "https://maven.impactdev.net/repository/development/")
 }
 
 dependencies {
@@ -19,13 +19,14 @@ dependencies {
     modImplementation(libs.fabricLoader)
     modApi(libs.architectury)
     modApi(libs.molang)
+    modApi(libs.mclib)
 
     // For Showdown
-    modCompileOnly(libs.graal)
+    modCompileOnly(libs.javet) // Linux or Windows
+    modCompileOnly(libs.javetMac) // Mac OS (x86_64 Only)
 
     //shadowCommon group: 'commons-io', name: 'commons-io', version: '2.6'
 
-
     testRuntimeOnly(libs.junitEngine)
     testImplementation(libs.junitApi)
     testImplementation(libs.junitParams)
@@ -33,8 +34,32 @@ dependencies {
     testImplementation(libs.mockk)
 
     compileOnly("net.luckperms:api:${rootProject.property("luckperms_version")}")
+
+    // For Showdown
+//    modCompileOnly 'com.caoccao.javet:javet:1.0.6' // Linux or Windows
+//    modCompileOnly 'com.caoccao.javet:javet-macos:1.0.6' // Mac OS (x86_64 Only)
+//    modCompileOnly group: 'commons-io', name: 'commons-io', version: '2.6'
+
+    implementation("net.impactdev:json:1.0.0")
 }
 
-tasks.withType<Test> {
-    useJUnitPlatform()
-}
+publishing {
+    repositories {
+        maven("https://maven.impactdev.net/repository/development/") {
+            name = "ImpactDev-Public"
+            credentials {
+                username = System.getenv("NEXUS_USER")
+                password = System.getenv("NEXUS_PW")
+            }
+        }
+    }
+
+    publications {
+        create<MavenPublication>("mod") {
+            from(components["java"])
+            groupId = "com.cobblemon"
+            artifactId = "mod"
+            version = rootProject.version.toString()
+        }
+    }
+}

common/gradle.properties

@@ -1 +0,0 @@
-maven.artifactId = mod

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Cobblemon Contributors
+ * Copyright (C) 2022 Cobblemon Contributors
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

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

@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.mixin;
-
-import com.cobblemon.mod.common.client.render.item.CobblemonBuiltinItemRenderer;
-import com.cobblemon.mod.common.client.render.item.CobblemonBuiltinItemRendererRegistry;
-import net.minecraft.client.render.VertexConsumerProvider;
-import net.minecraft.client.render.item.BuiltinModelItemRenderer;
-import net.minecraft.client.render.model.json.ModelTransformation;
-import net.minecraft.client.util.math.MatrixStack;
-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(BuiltinModelItemRenderer.class)
-public class BuiltinModelItemRendererMixin {
-
-    @Inject(method = "render", at = @At("HEAD"), cancellable = true)
-    private void cobblemon$useDynamicItemRenderer(ItemStack stack, ModelTransformation.Mode mode, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, int overlay, CallbackInfo ci) {
-        CobblemonBuiltinItemRenderer renderer = CobblemonBuiltinItemRendererRegistry.INSTANCE.rendererOf(stack.getItem());
-        if (renderer != null) {
-            renderer.render(stack, mode, matrices, vertexConsumers, light, overlay);
-            ci.cancel();
-        }
-    }
-
-}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Cobblemon Contributors
+ * Copyright (C) 2022 Cobblemon Contributors
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Cobblemon Contributors
+ * Copyright (C) 2022 Cobblemon Contributors
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Cobblemon Contributors
+ * Copyright (C) 2022 Cobblemon Contributors
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

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

@@ -1,53 +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.client.CobblemonClient;
-import com.cobblemon.mod.common.client.keybind.keybinds.PartySendBinding;
-import net.minecraft.client.Mouse;
-import org.objectweb.asm.Opcodes;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-@Mixin(Mouse.class)
-public class PartyScrollMixin {
-    @Shadow
-    private double eventDeltaWheel;
-
-    @Inject(
-            method = "onMouseScroll",
-            at = @At(
-                    value = "FIELD",
-                    target="Lnet/minecraft/client/Mouse;eventDeltaWheel:D",
-                    opcode = Opcodes.PUTFIELD,
-                    ordinal = 2,
-                    shift = At.Shift.BEFORE
-            ),
-            cancellable = true
-    )
-    public void onMouseScroll(long window, double horizontal, double vertical, CallbackInfo ci) {
-        if (PartySendBinding.INSTANCE.getWasDown()) {
-            int i = (int)eventDeltaWheel;
-            if (i > 0) {
-                while (i-- > 0) CobblemonClient.INSTANCE.getStorage().shiftSelected(false);
-                ci.cancel();
-                eventDeltaWheel = 0;
-                PartySendBinding.INSTANCE.actioned();
-            } else if (i < 0) {
-                while (i++ < 0) CobblemonClient.INSTANCE.getStorage().shiftSelected(true);
-                ci.cancel();
-                eventDeltaWheel = 0;
-                PartySendBinding.INSTANCE.actioned();
-            }
-        }
-    }
-}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Cobblemon Contributors
+ * Copyright (C) 2022 Cobblemon Contributors
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -9,25 +9,15 @@
 package com.cobblemon.mod.common.mixin;
 
 import com.cobblemon.mod.common.Cobblemon;
-import com.cobblemon.mod.common.CobblemonItems;
-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.pokemon.Pokemon;
 import com.cobblemon.mod.common.util.CompoundTagExtensionsKt;
 import com.cobblemon.mod.common.util.DataKeys;
 import net.minecraft.entity.EntityType;
-import net.minecraft.entity.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;
 import org.spongepowered.asm.mixin.Mixin;
@@ -35,13 +25,9 @@ import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
-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 {
 
@@ -57,11 +43,6 @@ public abstract class PlayerMixin extends LivingEntity {
 
     @Shadow public abstract boolean isSpectator();
 
-    @Shadow public abstract boolean giveItemStack(ItemStack stack);
-
-    @Shadow public abstract void sendMessage(Text message, boolean overlay);
-
-
     protected PlayerMixin(EntityType<? extends LivingEntity> p_20966_, World p_20967_) {
         super(p_20966_, p_20967_);
     }
@@ -134,32 +115,4 @@ public abstract class PlayerMixin extends LivingEntity {
         return CompoundTagExtensionsKt.isPokemonEntity(nbt);
     }
 
-    @Inject(
-        method = "eatFood",
-        at = @At(
-            value = "INVOKE",
-            target = "Lnet/minecraft/entity/player/PlayerEntity;getHungerManager()Lnet/minecraft/entity/player/HungerManager;",
-            shift = At.Shift.AFTER
-        )
-    )
-    public void onEatFood(World world, ItemStack stack, CallbackInfoReturnable<ItemStack> cir) {
-        if (!getWorld().isClient) {
-            if (stack.getItem() == Items.APPLE && getWorld().random.nextDouble() < Cobblemon.config.getAppleLeftoversChance()) {
-                ItemStack leftovers = new ItemStack(CobblemonItems.LEFTOVERS.get());
-                ServerPlayerEntity player = Objects.requireNonNull(getServer()).getPlayerManager().getPlayer(uuid);
-                assert player != null;
-                CobblemonEvents.LEFTOVERS_CREATED.postThen(
-                    new LeftoversCreatedEvent(player, leftovers),
-                    leftoversCreatedEvent -> null,
-                    leftoversCreatedEvent -> {
-                        if(!player.giveItemStack(leftoversCreatedEvent.getLeftovers())) {
-                            var itemPos = player.getRotationVector().multiply(0.5).add(getPos());
-                            getWorld().spawnEntity(new ItemEntity(getWorld(), itemPos.getX(), itemPos.getY(), itemPos.getZ(), leftoversCreatedEvent.getLeftovers()));
-                        }
-                        return null;
-                    }
-                );
-            }
-        }
-    }
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Cobblemon Contributors
+ * Copyright (C) 2022 Cobblemon Contributors
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -8,25 +8,20 @@
 
 package com.cobblemon.mod.common.mixin;
 
-import com.cobblemon.mod.common.api.tags.CobblemonBlockTags;
+import com.cobblemon.mod.common.tags.CobblemonBlockTags;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.PointedDripstoneBlock;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Redirect;
-import org.spongepowered.asm.mixin.injection.Slice;
 
 @Mixin(PointedDripstoneBlock.class)
 public abstract class PointedDripstoneBlockMixin {
 
-    @Redirect(
-            method = "canGrow(Lnet/minecraft/block/BlockState;Lnet/minecraft/block/BlockState;)Z",
-            at = @At(value = "INVOKE", target = "Lnet/minecraft/block/BlockState;isOf(Lnet/minecraft/block/Block;)Z", ordinal = 0),
-            slice = @Slice(from = @At(value = "FIELD", target = "Lnet/minecraft/block/Blocks;DRIPSTONE_BLOCK:Lnet/minecraft/block/Block;"))
-    )
+    @Redirect(method = "canGrow(Lnet/minecraft/block/BlockState;Lnet/minecraft/block/BlockState;)Z", at = @At(value = "INVOKE", target = "Lnet/minecraft/block/BlockState;isOf(Lnet/minecraft/block/Block;)Z", ordinal = 0))
     private static boolean cobblemon$validateMoonStoneDripstone(BlockState instance, Block block) {
-        return instance.isIn(CobblemonBlockTags.DRIPSTONE_GROWABLE);
+        return instance.isIn(CobblemonBlockTags.INSTANCE.getDRIPSTONE_GROWABLE());
     }
 
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Cobblemon Contributors
+ * Copyright (C) 2022 Cobblemon Contributors
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

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

@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.mixin;
-
-import com.cobblemon.mod.common.block.ApricornBlock;
-import net.minecraft.block.BlockState;
-import net.minecraft.block.dispenser.ShearsDispenserBehavior;
-import net.minecraft.server.world.ServerWorld;
-import net.minecraft.sound.SoundCategory;
-import net.minecraft.sound.SoundEvents;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.event.GameEvent;
-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(ShearsDispenserBehavior.class)
-public abstract class ShearsDispenserBehaviorMixin {
-
-    // This exists so we can execute our custom interaction only if no one redirected shears interactions to overwrite the vanilla ones.
-    @Inject(method = "tryShearBlock", at = @At("HEAD"), cancellable = true)
-    private static void cobblemon$tryApricornHarvest(ServerWorld world, BlockPos pos, CallbackInfoReturnable<Boolean> cir) {
-        final BlockState state = world.getBlockState(pos);
-        if (state.getBlock() instanceof ApricornBlock apricornBlock && state.get(ApricornBlock.Companion.getAGE()) == ApricornBlock.MAX_AGE) {
-            world.playSound(null, pos, SoundEvents.ENTITY_SHEEP_SHEAR, SoundCategory.BLOCKS, 1F, 1F);
-            apricornBlock.harvest(world, state, pos);
-            world.emitGameEvent(null, GameEvent.SHEAR, pos);
-            cir.setReturnValue(true);
-        }
-    }
-
-}

common/src/main/java/com/cobblemon/mod/common/mixin/accessor/AccessorEntity.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Cobblemon Contributors
+ * Copyright (C) 2022 Cobblemon Contributors
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

common/src/main/java/com/cobblemon/mod/common/mixin/accessor/KeyBindingAccessor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Cobblemon Contributors
+ * Copyright (C) 2022 Cobblemon Contributors
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

common/src/main/java/com/cobblemon/mod/common/mixin/entity/TameableEntityMixin.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Cobblemon Contributors
+ * Copyright (C) 2022 Cobblemon Contributors
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

common/src/main/java/com/cobblemon/mod/common/mixin/pokeball/ItemRendererMixin.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Cobblemon Contributors
+ * Copyright (C) 2022 Cobblemon Contributors
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Cobblemon Contributors
+ * Copyright (C) 2022 Cobblemon Contributors
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -29,7 +29,7 @@ import com.cobblemon.mod.common.api.net.serializers.StringSetDataSerializer
 import com.cobblemon.mod.common.api.net.serializers.Vec3DataSerializer
 import com.cobblemon.mod.common.api.permission.PermissionValidator
 import com.cobblemon.mod.common.api.pokeball.catching.calculators.CaptureCalculator
-import com.cobblemon.mod.common.api.pokeball.catching.calculators.CaptureCalculators
+import com.cobblemon.mod.common.api.pokeball.catching.calculators.CobblemonGen348CaptureCalculator
 import com.cobblemon.mod.common.api.pokemon.PokemonSpecies
 import com.cobblemon.mod.common.api.pokemon.effect.ShoulderEffectRegistry
 import com.cobblemon.mod.common.api.pokemon.experience.ExperienceCalculator
@@ -37,16 +37,18 @@ import com.cobblemon.mod.common.api.pokemon.experience.ExperienceGroups
 import com.cobblemon.mod.common.api.pokemon.experience.StandardExperienceCalculator
 import com.cobblemon.mod.common.api.pokemon.feature.ChoiceSpeciesFeatureProvider
 import com.cobblemon.mod.common.api.pokemon.feature.FlagSpeciesFeatureProvider
+import com.cobblemon.mod.common.api.pokemon.feature.GlobalSpeciesFeatures
 import com.cobblemon.mod.common.api.pokemon.feature.SpeciesFeatures
-import com.cobblemon.mod.common.api.pokemon.helditem.HeldItemProvider
 import com.cobblemon.mod.common.api.pokemon.stats.EvCalculator
 import com.cobblemon.mod.common.api.pokemon.stats.Generation8EvCalculator
 import com.cobblemon.mod.common.api.pokemon.stats.StatProvider
 import com.cobblemon.mod.common.api.properties.CustomPokemonProperty
 import com.cobblemon.mod.common.api.reactive.Observable.Companion.filter
 import com.cobblemon.mod.common.api.reactive.Observable.Companion.map
+import com.cobblemon.mod.common.api.reactive.Observable.Companion.takeFirst
 import com.cobblemon.mod.common.api.scheduling.ScheduledTaskTracker
 import com.cobblemon.mod.common.api.spawning.BestSpawner
+import com.cobblemon.mod.common.api.spawning.CobblemonSpawnPools
 import com.cobblemon.mod.common.api.spawning.CobblemonSpawningProspector
 import com.cobblemon.mod.common.api.spawning.context.AreaContextResolver
 import com.cobblemon.mod.common.api.spawning.prospecting.SpawningProspector
@@ -60,16 +62,14 @@ import com.cobblemon.mod.common.api.storage.factory.FileBackedPokemonStoreFactor
 import com.cobblemon.mod.common.api.storage.pc.PCStore
 import com.cobblemon.mod.common.api.storage.pc.link.PCLinkManager
 import com.cobblemon.mod.common.api.storage.player.PlayerDataStoreManager
-import com.cobblemon.mod.common.api.tags.CobblemonEntityTypeTags
 import com.cobblemon.mod.common.battles.BattleFormat
 import com.cobblemon.mod.common.battles.BattleRegistry
 import com.cobblemon.mod.common.battles.BattleSide
 import com.cobblemon.mod.common.battles.ShowdownThread
 import com.cobblemon.mod.common.battles.actor.PokemonBattleActor
 import com.cobblemon.mod.common.battles.pokemon.BattlePokemon
-import com.cobblemon.mod.common.battles.runner.ShowdownService
+import com.cobblemon.mod.common.battles.runner.ShowdownConnection
 import com.cobblemon.mod.common.config.CobblemonConfig
-import com.cobblemon.mod.common.config.LastChangedVersion
 import com.cobblemon.mod.common.config.constraint.IntConstraint
 import com.cobblemon.mod.common.config.starter.StarterConfig
 import com.cobblemon.mod.common.data.CobblemonDataProvider
@@ -78,14 +78,14 @@ import com.cobblemon.mod.common.events.ServerTickHandler
 import com.cobblemon.mod.common.item.PokeBallItem
 import com.cobblemon.mod.common.net.messages.client.settings.ServerSettingsPacket
 import com.cobblemon.mod.common.net.serverhandling.ServerPacketRegistrar
-import com.cobblemon.mod.common.particle.CobblemonParticles
 import com.cobblemon.mod.common.permission.LaxPermissionValidator
 import com.cobblemon.mod.common.pokemon.Pokemon
 import com.cobblemon.mod.common.pokemon.aspects.GENDER_ASPECT
 import com.cobblemon.mod.common.pokemon.aspects.SHINY_ASPECT
 import com.cobblemon.mod.common.pokemon.evolution.variants.BlockClickEvolution
-import com.cobblemon.mod.common.pokemon.feature.*
-import com.cobblemon.mod.common.pokemon.helditem.CobblemonHeldItemManager
+import com.cobblemon.mod.common.pokemon.feature.BattleCriticalHitsFeature
+import com.cobblemon.mod.common.pokemon.feature.DamageTakenFeature
+import com.cobblemon.mod.common.pokemon.feature.TagSeasonResolver
 import com.cobblemon.mod.common.pokemon.properties.HiddenAbilityPropertyType
 import com.cobblemon.mod.common.pokemon.properties.UncatchableProperty
 import com.cobblemon.mod.common.pokemon.properties.UntradeableProperty
@@ -93,20 +93,17 @@ import com.cobblemon.mod.common.pokemon.properties.tags.PokemonFlagProperty
 import com.cobblemon.mod.common.pokemon.stat.CobblemonStatProvider
 import com.cobblemon.mod.common.registry.CompletableRegistry
 import com.cobblemon.mod.common.starter.CobblemonStarterHandler
-import com.cobblemon.mod.common.util.DataKeys
 import com.cobblemon.mod.common.util.cobblemonResource
 import com.cobblemon.mod.common.util.getServer
 import com.cobblemon.mod.common.util.ifDedicatedServer
-import com.cobblemon.mod.common.util.isLaterVersion
 import com.cobblemon.mod.common.util.party
 import com.cobblemon.mod.common.util.removeAmountIf
-import com.cobblemon.mod.common.world.gamerules.CobblemonGameRules
+import com.cobblemon.mod.common.world.CobblemonGameRules
 import com.cobblemon.mod.common.world.feature.CobblemonOrePlacedFeatures
 import com.cobblemon.mod.common.world.placement.CobblemonPlacementTypes
 import dev.architectury.event.EventResult
 import dev.architectury.event.events.common.CommandRegistrationEvent
 import dev.architectury.event.events.common.InteractionEvent
-import dev.architectury.event.events.common.PlayerEvent
 import dev.architectury.hooks.item.tool.AxeItemHooks
 import java.io.File
 import java.io.FileReader
@@ -114,12 +111,10 @@ import java.io.FileWriter
 import java.io.PrintWriter
 import java.util.UUID
 import kotlin.properties.Delegates
+import kotlin.reflect.KMutableProperty
 import kotlin.reflect.full.memberProperties
-import kotlin.reflect.jvm.isAccessible
-import kotlin.reflect.jvm.javaField
 import net.minecraft.client.MinecraftClient
 import net.minecraft.entity.data.TrackedDataHandlerRegistry
-import net.minecraft.item.NameTagItem
 import net.minecraft.server.network.ServerPlayerEntity
 import net.minecraft.util.WorldSavePath
 import net.minecraft.util.registry.RegistryKey
@@ -128,22 +123,18 @@ import org.apache.logging.log4j.LogManager
 
 object Cobblemon {
     const val MODID = "cobblemon"
-    const val VERSION = "1.3.1"
+    const val VERSION = "1.2.0"
     const val CONFIG_PATH = "config/$MODID/main.json"
     val LOGGER = LogManager.getLogger()
 
     lateinit var implementation: CobblemonImplementation
-    @Deprecated("This field is now a config value", ReplaceWith("Cobblemon.config.captureCalculator"))
-    var captureCalculator: CaptureCalculator
-        get() = this.config.captureCalculator
-        set(value) {
-            this.config.captureCalculator = value
-        }
+    lateinit var showdown: ShowdownConnection
+    var captureCalculator: CaptureCalculator = CobblemonGen348CaptureCalculator
     var experienceCalculator: ExperienceCalculator = StandardExperienceCalculator
     var evYieldCalculator: EvCalculator = Generation8EvCalculator
     var starterHandler: StarterHandler = CobblemonStarterHandler()
     var isDedicatedServer = false
-    val showdownThread = ShowdownThread()
+    var showdownThread = ShowdownThread()
     lateinit var config: CobblemonConfig
     var prospector: SpawningProspector = CobblemonSpawningProspector
     var areaContextResolver: AreaContextResolver = object : AreaContextResolver {}
@@ -157,12 +148,11 @@ object Cobblemon {
     var statProvider: StatProvider = CobblemonStatProvider
     var seasonResolver: SeasonResolver = TagSeasonResolver
 
-    fun preInitialize(implementation: CobblemonImplementation) {
+    fun preinitialize(implementation: CobblemonImplementation) {
         DropEntry.register("command", CommandDropEntry::class.java)
         DropEntry.register("item", ItemDropEntry::class.java, isDefault = true)
 
         ExperienceGroups.registerDefaults()
-        CaptureCalculators.registerDefaults()
 
         this.loadConfig()
         this.implementation = implementation
@@ -176,7 +166,6 @@ object Cobblemon {
         CobblemonSounds.register()
         CobblemonFeatures.register()
         CobblemonGameRules.register()
-        CobblemonParticles.register()
 
         ShoulderEffectRegistry.register()
 
@@ -191,16 +180,9 @@ object Cobblemon {
             BattleRegistry.getBattleByParticipatingPlayer(it)?.stop()
         }
         LIVING_DEATH.pipe(filter { it is ServerPlayerEntity }, map { it as ServerPlayerEntity }).subscribe {
-            PCLinkManager.removeLink(it.uuid)
             battleRegistry.getBattleByParticipatingPlayer(it)?.stop()
         }
 
-        InteractionEvent.INTERACT_ENTITY.register(InteractionEvent.InteractEntity { player, entity, hand ->
-            if (player.getStackInHand(hand).item is NameTagItem && entity.type.isIn(CobblemonEntityTypeTags.CANNOT_HAVE_NAME_TAG))
-                EventResult.interruptTrue()
-            else
-                EventResult.pass()
-        })
         InteractionEvent.RIGHT_CLICK_BLOCK.register(InteractionEvent.RightClickBlock { pl, _, pos, _ ->
             val player = pl as? ServerPlayerEntity ?: return@RightClickBlock EventResult.pass()
             val block = player.world.getBlockState(pos).block
@@ -213,20 +195,13 @@ object Cobblemon {
             }
             return@RightClickBlock EventResult.pass()
         })
-
-        PlayerEvent.CHANGE_DIMENSION.register(PlayerEvent.ChangeDimension{ player, _, _ ->
-            player.party().forEach { pokemon -> pokemon.entity?.recallWithAnimation() }
-        })
-
         TrackedDataHandlerRegistry.register(Vec3DataSerializer)
         TrackedDataHandlerRegistry.register(StringSetDataSerializer)
         TrackedDataHandlerRegistry.register(PoseTypeDataSerializer)
-
-        HeldItemProvider.register(CobblemonHeldItemManager, Priority.LOWEST)
     }
 
     fun initialize() {
-        showdownThread.launch()
+        showdownThread.start()
 
         CompletableRegistry.allRegistriesCompleted.thenAccept {
             LOGGER.info("All registries loaded.")
@@ -244,12 +219,8 @@ object Cobblemon {
         SpeciesFeatures.types["choice"] = ChoiceSpeciesFeatureProvider::class.java
         SpeciesFeatures.types["flag"] = FlagSpeciesFeatureProvider::class.java
 
-        SpeciesFeatures.register(
-            DataKeys.CAN_BE_MILKED,
-            FlagSpeciesFeatureProvider(keys = listOf(DataKeys.CAN_BE_MILKED), default = true))
-        SpeciesFeatures.register(
-            DataKeys.HAS_BEEN_SHEARED,
-            FlagSpeciesFeatureProvider(keys = listOf(DataKeys.HAS_BEEN_SHEARED), default = false))
+        GlobalSpeciesFeatures.register(DamageTakenFeature.ID) { DamageTakenFeature() }
+        GlobalSpeciesFeatures.register(BattleCriticalHitsFeature.ID) { BattleCriticalHitsFeature() }
 
         CustomPokemonProperty.register(UntradeableProperty)
         CustomPokemonProperty.register(UncatchableProperty)
@@ -290,6 +261,7 @@ object Cobblemon {
         SERVER_STOPPED.subscribe {
             storage.unregisterAll()
             playerData.saveAll()
+            showdown.close()
         }
         SERVER_STARTED.subscribe {
             bestSpawner.onServerStarted()
@@ -317,13 +289,15 @@ object Cobblemon {
             }
         }
 
-        PokemonSpecies.observable.subscribe {
-            LOGGER.info("Starting dummy Showdown battle to force it to pre-load data.")
-            battleRegistry.startBattle(
-                BattleFormat.GEN_9_SINGLES,
-                BattleSide(PokemonBattleActor(UUID.randomUUID(), BattlePokemon(Pokemon().initialize()), -1F)),
-                BattleSide(PokemonBattleActor(UUID.randomUUID(), BattlePokemon(Pokemon().initialize()), -1F))
-            ).apply { mute = true }
+        showdownThread.showdownStarted.thenAccept {
+            PokemonSpecies.observable.pipe(takeFirst()).subscribe {
+                LOGGER.info("Starting dummy Showdown battle to force it to pre-load data.")
+                battleRegistry.startBattle(
+                    BattleFormat.GEN_8_SINGLES,
+                    BattleSide(PokemonBattleActor(UUID.randomUUID(), BattlePokemon(Pokemon().initialize()), -1F)),
+                    BattleSide(PokemonBattleActor(UUID.randomUUID(), BattlePokemon(Pokemon().initialize()), -1F))
+                ).apply { mute = true }
+            }
         }
     }
 
@@ -352,59 +326,44 @@ object Cobblemon {
                 exception.printStackTrace()
             }
 
-            val defaultConfig = CobblemonConfig()
+            this.config::class.memberProperties.forEach {
+                // Member must have annotations and must be mutable
+                if (it.annotations.isEmpty() || it !is KMutableProperty<*>) return@forEach
 
-            CobblemonConfig::class.memberProperties.forEach {
-                val field = it.javaField!!
-                it.isAccessible = true
-                field.annotations.forEach {
-                    when (it) {
-                        is LastChangedVersion -> {
-                            val defaultChangedVersion = it.version
-                            val lastSavedVersion = config.lastSavedVersion
-                            if (defaultChangedVersion.isLaterVersion(lastSavedVersion)) {
-                                field.set(config, field.get(defaultConfig))
-                            }
-                        }
+                var value = it.getter.call(config)
+                for (annotation in it.annotations) {
+                    when (annotation) {
                         is IntConstraint -> {
-                            var value = field.get(config)
-                            if (value is Int) {
-                                value = value.coerceIn(it.min, it.max)
-                                field.set(config, value)
-                            }
+                            if (value !is Int) break
+                            value = value.coerceIn(annotation.min, annotation.max)
+                            it.setter.call(config, value)
                         }
                     }
                 }
             }
         } else {
             this.config = CobblemonConfig()
+            this.saveConfig()
         }
 
-        config.lastSavedVersion = VERSION
-        this.saveConfig()
-
         bestSpawner.loadConfig()
         PokemonSpecies.observable.subscribe { starterConfig = this.loadStarterConfig() }
     }
 
     fun loadStarterConfig(): StarterConfig {
-        if (config.exportStarterConfig) {
-            val file = File("config/cobblemon/starters.json")
-            file.parentFile.mkdirs()
-            if (!file.exists()) {
-                val config = StarterConfig()
-                val pw = PrintWriter(file)
-                StarterConfig.GSON.toJson(config, pw)
-                pw.close()
-                return config
-            }
-            val reader = FileReader(file)
-            val config = StarterConfig.GSON.fromJson(reader, StarterConfig::class.java)
-            reader.close()
+        val file = File("config/cobblemon/starters.json")
+        file.parentFile.mkdirs()
+        if (!file.exists()) {
+            val config = StarterConfig()
+            val pw = PrintWriter(file)
+            StarterConfig.GSON.toJson(config, pw)
+            pw.close()
             return config
-        } else {
-            return StarterConfig()
         }
+        val reader = FileReader(file)
+        val config = StarterConfig.GSON.fromJson(reader, StarterConfig::class.java)
+        reader.close()
+        return config
     }
 
     fun saveConfig() {

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Cobblemon Contributors
+ * Copyright (C) 2022 Cobblemon Contributors
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -9,8 +9,8 @@
 package com.cobblemon.mod.common
 
 import com.cobblemon.mod.common.registry.CompletableRegistry
-import com.cobblemon.mod.common.block.entity.HealingMachineBlockEntity
-import com.cobblemon.mod.common.block.entity.PCBlockEntity
+import com.cobblemon.mod.common.world.block.entity.HealingMachineBlockEntity
+import com.cobblemon.mod.common.world.block.entity.PCBlockEntity
 import dev.architectury.registry.registries.RegistrySupplier
 import java.util.function.Supplier
 import net.minecraft.block.entity.BlockEntityType
@@ -21,14 +21,12 @@ object CobblemonBlockEntities : CompletableRegistry<BlockEntityType<*>>(Registry
         return queue(name, blockEntityType)
     }
 
-    @JvmField
     val HEALING_MACHINE = com.cobblemon.mod.common.CobblemonBlockEntities.register("healing_machine") {
         BlockEntityType.Builder.create(
             ::HealingMachineBlockEntity,
             CobblemonBlocks.HEALING_MACHINE.get()
         ).build(null)
     }
-    @JvmField
     val PC = com.cobblemon.mod.common.CobblemonBlockEntities.register("pc") {
         BlockEntityType.Builder.create(
             ::PCBlockEntity,

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Cobblemon Contributors
+ * Copyright (C) 2022 Cobblemon Contributors
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -10,170 +10,132 @@ package com.cobblemon.mod.common
 
 import com.cobblemon.mod.common.api.apricorn.Apricorn
 import com.cobblemon.mod.common.registry.CompletableRegistry
-import com.cobblemon.mod.common.block.ApricornBlock
-import com.cobblemon.mod.common.block.ApricornSaplingBlock
-import com.cobblemon.mod.common.block.HealingMachineBlock
-import com.cobblemon.mod.common.block.PCBlock
+import com.cobblemon.mod.common.world.block.ApricornBlock
+import com.cobblemon.mod.common.world.block.ApricornSaplingBlock
+import com.cobblemon.mod.common.world.block.HealingMachineBlock
+import com.cobblemon.mod.common.world.block.PCBlock
 import dev.architectury.registry.registries.RegistrySupplier
-import net.minecraft.block.*
+import net.minecraft.block.AbstractBlock
+import net.minecraft.block.Block
+import net.minecraft.block.BlockState
+import net.minecraft.block.Blocks
+import net.minecraft.block.DoorBlock
+import net.minecraft.block.FenceBlock
+import net.minecraft.block.FenceGateBlock
+import net.minecraft.block.LeavesBlock
+import net.minecraft.block.MapColor
+import net.minecraft.block.Material
+import net.minecraft.block.OreBlock
+import net.minecraft.block.PillarBlock
+import net.minecraft.block.PressurePlateBlock
+import net.minecraft.block.SlabBlock
+import net.minecraft.block.StairsBlock
+import net.minecraft.block.TrapdoorBlock
+import net.minecraft.block.WoodenButtonBlock
 import net.minecraft.entity.EntityType
 import net.minecraft.sound.BlockSoundGroup
 import net.minecraft.util.math.Direction
 import net.minecraft.util.math.intprovider.UniformIntProvider
 import net.minecraft.util.registry.Registry
-import java.util.function.ToIntFunction
 
 object CobblemonBlocks : CompletableRegistry<Block>(Registry.BLOCK_KEY) {
     /**
      * Evolution Ores
      */
-    @JvmField
+
     val DAWN_STONE_ORE = this.evolutionStoneOre("dawn_stone_ore")
-    @JvmField
     val DUSK_STONE_ORE = this.evolutionStoneOre("dusk_stone_ore")
-    @JvmField
     val FIRE_STONE_ORE = this.evolutionStoneOre("fire_stone_ore")
-    @JvmField
     val ICE_STONE_ORE = this.evolutionStoneOre("ice_stone_ore")
-    @JvmField
     val LEAF_STONE_ORE = this.evolutionStoneOre("leaf_stone_ore")
-    @JvmField
     val MOON_STONE_ORE = this.evolutionStoneOre("moon_stone_ore")
-    @JvmField
     val DRIPSTONE_MOON_STONE_ORE = this.evolutionStoneOre("dripstone_moon_stone_ore")
-    @JvmField
     val SHINY_STONE_ORE = this.evolutionStoneOre("shiny_stone_ore")
-    @JvmField
     val SUN_STONE_ORE = this.evolutionStoneOre("sun_stone_ore")
-    @JvmField
     val THUNDER_STONE_ORE = this.evolutionStoneOre("thunder_stone_ore")
-    @JvmField
     val WATER_STONE_ORE = this.evolutionStoneOre("water_stone_ore")
 
     /**
      * Deepslate separator
      */
 
-    @JvmField
     val DEEPSLATE_DAWN_STONE_ORE = this.deepslateEvolutionStoneOre("deepslate_dawn_stone_ore")
-    @JvmField
     val DEEPSLATE_DUSK_STONE_ORE = this.deepslateEvolutionStoneOre("deepslate_dusk_stone_ore")
-    @JvmField
     val DEEPSLATE_FIRE_STONE_ORE = this.deepslateEvolutionStoneOre("deepslate_fire_stone_ore")
-    @JvmField
     val DEEPSLATE_ICE_STONE_ORE = this.deepslateEvolutionStoneOre("deepslate_ice_stone_ore")
-    @JvmField
     val DEEPSLATE_LEAF_STONE_ORE = this.deepslateEvolutionStoneOre("deepslate_leaf_stone_ore")
-    @JvmField
     val DEEPSLATE_MOON_STONE_ORE = this.deepslateEvolutionStoneOre("deepslate_moon_stone_ore")
-    @JvmField
     val DEEPSLATE_SHINY_STONE_ORE = this.deepslateEvolutionStoneOre("deepslate_shiny_stone_ore")
-    @JvmField
     val DEEPSLATE_SUN_STONE_ORE = this.deepslateEvolutionStoneOre("deepslate_sun_stone_ore")
-    @JvmField
     val DEEPSLATE_THUNDER_STONE_ORE = this.deepslateEvolutionStoneOre("deepslate_thunder_stone_ore")
-    @JvmField
     val DEEPSLATE_WATER_STONE_ORE = this.deepslateEvolutionStoneOre("deepslate_water_stone_ore")
 
     /**
      * Apricorns
      */
 
-    @JvmField
     val APRICORN_LOG = queue("apricorn_log") {
         log(
             MapColor.DIRT_BROWN,
             MapColor.BROWN
         )
     }
-    @JvmField
     val STRIPPED_APRICORN_LOG = queue("stripped_apricorn_log") {
         log(
             MapColor.DIRT_BROWN,
             MapColor.DIRT_BROWN
         )
     }
-    @JvmField
     val APRICORN_WOOD = queue("apricorn_wood") {
         log(
             MapColor.DIRT_BROWN,
             MapColor.DIRT_BROWN
         )
     }
-    @JvmField
     val STRIPPED_APRICORN_WOOD = queue("stripped_apricorn_wood") {
         log(
             MapColor.DIRT_BROWN,
             MapColor.DIRT_BROWN
         )
     }
-    @JvmField
     val APRICORN_PLANKS = queue("apricorn_planks") { Block(AbstractBlock.Settings.of(Material.WOOD, MapColor.DIRT_BROWN).strength(2.0f, 3.0f).sounds(BlockSoundGroup.WOOD)) }
-    @JvmField
     val APRICORN_LEAVES = queue("apricorn_leaves") { com.cobblemon.mod.common.CobblemonBlocks.leaves(BlockSoundGroup.GRASS) }
-    @JvmField
     val APRICORN_FENCE = queue("apricorn_fence") { FenceBlock(AbstractBlock.Settings.of(Material.WOOD, APRICORN_PLANKS.get().defaultMapColor).strength(2.0f, 3.0f).sounds(BlockSoundGroup.WOOD)) }
-    @JvmField
     val APRICORN_FENCE_GATE = queue("apricorn_fence_gate") { FenceGateBlock(AbstractBlock.Settings.of(Material.WOOD, APRICORN_PLANKS.get().defaultMapColor).strength(2.0f, 3.0f).sounds(BlockSoundGroup.WOOD)) }
-    @JvmField
     val APRICORN_BUTTON = queue("apricorn_button") { WoodenButtonBlock(AbstractBlock.Settings.of(Material.DECORATION).noCollision().strength(0.5f).sounds(BlockSoundGroup.WOOD)) }
-    @JvmField
     val APRICORN_PRESSURE_PLATE = queue("apricorn_pressure_plate") { PressurePlateBlock(PressurePlateBlock.ActivationRule.EVERYTHING, AbstractBlock.Settings.of(Material.WOOD, APRICORN_PLANKS.get().defaultMapColor).noCollision().strength(0.5f).sounds(BlockSoundGroup.WOOD)) }
     // Tag was removed be sure to add it back when implemented
-//    @JvmField
-//    val APRICORN_SIGN = queue("apricorn_sign") { StandingSignBlock(AbstractBlock.Settings.of(Material.WOOD).noCollission().strength(1.0f).sounds(BlockSoundGroup.WOOD), APRICORN_WOOD_TYPE) }
-    //@JvmField
-//    val APRICORN_WALL_SIGN = queue("apricorn_wall_sign") { WallSignBlock(AbstractBlock.Settings.of(Material.WOOD).noCollission().strength(1.0f).sounds(BlockSoundGroup.WOOD).dropsLike(APRICORN_SIGN), APRICORN_WOOD_TYPE) }
-    @JvmField
+    //val APRICORN_SIGN = queue("apricorn_sign") { StandingSignBlock(AbstractBlock.Settings.of(Material.WOOD).noCollission().strength(1.0f).sounds(BlockSoundGroup.WOOD), APRICORN_WOOD_TYPE) }
+    //val APRICORN_WALL_SIGN = queue("apricorn_wall_sign") { WallSignBlock(AbstractBlock.Settings.of(Material.WOOD).noCollission().strength(1.0f).sounds(BlockSoundGroup.WOOD).dropsLike(APRICORN_SIGN), APRICORN_WOOD_TYPE) }
     val APRICORN_SLAB = queue("apricorn_slab") { SlabBlock(AbstractBlock.Settings.of(Material.WOOD, MapColor.OAK_TAN).strength(2.0f, 3.0f).sounds(BlockSoundGroup.WOOD)) }
-    @JvmField
     val APRICORN_STAIRS = queue("apricorn_stairs") { StairsBlock(
         APRICORN_PLANKS.get().defaultState, AbstractBlock.Settings.copy(
             APRICORN_PLANKS.get())) }
-    @JvmField
     val APRICORN_DOOR = queue("apricorn_door") { DoorBlock(AbstractBlock.Settings.of(Material.WOOD, APRICORN_PLANKS.get().defaultMapColor).strength(3.0F).sounds(BlockSoundGroup.WOOD).nonOpaque()) }
-    @JvmField
     val APRICORN_TRAPDOOR = queue("apricorn_trapdoor") { TrapdoorBlock(AbstractBlock.Settings.of(Material.WOOD, MapColor.OAK_TAN).strength(3.0F).sounds(BlockSoundGroup.WOOD).nonOpaque().allowsSpawning { _, _, _, _ -> false }) }
 
     private val PLANT_PROPERTIES = AbstractBlock.Settings.of(Material.PLANT).noCollision().ticksRandomly().breakInstantly().sounds(BlockSoundGroup.GRASS)
-    @JvmField
     val BLACK_APRICORN_SAPLING = queue("black_apricorn_sapling") { ApricornSaplingBlock(PLANT_PROPERTIES, Apricorn.BLACK) }
-    @JvmField
     val BLUE_APRICORN_SAPLING = queue("blue_apricorn_sapling") { ApricornSaplingBlock(PLANT_PROPERTIES, Apricorn.BLUE) }
-    @JvmField
     val GREEN_APRICORN_SAPLING = queue("green_apricorn_sapling") { ApricornSaplingBlock(PLANT_PROPERTIES, Apricorn.GREEN) }
-    @JvmField
     val PINK_APRICORN_SAPLING = queue("pink_apricorn_sapling") { ApricornSaplingBlock(PLANT_PROPERTIES, Apricorn.PINK) }
-    @JvmField
     val RED_APRICORN_SAPLING = queue("red_apricorn_sapling") { ApricornSaplingBlock(PLANT_PROPERTIES, Apricorn.RED) }
-    @JvmField
     val WHITE_APRICORN_SAPLING = queue("white_apricorn_sapling") { ApricornSaplingBlock(PLANT_PROPERTIES, Apricorn.WHITE) }
-    @JvmField
     val YELLOW_APRICORN_SAPLING = queue("yellow_apricorn_sapling") { ApricornSaplingBlock(PLANT_PROPERTIES, Apricorn.YELLOW) }
 
-    @JvmField
     val BLACK_APRICORN = registerApricornBlock("black_apricorn", Apricorn.BLACK)
-    @JvmField
     val BLUE_APRICORN = registerApricornBlock("blue_apricorn", Apricorn.BLUE)
-    @JvmField
     val GREEN_APRICORN = registerApricornBlock("green_apricorn", Apricorn.GREEN)
-    @JvmField
     val PINK_APRICORN = registerApricornBlock("pink_apricorn", Apricorn.PINK)
-    @JvmField
     val RED_APRICORN = registerApricornBlock("red_apricorn", Apricorn.RED)
-    @JvmField
     val WHITE_APRICORN = registerApricornBlock("white_apricorn", Apricorn.WHITE)
-    @JvmField
     val YELLOW_APRICORN = registerApricornBlock("yellow_apricorn", Apricorn.YELLOW)
 
-    @JvmField
-    val HEALING_MACHINE = queue("healing_machine") { HealingMachineBlock(AbstractBlock.Settings.of(Material.METAL, MapColor.IRON_GRAY).sounds(BlockSoundGroup.METAL).strength(2f).nonOpaque().luminance(ToIntFunction { state: BlockState -> if (state.get(HealingMachineBlock.CHARGE_LEVEL) >= HealingMachineBlock.MAX_CHARGE_LEVEL) 7 else 2 })) }
-    @JvmField
-    val PC = queue("pc") { PCBlock(AbstractBlock.Settings.of(Material.METAL, MapColor.IRON_GRAY).sounds(BlockSoundGroup.METAL).strength(2F).nonOpaque().luminance(ToIntFunction { state: BlockState -> if ((state.get(
-            PCBlock.ON) as Boolean) && (state.get(PCBlock.PART) == PCBlock.PCPart.TOP)) 10 else 0 })) }
+    val HEALING_MACHINE = queue("healing_machine") { HealingMachineBlock(AbstractBlock.Settings.of(Material.METAL, MapColor.IRON_GRAY).sounds(BlockSoundGroup.METAL).strength(2f).nonOpaque()) }
+    val PC = queue("pc") { PCBlock(AbstractBlock.Settings.of(Material.METAL, MapColor.IRON_GRAY).sounds(BlockSoundGroup.METAL).strength(2F).nonOpaque()) }
 
     private fun registerApricornBlock(id: String, apricorn: Apricorn): RegistrySupplier<ApricornBlock> {
-        return queue(id) { ApricornBlock(AbstractBlock.Settings.of(Material.PLANT, apricorn.mapColor()).ticksRandomly().strength(Blocks.OAK_LOG.hardness, Blocks.OAK_LOG.blastResistance).sounds(BlockSoundGroup.WOOD).nonOpaque(), apricorn) }
+        return queue(id) { ApricornBlock(AbstractBlock.Settings.of(Material.PLANT).ticksRandomly().strength(0.2f, 3.0f).sounds(BlockSoundGroup.WOOD).nonOpaque(), apricorn) }
     }
 
     /**

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Cobblemon Contributors
+ * Copyright (C) 2022 Cobblemon Contributors
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -10,16 +10,8 @@ package com.cobblemon.mod.common
 
 import java.util.function.Supplier
 import net.minecraft.client.model.TexturedModelData
-import net.minecraft.client.particle.ParticleFactory
-import net.minecraft.client.particle.SpriteProvider
 import net.minecraft.client.render.entity.model.EntityModelLayer
-import net.minecraft.particle.ParticleEffect
-import net.minecraft.particle.ParticleType
 
 interface CobblemonClientImplementation {
     fun registerLayer(modelLayer: EntityModelLayer, supplier: Supplier<TexturedModelData>)
-    fun <T : ParticleEffect> registerParticleFactory(
-        type: ParticleType<T>,
-        factory: (SpriteProvider) -> ParticleFactory<T>
-    )
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Cobblemon Contributors
+ * Copyright (C) 2022 Cobblemon Contributors
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -8,7 +8,22 @@
 
 package com.cobblemon.mod.common
 
-import com.cobblemon.mod.common.command.*
+import com.cobblemon.mod.common.command.ChangeScaleAndSize
+import com.cobblemon.mod.common.command.CheckSpawnsCommand
+import com.cobblemon.mod.common.command.ClickTextCommand
+import com.cobblemon.mod.common.command.FriendshipCommand
+import com.cobblemon.mod.common.command.GetNBT
+import com.cobblemon.mod.common.command.GivePokemon
+import com.cobblemon.mod.common.command.HealPokemonCommand
+import com.cobblemon.mod.common.command.LevelUp
+import com.cobblemon.mod.common.command.OpenStarterScreenCommand
+import com.cobblemon.mod.common.command.PokemonEditCommand
+import com.cobblemon.mod.common.command.SpawnAllPokemon
+import com.cobblemon.mod.common.command.SpawnPokemon
+import com.cobblemon.mod.common.command.StopBattleCommand
+import com.cobblemon.mod.common.command.TakePokemon
+import com.cobblemon.mod.common.command.TeachCommand
+import com.cobblemon.mod.common.command.TestCommand
 import com.mojang.brigadier.CommandDispatcher
 import net.minecraft.command.CommandRegistryAccess
 import net.minecraft.server.command.CommandManager
@@ -21,7 +36,6 @@ object CobblemonCommands {
         TakePokemon.register(dispatcher)
         ChangeScaleAndSize.register(dispatcher)
         TestCommand.register(dispatcher)
-        ReloadShowdownCommand.register(dispatcher)
         ClickTextCommand.register(dispatcher)
         PokemonEditCommand.register(dispatcher)
         TeachCommand.register(dispatcher)
@@ -33,10 +47,5 @@ object CobblemonCommands {
         OpenStarterScreenCommand.register(dispatcher)
         SpawnAllPokemon.register(dispatcher)
         FriendshipCommand.register(dispatcher)
-        GiveAllPokemon.register(dispatcher)
-        HeldItemCommand.register(dispatcher, registry)
-        PcCommand.register(dispatcher)
-        SpawnPokemonFromPool.register(dispatcher)
-        PokeboxCommand.register(dispatcher)
     }
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Cobblemon Contributors
+ * Copyright (C) 2022 Cobblemon Contributors
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Cobblemon Contributors
+ * Copyright (C) 2022 Cobblemon Contributors
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -11,7 +11,6 @@ package com.cobblemon.mod.common
 import com.cobblemon.mod.common.api.events.CobblemonEvents
 import com.cobblemon.mod.common.api.events.entity.EntityAttributeEvent
 import com.cobblemon.mod.common.api.pokeball.PokeBalls
-import com.cobblemon.mod.common.entity.data.CobblemonTrackedDataHandlerRegistry
 import com.cobblemon.mod.common.entity.pokeball.EmptyPokeBallEntity
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.registry.CompletableRegistry
@@ -22,14 +21,14 @@ import net.minecraft.entity.Entity
 import net.minecraft.entity.EntityType
 import net.minecraft.entity.LivingEntity
 import net.minecraft.entity.SpawnGroup
+import net.minecraft.entity.attribute.DefaultAttributeContainer
 import net.minecraft.entity.attribute.EntityAttributes
 import net.minecraft.util.registry.Registry
 
 object CobblemonEntities : CompletableRegistry<EntityType<*>>(Registry.ENTITY_TYPE_KEY) {
-
     override fun register() {
         super.register()
-        CobblemonTrackedDataHandlerRegistry.register()
+
         EntityAttributeRegistry.register(
             { POKEMON.get() },
             {
@@ -53,7 +52,6 @@ object CobblemonEntities : CompletableRegistry<EntityType<*>>(Registry.ENTITY_TY
         return queue(name) { entityTypeBuilder.build(cobblemonResource("pokemon").toString()) }
     }
 
-    @JvmField
     val POKEMON = livingEntity(
         name = "pokemon",
         entityTypeBuilder = EntityType.Builder.create<PokemonEntity>(
@@ -62,7 +60,6 @@ object CobblemonEntities : CompletableRegistry<EntityType<*>>(Registry.ENTITY_TY
         )
     )
 
-    @JvmField
     val EMPTY_POKEBALL = entity(
         name = "empty_pokeball",
         entityTypeBuilder = EntityType.Builder.create<EmptyPokeBallEntity>(

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Cobblemon Contributors
+ * Copyright (C) 2022 Cobblemon Contributors
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -21,6 +21,5 @@ object CobblemonFeatures : CompletableRegistry<Feature<*>>(Registry.FEATURE_KEY)
         return queue(name, feature)
     }
 
-    @JvmField
     val APRICORN_TREE_FEATURE = register("apricorn_tree_feature") { ApricornTreeFeature(SingleStateFeatureConfig.CODEC) }
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Cobblemon Contributors
+ * Copyright (C) 2022 Cobblemon Contributors
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -12,15 +12,9 @@ import com.cobblemon.mod.common.api.net.NetworkPacket
 import net.minecraft.server.network.ServerPlayerEntity
 
 interface CobblemonImplementation {
-    val modAPI: ModAPI
     fun isModInstalled(id: String): Boolean
 }
 
-enum class ModAPI {
-    FABRIC,
-    FORGE
-}
-
 interface NetworkDelegate {
 
     fun sendPacketToPlayer(player: ServerPlayerEntity, packet: NetworkPacket)

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Cobblemon Contributors
+ * Copyright (C) 2022 Cobblemon Contributors
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -9,367 +9,158 @@
 package com.cobblemon.mod.common
 
 import com.cobblemon.mod.common.api.pokeball.PokeBalls
-import com.cobblemon.mod.common.api.pokemon.helditem.HeldItemProvider
 import com.cobblemon.mod.common.api.pokemon.stats.Stats
-import com.cobblemon.mod.common.item.*
+import com.cobblemon.mod.common.item.ApricornItem
+import com.cobblemon.mod.common.item.CobblemonItem
+import com.cobblemon.mod.common.item.CobblemonItemGroups
+import com.cobblemon.mod.common.item.PokeBallItem
 import com.cobblemon.mod.common.item.interactive.CandyItem
 import com.cobblemon.mod.common.item.interactive.LinkCableItem
 import com.cobblemon.mod.common.item.interactive.VitaminItem
 import com.cobblemon.mod.common.pokeball.PokeBall
-import com.cobblemon.mod.common.pokemon.helditem.CobblemonHeldItemManager
 import com.cobblemon.mod.common.registry.CompletableRegistry
 import dev.architectury.registry.registries.RegistrySupplier
 import net.minecraft.block.Block
-import net.minecraft.block.ComposterBlock
-import net.minecraft.item.*
+import net.minecraft.item.AliasedBlockItem
+import net.minecraft.item.BlockItem
+import net.minecraft.item.Item
+import net.minecraft.item.ItemGroup
 import net.minecraft.util.registry.Registry
 
 object CobblemonItems : CompletableRegistry<Item>(Registry.ITEM_KEY) {
 
-    init {
-        this.completed.thenRun {
-            val compostChance = ComposterBlock.ITEM_TO_LEVEL_INCREASE_CHANCE.getFloat(Items.OAK_LEAVES)
-            // Should always pass unless Mojang reworks leaves to no longer work in the Composter, in that case we already updated w.o doing anything
-            if (compostChance != ComposterBlock.ITEM_TO_LEVEL_INCREASE_CHANCE.defaultReturnValue()) {
-                ComposterBlock.ITEM_TO_LEVEL_INCREASE_CHANCE[APRICORN_LEAVES.get()] = compostChance
-            }
-        }
-    }
-
     private val pokeballs = mutableListOf<RegistrySupplier<PokeBallItem>>()
 
-    @JvmField
     val POKE_BALL = pokeballItem(PokeBalls.POKE_BALL)
-    @JvmField
     val CITRINE_BALL = pokeballItem(PokeBalls.CITRINE_BALL)
-    @JvmField
     val VERDANT_BALL = pokeballItem(PokeBalls.VERDANT_BALL)
-    @JvmField
     val AZURE_BALL = pokeballItem(PokeBalls.AZURE_BALL)
-    @JvmField
     val ROSEATE_BALL = pokeballItem(PokeBalls.ROSEATE_BALL)
-    @JvmField
     val SLATE_BALL = pokeballItem(PokeBalls.SLATE_BALL)
-    @JvmField
     val PREMIER_BALL = pokeballItem(PokeBalls.PREMIER_BALL)
-    @JvmField
     val GREAT_BALL = pokeballItem(PokeBalls.GREAT_BALL)
-    @JvmField
     val ULTRA_BALL = pokeballItem(PokeBalls.ULTRA_BALL)
-    @JvmField
     val SAFARI_BALL = pokeballItem(PokeBalls.SAFARI_BALL)
-    @JvmField
     val FAST_BALL = pokeballItem(PokeBalls.FAST_BALL)
-    @JvmField
     val LEVEL_BALL = pokeballItem(PokeBalls.LEVEL_BALL)
-    @JvmField
     val LURE_BALL = pokeballItem(PokeBalls.LURE_BALL)
-    @JvmField
     val HEAVY_BALL = pokeballItem(PokeBalls.HEAVY_BALL)
-    @JvmField
     val LOVE_BALL = pokeballItem(PokeBalls.LOVE_BALL)
-    @JvmField
     val FRIEND_BALL = pokeballItem(PokeBalls.FRIEND_BALL)
-    @JvmField
     val MOON_BALL = pokeballItem(PokeBalls.MOON_BALL)
-    @JvmField
     val SPORT_BALL = pokeballItem(PokeBalls.SPORT_BALL)
-    @JvmField
     val PARK_BALL = pokeballItem(PokeBalls.PARK_BALL)
-    @JvmField
     val NET_BALL = pokeballItem(PokeBalls.NET_BALL)
-    @JvmField
     val DIVE_BALL = pokeballItem(PokeBalls.DIVE_BALL)
-    @JvmField
     val NEST_BALL = pokeballItem(PokeBalls.NEST_BALL)
-    @JvmField
     val REPEAT_BALL = pokeballItem(PokeBalls.REPEAT_BALL)
-    @JvmField
     val TIMER_BALL = pokeballItem(PokeBalls.TIMER_BALL)
-    @JvmField
     val LUXURY_BALL = pokeballItem(PokeBalls.LUXURY_BALL)
-    @JvmField
     val DUSK_BALL = pokeballItem(PokeBalls.DUSK_BALL)
-    @JvmField
     val HEAL_BALL = pokeballItem(PokeBalls.HEAL_BALL)
-    @JvmField
     val QUICK_BALL = pokeballItem(PokeBalls.QUICK_BALL)
-    @JvmField
     val DREAM_BALL = pokeballItem(PokeBalls.DREAM_BALL)
-    @JvmField
     val BEAST_BALL = pokeballItem(PokeBalls.BEAST_BALL)
-    @JvmField
     val MASTER_BALL = pokeballItem(PokeBalls.MASTER_BALL)
-    @JvmField
     val CHERISH_BALL = pokeballItem(PokeBalls.CHERISH_BALL)
 
-    @JvmField
     val RED_APRICORN = queue("red_apricorn") { ApricornItem(CobblemonBlocks.RED_APRICORN.get()) }
-    @JvmField
     val YELLOW_APRICORN = queue("yellow_apricorn") { ApricornItem(CobblemonBlocks.YELLOW_APRICORN.get()) }
-    @JvmField
     val GREEN_APRICORN = queue("green_apricorn") { ApricornItem(CobblemonBlocks.GREEN_APRICORN.get()) }
-    @JvmField
     val BLUE_APRICORN = queue("blue_apricorn") { ApricornItem(CobblemonBlocks.BLUE_APRICORN.get()) }
-    @JvmField
     val PINK_APRICORN = queue("pink_apricorn") { ApricornItem(CobblemonBlocks.PINK_APRICORN.get()) }
-    @JvmField
     val BLACK_APRICORN = queue("black_apricorn") { ApricornItem(CobblemonBlocks.BLACK_APRICORN.get()) }
-    @JvmField
     val WHITE_APRICORN = queue("white_apricorn") { ApricornItem(CobblemonBlocks.WHITE_APRICORN.get()) }
 
-    @JvmField
-    val RED_APRICORN_SEED = queue("red_apricorn_seed") { ApricornSeedItem(CobblemonBlocks.RED_APRICORN_SAPLING.get(), ItemGroup.MISC) }
-    @JvmField
-    val YELLOW_APRICORN_SEED = queue("yellow_apricorn_seed") { ApricornSeedItem(CobblemonBlocks.YELLOW_APRICORN_SAPLING.get(), ItemGroup.MISC) }
-    @JvmField
-    val GREEN_APRICORN_SEED = queue("green_apricorn_seed") { ApricornSeedItem(CobblemonBlocks.GREEN_APRICORN_SAPLING.get(), ItemGroup.MISC) }
-    @JvmField
-    val BLUE_APRICORN_SEED = queue("blue_apricorn_seed") { ApricornSeedItem(CobblemonBlocks.BLUE_APRICORN_SAPLING.get(), ItemGroup.MISC) }
-    @JvmField
-    val PINK_APRICORN_SEED = queue("pink_apricorn_seed") { ApricornSeedItem(CobblemonBlocks.PINK_APRICORN_SAPLING.get(), ItemGroup.MISC) }
-    @JvmField
-    val BLACK_APRICORN_SEED = queue("black_apricorn_seed") { ApricornSeedItem(CobblemonBlocks.BLACK_APRICORN_SAPLING.get(), ItemGroup.MISC) }
-    @JvmField
-    val WHITE_APRICORN_SEED = queue("white_apricorn_seed") { ApricornSeedItem(CobblemonBlocks.WHITE_APRICORN_SAPLING.get(), ItemGroup.MISC) }
+    val RED_APRICORN_SEED = queue("red_apricorn_seed") { itemNameBlockItem(CobblemonBlocks.RED_APRICORN_SAPLING.get(), ItemGroup.MISC) }
+    val YELLOW_APRICORN_SEED = queue("yellow_apricorn_seed") { itemNameBlockItem(CobblemonBlocks.YELLOW_APRICORN_SAPLING.get(), ItemGroup.MISC) }
+    val GREEN_APRICORN_SEED = queue("green_apricorn_seed") { itemNameBlockItem(CobblemonBlocks.GREEN_APRICORN_SAPLING.get(), ItemGroup.MISC) }
+    val BLUE_APRICORN_SEED = queue("blue_apricorn_seed") { itemNameBlockItem(CobblemonBlocks.BLUE_APRICORN_SAPLING.get(), ItemGroup.MISC) }
+    val PINK_APRICORN_SEED = queue("pink_apricorn_seed") { itemNameBlockItem(CobblemonBlocks.PINK_APRICORN_SAPLING.get(), ItemGroup.MISC) }
+    val BLACK_APRICORN_SEED = queue("black_apricorn_seed") { itemNameBlockItem(CobblemonBlocks.BLACK_APRICORN_SAPLING.get(), ItemGroup.MISC) }
+    val WHITE_APRICORN_SEED = queue("white_apricorn_seed") { itemNameBlockItem(CobblemonBlocks.WHITE_APRICORN_SAPLING.get(), ItemGroup.MISC) }
 
-    @JvmField
     val APRICORN_LOG = queue("apricorn_log") { blockItem(CobblemonBlocks.APRICORN_LOG.get(), ItemGroup.BUILDING_BLOCKS) }
-    @JvmField
     val STRIPPED_APRICORN_LOG = queue("stripped_apricorn_log") { blockItem(CobblemonBlocks.STRIPPED_APRICORN_LOG.get(), ItemGroup.BUILDING_BLOCKS) }
-    @JvmField
     val APRICORN_WOOD = queue("apricorn_wood") { blockItem(CobblemonBlocks.APRICORN_WOOD.get(), ItemGroup.BUILDING_BLOCKS) }
-    @JvmField
     val STRIPPED_APRICORN_WOOD = queue("stripped_apricorn_wood") { blockItem(CobblemonBlocks.STRIPPED_APRICORN_WOOD.get(), ItemGroup.BUILDING_BLOCKS) }
-    @JvmField
     val APRICORN_PLANKS = queue("apricorn_planks") { blockItem(CobblemonBlocks.APRICORN_PLANKS.get(), ItemGroup.BUILDING_BLOCKS) }
-    @JvmField
     val APRICORN_LEAVES = queue("apricorn_leaves") { blockItem(CobblemonBlocks.APRICORN_LEAVES.get(), ItemGroup.BUILDING_BLOCKS) }
 
-    @JvmField
     val APRICORN_DOOR = queue("apricorn_door") { blockItem(CobblemonBlocks.APRICORN_DOOR.get(), ItemGroup.REDSTONE) }
-    @JvmField
     val APRICORN_TRAPDOOR = queue("apricorn_trapdoor") { blockItem(CobblemonBlocks.APRICORN_TRAPDOOR.get(), ItemGroup.REDSTONE) }
-    @JvmField
     val APRICORN_FENCE = queue("apricorn_fence") { blockItem(CobblemonBlocks.APRICORN_FENCE.get(), ItemGroup.DECORATIONS) }
-    @JvmField
     val APRICORN_FENCE_GATE = queue("apricorn_fence_gate") { blockItem(CobblemonBlocks.APRICORN_FENCE_GATE.get(), ItemGroup.REDSTONE) }
-    @JvmField
     val APRICORN_BUTTON = queue("apricorn_button") { blockItem(CobblemonBlocks.APRICORN_BUTTON.get(), ItemGroup.REDSTONE) }
-    @JvmField
     val APRICORN_PRESSURE_PLATE = queue("apricorn_pressure_plate") { blockItem(CobblemonBlocks.APRICORN_PRESSURE_PLATE.get(), ItemGroup.REDSTONE) }
-    //@JvmField
-//    val APRICORN_SIGN = queue("apricorn_sign", SignItem(Item.Properties().stacksTo(16).tab(CreativeModeTab.TAB_DECORATIONS), CobblemonBlocks.APRICORN_SIGN, CobblemonBlocks.APRICORN_WALL_SIGN))
-    @JvmField
+    //val APRICORN_SIGN = queue("apricorn_sign", SignItem(Item.Properties().stacksTo(16).tab(CreativeModeTab.TAB_DECORATIONS), CobblemonBlocks.APRICORN_SIGN, CobblemonBlocks.APRICORN_WALL_SIGN))
     val APRICORN_SLAB = queue("apricorn_slab") { blockItem(CobblemonBlocks.APRICORN_SLAB.get(), ItemGroup.BUILDING_BLOCKS) }
-    @JvmField
     val APRICORN_STAIRS = queue("apricorn_stairs") { blockItem(CobblemonBlocks.APRICORN_STAIRS.get(), ItemGroup.BUILDING_BLOCKS) }
 
-    @JvmField
     val HEALING_MACHINE = queue("healing_machine") { blockItem(CobblemonBlocks.HEALING_MACHINE.get(), ItemGroup.REDSTONE) }
-    @JvmField
     val PC = queue("pc") { blockItem(CobblemonBlocks.PC.get(), ItemGroup.REDSTONE) }
 
     // Evolution items
-    @JvmField val LINK_CABLE = this.queue("link_cable") { LinkCableItem() }
-    @JvmField val DRAGON_SCALE = this.evolutionItem("dragon_scale")
-    @JvmField val KINGS_ROCK = this.evolutionItem("kings_rock")
-    @JvmField val METAL_COAT = this.evolutionItem("metal_coat")
-    @JvmField val UPGRADE = this.evolutionItem("upgrade")
-    @JvmField val DUBIOUS_DISC = this.evolutionItem("dubious_disc")
-    @JvmField val DEEP_SEA_SCALE = this.evolutionItem("deep_sea_scale")
-    @JvmField val DEEP_SEA_TOOTH = this.evolutionItem("deep_sea_tooth")
-    @JvmField val ELECTIRIZER = this.evolutionItem("electirizer")
-    @JvmField val MAGMARIZER = this.evolutionItem("magmarizer")
-    @JvmField val OVAL_STONE = this.evolutionItem("oval_stone")
-    @JvmField val PROTECTOR = this.evolutionItem("protector")
-    @JvmField val REAPER_CLOTH = this.evolutionItem("reaper_cloth")
-    @JvmField val PRISM_SCALE = this.evolutionItem("prism_scale")
-    @JvmField val SACHET = this.evolutionItem("sachet")
-    @JvmField val WHIPPED_DREAM = this.evolutionItem("whipped_dream")
-    @JvmField val STRAWBERRY_SWEET = this.evolutionItem("strawberry_sweet")
-    @JvmField val LOVE_SWEET = this.evolutionItem("love_sweet")
-    @JvmField val BERRY_SWEET = this.evolutionItem("berry_sweet")
-    @JvmField val CLOVER_SWEET = this.evolutionItem("clover_sweet")
-    @JvmField val FLOWER_SWEET = this.evolutionItem("flower_sweet")
-    @JvmField val STAR_SWEET = this.evolutionItem("star_sweet")
-    @JvmField val RIBBON_SWEET = this.evolutionItem("ribbon_sweet")
-    @JvmField val CHIPPED_POT = this.evolutionItem("chipped_pot")
-    @JvmField val CRACKED_POT = this.evolutionItem("cracked_pot")
-    @JvmField val SWEET_APPLE = this.evolutionItem("sweet_apple")
-    @JvmField val TART_APPLE = this.evolutionItem("tart_apple")
-    @JvmField val GALARICA_CUFF = this.evolutionItem("galarica_cuff")
-    @JvmField val GALARICA_WREATH = this.evolutionItem("galarica_wreath")
-    @JvmField val BLACK_AUGURITE = this.evolutionItem("black_augurite")
-    @JvmField val PEAT_BLOCK = this.evolutionItem("peat_block")
-    @JvmField val RAZOR_CLAW = this.evolutionItem("razor_claw")
-    @JvmField val RAZOR_FANG = this.evolutionItem("razor_fang")
-    // ToDo enable me when malicious armor goes in the game
-    //@JvmField val AUSPICIOUS_ARMOR = this.heldItem("auspicious_armor")
+    val LINK_CABLE = queue("link_cable") { LinkCableItem() }
+    val KINGS_ROCK = queue("kings_rock") { evolutionItem() }
+    val METAL_COAT = queue("metal_coat") { evolutionItem() }
+    val BLACK_AUGURITE = queue("black_augurite") { evolutionItem() }
+    val PROTECTOR = queue("protector") { evolutionItem() }
+    val OVAL_STONE = queue("oval_stone") { evolutionItem() }
+    val DRAGON_SCALE = queue("dragon_scale") { evolutionItem() }
+    val ELECTIRIZER = queue("electirizer") { evolutionItem() }
+    val MAGMARIZER = queue("magmarizer") { evolutionItem() }
+    val UPGRADE = queue("upgrade") { evolutionItem() }
+    val DUBIOUS_DISC = queue("dubious_disc") { evolutionItem() }
 
     // Medicine
-    @JvmField
     val RARE_CANDY = queue("rare_candy") { CandyItem { _, pokemon -> pokemon.getExperienceToNextLevel() } }
-    @JvmField
     val EXPERIENCE_CANDY_XS = queue("exp_candy_xs") { CandyItem { _, _ -> CandyItem.DEFAULT_XS_CANDY_YIELD } }
-    @JvmField
     val EXPERIENCE_CANDY_S = queue("exp_candy_s") { CandyItem { _, _ -> CandyItem.DEFAULT_S_CANDY_YIELD } }
-    @JvmField
     val EXPERIENCE_CANDY_M = queue("exp_candy_m") { CandyItem { _, _ -> CandyItem.DEFAULT_M_CANDY_YIELD } }
-    @JvmField
     val EXPERIENCE_CANDY_L = queue("exp_candy_l") { CandyItem { _, _ -> CandyItem.DEFAULT_L_CANDY_YIELD } }
-    @JvmField
     val EXPERIENCE_CANDY_XL = queue("exp_candy_xl") { CandyItem { _, _ -> CandyItem.DEFAULT_XL_CANDY_YIELD } }
-    @JvmField
     val CALCIUM = queue("calcium") { VitaminItem(Stats.SPECIAL_ATTACK) }
-    @JvmField
     val CARBOS = queue("carbos") { VitaminItem(Stats.SPEED) }
-    @JvmField
     val HP_UP = queue("hp_up") { VitaminItem(Stats.HP) }
-    @JvmField
     val IRON = queue("iron") { VitaminItem(Stats.DEFENCE) }
-    @JvmField
     val PROTEIN = queue("protein") { VitaminItem(Stats.ATTACK) }
-    @JvmField
     val ZINC = queue("zinc") { VitaminItem(Stats.SPECIAL_DEFENCE) }
 
     /**
      * Evolution Ores and Stones
      */
-    @JvmField
     val DAWN_STONE_ORE = queue("dawn_stone_ore") { blockItem(CobblemonBlocks.DAWN_STONE_ORE.get(), ItemGroup.BUILDING_BLOCKS) }
-    @JvmField
     val DUSK_STONE_ORE = queue("dusk_stone_ore") { blockItem(CobblemonBlocks.DUSK_STONE_ORE.get(), ItemGroup.BUILDING_BLOCKS) }
-    @JvmField
     val FIRE_STONE_ORE = queue("fire_stone_ore") { blockItem(CobblemonBlocks.FIRE_STONE_ORE.get(), ItemGroup.BUILDING_BLOCKS) }
-    @JvmField
     val ICE_STONE_ORE = queue("ice_stone_ore") { blockItem(CobblemonBlocks.ICE_STONE_ORE.get(), ItemGroup.BUILDING_BLOCKS) }
-    @JvmField
     val LEAF_STONE_ORE = queue("leaf_stone_ore") { blockItem(CobblemonBlocks.LEAF_STONE_ORE.get(), ItemGroup.BUILDING_BLOCKS) }
-    @JvmField
     val MOON_STONE_ORE = queue("moon_stone_ore") { blockItem(CobblemonBlocks.MOON_STONE_ORE.get(), ItemGroup.BUILDING_BLOCKS) }
-    @JvmField
     val SHINY_STONE_ORE = queue("shiny_stone_ore") { blockItem(CobblemonBlocks.SHINY_STONE_ORE.get(), ItemGroup.BUILDING_BLOCKS) }
-    @JvmField
     val SUN_STONE_ORE = queue("sun_stone_ore") { blockItem(CobblemonBlocks.SUN_STONE_ORE.get(), ItemGroup.BUILDING_BLOCKS) }
-    @JvmField
     val THUNDER_STONE_ORE = queue("thunder_stone_ore") { blockItem(CobblemonBlocks.THUNDER_STONE_ORE.get(), ItemGroup.BUILDING_BLOCKS) }
-    @JvmField
     val WATER_STONE_ORE = queue("water_stone_ore") { blockItem(CobblemonBlocks.WATER_STONE_ORE.get(), ItemGroup.BUILDING_BLOCKS) }
-    @JvmField
     val DEEPSLATE_DAWN_STONE_ORE = queue("deepslate_dawn_stone_ore") { blockItem(CobblemonBlocks.DEEPSLATE_DAWN_STONE_ORE.get(), ItemGroup.BUILDING_BLOCKS) }
-    @JvmField
     val DEEPSLATE_DUSK_STONE_ORE = queue("deepslate_dusk_stone_ore") { blockItem(CobblemonBlocks.DEEPSLATE_DUSK_STONE_ORE.get(), ItemGroup.BUILDING_BLOCKS) }
-    @JvmField
     val DEEPSLATE_FIRE_STONE_ORE = queue("deepslate_fire_stone_ore") { blockItem(CobblemonBlocks.DEEPSLATE_FIRE_STONE_ORE.get(), ItemGroup.BUILDING_BLOCKS) }
-    @JvmField
     val DEEPSLATE_ICE_STONE_ORE = queue("deepslate_ice_stone_ore") { blockItem(CobblemonBlocks.DEEPSLATE_ICE_STONE_ORE.get(), ItemGroup.BUILDING_BLOCKS) }
-    @JvmField
     val DEEPSLATE_LEAF_STONE_ORE = queue("deepslate_leaf_stone_ore") { blockItem(CobblemonBlocks.DEEPSLATE_LEAF_STONE_ORE.get(), ItemGroup.BUILDING_BLOCKS) }
-    @JvmField
     val DEEPSLATE_MOON_STONE_ORE = queue("deepslate_moon_stone_ore") { blockItem(CobblemonBlocks.DEEPSLATE_MOON_STONE_ORE.get(), ItemGroup.BUILDING_BLOCKS) }
-    @JvmField
     val DEEPSLATE_SHINY_STONE_ORE = queue("deepslate_shiny_stone_ore") { blockItem(CobblemonBlocks.DEEPSLATE_SHINY_STONE_ORE.get(), ItemGroup.BUILDING_BLOCKS) }
-    @JvmField
     val DEEPSLATE_SUN_STONE_ORE = queue("deepslate_sun_stone_ore") { blockItem(CobblemonBlocks.DEEPSLATE_SUN_STONE_ORE.get(), ItemGroup.BUILDING_BLOCKS) }
-    @JvmField
     val DEEPSLATE_THUNDER_STONE_ORE = queue("deepslate_thunder_stone_ore") { blockItem(CobblemonBlocks.DEEPSLATE_THUNDER_STONE_ORE.get(), ItemGroup.BUILDING_BLOCKS) }
-    @JvmField
     val DEEPSLATE_WATER_STONE_ORE = queue("deepslate_water_stone_ore") { blockItem(CobblemonBlocks.DEEPSLATE_WATER_STONE_ORE.get(), ItemGroup.BUILDING_BLOCKS) }
-    @JvmField
     val DRIPSTONE_MOON_STONE_ORE = queue("dripstone_moon_stone_ore") { blockItem(CobblemonBlocks.DRIPSTONE_MOON_STONE_ORE.get(), ItemGroup.BUILDING_BLOCKS) }
-    @JvmField
-    val DAWN_STONE = this.evolutionItem("dawn_stone")
-    @JvmField
-    val DUSK_STONE = this.evolutionItem("dusk_stone")
-    @JvmField
-    val FIRE_STONE = this.evolutionItem("fire_stone")
-    @JvmField
-    val ICE_STONE = this.evolutionItem("ice_stone")
-    @JvmField
-    val LEAF_STONE = this.evolutionItem("leaf_stone")
-    @JvmField
-    val MOON_STONE = this.evolutionItem("moon_stone")
-    @JvmField
-    val SHINY_STONE = this.evolutionItem("shiny_stone")
-    @JvmField
-    val SUN_STONE = this.evolutionItem("sun_stone")
-    @JvmField
-    val THUNDER_STONE = this.evolutionItem("thunder_stone")
-    @JvmField
-    val WATER_STONE = this.evolutionItem("water_stone")
-
-    // Held Items
-    @JvmField
-    val ASSAULT_VEST = this.heldItem("assault_vest")
-    @JvmField
-    val BIG_ROOT = this.heldItem("big_root")
-    @JvmField
-    val BLACK_BELT = this.heldItem("black_belt")
-    @JvmField
-    val BLACK_GLASSES = this.heldItem("black_glasses")
-    @JvmField
-    val BLACK_SLUDGE = this.heldItem("black_sludge")
-    @JvmField
-    val CHARCOAL = this.heldItem("charcoal_stick", remappedName = "charcoal")
-    @JvmField
-    val CHOICE_BAND = this.heldItem("choice_band")
-    @JvmField
-    val CHOICE_SCARF = this.heldItem("choice_scarf")
-    @JvmField
-    val CHOICE_SPECS = this.heldItem("choice_specs")
-    @JvmField
-    val DRAGON_FANG = this.heldItem("dragon_fang")
-    @JvmField
-    val EXP_SHARE = this.heldItem("exp_share")
-    @JvmField
-    val FOCUS_BAND = this.heldItem("focus_band")
-    @JvmField
-    val HARD_STONE = this.heldItem("hard_stone")
-    @JvmField
-    val HEAVY_DUTY_BOOTS = this.heldItem("heavy_duty_boots")
-    @JvmField
-    val LEFTOVERS = this.heldItem("leftovers")
-    @JvmField
-    val LIGHT_CLAY = this.heldItem("light_clay")
-    @JvmField
-    val LUCKY_EGG = this.heldItem("lucky_egg")
-    @JvmField
-    val MAGNET = this.heldItem("magnet")
-    @JvmField
-    val MIRACLE_SEED = this.heldItem("miracle_seed")
-    @JvmField
-    val MUSCLE_BAND = this.heldItem("muscle_band")
-    @JvmField
-    val MYSTIC_WATER = this.heldItem("mystic_water")
-    @JvmField
-    val NEVER_MELT_ICE = this.heldItem("never_melt_ice")
-    @JvmField
-    val POISON_BARB = this.heldItem("poison_barb")
-    @JvmField
-    val QUICK_CLAW = this.heldItem("quick_claw")
-    @JvmField
-    val ROCKY_HELMET = this.heldItem("rocky_helmet")
-    @JvmField
-    val SAFETY_GOGGLES = this.heldItem("safety_goggles")
-    @JvmField
-    val SHARP_BEAK = this.heldItem("sharp_beak")
-    @JvmField
-    val SILK_SCARF = this.heldItem("silk_scarf")
-    @JvmField
-    val SILVER_POWDER = this.heldItem("silver_powder")
-    @JvmField
-    val SOFT_SAND = this.heldItem("soft_sand")
-    @JvmField
-    val SPELL_TAG = this.heldItem("spell_tag")
-    @JvmField
-    val TWISTED_SPOON = this.heldItem("twisted_spoon")
-    @JvmField
-    val WISE_GLASSES = this.heldItem("wise_glasses")
-
-    // Misc
-    @JvmField
-    val POKEMON_MODEL = queue("pokemon_model") { PokemonItem() }
+    val DAWN_STONE = queue("dawn_stone") { evolutionItem() }
+    val DUSK_STONE = queue("dusk_stone") { evolutionItem() }
+    val FIRE_STONE = queue("fire_stone") { evolutionItem() }
+    val ICE_STONE = queue("ice_stone") { evolutionItem() }
+    val LEAF_STONE = queue("leaf_stone") { evolutionItem() }
+    val MOON_STONE = queue("moon_stone") { evolutionItem() }
+    val SHINY_STONE = queue("shiny_stone") { evolutionItem() }
+    val SUN_STONE = queue("sun_stone") { evolutionItem() }
+    val THUNDER_STONE = queue("thunder_stone") { evolutionItem() }
+    val WATER_STONE = queue("water_stone") { evolutionItem() }
 
     fun pokeballs(): List<RegistrySupplier<PokeBallItem>> = this.pokeballs
 
@@ -381,7 +172,9 @@ object CobblemonItems : CompletableRegistry<Item>(Registry.ITEM_KEY) {
         return AliasedBlockItem(block, Item.Settings().group(tab))
     }
 
-    private fun evolutionItem(name: String) = queue(name) { CobblemonItem(Item.Settings().group(CobblemonItemGroups.EVOLUTION_ITEM_GROUP)) }
+    private fun evolutionItem(): CobblemonItem {
+        return CobblemonItem(Item.Settings().group(CobblemonItemGroups.EVOLUTION_ITEM_GROUP))
+    }
 
     private fun pokeballItem(pokeBall: PokeBall): RegistrySupplier<PokeBallItem> {
         val supplier = this.queue(pokeBall.name.path) { PokeBallItem(pokeBall) }
@@ -390,11 +183,4 @@ object CobblemonItems : CompletableRegistry<Item>(Registry.ITEM_KEY) {
         return supplier
     }
 
-    private fun heldItem(name: String, remappedName: String? = null): RegistrySupplier<CobblemonItem> = queue(name) {
-        val item = CobblemonItem(Item.Settings().group(CobblemonItemGroups.HELD_ITEM_GROUP))
-        if (remappedName != null) {
-            CobblemonHeldItemManager.registerRemap(item, remappedName)
-        }
-        return@queue item
-    }
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Cobblemon Contributors
+ * Copyright (C) 2022 Cobblemon Contributors
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -28,15 +28,30 @@ import com.cobblemon.mod.common.net.messages.client.battle.BattleSetTeamPokemonP
 import com.cobblemon.mod.common.net.messages.client.battle.BattleSwitchPokemonPacket
 import com.cobblemon.mod.common.net.messages.client.battle.BattleUpdateTeamPokemonPacket
 import com.cobblemon.mod.common.net.messages.client.battle.ChallengeNotificationPacket
-import com.cobblemon.mod.common.net.messages.client.data.*
+import com.cobblemon.mod.common.net.messages.client.data.AbilityRegistrySyncPacket
+import com.cobblemon.mod.common.net.messages.client.data.MovesRegistrySyncPacket
 import com.cobblemon.mod.common.net.messages.client.data.PropertiesCompletionRegistrySyncPacket
-import com.cobblemon.mod.common.net.messages.client.effect.SpawnSnowstormParticlePacket
-import com.cobblemon.mod.common.net.messages.client.pokemon.update.*
+import com.cobblemon.mod.common.net.messages.client.data.SpeciesRegistrySyncPacket
+import com.cobblemon.mod.common.net.messages.client.pokemon.update.AbilityUpdatePacket
+import com.cobblemon.mod.common.net.messages.client.pokemon.update.AspectsUpdatePacket
+import com.cobblemon.mod.common.net.messages.client.pokemon.update.BenchedMovesUpdatePacket
+import com.cobblemon.mod.common.net.messages.client.pokemon.update.CaughtBallUpdatePacket
+import com.cobblemon.mod.common.net.messages.client.pokemon.update.EVsUpdatePacket
+import com.cobblemon.mod.common.net.messages.client.pokemon.update.ExperienceUpdatePacket
+import com.cobblemon.mod.common.net.messages.client.pokemon.update.FriendshipUpdatePacket
+import com.cobblemon.mod.common.net.messages.client.pokemon.update.GenderUpdatePacket
+import com.cobblemon.mod.common.net.messages.client.pokemon.update.HealthUpdatePacket
+import com.cobblemon.mod.common.net.messages.client.pokemon.update.IVsUpdatePacket
+import com.cobblemon.mod.common.net.messages.client.pokemon.update.MoveSetUpdatePacket
+import com.cobblemon.mod.common.net.messages.client.pokemon.update.NatureUpdatePacket
+import com.cobblemon.mod.common.net.messages.client.pokemon.update.PokemonStateUpdatePacket
+import com.cobblemon.mod.common.net.messages.client.pokemon.update.ShinyUpdatePacket
+import com.cobblemon.mod.common.net.messages.client.pokemon.update.SpeciesUpdatePacket
+import com.cobblemon.mod.common.net.messages.client.pokemon.update.StatusUpdatePacket
 import com.cobblemon.mod.common.net.messages.client.pokemon.update.evolution.AddEvolutionPacket
 import com.cobblemon.mod.common.net.messages.client.pokemon.update.evolution.ClearEvolutionsPacket
 import com.cobblemon.mod.common.net.messages.client.pokemon.update.evolution.RemoveEvolutionPacket
 import com.cobblemon.mod.common.net.messages.client.settings.ServerSettingsPacket
-import com.cobblemon.mod.common.net.messages.client.sound.UnvalidatedPlaySoundS2CPacket
 import com.cobblemon.mod.common.net.messages.client.starter.OpenStarterUIPacket
 import com.cobblemon.mod.common.net.messages.client.starter.SetClientPlayerDataPacket
 import com.cobblemon.mod.common.net.messages.client.storage.RemoveClientPokemonPacket
@@ -51,7 +66,6 @@ import com.cobblemon.mod.common.net.messages.client.storage.pc.MoveClientPCPokem
 import com.cobblemon.mod.common.net.messages.client.storage.pc.OpenPCPacket
 import com.cobblemon.mod.common.net.messages.client.storage.pc.SetPCBoxPokemonPacket
 import com.cobblemon.mod.common.net.messages.client.storage.pc.SetPCPokemonPacket
-import com.cobblemon.mod.common.net.messages.client.ui.InteractPokemonUIPacket
 import com.cobblemon.mod.common.net.messages.client.ui.SummaryUIPacket
 import com.cobblemon.mod.common.net.messages.server.BattleChallengePacket
 import com.cobblemon.mod.common.net.messages.server.BenchMovePacket
@@ -59,14 +73,17 @@ import com.cobblemon.mod.common.net.messages.server.RequestMoveSwapPacket
 import com.cobblemon.mod.common.net.messages.server.SelectStarterPacket
 import com.cobblemon.mod.common.net.messages.server.SendOutPokemonPacket
 import com.cobblemon.mod.common.net.messages.server.battle.BattleSelectActionsPacket
-import com.cobblemon.mod.common.net.messages.server.pokemon.interact.InteractPokemonPacket
 import com.cobblemon.mod.common.net.messages.server.pokemon.update.evolution.AcceptEvolutionPacket
 import com.cobblemon.mod.common.net.messages.server.starter.RequestStarterScreenPacket
 import com.cobblemon.mod.common.net.messages.server.storage.SwapPCPartyPokemonPacket
 import com.cobblemon.mod.common.net.messages.server.storage.party.MovePartyPokemonPacket
 import com.cobblemon.mod.common.net.messages.server.storage.party.ReleasePartyPokemonPacket
 import com.cobblemon.mod.common.net.messages.server.storage.party.SwapPartyPokemonPacket
-import com.cobblemon.mod.common.net.messages.server.storage.pc.*
+import com.cobblemon.mod.common.net.messages.server.storage.pc.MovePCPokemonPacket
+import com.cobblemon.mod.common.net.messages.server.storage.pc.MovePCPokemonToPartyPacket
+import com.cobblemon.mod.common.net.messages.server.storage.pc.MovePartyPokemonToPCPacket
+import com.cobblemon.mod.common.net.messages.server.storage.pc.ReleasePCPokemonPacket
+import com.cobblemon.mod.common.net.messages.server.storage.pc.SwapPCPokemonPacket
 import com.cobblemon.mod.common.util.getServer
 import java.util.concurrent.CompletableFuture
 import net.minecraft.server.network.ServerPlayerEntity
@@ -131,7 +148,6 @@ object CobblemonNetwork {
         buildClientMessage<AbilityUpdatePacket>()
         buildClientMessage<EVsUpdatePacket>()
         buildClientMessage<IVsUpdatePacket>()
-        buildClientMessage<HeldItemUpdatePacket>()
 
         // Evolution start
         buildClientMessage<AddEvolutionPacket>()
@@ -159,7 +175,6 @@ object CobblemonNetwork {
 
         // UI Packets
         buildClientMessage<SummaryUIPacket>()
-        buildClientMessage<InteractPokemonUIPacket>()
 
         // Starter packets
         buildClientMessage<OpenStarterUIPacket>()
@@ -187,18 +202,11 @@ object CobblemonNetwork {
         buildClientMessage<ServerSettingsPacket>()
 
         // Data registries
-        buildClientMessage<UnlockReloadPacket>()
         buildClientMessage<AbilityRegistrySyncPacket>()
         buildClientMessage<MovesRegistrySyncPacket>()
         buildClientMessage<SpeciesRegistrySyncPacket>()
         buildClientMessage<PropertiesCompletionRegistrySyncPacket>()
 
-        // Effects
-        buildClientMessage<SpawnSnowstormParticlePacket>()
-
-        // Hax
-        buildClientMessage<UnvalidatedPlaySoundS2CPacket>()
-
         /**
          * Server Packets
          */
@@ -208,9 +216,6 @@ object CobblemonNetwork {
         buildServerMessage<AcceptEvolutionPacket>()
         // Evolution End
 
-        // Interaction Packets
-        buildServerMessage<InteractPokemonPacket>()
-
         // Storage Packets
         buildServerMessage<SendOutPokemonPacket>()
         buildServerMessage<RequestMoveSwapPacket>()
@@ -221,7 +226,6 @@ object CobblemonNetwork {
         buildServerMessage<MovePartyPokemonToPCPacket>()
         buildServerMessage<ReleasePartyPokemonPacket>()
         buildServerMessage<ReleasePCPokemonPacket>()
-        buildServerMessage<UnlinkPlayerFromPCPacket>()
 
         // Starter packets
         buildServerMessage<SelectStarterPacket>()

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Cobblemon Contributors
+ * Copyright (C) 2022 Cobblemon Contributors
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Cobblemon Contributors
+ * Copyright (C) 2022 Cobblemon Contributors
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -16,42 +16,12 @@ import net.minecraft.util.registry.Registry
 object CobblemonSounds : CompletableRegistry<SoundEvent>(Registry.SOUND_EVENT_KEY) {
     private fun queue(name: String) = queue(name) { SoundEvent(cobblemonResource(name)) }
 
-    @JvmField
-    val GUI_CLICK = queue("gui.click")
-
-    @JvmField
-    val PC_ON = queue("pc.on")
-    @JvmField
-    val PC_OFF = queue("pc.off")
-    @JvmField
-    val PC_GRAB = queue("pc.grab")
-    @JvmField
-    val PC_DROP = queue("pc.drop")
-    @JvmField
-    val PC_RELEASE = queue("pc.release")
-
-    @JvmField
-    val HEALING_MACHINE_ACTIVE = queue("healing_machine.active")
-
-    @JvmField
     val POKE_BALL_CAPTURE_STARTED = queue("poke_ball.capture_started")
-    @JvmField
     val POKE_BALL_CAPTURE_SUCCEEDED = queue("poke_ball.capture_succeeded")
-    @JvmField
     val POKE_BALL_SHAKE = queue("poke_ball.shake")
-    @JvmField
     val POKE_BALL_OPEN = queue("poke_ball.open")
-    @JvmField
     val POKE_BALL_HIT = queue("poke_ball.hit")
-    @JvmField
     val POKE_BALL_SEND_OUT = queue("poke_ball.send_out")
-    @JvmField
     val POKE_BALL_RECALL = queue("poke_ball.recall")
-
-    @JvmField
     val ITEM_USE = queue("item.use")
-    @JvmField
-    val CAN_EVOLVE = queue("pokemon.can_evolve")
-    @JvmField
-    val EVOLVING = queue("pokemon.evolving")
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Cobblemon Contributors
+ * Copyright (C) 2022 Cobblemon Contributors
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Cobblemon Contributors
+ * Copyright (C) 2022 Cobblemon Contributors
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Cobblemon Contributors
+ * Copyright (C) 2022 Cobblemon Contributors
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Cobblemon Contributors
+ * Copyright (C) 2022 Cobblemon Contributors
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Cobblemon Contributors
+ * Copyright (C) 2022 Cobblemon Contributors
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

common/src/main/kotlin/com/cobblemon/mod/common/api/LevelCurve.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Cobblemon Contributors
+ * Copyright (C) 2022 Cobblemon Contributors
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

common/src/main/kotlin/com/cobblemon/mod/common/api/ModDependant.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Cobblemon Contributors
+ * Copyright (C) 2022 Cobblemon Contributors
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

common/src/main/kotlin/com/cobblemon/mod/common/api/PrioritizedList.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Cobblemon Contributors
+ * Copyright (C) 2022 Cobblemon Contributors
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -18,8 +18,7 @@ package com.cobblemon.mod.common.api
  */
 open class PrioritizedList<T> : Iterable<T> {
     protected val priorityMap = mutableMapOf<Priority, MutableList<T>>()
-    // Please don't change arraylist, we need insertion order
-    protected val ordered = arrayListOf<T>()
+    protected val ordered = mutableListOf<T>()
 
     val mapping: Map<Priority, List<T>>
         get() = priorityMap.toMap()
@@ -32,8 +31,7 @@ open class PrioritizedList<T> : Iterable<T> {
     }
 
     fun add(priority: Priority, value: T) {
-        // Please don't change arraylist, we need insertion order
-        priorityMap.putIfAbsent(priority, arrayListOf())
+        priorityMap.putIfAbsent(priority, mutableListOf())
         priorityMap[priority]?.add(value)
         reorder()
     }

common/src/main/kotlin/com/cobblemon/mod/common/api/Priority.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Cobblemon Contributors
+ * Copyright (C) 2022 Cobblemon Contributors
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

common/src/main/kotlin/com/cobblemon/mod/common/api/SeasonResolver.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Cobblemon Contributors
+ * Copyright (C) 2022 Cobblemon Contributors
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Cobblemon Contributors
+ * Copyright (C) 2022 Cobblemon Contributors
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -9,41 +9,64 @@
 package com.cobblemon.mod.common.api.abilities
 
 import com.cobblemon.mod.common.Cobblemon
-import com.cobblemon.mod.common.api.data.DataRegistry
+import com.cobblemon.mod.common.api.data.JsonDataRegistry
 import com.cobblemon.mod.common.api.reactive.SimpleObservable
-import com.cobblemon.mod.common.battles.runner.ShowdownService
 import com.cobblemon.mod.common.net.messages.client.data.AbilityRegistrySyncPacket
 import com.cobblemon.mod.common.pokemon.abilities.HiddenAbilityType
+import com.cobblemon.mod.common.util.asTranslated
 import com.cobblemon.mod.common.util.cobblemonResource
-import net.minecraft.resource.ResourceManager
+import com.google.gson.Gson
+import com.google.gson.GsonBuilder
+import com.google.gson.JsonDeserializationContext
+import com.google.gson.JsonDeserializer
+import com.google.gson.JsonElement
+import com.google.gson.reflect.TypeToken
+import java.lang.reflect.Type
+import kotlin.io.path.Path
 import net.minecraft.resource.ResourceType
 import net.minecraft.server.network.ServerPlayerEntity
+import net.minecraft.text.MutableText
+import net.minecraft.util.Identifier
 
 /**
  * Registry for all known Abilities
  */
-object Abilities : DataRegistry {
-
+object Abilities : JsonDataRegistry<AbilityTemplate> {
     override val id = cobblemonResource("abilities")
     override val type = ResourceType.SERVER_DATA
     override val observable = SimpleObservable<Abilities>()
+    override val typeToken: TypeToken<AbilityTemplate> = TypeToken.get(AbilityTemplate::class.java)
+    override val resourcePath = "abilities"
+    override val gson: Gson = GsonBuilder()
+        .disableHtmlEscaping()
+        .setLenient()
+        .setPrettyPrinting()
+        .registerTypeAdapter(MutableText::class.java, MutableTextAdapter)
+        .create()
 
     val DUMMY = AbilityTemplate(name = "dummy")
 
+    private val allAbilities = mutableListOf<AbilityTemplate>()
     private val abilityMap = mutableMapOf<String, AbilityTemplate>()
 
-    override fun reload(manager: ResourceManager) {
+    object MutableTextAdapter : JsonDeserializer<MutableText> {
+        override fun deserialize(json: JsonElement, type: Type, ctx: JsonDeserializationContext) = json.asString.asTranslated()
+    }
+
+    override fun reload(data: Map<Identifier, AbilityTemplate>) {
         PotentialAbility.types.clear()
         PotentialAbility.types.add(CommonAbilityType)
         PotentialAbility.types.add(HiddenAbilityType)
-        this.abilityMap.clear()
-        val abilitiesJson = ShowdownService.get().getAbilityIds()
-        for (i in 0 until abilitiesJson.size()) {
-            val id = abilitiesJson[i].asString
-            val ability = AbilityTemplate(id)
-            this.register(ability)
+
+        allAbilities.clear()
+        abilityMap.clear()
+
+        data.forEach { (identifier, abilityTemplate) ->
+            allAbilities.add(abilityTemplate)
+            abilityMap[identifier.path] = abilityTemplate
         }
-        Cobblemon.LOGGER.info("Loaded {} abilities", this.abilityMap.size)
+
+        Cobblemon.LOGGER.info("Loaded {} abilities", this.allAbilities.size)
         this.observable.emit(this)
     }
 
@@ -52,19 +75,14 @@ object Abilities : DataRegistry {
     }
 
     fun register(ability: AbilityTemplate): AbilityTemplate {
-        this.abilityMap[ability.name.lowercase()] = ability
+        abilityMap[ability.name.lowercase()] = ability
+        allAbilities.add(ability)
         return ability
     }
 
-    fun all() = this.abilityMap.values.toList()
-    fun first() = this.abilityMap.values.first()
+    fun all() = allAbilities.toList()
+    fun first() = allAbilities.first()
     fun get(name: String) = abilityMap[name.lowercase()]
-    fun getOrException(name: String) = get(name) ?: throw IllegalArgumentException("Unable to find ability of name: $name")
-    fun count() = this.abilityMap.size
-
-    internal fun receiveSyncPacket(abilities: Collection<AbilityTemplate>) {
-        this.abilityMap.clear()
-        abilities.forEach { ability -> this.register(ability) }
-    }
-
+    fun getOrException(name: String) = get(name)!!
+    fun count() = allAbilities.size
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Cobblemon Contributors
+ * Copyright (C) 2022 Cobblemon Contributors
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -8,10 +8,10 @@
 
 package com.cobblemon.mod.common.api.abilities
 
-import com.cobblemon.mod.common.api.Priority
 import com.cobblemon.mod.common.util.DataKeys
 import com.google.gson.JsonObject
 import net.minecraft.nbt.NbtCompound
+import net.minecraft.text.MutableText
 
 /**
  * Representing an Ability with all its attributes
@@ -21,60 +21,27 @@ import net.minecraft.nbt.NbtCompound
  * @author Qu
  * @since January 9th, 2022
  */
-open class Ability internal constructor(var template: AbilityTemplate, var forced: Boolean) {
+open class Ability internal constructor(var template: AbilityTemplate) {
 
     val name: String
         get() = template.name
 
-    val displayName: String
+    val displayName: MutableText
         get() = template.displayName
 
-    val description: String
+    val description: MutableText
         get() = template.description
 
-    /**
-     * This represents the last known index of this backing ability in the species data.
-     * 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
-
-    /**
-     * The last known priority of this ability in the species data.
-     * The value can be mutated however this is not recommended by API users.
-     */
-    var priority = Priority.LOWEST
-
     open fun saveToNBT(nbt: NbtCompound): NbtCompound {
         nbt.putString(DataKeys.POKEMON_ABILITY_NAME, name)
-        nbt.putBoolean(DataKeys.POKEMON_ABILITY_FORCED, forced)
-        nbt.putInt(DataKeys.POKEMON_ABILITY_INDEX, index)
-        nbt.putString(DataKeys.POKEMON_ABILITY_PRIORITY, priority.name)
         return nbt
     }
 
     open fun saveToJSON(json: JsonObject): JsonObject {
         json.addProperty(DataKeys.POKEMON_ABILITY_NAME, name)
-        json.addProperty(DataKeys.POKEMON_ABILITY_FORCED, forced)
-        json.addProperty(DataKeys.POKEMON_ABILITY_INDEX, index)
-        json.addProperty(DataKeys.POKEMON_ABILITY_PRIORITY, priority.name)
         return json
     }
 
-    open fun loadFromNBT(nbt: NbtCompound): Ability {
-        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 {
-        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
-    }
+    open fun loadFromNBT(nbt: NbtCompound) =  this
+    open fun loadFromJSON(json: JsonObject) = this
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Cobblemon Contributors
+ * Copyright (C) 2022 Cobblemon Contributors
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -22,17 +22,15 @@ import com.cobblemon.mod.common.pokemon.Species
  * @since July 28th, 2022
  */
 open class AbilityPool : PrioritizedList<PotentialAbility>() {
-    fun select(species: Species, aspects: Set<String>): Pair<Ability, Priority> {
+    fun select(species: Species, aspects: Set<String>): Ability {
         for (priority in Priority.values()) {
             val potentialAbilities = priorityMap[priority]?.filter { it.isSatisfiedBy(aspects) } ?: continue
             if (potentialAbilities.isNotEmpty()) {
-                return potentialAbilities.random().template.create() to priority
+                return potentialAbilities.random().template.create()
             }
         }
 
         LOGGER.error("Unable to select an ability from the pool for $species and aspects: ${aspects.joinToString()}")
-        LOGGER.error("Usually this happens when a client is doing logic it shouldn't. Please show this to the Cobblemon developers!")
-        Exception().printStackTrace()
-        return Abilities.first().create() to Priority.LOWEST
+        return Abilities.first().create()
     }
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Cobblemon Contributors
+ * Copyright (C) 2022 Cobblemon Contributors
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -8,8 +8,10 @@
 
 package com.cobblemon.mod.common.api.abilities
 
+import com.cobblemon.mod.common.util.lang
 import com.google.gson.JsonObject
 import net.minecraft.nbt.NbtCompound
+import net.minecraft.text.MutableText
 
 /**
  * This represents the base of an Ability.
@@ -19,14 +21,14 @@ import net.minecraft.nbt.NbtCompound
  */
 class AbilityTemplate(
     val name: String = "",
-    var builder: (AbilityTemplate, forced: Boolean) -> Ability = { template, forced -> Ability(template, forced) },
-    val displayName: String = "cobblemon.ability.$name",
-    val description: String = "cobblemon.ability.$name.desc"
+    var builder: (AbilityTemplate) -> Ability = { Ability(it) },
+    val displayName: MutableText = lang("ability.$name"),
+    val description: MutableText = lang("ability.$name.desc")
 ) {
     /**
      * Returns the Ability or if applicable the extension connected to this template
      */
-    fun create(forced: Boolean = false) = builder(this, forced)
+    fun create() = builder(this)
 
 
     /**
@@ -34,12 +36,12 @@ class AbilityTemplate(
      *
      * Ability extensions need to write and read their needed data from here.
      */
-    fun create(nbt: NbtCompound) = create().loadFromNBT(nbt)
+    fun create(nbt: NbtCompound) = builder(this).loadFromNBT(nbt)
 
     /**
      * Returns the Ability and loads the given JSON object into it.
      *
      * Ability extensions need to write and read their needed data from here.
      */
-    fun create(json: JsonObject) = create().loadFromJSON(json)
+    fun create(json: JsonObject) = builder(this).loadFromJSON(json)
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Cobblemon Contributors
+ * Copyright (C) 2022 Cobblemon Contributors
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

common/src/main/kotlin/com/cobblemon/mod/common/api/ai/SleepDepth.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Cobblemon Contributors
+ * Copyright (C) 2022 Cobblemon Contributors
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

common/src/main/kotlin/com/cobblemon/mod/common/api/apricorn/Apricorn.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Cobblemon Contributors
+ * Copyright (C) 2022 Cobblemon Contributors
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -11,9 +11,8 @@ package com.cobblemon.mod.common.api.apricorn
 import com.cobblemon.mod.common.CobblemonBlocks
 import com.cobblemon.mod.common.CobblemonItems
 import com.cobblemon.mod.common.item.ApricornItem
-import com.cobblemon.mod.common.block.ApricornBlock
-import com.cobblemon.mod.common.block.ApricornSaplingBlock
-import net.minecraft.block.MapColor
+import com.cobblemon.mod.common.world.block.ApricornBlock
+import com.cobblemon.mod.common.world.block.ApricornSaplingBlock
 import net.minecraft.item.BlockItem
 
 /**
@@ -72,14 +71,4 @@ enum class Apricorn {
         YELLOW -> CobblemonBlocks.YELLOW_APRICORN_SAPLING.get()
     }
 
-    fun mapColor(): MapColor = when(this) {
-        BLACK -> MapColor.BLACK
-        BLUE ->  MapColor.BLUE
-        GREEN ->  MapColor.GREEN
-        PINK ->  MapColor.PINK
-        RED ->  MapColor.RED
-        WHITE ->  MapColor.WHITE
-        YELLOW ->  MapColor.YELLOW
-    }
-
 }

common/src/main/kotlin/com/cobblemon/mod/common/api/asset/JsonManifestWalker.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Cobblemon Contributors
+ * Copyright (C) 2022 Cobblemon Contributors
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

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

@@ -1,194 +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.battles.interpreter
-
-import com.cobblemon.mod.common.api.battles.model.PokemonBattle
-import com.cobblemon.mod.common.api.battles.model.actor.BattleActor
-import com.cobblemon.mod.common.battles.ActiveBattlePokemon
-
-/**
- * A class responsible for parsing a raw simulator protocol message received from Showdown.
- * For more information see the [Showdown protocol](https://github.com/smogon/pokemon-showdown/blob/master/sim/SIM-PROTOCOL.md).
- *
- * @constructor Creates a battle message with the given raw message.
- *
- * @param rawMessage The raw message received from Showdown.
- *
- * @author Licious
- * @since December 31st, 2022
- */
-class BattleMessage(rawMessage: String) {
-
-    /**
-     * The ID of the action received in the message.
-     */
-    var id = ""
-        private set
-
-    /**
-     * The raw message received.
-     */
-    var rawMessage: String = rawMessage
-        private set
-
-    /**
-     * A collection of the individual arguments the message had.
-     */
-    private val args = arrayListOf<String>()
-
-    /**
-     * A collection of the optional arguments the message had.
-     */
-    private val optionalArguments = hashMapOf<String, String>()
-
-    /**
-     * Pattern to match the start of an optional argument.
-     */
-    private val optionalArgumentMatcher = Regex("^\\$OPTIONAL_ARG_START([^]]+)$OPTIONAL_ARG_END")
-
-    init {
-        this.parse(rawMessage)
-    }
-
-    /**
-     * Get an argument at the given [index].
-     *
-     * @param index The index of the expected argument.
-     * @return The argument if existing or null.
-     */
-    fun argumentAt(index: Int): String? = this.args.getOrNull(index)
-
-    /**
-     * Get an optional argument with the given [name].
-     * This returns the data of the argument only.
-     *
-     * @param name The name of the optional argument.
-     * @return The argument data if existing or null.
-     */
-    fun optionalArgument(name: String): String? = this.optionalArguments[name.lowercase()]
-
-    /**
-     * Checks if an optional argument is present.
-     * [optionalArgument] is null safe, this method is meant as a way to check 'flags' as some optional arguments contain no data.
-     *
-     * @param name The name of the optional argument.
-     * @return True if the argument is present.
-     */
-    fun hasOptionalArgument(name: String): Boolean = this.optionalArgument(name) != null
-
-    /**
-     * Clears the parsed arguments and parses the message again with the new given [rawMessage].
-     *
-     * @param rawMessage The raw message received from Showdown.
-     * @return This instance of the battle message updated.
-     */
-    fun parse(rawMessage: String): BattleMessage {
-        var message = rawMessage.trim()
-        this.id = ""
-        this.args.clear()
-        this.optionalArguments.clear()
-        this.rawMessage = message
-        if (!message.startsWith(SEPARATOR) || message == SEPARATOR) {
-            return this
-        }
-        message = this.push(message)
-        this.id = message.substringBefore(SEPARATOR)
-        message = this.push(message)
-        while (message.isNotBlank()) {
-            val currentData = message.substringBefore(SEPARATOR)
-            val optionalArgumentID = this.optionalArgumentMatcher.find(currentData)
-            if (optionalArgumentID != null) {
-                val id = optionalArgumentID.value.removePrefix(OPTIONAL_ARG_START).removeSuffix(OPTIONAL_ARG_END).lowercase()
-                val value = currentData.substringAfter(optionalArgumentID.value).trim()
-                this.optionalArguments[id] = value
-            }
-            else {
-                this.args.add(currentData)
-            }
-            message = this.push(message)
-        }
-        return this
-    }
-
-    /**
-     * Queries an argument at the given [index] for a 'pnx' that will be parsed into a [BattleActor] and [ActiveBattlePokemon].
-     *
-     * @param index The index of the argument containing the [BattleActor] and [ActiveBattlePokemon].
-     * @param battle The [PokemonBattle] being queried.
-     * @return A pair of [BattleActor] and [ActiveBattlePokemon] if the argument exists and successfully parses them otherwise null.
-     */
-    fun actorAndActivePokemon(index: Int, battle: PokemonBattle): Pair<BattleActor, ActiveBattlePokemon>? {
-        val pnx = this.argumentAt(index)?.takeIf { it.length >= 3 }?.substring(0, 3) ?: return null
-        return this.actorAndActivePokemon(pnx, battle)
-    }
-
-    /**
-     * Attempts to parse an [Effect] from an argument at the given [index].
-     *
-     * @param index The index of the expected argument.
-     * @return The parsed [Effect] or null.
-     */
-    fun effectAt(index: Int): Effect? {
-        val data = this.argumentAt(index) ?: return null
-        return Effect.parse(data)
-    }
-
-    /**
-     * Attempts to parse an [Effect] from an optional argument.
-     *
-     * @param argumentName The name of the optional argument.
-     * @return The parsed [Effect] or null.
-     */
-    fun effect(argumentName: String = "from"): Effect? {
-        val data = this.optionalArgument(argumentName) ?: return null
-        return Effect.parse(data)
-    }
-
-    /**
-     * Queries an optional argument with given [argumentName] for a 'pnx' that will be parsed into a [BattleActor] and [ActiveBattlePokemon].
-     *
-     * @param battle The [PokemonBattle] being queried.
-     * @param argumentName The name of the optional argument.
-     * @return A pair of [BattleActor] and [ActiveBattlePokemon] if the argument exists and successfully parses them otherwise null.
-     */
-    fun actorAndActivePokemonFromOptional(battle: PokemonBattle, argumentName: String = "of"): Pair<BattleActor, ActiveBattlePokemon>? {
-        val pnx = this.optionalArgument(argumentName)?.substring(0, 3) ?: return null
-        return this.actorAndActivePokemon(pnx, battle)
-    }
-
-    /**
-     * Pushes the given string down into the next argument.
-     *
-     * @param message The current state of the message.
-     * @return A substring of [message] after the first [SEPARATOR] or empty if no [SEPARATOR] remains.
-     */
-    private fun push(message: String): String = message.substringAfter(SEPARATOR, "")
-
-    /**
-     * A utility to wrap [PokemonBattle.getActorAndActiveSlotFromPNX] to make it nullable instead of throwing an exception.
-     *
-     * @param pnx The raw pnx.
-     * @param battle The [PokemonBattle] being queried.
-     * @returnA pair of [BattleActor] and [ActiveBattlePokemon] if [PokemonBattle.getActorAndActiveSlotFromPNX] executes without any exception being thrown or else null.
-     */
-    private fun actorAndActivePokemon(pnx: String, battle: PokemonBattle): Pair<BattleActor, ActiveBattlePokemon>? = try {
-        battle.getActorAndActiveSlotFromPNX(pnx)
-    } catch (_: Exception) {
-        null
-    }
-
-    companion object {
-
-        private const val SEPARATOR = "|"
-        private const val OPTIONAL_ARG_START = "["
-        private const val OPTIONAL_ARG_END = "]"
-
-    }
-
-}

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

@@ -1,145 +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.battles.interpreter
-
-import com.cobblemon.mod.common.api.abilities.Abilities
-import com.cobblemon.mod.common.api.data.ShowdownIdentifiable
-import com.cobblemon.mod.common.api.moves.Moves
-import com.cobblemon.mod.common.battles.interpreter.CobblemonEffect
-
-/**
- * A representation of an effect received from Showdown inside a [BattleMessage].
- *
- * @author Licious
- * @since December 31st, 2022
- */
-interface Effect {
-
-    /**
-     * The literal ID of this [Effect].
-     */
-    val id: String
-
-    /**
-     * The [Effect.Type] of this [Effect].
-     */
-    val type: Type
-
-    /**
-     * The raw literal data received when parsing this [Effect].
-     */
-    val rawData: String
-
-    /**
-     * Represents the type of the [Effect].
-     *
-     * @property prefix The literal prefix used to identify the type by the Showdown simulator protocol.
-     *
-     * @author Licious
-     * @since December 31st, 2022
-     */
-    enum class Type(val prefix: String) {
-
-        ABILITY("ability:"),
-        ITEM("item:"),
-        MOVE("move:"),
-        PURE(""),
-
-    }
-
-    companion object {
-
-        /**
-         * Creates an [Effect].
-         *
-         * @param id The ID of the effect, this may be validated
-         * @param type The [Effect.Type].
-         * @param rawData The received string in the battle message.
-         * @return An [Effect] containing the given data of the given [type].
-         */
-        private fun of(id: String, type: Type, rawData: String): Effect = CobblemonEffect(id, type, rawData)
-
-        /**
-         * Creates an [Effect] with type [Effect.Type.ABILITY].
-         *
-         * @param id The ID of the effect, meant to be present in [Abilities].
-         * @param rawData The received string in the battle message.
-         * @return An [Effect] containing the given data of [Effect.Type.ABILITY].
-         *
-         * @throws IllegalArgumentException If the [id] cannot be found in the [Abilities] registry.
-         */
-        fun ability(id: String, rawData: String): Effect {
-            if (Abilities.get(id) == null) {
-                throw IllegalArgumentException("Cannot instance ability effect with ID $id")
-            }
-            return of(id, Type.ABILITY, rawData)
-        }
-
-        /**
-         * Creates an [Effect] with type [Effect.Type.ITEM].
-         *
-         * @param id The ID of the effect. This should be trusted as Showdown keeps the held items on their end.
-         * @param rawData The received string in the battle message.
-         * @return An [Effect] containing the given data of [Effect.Type.ITEM].
-         */
-        fun item(id: String, rawData: String): Effect = of(id, Type.ITEM, rawData)
-
-        /**
-         * Creates an [Effect] with type [Effect.Type.MOVE].
-         *
-         * @param id The ID of the effect, meant to be present in [Moves].
-         * @param rawData The received string in the battle message.
-         * @return An [Effect] containing the given data of [Effect.Type.MOVE].
-         *
-         * @throws IllegalArgumentException If the [id] cannot be found in the [Moves] registry.
-         */
-        fun move(id: String, rawData: String): Effect {
-            if (Moves.getByName(id) == null) {
-                throw IllegalArgumentException("Cannot instance move effect with ID $id")
-            }
-            return of(id, Type.MOVE, rawData)
-        }
-
-        /**
-         * Creates a "pure" [Effect].
-         * This is the representation of a purely literal effect by Showdown.
-         *
-         * @param id The ID of the effect.
-         * @param rawData The received string in the battle message.
-         * @return An [Effect] containing the given data of [Effect.Type.PURE].
-         */
-        fun pure(id: String, rawData: String): Effect = of(id, Type.PURE, rawData)
-
-        /**
-         * Parses an [Effect] from the given [rawData].
-         *
-         * @param rawData The raw data expecting to create an [Effect].
-         * @return The parsed [Effect] or null if the raw data is blank or the parsed effect throws an [IllegalArgumentException].
-         *
-         * @throws IllegalArgumentException if the parsed type doesn't allow the resulting ID.
-         */
-        fun parse(rawData: String): Effect? {
-            if (rawData.isBlank()) {
-                return null
-            }
-            return try {
-                when {
-                    rawData.startsWith(Type.ABILITY.prefix) -> ability(rawData.lowercase().substringAfter(Type.ABILITY.prefix).replace(ShowdownIdentifiable.REGEX, ""), rawData)
-                    rawData.startsWith(Type.ITEM.prefix) -> item(rawData.lowercase().substringAfter(Type.ITEM.prefix).replace(ShowdownIdentifiable.REGEX, ""), rawData)
-                    rawData.startsWith(Type.MOVE.prefix) -> move(rawData.lowercase().substringAfter(Type.MOVE.prefix).replace(ShowdownIdentifiable.REGEX, ""), rawData)
-                    else -> pure(rawData.lowercase().replace(ShowdownIdentifiable.REGEX, ""), rawData)
-                }
-            } catch (_: Exception) {
-                null
-            }
-        }
-
-    }
-
-}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Cobblemon Contributors
+ * Copyright (C) 2022 Cobblemon Contributors
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -10,33 +10,29 @@ package com.cobblemon.mod.common.api.battles.model
 
 import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.Cobblemon.LOGGER
+import com.cobblemon.mod.common.Cobblemon.showdown
 import com.cobblemon.mod.common.CobblemonNetwork
-import com.cobblemon.mod.common.api.battles.interpreter.BattleMessage
 import com.cobblemon.mod.common.api.battles.model.actor.ActorType
 import com.cobblemon.mod.common.api.battles.model.actor.BattleActor
 import com.cobblemon.mod.common.api.battles.model.actor.EntityBackedBattleActor
 import com.cobblemon.mod.common.api.battles.model.actor.FleeableBattleActor
 import com.cobblemon.mod.common.api.net.NetworkPacket
-import com.cobblemon.mod.common.api.tags.CobblemonItemTags
-import com.cobblemon.mod.common.api.text.red
 import com.cobblemon.mod.common.api.text.yellow
 import com.cobblemon.mod.common.battles.ActiveBattlePokemon
 import com.cobblemon.mod.common.battles.BattleCaptureAction
 import com.cobblemon.mod.common.battles.BattleFormat
 import com.cobblemon.mod.common.battles.BattleRegistry
 import com.cobblemon.mod.common.battles.BattleSide
-import com.cobblemon.mod.common.battles.actor.PlayerBattleActor
 import com.cobblemon.mod.common.battles.dispatch.BattleDispatch
 import com.cobblemon.mod.common.battles.dispatch.DispatchResult
 import com.cobblemon.mod.common.battles.dispatch.GO
-import com.cobblemon.mod.common.battles.dispatch.WaitDispatch
-import com.cobblemon.mod.common.battles.runner.ShowdownService
 import com.cobblemon.mod.common.net.messages.client.battle.BattleEndPacket
-import com.cobblemon.mod.common.pokemon.evolution.progress.DefeatEvolutionProgress
+import com.cobblemon.mod.common.pokemon.feature.BattleCriticalHitsFeature
+import com.cobblemon.mod.common.util.DataKeys
 import com.cobblemon.mod.common.util.battleLang
 import com.cobblemon.mod.common.util.getPlayer
-import com.cobblemon.mod.common.util.party
-import net.minecraft.server.network.ServerPlayerEntity
+import com.google.gson.JsonArray
+import com.google.gson.JsonObject
 import java.util.UUID
 import java.util.concurrent.ConcurrentLinkedQueue
 import net.minecraft.text.Text
@@ -54,13 +50,12 @@ open class PokemonBattle(
 ) {
     /** Whether or not logging will be silenced for this battle. */
     var mute = true
-
     init {
         side1.battle = this
         side2.battle = this
         this.actors.forEach { actor ->
             actor.pokemonList.forEach { battlePokemon ->
-                battlePokemon.criticalHits = 0
+                battlePokemon.effectedPokemon.getFeature<BattleCriticalHitsFeature>(BattleCriticalHitsFeature.ID)?.reset()
             }
         }
     }
@@ -89,7 +84,6 @@ open class PokemonBattle(
 
     var dispatchResult = GO
     val dispatches = ConcurrentLinkedQueue<BattleDispatch>()
-    val afterDispatches = mutableListOf<() -> Unit>()
 
     val captureActions = mutableListOf<BattleCaptureAction>()
 
@@ -154,8 +148,17 @@ open class PokemonBattle(
     }
 
     fun writeShowdownAction(vararg messages: String) {
-        log(messages.joinToString("\n"))
-        ShowdownService.get().send(battleId, messages.toList().toTypedArray())
+        val jsonArray = JsonArray()
+        for (message in messages) {
+            jsonArray.add(message)
+        }
+        val request = JsonObject()
+        request.addProperty(DataKeys.REQUEST_TYPE, DataKeys.REQUEST_BATTLE_SEND_MESSAGE)
+        request.addProperty(DataKeys.REQUEST_BATTLE_ID, battleId.toString())
+        request.add(DataKeys.REQUEST_MESSAGES, jsonArray)
+        val json = BattleRegistry.gson.toJson(request)
+        log(json)
+        showdown.write(json)
     }
 
     fun turn(newTurnNumber: Int) {
@@ -172,33 +175,15 @@ open class PokemonBattle(
 
     fun end() {
         ended = true
-        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 }
-                faintedPokemons.forEach { faintedPokemon ->
-                    for (opponentPokemon in opponentNonFaintedPokemons) {
-                        val facedFainted = opponentPokemon.facedOpponents.contains(faintedPokemon)
-                        val defeatProgress = DefeatEvolutionProgress()
-                        val pokemon = opponentPokemon.effectedPokemon
-                        if (facedFainted && defeatProgress.shouldKeep(pokemon)) {
-                            val progress = pokemon.evolutionProxy.current().progressFirstOrCreate({ it is DefeatEvolutionProgress && it.currentProgress().target.matches(faintedPokemon.effectedPokemon) }) { defeatProgress }
-                            progress.updateProgress(DefeatEvolutionProgress.Progress(progress.currentProgress().target, progress.currentProgress().amount + 1))
-                        }
-                        val multiplier = when {
-                            // ToDo when Exp. All is implement if enabled && !facedFainted return 2.0, probably should be a configurable value too, this will have priority over the Exp. Share
-                            !facedFainted && pokemon.heldItemNoCopy().isIn(CobblemonItemTags.EXPERIENCE_SHARE) -> Cobblemon.config.experienceShareMultiplier
-                            // ToDo when Exp. All is implemented the facedFainted and else can be collapsed into the 1.0 return value
-                            facedFainted -> 1.0
-                            else -> continue
-                        }
-                        val experience = Cobblemon.experienceCalculator.calculate(opponentPokemon, faintedPokemon, multiplier)
-                        if (experience > 0) {
-                            opponent.awardExperience(opponentPokemon, experience)
-                        }
-                        Cobblemon.evYieldCalculator.calculate(opponentPokemon).forEach { (stat, amount) ->
-                            pokemon.evs.add(stat, amount)
-                        }
+        for (actor in actors) {
+            for (pokemon in actor.pokemonList.filter { it.health > 0 }) {
+                if (pokemon.facedOpponents.isNotEmpty() /* TODO exp share held item check */) {
+                    val experience = Cobblemon.experienceCalculator.calculate(pokemon)
+                    if (experience > 0) {
+                        actor.awardExperience(pokemon, (experience * Cobblemon.config.experienceMultiplier).toInt())
+                    }
+                    Cobblemon.evYieldCalculator.calculate(pokemon).forEach { (stat, amount) ->
+                        pokemon.originalPokemon.evs.add(stat, amount)
                     }
                 }
             }
@@ -223,20 +208,6 @@ open class PokemonBattle(
         sendSpectatorUpdate(packet)
     }
 
-    /**
-     * Sends a packet depending on the side of an actor.
-     *
-     * @param source The actor that triggered the necessity for this update.
-     * @param allyPacket The packet sent to the [source] and their allies.
-     * @param opponentPacket The packet sent to the opposing actors.
-     * @param spectatorsAsAlly If the spectators receive the [allyPacket] or the [opponentPacket], default is false.
-     */
-    fun sendSidedUpdate(source: BattleActor, allyPacket: NetworkPacket, opponentPacket: NetworkPacket, spectatorsAsAlly: Boolean = false) {
-        source.getSide().actors.forEach { it.sendUpdate(allyPacket) }
-        source.getSide().getOppositeSide().actors.forEach { it.sendUpdate(opponentPacket) }
-        sendSpectatorUpdate(if (spectatorsAsAlly) allyPacket else opponentPacket)
-    }
-
     fun sendToActors(packet: NetworkPacket) {
         CobblemonNetwork.sendToPlayers(actors.flatMap { it.getPlayerUUIDs().mapNotNull { it.getPlayer() } }, packet)
     }
@@ -261,13 +232,6 @@ open class PokemonBattle(
         }
     }
 
-    fun dispatchWaiting(delaySeconds: Float = 1F, dispatcher: () -> Unit) {
-        dispatch {
-            dispatcher()
-            WaitDispatch(delaySeconds)
-        }
-    }
-
     fun dispatchInsert(dispatcher: () -> Iterable<BattleDispatch>) {
         dispatch {
             val newDispatches = dispatcher()
@@ -283,21 +247,12 @@ open class PokemonBattle(
         dispatches.add(dispatcher)
     }
 
-    fun doWhenClear(action: () -> Unit) {
-        afterDispatches.add(action)
-    }
-
     fun tick() {
         while (dispatchResult.canProceed()) {
             val dispatch = dispatches.poll() ?: break
             dispatchResult = dispatch(this)
         }
 
-        if (dispatches.isEmpty()) {
-            afterDispatches.toList().forEach { it() }
-            afterDispatches.clear()
-        }
-
         if (started && isPvW && !ended) {
             checkFlee()
         }
@@ -309,18 +264,15 @@ open class PokemonBattle(
             .filterIsInstance<FleeableBattleActor>()
             .filter { it.getWorldAndPosition() != null }
             .none { pokemonActor ->
-                if (pokemonActor.fleeDistance == -1F) true
-                else {
-                    val (world, pos) = pokemonActor.getWorldAndPosition()!!
-                    val nearestPlayerActorDistance = actors.asSequence()
-                        .filter { it.type == ActorType.PLAYER }
-                        .filterIsInstance<EntityBackedBattleActor<*>>()
-                        .mapNotNull { it.entity }
-                        .filter { it.world == world }
-                        .minOfOrNull { pos.distanceTo(it.pos) }
+                val (world, pos) = pokemonActor.getWorldAndPosition()!!
+                val nearestPlayerActorDistance = actors
+                    .filter { it.type == ActorType.PLAYER }
+                    .filterIsInstance<EntityBackedBattleActor<*>>()
+                    .mapNotNull { it.entity }
+                    .filter { it.world == world }
+                    .minOfOrNull { pos.distanceTo(it.pos) }
 
-                    nearestPlayerActorDistance != null && nearestPlayerActorDistance < pokemonActor.fleeDistance
-                }
+                nearestPlayerActorDistance != null && nearestPlayerActorDistance < pokemonActor.fleeDistance
             }
 
         if (wildPokemonOutOfRange) {
@@ -341,36 +293,4 @@ open class PokemonBattle(
             actors.forEach { it.responses.clear() ; it.request = null }
         }
     }
-
-    /**
-     * 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.
-     * Logging is independent of [mute].
-     *
-     * @param message The [BattleMessage] that wasn't able to find a lang interpretation.
-     * @return The generated [Text] meant to notify the client.
-     */
-    internal fun createUnimplemented(message: BattleMessage): Text {
-        LOGGER.error("Missing interpretation on '{}' action {}", message.id, message.rawMessage)
-        return Text.literal("Missing interpretation on '${message.id}' action ${message.rawMessage}").red()
-    }
-
-    /**
-     * A variant of [createUnimplemented].
-     * This will log both the public and private message however the clients will no longer receive the full raw message in order to prevent extra information they shouldn't see.
-     *
-     * @param publicMessage The public variant of [BattleMessage] that wasn't able to find a lang interpretation.
-     * @param privateMessage The private variant of [BattleMessage] that wasn't able to find a lang interpretation.
-     * @return The generated [Text] meant to notify the client.
-     *
-     * @throws IllegalArgumentException if the [publicMessage] and [privateMessage] don't have a matching [BattleMessage.id].
-     */
-    internal fun createUnimplementedSplit(publicMessage: BattleMessage, privateMessage: BattleMessage): Text {
-        if (publicMessage.id != privateMessage.id) {
-            throw IllegalArgumentException("Messages do not match")
-        }
-        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()
-    }
-
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Cobblemon Contributors
+ * Copyright (C) 2022 Cobblemon Contributors
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Cobblemon Contributors
+ * Copyright (C) 2022 Cobblemon Contributors
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Cobblemon Contributors
+ * Copyright (C) 2022 Cobblemon Contributors
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -115,16 +115,6 @@ abstract class BattleActor(
     }
 
     abstract fun getName(): MutableText
-
-    /**
-     * Appends the given name to this owner as the prefix.
-     * NPC and player actors expect to append their [getName] while wild Pokémon append nothing.
-     *
-     * @param name The name of an object being appended, typically a Pokémon nickname received from showdown.
-     * @return A [MutableText] of the [name] append with owner prefix.
-     */
-    abstract fun nameOwned(name: String): MutableText
-
     open fun sendMessage(component: Text) {
         sendUpdate(BattleMessagePacket(component))
     }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Cobblemon Contributors
+ * Copyright (C) 2022 Cobblemon Contributors
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Cobblemon Contributors
+ * Copyright (C) 2022 Cobblemon Contributors
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Cobblemon Contributors
+ * Copyright (C) 2022 Cobblemon Contributors
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

common/src/main/kotlin/com/cobblemon/mod/common/api/codec/MappedCodec.kt

@@ -1,47 +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.codec
-
-import com.mojang.datafixers.util.Pair
-import com.mojang.serialization.Codec
-import com.mojang.serialization.DataResult
-import com.mojang.serialization.DynamicOps
-import com.mojang.serialization.codecs.PrimitiveCodec
-import com.mojang.serialization.codecs.RecordCodecBuilder
-import net.minecraft.network.PacketByteBuf
-
-class MappedCodec<A : CodecMapped, K>(
-    val codecRetriever: (K) -> Codec<out A>,
-    val keyName: String = "type",
-    val keyFromString: (String) -> K
-) : Codec<A> {
-    override fun <T> encode(input: A, ops: DynamicOps<T>, prefix: T): DataResult<T> {
-        return input.encode(ops)
-    }
-
-    override fun <T> decode(ops: DynamicOps<T>, input: T): DataResult<Pair<A, T>> {
-        val thingCodec: Codec<ThingWithType> = RecordCodecBuilder.create { instance ->
-            instance
-                .group(PrimitiveCodec.STRING.fieldOf(keyName).forGetter { it.string })
-                .apply(instance, ::ThingWithType)
-        }
-        val thingWithType = thingCodec.decode(ops, input).map { it.first }
-        val key = thingWithType.get().left().get().string
-        val codec = codecRetriever(keyFromString(key))
-        return codec.decode(ops, input).map { Pair(it.first, it.second) }
-    }
-}
-
-private class ThingWithType(val string: String)
-
-interface CodecMapped {
-    fun <T> encode(ops: DynamicOps<T>): DataResult<T>
-    fun readFromBuffer(buffer: PacketByteBuf)
-    fun writeToBuffer(buffer: PacketByteBuf)
-}

common/src/main/kotlin/com/cobblemon/mod/common/api/conditional/RegistryLikeAdapter.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Cobblemon Contributors
+ * Copyright (C) 2022 Cobblemon Contributors
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

common/src/main/kotlin/com/cobblemon/mod/common/api/conditional/RegistryLikeCondition.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Cobblemon Contributors
+ * Copyright (C) 2022 Cobblemon Contributors
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

common/src/main/kotlin/com/cobblemon/mod/common/api/conditional/RegistryLikeIdentifierCondition.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Cobblemon Contributors
+ * Copyright (C) 2022 Cobblemon Contributors
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

common/src/main/kotlin/com/cobblemon/mod/common/api/conditional/RegistryLikeTagCondition.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Cobblemon Contributors
+ * Copyright (C) 2022 Cobblemon Contributors
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

common/src/main/kotlin/com/cobblemon/mod/common/api/data/ArbitrarilyMappedSerializableCompanion.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.data
-
-import com.cobblemon.mod.common.api.codec.CodecMapped
-import com.cobblemon.mod.common.api.codec.MappedCodec
-import com.mojang.serialization.Codec
-import java.lang.IllegalArgumentException
-import net.minecraft.network.PacketByteBuf
-
-/**
- * A utility class to help give Codec support for map adapted class hierarchies.
- *
- * @author Hiroku
- * @since January 21st, 2023
- */
-abstract class ArbitrarilyMappedSerializableCompanion<T : CodecMapped, K>(
-    val keyFromString: (String) -> K,
-    val stringFromKey: (K) -> String,
-    val keyFromValue: (T) -> K
-) {
-    val codec: MappedCodec<T, K> = MappedCodec(codecRetriever = { subtypes[it]!!.codec }, keyFromString = keyFromString)
-    private val subtypes = mutableMapOf<K, RegisteredSubtype<out T>>()
-
-    fun <E : T> registerSubtype(key: K, clazz: Class<E>, codec: Codec<E>) {
-        subtypes[key] = RegisteredSubtype(clazz, codec)
-    }
-
-    fun writeToBuffer(buffer: PacketByteBuf, value: T) {
-        val typeString = stringFromKey(keyFromValue(value))
-        buffer.writeString(typeString)
-        value.writeToBuffer(buffer)
-    }
-
-    fun readFromBuffer(buffer: PacketByteBuf): T {
-        val typeString = buffer.readString()
-        val clazz = subtypes[keyFromString(typeString)]?.clazz ?: throw IllegalArgumentException("Unrecognized subtype: $typeString")
-        val value = clazz.getDeclaredConstructor().newInstance()
-        value.readFromBuffer(buffer)
-        return value
-    }
-}
-
-class RegisteredSubtype<T>(val clazz: Class<out T>, val codec: Codec<out T>)

common/src/main/kotlin/com/cobblemon/mod/common/api/data/ClientDataSynchronizer.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Cobblemon Contributors
+ * Copyright (C) 2022 Cobblemon Contributors
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

common/src/main/kotlin/com/cobblemon/mod/common/api/data/DataProvider.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Cobblemon Contributors
+ * Copyright (C) 2022 Cobblemon Contributors
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

common/src/main/kotlin/com/cobblemon/mod/common/api/data/DataRegistry.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Cobblemon Contributors
+ * Copyright (C) 2022 Cobblemon Contributors
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

common/src/main/kotlin/com/cobblemon/mod/common/api/data/JsonDataRegistry.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Cobblemon Contributors
+ * Copyright (C) 2022 Cobblemon Contributors
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

common/src/main/kotlin/com/cobblemon/mod/common/api/data/ShowdownIdentifiable.kt

@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.data
-
-/**
- * Represents an object that has a showdown ID attached to itself.
- *
- * @author Licious
- * @since January 28th, 2022
- */
-interface ShowdownIdentifiable {
-
-    /**
-     * Converts the implementation to literal Showdown ID.
-     *
-     * @return The literal Showdown ID.
-     */
-    fun showdownId(): String
-
-    companion object {
-
-        internal val REGEX = Regex("[^a-z0-9]+")
-
-    }
-
-}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Cobblemon Contributors
+ * Copyright (C) 2022 Cobblemon Contributors
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Cobblemon Contributors
+ * Copyright (C) 2022 Cobblemon Contributors
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Cobblemon Contributors
+ * Copyright (C) 2022 Cobblemon Contributors
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Cobblemon Contributors
+ * Copyright (C) 2022 Cobblemon Contributors
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Cobblemon Contributors
+ * Copyright (C) 2022 Cobblemon Contributors
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Cobblemon Contributors
+ * Copyright (C) 2022 Cobblemon Contributors
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Cobblemon Contributors
+ * Copyright (C) 2022 Cobblemon Contributors
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Cobblemon Contributors
+ * Copyright (C) 2022 Cobblemon Contributors
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Cobblemon Contributors
+ * Copyright (C) 2022 Cobblemon Contributors
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -16,5 +16,4 @@ interface PokemonSideDelegate : EntitySideDelegate<PokemonEntity> {
     fun changePokemon(pokemon: Pokemon)
     fun drop(source: DamageSource?) {}
     fun updatePostDeath() {}
-    fun handleStatus(status: Byte) {}
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Cobblemon Contributors
+ * Copyright (C) 2022 Cobblemon Contributors
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Cobblemon Contributors
+ * Copyright (C) 2022 Cobblemon Contributors
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -11,11 +11,6 @@ package com.cobblemon.mod.common.api.events
 import com.cobblemon.mod.common.api.events.battles.BattleVictoryEvent
 import com.cobblemon.mod.common.api.events.drops.LootDroppedEvent
 import com.cobblemon.mod.common.api.events.entity.EntityAttributeEvent
-import com.cobblemon.mod.common.api.events.entity.PokemonEntityLoadEvent
-import com.cobblemon.mod.common.api.events.entity.PokemonEntitySaveEvent
-import com.cobblemon.mod.common.api.events.entity.PokemonEntitySaveToWorldEvent
-import com.cobblemon.mod.common.api.events.farming.ApricornHarvestEvent
-import com.cobblemon.mod.common.api.events.item.LeftoversCreatedEvent
 import com.cobblemon.mod.common.api.events.net.MessageBuiltEvent
 import com.cobblemon.mod.common.api.events.pokemon.ExperienceGainedPostEvent
 import com.cobblemon.mod.common.api.events.pokemon.ExperienceGainedPreEvent
@@ -29,7 +24,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.interaction.ExperienceCandyUseEvent
 import com.cobblemon.mod.common.api.events.starter.StarterChosenEvent
-import com.cobblemon.mod.common.api.events.storage.ReleasePokemonEvent
 import com.cobblemon.mod.common.api.reactive.CancelableObservable
 import com.cobblemon.mod.common.api.reactive.EventObservable
 import com.cobblemon.mod.common.api.reactive.SimpleObservable
@@ -48,86 +42,41 @@ import net.minecraft.entity.LivingEntity
 import net.minecraft.server.network.ServerPlayerEntity
 
 object CobblemonEvents {
-    @JvmField
     val MESSAGE_BUILT = EventObservable<MessageBuiltEvent<*>>()
-    @JvmField
     val DATA_SYNCHRONIZED = SimpleObservable<ServerPlayerEntity>()
-    @JvmField
     val ENTITY_ATTRIBUTE = EventObservable<EntityAttributeEvent>()
-    @JvmField
     val SHOULDER_MOUNT = CancelableObservable<ShoulderMountEvent>()
-    @JvmField
     val FRIENDSHIP_UPDATED = EventObservable<FriendshipUpdatedEvent>()
-    @JvmField
     val POKEMON_FAINTED = EventObservable<PokemonFaintedEvent>()
-    @JvmField
     val EVOLUTION_ACCEPTED = CancelableObservable<EvolutionAcceptedEvent>()
-    @JvmField
     val EVOLUTION_DISPLAY = EventObservable<EvolutionDisplayEvent>()
-    @JvmField
     val EVOLUTION_COMPLETE = EventObservable<EvolutionCompleteEvent>()
 
-    @JvmField
     val POKEMON_CAPTURED = EventObservable<PokemonCapturedEvent>()
-//    @JvmField
 //    val EGG_HATCH = EventObservable<HatchEggEvent>()
-    @JvmField
     val BATTLE_VICTORY = EventObservable<BattleVictoryEvent>()
 
-    @JvmField
     val LEVEL_UP_EVENT = EventObservable<LevelUpEvent>()
 
-    @JvmField
-    val POKEMON_ENTITY_SAVE = EventObservable<PokemonEntitySaveEvent>()
-    @JvmField
-    val POKEMON_ENTITY_LOAD = CancelableObservable<PokemonEntityLoadEvent>()
-    @JvmField
-    val POKEMON_ENTITY_SAVE_TO_WORLD = CancelableObservable<PokemonEntitySaveToWorldEvent>()
-
-    @JvmField
     val EXPERIENCE_GAINED_EVENT_PRE = CancelableObservable<ExperienceGainedPreEvent>()
-    @JvmField
     val EXPERIENCE_GAINED_EVENT_POST = EventObservable<ExperienceGainedPostEvent>()
-    @JvmField
     val EXPERIENCE_CANDY_USE_PRE = CancelableObservable<ExperienceCandyUseEvent.Pre>()
-    @JvmField
     val EXPERIENCE_CANDY_USE_POST = EventObservable<ExperienceCandyUseEvent.Post>()
 
-    @JvmField
-    val POKEMON_RELEASED_EVENT_PRE = CancelableObservable<ReleasePokemonEvent.Pre>()
-    @JvmField
-    val POKEMON_RELEASED_EVENT_POST = EventObservable<ReleasePokemonEvent.Post>()
-
-    @JvmField
     val LOOT_DROPPED = CancelableObservable<LootDroppedEvent>()
-    @JvmField
     val STARTER_CHOSEN = CancelableObservable<StarterChosenEvent>()
 
-    @JvmField
-    val APRICORN_HARVESTED = EventObservable<ApricornHarvestEvent>()
-    @JvmField
-    val LEFTOVERS_CREATED = CancelableObservable<LeftoversCreatedEvent>()
-
-    @JvmField
     val SERVER_STARTING = LifecycleEvent.SERVER_STARTING.asServerObservable()
-    @JvmField
     val SERVER_STOPPING = LifecycleEvent.SERVER_STOPPING.asServerObservable()
 
-    @JvmField
     val SERVER_STARTED = LifecycleEvent.SERVER_STARTED.asServerObservable()
-    @JvmField
     val SERVER_STOPPED = LifecycleEvent.SERVER_STOPPED.asServerObservable()
 
-    @JvmField
     val TICK_PRE = TickEvent.SERVER_PRE.asTickObservable()
-    @JvmField
     val TICK_POST = TickEvent.SERVER_POST.asTickObservable()
 
-    @JvmField
     val PLAYER_JOIN = PlayerEvent.PLAYER_JOIN.asObservable<PlayerJoin, ServerPlayerEntity> { obs -> PlayerJoin { obs.emit(it) } }
-    @JvmField
     val PLAYER_QUIT = PlayerEvent.PLAYER_QUIT.asObservable<PlayerQuit, ServerPlayerEntity> { obs -> PlayerQuit { obs.emit(it) } }
 
-    @JvmField
     val LIVING_DEATH = EntityEvent.LIVING_DEATH.asObservable<LivingDeath, LivingEntity> { obs -> LivingDeath { entity, source -> obs.emit(entity); EventResult.pass() } }
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Cobblemon Contributors
+ * Copyright (C) 2022 Cobblemon Contributors
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Cobblemon Contributors
+ * Copyright (C) 2022 Cobblemon Contributors
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Cobblemon Contributors
+ * Copyright (C) 2022 Cobblemon Contributors
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

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

@@ -1,29 +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.entity
-
-import com.cobblemon.mod.common.api.events.Cancelable
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
-import net.minecraft.nbt.NbtCompound
-
-/**
- * An event fired when a [PokemonEntity] is being loaded from NBT. This could be from sending a Pokémon
- * through a portal or saved into the world. Subscribers to this event should read from the NBT and apply
- * any changes that are relevant to the entity.
- *
- * Cancelling this event will dispose of the Pokémon after it loads. Use this when the existence of this
- * entity is no longer appropriate, such as if it was an event Pokémon that has expired.
- *
- * @property pokemonEntity The entity being loaded from NBT. All other native loading has been done by this time.
- * @property nbt The NBT the entity is being loaded from.
- *
- * @author Hiroku
- * @since January 7th, 2022
- */
-data class PokemonEntityLoadEvent(val pokemonEntity: PokemonEntity, val nbt: NbtCompound) : Cancelable()

common/src/main/kotlin/com/cobblemon/mod/common/api/events/entity/PokemonEntitySaveEvent.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.events.entity
-
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
-import net.minecraft.nbt.NbtCompound
-
-/**
- * Event fired when a Pokémon is being saved to NBT. This could be for
- * teleporting across worlds or for saving to the world or probably other
- * things.
- *
- * This event exists so that you can save additional information about a
- * Pokémon into entity NBT so that you can handle the [PokemonEntityLoadEvent]
- * later and restore that unique state. For example, an entity might be some
- * kind of boss, and you want to restore those properties after a world
- * reload.
- *
- * @property pokemonEntity The Pokémon entity being saved.
- * @property nbt The [NbtCompound] that the Pokémon is being saved to.
- *      You should add or remove from this for whatever you
- *      want to accomplish. The existing contents will be all
- *      of what Cobblemon saves natively.
- *
- * @author Hiroku
- * @since January 6th, 2023
- */
-data class PokemonEntitySaveEvent(val pokemonEntity: PokemonEntity, val nbt: NbtCompound)

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

@@ -1,21 +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.entity
-
-import com.cobblemon.mod.common.api.events.Cancelable
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
-
-/**
- * Event fired when a Pokémon is about to be saved to the world. Cancel this event if the Pokémon
- * should not be saved to the world.
- *
- * @author Hiroku
- * @since January 7th, 2022
- */
-class PokemonEntitySaveToWorldEvent(val pokemonEntity: PokemonEntity) : Cancelable()

common/src/main/kotlin/com/cobblemon/mod/common/api/events/farming/ApricornHarvestEvent.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.events.farming
-
-import net.minecraft.block.BlockState
-import net.minecraft.server.network.ServerPlayerEntity
-import net.minecraft.server.world.ServerWorld
-import net.minecraft.util.math.BlockPos
-
-/**
- * Event fired when an Apricorn is harvested.
- */
-class ApricornHarvestEvent(
-    val player: ServerPlayerEntity,
-    val world: ServerWorld,
-    val pos: BlockPos
-) {
-    fun getBlock(): BlockState {
-        return world.getBlockState(pos)
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/api/events/item/LeftoversCreatedEvent.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.events.item
-
-import com.cobblemon.mod.common.api.events.Cancelable
-import net.minecraft.item.ItemStack
-import net.minecraft.server.network.ServerPlayerEntity
-
-/**
- * Fired when eating an apple triggers the creation of a Leftovers. The stack that will be given
- * can be changed via [leftovers]. Cancelling the event will prevent a Leftovers from being given.
- *
- * @author Hiroku
- * @since March 11th, 2023
- */
-class LeftoversCreatedEvent(val playerEntity: ServerPlayerEntity, var leftovers: ItemStack) : Cancelable()

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Cobblemon Contributors
+ * Copyright (C) 2022 Cobblemon Contributors
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Cobblemon Contributors
+ * Copyright (C) 2022 Cobblemon Contributors
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -15,7 +15,7 @@ import com.cobblemon.mod.common.pokemon.Pokemon
 
 /**
  * Event fired when experience is about to be gained. Cancelling this event prevents
- * any experience being added, and the amount of experience can be changed from [experience].
+ * any experience being added, and the amount of experience cna be hcanged from [experience].
  *
  * @author Hiroku
  * @since August 5th, 2022

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Cobblemon Contributors
+ * Copyright (C) 2022 Cobblemon Contributors
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Cobblemon Contributors
+ * Copyright (C) 2022 Cobblemon Contributors
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Cobblemon Contributors
+ * Copyright (C) 2022 Cobblemon Contributors
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this