cleanup

# Conflicts:
#	common/src/main/kotlin/com/cobblemon/mod/common/client/gui/pc/PCGUI.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/client/gui/pc/StorageWidget.kt

CHANGELOG.md

@@ -2,6 +2,7 @@
 ## [1.8.3 (MONTH xth, 2026)](#1-8-3)
 
 ### Additions
+- You can now drag to select multiple Pokémon inside the PC menu.
 
 ### Pokémon Added
 #### Generation 4
@@ -21,8 +22,6 @@
 ### Animation updates for the following Pokémon
 
 ### Changes
-- Changed the Misc icon in the Campfire Pot Recipe Book to Health Candy
-- Moved EXP Candies from the Medicine recipe book category to the Misc category
 
 ### Fixes
 - Fixed datapacks with item interaction evolutions that don't specify an item crashing the world on load.
@@ -36,16 +35,9 @@
 - Fixed conflicts with other mods that would make use of recipe books in certain ways (Farmer's Delight Cooking Pot)
 - Fixed Pokémon battles stalling when a sidemod cancels the `THROWN_POKEBALL_HIT` hit event
 - Fixed choice feature tab completion in `spawnpokemon/pokegive/pokeedit` commands
-- Fixed MoLang that's targeting players intermittedly failing when they have died, needing them to relog
-- Fixed all pots of mod on NeoForge
-- Fixed party overlay not hiding when player opens the pokedex scanner 
-- Added compat for AppleSkin
 
 ### Developer
 - Bumped NeoForge to `21.1.195` to get access to MixinExtras `0.5` and the expressions annotation
-- New Platform Event `PLAYER_RESPAWN` which is fired when a player respawns (either through death or returning from the end)
-- Platform Events `SERVER_PLAYER_TICK_PRE` and `SERVER_PLAYER_TICK_POST` no longer fire when the player is dead
-  - it is now tied much closer to the actual entity rather than the player (or their connection)
 
 ### Molang & Datapacks
 - Fixed `q.pokemon.nature` returning class instance instead of proper string value (`cobblemon:adamant`)

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

@@ -60,8 +60,6 @@ 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.PlayerInstancedDataStoreManager
 import com.cobblemon.mod.common.api.storage.player.PlayerInstancedDataStoreTypes
-import com.cobblemon.mod.common.api.storage.player.adapter.BadgeMongoBackend
-import com.cobblemon.mod.common.api.storage.player.adapter.BadgeNbtBackend
 import com.cobblemon.mod.common.api.storage.player.adapter.DexDataMongoBackend
 import com.cobblemon.mod.common.api.storage.player.adapter.DexDataNbtBackend
 import com.cobblemon.mod.common.api.storage.player.adapter.PlayerDataJsonBackend
@@ -262,9 +260,6 @@ object Cobblemon {
             RequestManager.onLogoff(it.player)
             serverPlayerStructs.remove(it.player.uuid)
         }
-        PlatformEvents.PLAYER_RESPAWN.subscribe {
-            serverPlayerStructs.remove(it.player.uuid)
-        }
         PlatformEvents.PLAYER_DEATH.subscribe {
             PCLinkManager.removeLink(it.player.uuid)
             battleRegistry.getBattleByParticipatingPlayer(it.player)?.stop()
@@ -393,13 +388,10 @@ object Cobblemon {
 
                     val tmMoveFactory = CachedPlayerDataStoreFactory(TMMoveNbtBackend())
                     tmMoveFactory.setup(server)
-                    val badgeFactory = CachedPlayerDataStoreFactory(BadgeNbtBackend())
-                    badgeFactory.setup(server)
 
                     playerDataManager.setFactory(generalJsonFactory, PlayerInstancedDataStoreTypes.GENERAL)
                     playerDataManager.setFactory(pokedexNbtFactory, PlayerInstancedDataStoreTypes.POKEDEX)
                     playerDataManager.setFactory(tmMoveFactory, PlayerInstancedDataStoreTypes.TM_MOVES)
-                    playerDataManager.setFactory(badgeFactory, PlayerInstancedDataStoreTypes.BADGES)
 
                     if (config.storageFormat == "nbt") {
                         NBTStoreAdapter(pokemonStoreRoot.absolutePath, useNestedFolders = true, folderPerClass = true)
@@ -430,15 +422,10 @@ object Cobblemon {
                                 TMMoveMongoBackend(mongoClient, config.mongoDBDatabaseName, "TMMovesCollection")
                         )
                         tmMovesMongoFactory.setup(server)
-                        val badgesMongoFactory = CachedPlayerDataStoreFactory(
-                            BadgeMongoBackend(mongoClient, config.mongoDBDatabaseName, "BadgesCollection")
-                        )
-                        badgesMongoFactory.setup(server)
 
                         playerDataManager.setFactory(generalMongoFactory, PlayerInstancedDataStoreTypes.GENERAL)
                         playerDataManager.setFactory(pokedexMongoFactory, PlayerInstancedDataStoreTypes.POKEDEX)
                         playerDataManager.setFactory(tmMovesMongoFactory, PlayerInstancedDataStoreTypes.TM_MOVES)
-                        playerDataManager.setFactory(badgesMongoFactory, PlayerInstancedDataStoreTypes.BADGES)
                         MongoDBStoreAdapter(mongoClient, config.mongoDBDatabaseName)
                     } catch (e: ClassNotFoundException) {
                         LOGGER.error("MongoDB driver not found.")
@@ -623,7 +610,6 @@ object Cobblemon {
         this.implementation.registerCommandArgument(cobblemonResource("transform_type"), TransformTypeArgumentType::class, SingletonArgumentInfo.contextFree(TransformTypeArgumentType::transformType))
         this.implementation.registerCommandArgument(cobblemonResource("model_part"), ModelPartArgumentType::class, SingletonArgumentInfo.contextFree(ModelPartArgumentType::modelPart))
         this.implementation.registerCommandArgument(cobblemonResource("tm"), TmArgumentType::class, SingletonArgumentInfo.contextFree(TmArgumentType::tm))
-        this.implementation.registerCommandArgument(cobblemonResource("badge"), BadgeArgumentType::class, SingletonArgumentInfo.contextFree(BadgeArgumentType::badge))
     }
 
 }

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

@@ -845,35 +845,54 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<
     @JvmField
     val PEP_UP_FLOWER = this.create("pep_up_flower", FlowerBlock(MobEffects.LEVITATION, 10F, BlockBehaviour.Properties.of().mapColor(MapColor.PLANT).noCollission().instabreak().sound(SoundType.GRASS).offsetType(BlockBehaviour.OffsetType.XZ).pushReaction(PushReaction.DESTROY)))
     @JvmField
+    val POTTED_PEP_UP_FLOWER = this.create("potted_pep_up_flower", BlocksInvoker.createFlowerPotBlock(PEP_UP_FLOWER))
+    @JvmField
     val HEARTY_GRAINS = this.create("hearty_grains", HeartyGrainsBlock(BlockBehaviour.Properties.of().pushReaction(PushReaction.DESTROY).ignitedByLava().mapColor(MapColor.PLANT).noCollission().randomTicks().instabreak()))
+
     @JvmField
     val GALARICA_NUT_BUSH = this.create("galarica_nut_bush", NutBushBlock(BlockBehaviour.Properties.of().mapColor(MapColor.PLANT).randomTicks().noCollission().sound(SoundType.SWEET_BERRY_BUSH).pushReaction(PushReaction.DESTROY)))
 
+    @JvmField
+    val POTTED_RED_APRICORN_SAPLING = this.create("potted_red_apricorn_sapling", BlocksInvoker.createFlowerPotBlock(RED_APRICORN_SAPLING))
+    @JvmField
+    val POTTED_YELLOW_APRICORN_SAPLING = this.create("potted_yellow_apricorn_sapling", BlocksInvoker.createFlowerPotBlock(YELLOW_APRICORN_SAPLING))
+    @JvmField
+    val POTTED_GREEN_APRICORN_SAPLING = this.create("potted_green_apricorn_sapling", BlocksInvoker.createFlowerPotBlock(GREEN_APRICORN_SAPLING))
+    @JvmField
+    val POTTED_BLUE_APRICORN_SAPLING = this.create("potted_blue_apricorn_sapling", BlocksInvoker.createFlowerPotBlock(BLUE_APRICORN_SAPLING))
+    @JvmField
+    val POTTED_PINK_APRICORN_SAPLING = this.create("potted_pink_apricorn_sapling", BlocksInvoker.createFlowerPotBlock(PINK_APRICORN_SAPLING))
+    @JvmField
+    val POTTED_BLACK_APRICORN_SAPLING = this.create("potted_black_apricorn_sapling", BlocksInvoker.createFlowerPotBlock(BLACK_APRICORN_SAPLING))
+    @JvmField
+    val POTTED_WHITE_APRICORN_SAPLING = this.create("potted_white_apricorn_sapling", BlocksInvoker.createFlowerPotBlock(WHITE_APRICORN_SAPLING))
+    @JvmField
+    val POTTED_SACCHARINE_SAPLING = this.create("potted_saccharine_sapling", BlocksInvoker.createFlowerPotBlock(SACCHARINE_SAPLING))
 
     @JvmField
     val RED_MINT_LEAF_LITTER = this.mintLitter("red_mint_leaf_litter", MapColor.COLOR_RED)
     @JvmField
-    val POTTED_RED_MINT = this.flowerPot("potted_red_mint", RED_MINT_LEAF_LITTER)
+    val POTTED_RED_MINT = this.pottedPlant("potted_red_mint", RED_MINT_LEAF_LITTER)
     @JvmField
     val BLUE_MINT_LEAF_LITTER = this.mintLitter("blue_mint_leaf_litter", MapColor.COLOR_BLUE)
     @JvmField
-    val POTTED_BLUE_MINT = this.flowerPot("potted_blue_mint", BLUE_MINT_LEAF_LITTER)
+    val POTTED_BLUE_MINT = this.pottedPlant("potted_blue_mint", BLUE_MINT_LEAF_LITTER)
     @JvmField
     val CYAN_MINT_LEAF_LITTER = this.mintLitter("cyan_mint_leaf_litter", MapColor.COLOR_CYAN)
     @JvmField
-    val POTTED_CYAN_MINT = this.flowerPot("potted_cyan_mint", CYAN_MINT_LEAF_LITTER)
+    val POTTED_CYAN_MINT = this.pottedPlant("potted_cyan_mint", CYAN_MINT_LEAF_LITTER)
     @JvmField
     val PINK_MINT_LEAF_LITTER = this.mintLitter("pink_mint_leaf_litter", MapColor.COLOR_PINK)
     @JvmField
-    val POTTED_PINK_MINT = this.flowerPot("potted_pink_mint", PINK_MINT_LEAF_LITTER)
+    val POTTED_PINK_MINT = this.pottedPlant("potted_pink_mint", PINK_MINT_LEAF_LITTER)
     @JvmField
     val GREEN_MINT_LEAF_LITTER = this.mintLitter("green_mint_leaf_litter", MapColor.COLOR_GREEN)
     @JvmField
-    val POTTED_GREEN_MINT = this.flowerPot("potted_green_mint", GREEN_MINT_LEAF_LITTER)
+    val POTTED_GREEN_MINT = this.pottedPlant("potted_green_mint", GREEN_MINT_LEAF_LITTER)
     @JvmField
     val WHITE_MINT_LEAF_LITTER = this.mintLitter("white_mint_leaf_litter", MapColor.SNOW)
     @JvmField
-    val POTTED_WHITE_MINT = this.flowerPot("potted_white_mint", WHITE_MINT_LEAF_LITTER)
+    val POTTED_WHITE_MINT = this.pottedPlant("potted_white_mint", WHITE_MINT_LEAF_LITTER)
 
     @JvmField
     val LOBAILA = this.create("lobaila", LobailaFlowerBlock(BlockBehaviour.Properties.of().mapColor(MapColor.PLANT).noCollission().instabreak().sound(SoundType.GRASS).offsetType(BlockBehaviour.OffsetType.XZ).ignitedByLava().pushReaction(PushReaction.DESTROY)))
@@ -1085,163 +1104,145 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<
     //val BINDING_SOIL = this.create("binding_soil", BindingSoilBlock(BlockBehaviour.Properties.of()))
 
     @JvmField
-    val POTTED_AGUAV_BERRY = this.flowerPot("potted_aguav_berry", AGUAV_BERRY)
+    val POTTED_AGUAV_BERRY = this.create("potted_aguav_berry", BlocksInvoker.createFlowerPotBlock(AGUAV_BERRY))
     @JvmField
-    val POTTED_APICOT_BERRY = this.flowerPot("potted_apicot_berry", APICOT_BERRY)
+    val POTTED_APICOT_BERRY = this.create("potted_apicot_berry", BlocksInvoker.createFlowerPotBlock(APICOT_BERRY))
     @JvmField
-    val POTTED_ASPEAR_BERRY = this.flowerPot("potted_aspear_berry", ASPEAR_BERRY)
+    val POTTED_ASPEAR_BERRY = this.create("potted_aspear_berry", BlocksInvoker.createFlowerPotBlock(ASPEAR_BERRY))
     @JvmField
-    val POTTED_BABIRI_BERRY = this.flowerPot("potted_babiri_berry", BABIRI_BERRY)
+    val POTTED_BABIRI_BERRY = this.create("potted_babiri_berry", BlocksInvoker.createFlowerPotBlock(BABIRI_BERRY))
     @JvmField
-    val POTTED_BELUE_BERRY = this.flowerPot("potted_belue_berry", BELUE_BERRY)
+    val POTTED_BELUE_BERRY = this.create("potted_belue_berry", BlocksInvoker.createFlowerPotBlock(BELUE_BERRY))
     @JvmField
-    val POTTED_BLUK_BERRY = this.flowerPot("potted_bluk_berry", BLUK_BERRY)
+    val POTTED_BLUK_BERRY = this.create("potted_bluk_berry", BlocksInvoker.createFlowerPotBlock(BLUK_BERRY))
     @JvmField
-    val POTTED_CHARTI_BERRY = this.flowerPot("potted_charti_berry", CHARTI_BERRY)
+    val POTTED_CHARTI_BERRY = this.create("potted_charti_berry", BlocksInvoker.createFlowerPotBlock(CHARTI_BERRY))
     @JvmField
-    val POTTED_CHERI_BERRY = this.flowerPot("potted_cheri_berry", CHERI_BERRY)
+    val POTTED_CHERI_BERRY = this.create("potted_cheri_berry", BlocksInvoker.createFlowerPotBlock(CHERI_BERRY))
     @JvmField
-    val POTTED_CHESTO_BERRY = this.flowerPot("potted_chesto_berry", CHESTO_BERRY)
+    val POTTED_CHESTO_BERRY = this.create("potted_chesto_berry", BlocksInvoker.createFlowerPotBlock(CHESTO_BERRY))
     @JvmField
-    val POTTED_CHILAN_BERRY = this.flowerPot("potted_chilan_berry", CHILAN_BERRY)
+    val POTTED_CHILAN_BERRY = this.create("potted_chilan_berry", BlocksInvoker.createFlowerPotBlock(CHILAN_BERRY))
     @JvmField
-    val POTTED_CHOPLE_BERRY = this.flowerPot("potted_chople_berry", CHOPLE_BERRY)
+    val POTTED_CHOPLE_BERRY = this.create("potted_chople_berry", BlocksInvoker.createFlowerPotBlock(CHOPLE_BERRY))
     @JvmField
-    val POTTED_COBA_BERRY = this.flowerPot("potted_coba_berry", COBA_BERRY)
+    val POTTED_COBA_BERRY = this.create("potted_coba_berry", BlocksInvoker.createFlowerPotBlock(COBA_BERRY))
     @JvmField
-    val POTTED_COLBUR_BERRY = this.flowerPot("potted_colbur_berry", COLBUR_BERRY)
+    val POTTED_COLBUR_BERRY = this.create("potted_colbur_berry", BlocksInvoker.createFlowerPotBlock(COLBUR_BERRY))
     @JvmField
-    val POTTED_CORNN_BERRY = this.flowerPot("potted_cornn_berry", CORNN_BERRY)
+    val POTTED_CORNN_BERRY = this.create("potted_cornn_berry", BlocksInvoker.createFlowerPotBlock(CORNN_BERRY))
     @JvmField
-    val POTTED_CUSTAP_BERRY = this.flowerPot("potted_custap_berry", CUSTAP_BERRY)
+    val POTTED_CUSTAP_BERRY = this.create("potted_custap_berry", BlocksInvoker.createFlowerPotBlock(CUSTAP_BERRY))
     @JvmField
-    val POTTED_DURIN_BERRY = this.flowerPot("potted_durin_berry", DURIN_BERRY)
+    val POTTED_DURIN_BERRY = this.create("potted_durin_berry", BlocksInvoker.createFlowerPotBlock(DURIN_BERRY))
     @JvmField
-    val POTTED_EGGANT_BERRY = this.flowerPot("potted_eggant_berry", EGGANT_BERRY)
+    val POTTED_EGGANT_BERRY = this.create("potted_eggant_berry", BlocksInvoker.createFlowerPotBlock(EGGANT_BERRY))
     @JvmField
-    val POTTED_ENIGMA_BERRY = this.flowerPot("potted_enigma_berry", ENIGMA_BERRY)
+    val POTTED_ENIGMA_BERRY = this.create("potted_enigma_berry", BlocksInvoker.createFlowerPotBlock(ENIGMA_BERRY))
     @JvmField
-    val POTTED_FIGY_BERRY = this.flowerPot("potted_figy_berry", FIGY_BERRY)
+    val POTTED_FIGY_BERRY = this.create("potted_figy_berry", BlocksInvoker.createFlowerPotBlock(FIGY_BERRY))
     @JvmField
-    val POTTED_GANLON_BERRY = this.flowerPot("potted_ganlon_berry", GANLON_BERRY)
+    val POTTED_GANLON_BERRY = this.create("potted_ganlon_berry", BlocksInvoker.createFlowerPotBlock(GANLON_BERRY))
     @JvmField
-    val POTTED_GREPA_BERRY = this.flowerPot("potted_grepa_berry", GREPA_BERRY)
+    val POTTED_GREPA_BERRY = this.create("potted_grepa_berry", BlocksInvoker.createFlowerPotBlock(GREPA_BERRY))
     @JvmField
-    val POTTED_HABAN_BERRY = this.flowerPot("potted_haban_berry", HABAN_BERRY)
+    val POTTED_HABAN_BERRY = this.create("potted_haban_berry", BlocksInvoker.createFlowerPotBlock(HABAN_BERRY))
     @JvmField
-    val POTTED_HONDEW_BERRY = this.flowerPot("potted_hondew_berry", HONDEW_BERRY)
+    val POTTED_HONDEW_BERRY = this.create("potted_hondew_berry", BlocksInvoker.createFlowerPotBlock(HONDEW_BERRY))
     @JvmField
-    val POTTED_HOPO_BERRY = this.flowerPot("potted_hopo_berry", HOPO_BERRY)
+    val POTTED_HOPO_BERRY = this.create("potted_hopo_berry", BlocksInvoker.createFlowerPotBlock(HOPO_BERRY))
     @JvmField
-    val POTTED_IAPAPA_BERRY = this.flowerPot("potted_iapapa_berry", IAPAPA_BERRY)
+    val POTTED_IAPAPA_BERRY = this.create("potted_iapapa_berry", BlocksInvoker.createFlowerPotBlock(IAPAPA_BERRY))
     @JvmField
-    val POTTED_JABOCA_BERRY = this.flowerPot("potted_jaboca_berry", JABOCA_BERRY)
+    val POTTED_JABOCA_BERRY = this.create("potted_jaboca_berry", BlocksInvoker.createFlowerPotBlock(JABOCA_BERRY))
     @JvmField
-    val POTTED_KASIB_BERRY = this.flowerPot("potted_kasib_berry", KASIB_BERRY)
+    val POTTED_KASIB_BERRY = this.create("potted_kasib_berry", BlocksInvoker.createFlowerPotBlock(KASIB_BERRY))
     @JvmField
-    val POTTED_KEBIA_BERRY = this.flowerPot("potted_kebia_berry", KEBIA_BERRY)
+    val POTTED_KEBIA_BERRY = this.create("potted_kebia_berry", BlocksInvoker.createFlowerPotBlock(KEBIA_BERRY))
     @JvmField
-    val POTTED_KEE_BERRY = this.flowerPot("potted_kee_berry", KEE_BERRY)
+    val POTTED_KEE_BERRY = this.create("potted_kee_berry", BlocksInvoker.createFlowerPotBlock(KEE_BERRY))
     @JvmField
-    val POTTED_KELPSY_BERRY = this.flowerPot("potted_kelpsy_berry", KELPSY_BERRY)
+    val POTTED_KELPSY_BERRY = this.create("potted_kelpsy_berry", BlocksInvoker.createFlowerPotBlock(KELPSY_BERRY))
     @JvmField
-    val POTTED_LANSAT_BERRY = this.flowerPot("potted_lansat_berry", LANSAT_BERRY)
+    val POTTED_LANSAT_BERRY = this.create("potted_lansat_berry", BlocksInvoker.createFlowerPotBlock(LANSAT_BERRY))
     @JvmField
-    val POTTED_LEPPA_BERRY = this.flowerPot("potted_leppa_berry", LEPPA_BERRY)
+    val POTTED_LEPPA_BERRY = this.create("potted_leppa_berry", BlocksInvoker.createFlowerPotBlock(LEPPA_BERRY))
     @JvmField
-    val POTTED_LIECHI_BERRY = this.flowerPot("potted_liechi_berry", LIECHI_BERRY)
+    val POTTED_LIECHI_BERRY = this.create("potted_liechi_berry", BlocksInvoker.createFlowerPotBlock(LIECHI_BERRY))
     @JvmField
-    val POTTED_LUM_BERRY = this.flowerPot("potted_lum_berry", LUM_BERRY)
+    val POTTED_LUM_BERRY = this.create("potted_lum_berry", BlocksInvoker.createFlowerPotBlock(LUM_BERRY))
     @JvmField
-    val POTTED_MAGO_BERRY = this.flowerPot("potted_mago_berry", MAGO_BERRY)
+    val POTTED_MAGO_BERRY = this.create("potted_mago_berry", BlocksInvoker.createFlowerPotBlock(MAGO_BERRY))
     @JvmField
-    val POTTED_MAGOST_BERRY = this.flowerPot("potted_magost_berry", MAGOST_BERRY)
+    val POTTED_MAGOST_BERRY = this.create("potted_magost_berry", BlocksInvoker.createFlowerPotBlock(MAGOST_BERRY))
     @JvmField
-    val POTTED_MARANGA_BERRY = this.flowerPot("potted_maranga_berry", MARANGA_BERRY)
+    val POTTED_MARANGA_BERRY = this.create("potted_maranga_berry", BlocksInvoker.createFlowerPotBlock(MARANGA_BERRY))
     @JvmField
-    val POTTED_MICLE_BERRY = this.flowerPot("potted_micle_berry", MICLE_BERRY)
+    val POTTED_MICLE_BERRY = this.create("potted_micle_berry", BlocksInvoker.createFlowerPotBlock(MICLE_BERRY))
     @JvmField
-    val POTTED_NANAB_BERRY = this.flowerPot("potted_nanab_berry", NANAB_BERRY)
+    val POTTED_NANAB_BERRY = this.create("potted_nanab_berry", BlocksInvoker.createFlowerPotBlock(NANAB_BERRY))
     @JvmField
-    val POTTED_NOMEL_BERRY = this.flowerPot("potted_nomel_berry", NOMEL_BERRY)
+    val POTTED_NOMEL_BERRY = this.create("potted_nomel_berry", BlocksInvoker.createFlowerPotBlock(NOMEL_BERRY))
     @JvmField
-    val POTTED_OCCA_BERRY = this.flowerPot("potted_occa_berry", OCCA_BERRY)
+    val POTTED_OCCA_BERRY = this.create("potted_occa_berry", BlocksInvoker.createFlowerPotBlock(OCCA_BERRY))
     @JvmField
-    val POTTED_ORAN_BERRY = this.flowerPot("potted_oran_berry", ORAN_BERRY)
+    val POTTED_ORAN_BERRY = this.create("potted_oran_berry", BlocksInvoker.createFlowerPotBlock(ORAN_BERRY))
     @JvmField
-    val POTTED_PAMTRE_BERRY = this.flowerPot("potted_pamtre_berry", PAMTRE_BERRY)
+    val POTTED_PAMTRE_BERRY = this.create("potted_pamtre_berry", BlocksInvoker.createFlowerPotBlock(PAMTRE_BERRY))
     @JvmField
-    val POTTED_PASSHO_BERRY = this.flowerPot("potted_passho_berry", PASSHO_BERRY)
+    val POTTED_PASSHO_BERRY = this.create("potted_passho_berry", BlocksInvoker.createFlowerPotBlock(PASSHO_BERRY))
     @JvmField
-    val POTTED_PAYAPA_BERRY = this.flowerPot("potted_payapa_berry", PAYAPA_BERRY)
+    val POTTED_PAYAPA_BERRY = this.create("potted_payapa_berry", BlocksInvoker.createFlowerPotBlock(PAYAPA_BERRY))
     @JvmField
-    val POTTED_PECHA_BERRY = this.flowerPot("potted_pecha_berry", PECHA_BERRY)
+    val POTTED_PECHA_BERRY = this.create("potted_pecha_berry", BlocksInvoker.createFlowerPotBlock(PECHA_BERRY))
     @JvmField
-    val POTTED_PERSIM_BERRY = this.flowerPot("potted_persim_berry", PERSIM_BERRY)
+    val POTTED_PERSIM_BERRY = this.create("potted_persim_berry", BlocksInvoker.createFlowerPotBlock(PERSIM_BERRY))
     @JvmField
-    val POTTED_PETAYA_BERRY = this.flowerPot("potted_petaya_berry", PETAYA_BERRY)
+    val POTTED_PETAYA_BERRY = this.create("potted_petaya_berry", BlocksInvoker.createFlowerPotBlock(PETAYA_BERRY))
     @JvmField
-    val POTTED_PINAP_BERRY = this.flowerPot("potted_pinap_berry", PINAP_BERRY)
+    val POTTED_PINAP_BERRY = this.create("potted_pinap_berry", BlocksInvoker.createFlowerPotBlock(PINAP_BERRY))
     @JvmField
-    val POTTED_POMEG_BERRY = this.flowerPot("potted_pomeg_berry", POMEG_BERRY)
+    val POTTED_POMEG_BERRY = this.create("potted_pomeg_berry", BlocksInvoker.createFlowerPotBlock(POMEG_BERRY))
     @JvmField
-    val POTTED_QUALOT_BERRY = this.flowerPot("potted_qualot_berry", QUALOT_BERRY)
+    val POTTED_QUALOT_BERRY = this.create("potted_qualot_berry", BlocksInvoker.createFlowerPotBlock(QUALOT_BERRY))
     @JvmField
-    val POTTED_RABUTA_BERRY = this.flowerPot("potted_rabuta_berry", RABUTA_BERRY)
+    val POTTED_RABUTA_BERRY = this.create("potted_rabuta_berry", BlocksInvoker.createFlowerPotBlock(RABUTA_BERRY))
     @JvmField
-    val POTTED_RAWST_BERRY = this.flowerPot("potted_rawst_berry", RAWST_BERRY)
+    val POTTED_RAWST_BERRY = this.create("potted_rawst_berry", BlocksInvoker.createFlowerPotBlock(RAWST_BERRY))
     @JvmField
-    val POTTED_RAZZ_BERRY = this.flowerPot("potted_razz_berry", RAZZ_BERRY)
+    val POTTED_RAZZ_BERRY = this.create("potted_razz_berry", BlocksInvoker.createFlowerPotBlock(RAZZ_BERRY))
     @JvmField
-    val POTTED_RINDO_BERRY = this.flowerPot("potted_rindo_berry", RINDO_BERRY)
+    val POTTED_RINDO_BERRY = this.create("potted_rindo_berry", BlocksInvoker.createFlowerPotBlock(RINDO_BERRY))
     @JvmField
-    val POTTED_ROSELI_BERRY = this.flowerPot("potted_roseli_berry", ROSELI_BERRY)
+    val POTTED_ROSELI_BERRY = this.create("potted_roseli_berry", BlocksInvoker.createFlowerPotBlock(ROSELI_BERRY))
     @JvmField
-    val POTTED_ROWAP_BERRY = this.flowerPot("potted_rowap_berry", ROWAP_BERRY)
+    val POTTED_ROWAP_BERRY = this.create("potted_rowap_berry", BlocksInvoker.createFlowerPotBlock(ROWAP_BERRY))
     @JvmField
-    val POTTED_SALAC_BERRY = this.flowerPot("potted_salac_berry", SALAC_BERRY)
+    val POTTED_SALAC_BERRY = this.create("potted_salac_berry", BlocksInvoker.createFlowerPotBlock(SALAC_BERRY))
     @JvmField
-    val POTTED_SHUCA_BERRY = this.flowerPot("potted_shuca_berry", SHUCA_BERRY)
+    val POTTED_SHUCA_BERRY = this.create("potted_shuca_berry", BlocksInvoker.createFlowerPotBlock(SHUCA_BERRY))
     @JvmField
-    val POTTED_SITRUS_BERRY = this.flowerPot("potted_sitrus_berry", SITRUS_BERRY)
+    val POTTED_SITRUS_BERRY = this.create("potted_sitrus_berry", BlocksInvoker.createFlowerPotBlock(SITRUS_BERRY))
     @JvmField
-    val POTTED_SPELON_BERRY = this.flowerPot("potted_spelon_berry", SPELON_BERRY)
+    val POTTED_SPELON_BERRY = this.create("potted_spelon_berry", BlocksInvoker.createFlowerPotBlock(SPELON_BERRY))
     @JvmField
-    val POTTED_STARF_BERRY = this.flowerPot("potted_starf_berry", STARF_BERRY)
+    val POTTED_STARF_BERRY = this.create("potted_starf_berry", BlocksInvoker.createFlowerPotBlock(STARF_BERRY))
     @JvmField
-    val POTTED_TAMATO_BERRY = this.flowerPot("potted_tamato_berry", TAMATO_BERRY)
+    val POTTED_TAMATO_BERRY = this.create("potted_tamato_berry", BlocksInvoker.createFlowerPotBlock(TAMATO_BERRY))
     @JvmField
-    val POTTED_TANGA_BERRY = this.flowerPot("potted_tanga_berry", TANGA_BERRY)
+    val POTTED_TANGA_BERRY = this.create("potted_tanga_berry", BlocksInvoker.createFlowerPotBlock(TANGA_BERRY))
     @JvmField
-    val POTTED_TOUGA_BERRY = this.flowerPot("potted_touga_berry", TOUGA_BERRY)
+    val POTTED_TOUGA_BERRY = this.create("potted_touga_berry", BlocksInvoker.createFlowerPotBlock(TOUGA_BERRY))
     @JvmField
-    val POTTED_WACAN_BERRY = this.flowerPot("potted_wacan_berry", WACAN_BERRY)
+    val POTTED_WACAN_BERRY = this.create("potted_wacan_berry", BlocksInvoker.createFlowerPotBlock(WACAN_BERRY))
     @JvmField
-    val POTTED_WATMEL_BERRY = this.flowerPot("potted_watmel_berry", WATMEL_BERRY)
+    val POTTED_WATMEL_BERRY = this.create("potted_watmel_berry", BlocksInvoker.createFlowerPotBlock(WATMEL_BERRY))
     @JvmField
-    val POTTED_WEPEAR_BERRY = this.flowerPot("potted_wepear_berry", WEPEAR_BERRY)
+    val POTTED_WEPEAR_BERRY = this.create("potted_wepear_berry", BlocksInvoker.createFlowerPotBlock(WEPEAR_BERRY))
     @JvmField
-    val POTTED_WIKI_BERRY = this.flowerPot("potted_wiki_berry", WIKI_BERRY)
+    val POTTED_WIKI_BERRY = this.create("potted_wiki_berry", BlocksInvoker.createFlowerPotBlock(WIKI_BERRY))
     @JvmField
-    val POTTED_YACHE_BERRY = this.flowerPot("potted_yache_berry", YACHE_BERRY)
-    @JvmField
-    val POTTED_PEP_UP_FLOWER = this.flowerPot("potted_pep_up_flower", PEP_UP_FLOWER)
-    @JvmField
-    val POTTED_RED_APRICORN_SAPLING = this.flowerPot("potted_red_apricorn_sapling", RED_APRICORN_SAPLING)
-    @JvmField
-    val POTTED_YELLOW_APRICORN_SAPLING = this.flowerPot("potted_yellow_apricorn_sapling", YELLOW_APRICORN_SAPLING)
-    @JvmField
-    val POTTED_GREEN_APRICORN_SAPLING = this.flowerPot("potted_green_apricorn_sapling", GREEN_APRICORN_SAPLING)
-    @JvmField
-    val POTTED_BLUE_APRICORN_SAPLING = this.flowerPot("potted_blue_apricorn_sapling", BLUE_APRICORN_SAPLING)
-    @JvmField
-    val POTTED_PINK_APRICORN_SAPLING = this.flowerPot("potted_pink_apricorn_sapling", PINK_APRICORN_SAPLING)
-    @JvmField
-    val POTTED_BLACK_APRICORN_SAPLING = this.flowerPot("potted_black_apricorn_sapling", BLACK_APRICORN_SAPLING)
-    @JvmField
-    val POTTED_WHITE_APRICORN_SAPLING = this.flowerPot("potted_white_apricorn_sapling", WHITE_APRICORN_SAPLING)
-    @JvmField
-    val POTTED_SACCHARINE_SAPLING = this.flowerPot("potted_saccharine_sapling", SACCHARINE_SAPLING)
+    val POTTED_YACHE_BERRY = this.create("potted_yache_berry", BlocksInvoker.createFlowerPotBlock(YACHE_BERRY))
 
     init {
         /**
@@ -1345,16 +1346,7 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<
 
     fun typeGemClusters() = typeGemClusters.toMap()
 
-    private fun flowerPot(name: String, flower: Block) = this.create(
-        name,
-        FlowerPotBlock(
-            flower,
-            BlockBehaviour.Properties.of()
-                .instabreak()
-                .noOcclusion()
-                .pushReaction(PushReaction.DESTROY)
-        )
-    )
+    private fun pottedPlant(name: String, flower: Block) = this.create(name, BlocksInvoker.createFlowerPotBlock(flower))
 
     private fun mintLitter(name: String, color: MapColor) = this.create(
         name,

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

@@ -73,7 +73,6 @@ object CobblemonCommands {
         PcTakeCommand.register(dispatcher)
         GiveTmCommand.register(dispatcher)
         TmCommand.register(dispatcher)
-        BadgeCommand.register(dispatcher)
 
         // Possibly lock down registration if and only if under dev environment or running in an environment
         // with a certain system environment variable set

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

@@ -432,7 +432,6 @@ object CobblemonNetwork {
         list.add(PacketRegisterInfo(SpeciesFeatureAssignmentSyncPacket.ID, SpeciesFeatureAssignmentSyncPacket::decode, DataRegistrySyncPacketHandler()))
         list.add(PacketRegisterInfo(NaturalMaterialRegistrySyncPacket.ID, NaturalMaterialRegistrySyncPacket::decode, DataRegistrySyncPacketHandler()))
         list.add(PacketRegisterInfo(FossilRegistrySyncPacket.ID, FossilRegistrySyncPacket::decode, DataRegistrySyncPacketHandler()))
-        list.add(PacketRegisterInfo(BadgeRegistrySyncPacket.ID, BadgeRegistrySyncPacket::decode, DataRegistrySyncPacketHandler()))
         list.add(PacketRegisterInfo(NPCRegistrySyncPacket.ID, NPCRegistrySyncPacket::decode, DataRegistrySyncPacketHandler()))
         list.add(PacketRegisterInfo(PokeRodRegistrySyncPacket.ID, PokeRodRegistrySyncPacket::decode, DataRegistrySyncPacketHandler()))
         list.add(PacketRegisterInfo(ScriptRegistrySyncPacket.ID, ScriptRegistrySyncPacket::decode, DataRegistrySyncPacketHandler()))
@@ -567,6 +566,7 @@ object CobblemonNetwork {
         list.add(PacketRegisterInfo(SwapPartyPokemonPacket.ID, SwapPartyPokemonPacket::decode, SwapPartyPokemonHandler))
 
         list.add(PacketRegisterInfo(MovePCPokemonPacket.ID, MovePCPokemonPacket::decode, MovePCPokemonHandler))
+        list.add(PacketRegisterInfo(MovePCPokemonBatchPacket.ID, MovePCPokemonBatchPacket::decode, MovePCPokemonBatchHandler))
         list.add(PacketRegisterInfo(MovePartyPokemonPacket.ID, MovePartyPokemonPacket::decode, MovePartyPokemonHandler))
 
         list.add(PacketRegisterInfo(SwapPCPartyPokemonPacket.ID, SwapPCPartyPokemonPacket::decode, SwapPCPartyPokemonHandler))

common/src/main/kotlin/com/cobblemon/mod/common/api/badges/Badge.kt

@@ -1,20 +0,0 @@
-package com.cobblemon.mod.common.api.badges
-
-import net.minecraft.resources.ResourceLocation
-import net.minecraft.util.StringRepresentable
-
-class Badge(
-    identifier: ResourceLocation,
-    val name: String,
-    val texture: ResourceLocation,
-    val order: Int
-): StringRepresentable {
-
-    @Transient
-    var identifier: ResourceLocation = identifier
-        internal set
-
-    override fun getSerializedName(): String {
-        return identifier.toString()
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/api/badges/BadgeManager.kt

@@ -1,54 +0,0 @@
-package com.cobblemon.mod.common.api.badges
-
-import com.cobblemon.mod.common.Cobblemon
-import com.cobblemon.mod.common.CobblemonNetwork.sendPacket
-import com.cobblemon.mod.common.api.storage.player.InstancedPlayerData
-import com.cobblemon.mod.common.api.storage.player.PlayerInstancedDataStoreTypes
-import com.cobblemon.mod.common.api.storage.player.client.ClientBadgeManager
-import com.cobblemon.mod.common.net.messages.client.SetClientPlayerDataPacket
-import com.cobblemon.mod.common.util.getPlayer
-import com.mojang.serialization.Codec
-import com.mojang.serialization.codecs.RecordCodecBuilder
-import net.minecraft.resources.ResourceLocation
-import java.util.UUID
-
-class BadgeManager(
-    override val uuid: UUID,
-    val obtainedBadges: MutableSet<ResourceLocation> = mutableSetOf()
-) : InstancedPlayerData {
-
-    val storeType = PlayerInstancedDataStoreTypes.BADGES
-
-    override fun toClientData() = ClientBadgeManager(obtainedBadges.toMutableSet())
-
-    fun give(badge: Badge): Boolean {
-        if (!obtainedBadges.add(badge.identifier)) return false
-        syncAndSave()
-        return true
-    }
-
-    fun remove(badge: Badge): Boolean {
-        if (!obtainedBadges.remove(badge.identifier)) return false
-        syncAndSave()
-        return true
-    }
-
-    private fun syncAndSave() {
-        uuid.getPlayer()?.sendPacket(SetClientPlayerDataPacket(storeType, toClientData()))
-        Cobblemon.playerDataManager.saveSingle(this, storeType)
-    }
-
-    companion object {
-        val CODEC: Codec<BadgeManager> = RecordCodecBuilder.create { instance ->
-            instance.group(
-                Codec.STRING.xmap(UUID::fromString, UUID::toString)
-                    .fieldOf("uuid")
-                    .forGetter { it.uuid },
-                Codec.list(ResourceLocation.CODEC)
-                    .xmap({ it.toMutableSet() }, { it.toList() })
-                    .fieldOf("obtainedBadges")
-                    .forGetter { it.obtainedBadges }
-            ).apply(instance, ::BadgeManager)
-        }
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/api/badges/Badges.kt

@@ -1,64 +0,0 @@
-package com.cobblemon.mod.common.api.badges
-
-import com.cobblemon.mod.common.Cobblemon
-import com.cobblemon.mod.common.api.data.JsonDataRegistry
-import com.cobblemon.mod.common.api.reactive.SimpleObservable
-import com.cobblemon.mod.common.net.messages.client.data.BadgeRegistrySyncPacket
-import com.cobblemon.mod.common.util.adapters.IdentifierAdapter
-import com.cobblemon.mod.common.util.cobblemonResource
-import com.google.gson.Gson
-import com.google.gson.GsonBuilder
-import com.google.gson.reflect.TypeToken
-import net.minecraft.resources.ResourceLocation
-import net.minecraft.server.level.ServerPlayer
-import net.minecraft.server.packs.PackType
-
-object Badges : JsonDataRegistry<Badge> {
-
-    override val id: ResourceLocation = cobblemonResource("badges")
-    override val type: PackType = PackType.SERVER_DATA
-    override val observable = SimpleObservable<Badges>()
-
-    override val gson: Gson = GsonBuilder()
-        .disableHtmlEscaping()
-        .setPrettyPrinting()
-        .registerTypeAdapter(ResourceLocation::class.java, IdentifierAdapter)
-        .create()
-
-    override val typeToken: TypeToken<Badge> = TypeToken.get(Badge::class.java)
-    override val resourcePath: String = "badges"
-
-    private val badges = hashMapOf<ResourceLocation, Badge>()
-
-    override fun reload(data: Map<ResourceLocation, Badge>) {
-        this.badges.clear()
-        data.forEach { (id, badge) ->
-            try {
-                badge.identifier = id
-                this.badges[id] = badge
-            } catch (e: Exception) {
-                Cobblemon.LOGGER.error("Skipped loading the {} badge", id, e)
-            }
-        }
-        Cobblemon.LOGGER.info("Loaded {} badges", this.badges.size)
-        this.observable.emit(this)
-    }
-
-    override fun sync(player: ServerPlayer) {
-        BadgeRegistrySyncPacket(this.all()).sendToPlayer(player)
-    }
-
-    /**
-     * Get all loaded [Badge]s.
-     */
-    @JvmStatic
-    fun all() = this.badges.values.toList()
-
-    /**
-     * Gets a [Badge] by its [ResourceLocation].
-     * @param identifier The identifier of the badge.
-     * @return The [Badge], if loaded, otherwise null.
-     */
-    @JvmStatic
-    fun getByIdentifier(identifier: ResourceLocation): Badge? = this.badges[identifier]
-}

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

@@ -145,8 +145,6 @@ object CobblemonPermissions {
     val SPECTATE_BATTLE = this.create("${COMMAND_PREFIX}spectatebattle", PermissionLevel.ALL_COMMANDS)
     @JvmStatic
     val TECHNICAL_MACHINE = this.create("${COMMAND_PREFIX}technicalmachine", PermissionLevel.CHEAT_COMMANDS_AND_COMMAND_BLOCKS)
-    @JvmStatic
-    val BADGE = this.create("${COMMAND_PREFIX}badge", PermissionLevel.CHEAT_COMMANDS_AND_COMMAND_BLOCKS)
 
     @JvmStatic
     val SEE_HIDDEN_NPCS = this.create("seehiddennpcs", PermissionLevel.CHEAT_COMMANDS_AND_COMMAND_BLOCKS)

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

@@ -29,12 +29,8 @@ object CobblemonStats {
     @JvmField
     val BATTLES_WON: CobblemonStat = CobblemonStat("battles_won")
     @JvmField
-    val PVP_BATTLES_WON: CobblemonStat = CobblemonStat("pvp_battles_won")
-    @JvmField
     val BATTLES_LOST: CobblemonStat = CobblemonStat("battles_lost")
     @JvmField
-    val PVP_BATTLES_LOST: CobblemonStat = CobblemonStat("pvp_battles_lost")
-    @JvmField
     val BATTLES_FLED: CobblemonStat = CobblemonStat("battles_fled")
     @JvmField
     val BATTLES_TOTAL: CobblemonStat = CobblemonStat("battles_total")
@@ -72,9 +68,7 @@ object CobblemonStats {
         stats["evolved"] = EVOLVED
         stats["level_up"] = LEVEL_UP
         stats["battles_won"] = BATTLES_WON
-        stats["pvp_battles_won"] = PVP_BATTLES_WON
         stats["battles_lost"] = BATTLES_LOST
-        stats["pvp_battles_lost"] = PVP_BATTLES_LOST
         stats["battles_fled"] = BATTLES_FLED
         stats["battles_total"] = BATTLES_TOTAL
         stats["dex_entries"] = DEX_ENTRIES

common/src/main/kotlin/com/cobblemon/mod/common/api/storage/pc/PCStore.kt

@@ -29,6 +29,7 @@ import com.cobblemon.mod.common.net.messages.client.storage.pc.InitializePCPacke
 import com.cobblemon.mod.common.net.messages.client.storage.pc.MoveClientPCPokemonPacket
 import com.cobblemon.mod.common.net.messages.client.storage.pc.SetPCPokemonPacket
 import com.cobblemon.mod.common.net.messages.client.storage.pc.wallpaper.UnlockPCBoxWallpaperPacket
+import com.cobblemon.mod.common.net.messages.server.storage.pc.MovePCPokemonBatchPacket
 import com.cobblemon.mod.common.pokemon.Pokemon
 import com.cobblemon.mod.common.util.DataKeys
 import com.cobblemon.mod.common.util.asTranslated
@@ -270,6 +271,34 @@ open class PCStore(
         }
     }
 
+    fun moveBatch(moves: List<Triple<UUID, PCPosition, PCPosition>>): Boolean {
+        if (moves.isEmpty() || moves.size > MovePCPokemonBatchPacket.MAX_MOVES) return false
+        if (moves.map { it.second }.toSet().size != moves.size ||
+            moves.map { it.third }.toSet().size != moves.size ||
+            moves.map { it.first }.toSet().size != moves.size
+        ) return false
+        if (moves.any { (_, source, target) -> !isValidPosition(source) || !isValidPosition(target) }) return false
+
+        val sourcePositions = moves.mapTo(mutableSetOf()) { it.second }
+        val pokemonMoves = moves.map { (pokemonID, source, target) ->
+            val pokemon = get(source)?.takeIf { it.uuid == pokemonID } ?: return false
+            Triple(source, target, pokemon)
+        }
+        if (pokemonMoves.any { (_, target, _) -> get(target) != null && target !in sourcePositions }) return false
+
+        pokemonMoves.forEach { (source, _, _) -> setAtPosition(source, null) }
+        pokemonMoves.forEach { (_, target, pokemon) -> setAtPosition(target, pokemon) }
+
+        pokemonMoves.forEach { (_, _, pokemon) ->
+            sendPacketToObservers(RemoveClientPokemonPacket(this, pokemon.uuid))
+        }
+        pokemonMoves.forEach { (_, target, pokemon) ->
+            sendPacketToObservers(SetPCPokemonPacket(uuid, target) { pokemon })
+        }
+        pcChangeObservable.emit(Unit)
+        return true
+    }
+
     override fun loadPositionFromNBT(nbt: CompoundTag): StoreCoordinates<PCPosition> {
         return StoreCoordinates(this, PCPosition(nbt.getShort(DataKeys.STORE_BOX).toInt(), nbt.getByte(DataKeys.STORE_SLOT).toInt()))
     }

common/src/main/kotlin/com/cobblemon/mod/common/api/storage/player/PlayerInstancedDataStoreManager.kt

@@ -10,7 +10,6 @@ package com.cobblemon.mod.common.api.storage.player
 
 import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.Cobblemon.MODID
-import com.cobblemon.mod.common.api.badges.BadgeManager
 import com.cobblemon.mod.common.api.pokedex.PokedexManager
 import com.cobblemon.mod.common.api.scheduling.ScheduledTask
 import com.cobblemon.mod.common.api.scheduling.ServerTaskTracker
@@ -77,14 +76,6 @@ open class PlayerInstancedDataStoreManager {
                 .infiniteIterations()
                 .tracker(ServerTaskTracker)
                 .build()
-
-        saveTasks[PlayerInstancedDataStoreTypes.BADGES] = ScheduledTask.Builder()
-            .execute { saveAllOfOneType(PlayerInstancedDataStoreTypes.BADGES) }
-            .delay(30F)
-            .interval(120F)
-            .infiniteIterations()
-            .tracker(ServerTaskTracker)
-            .build()
     }
 
     open fun get(playerId: UUID, dataType: PlayerInstancedDataStoreType): InstancedPlayerData {
@@ -157,9 +148,4 @@ open class PlayerInstancedDataStoreManager {
         }
         return data as TMMoveManager
     }
-
-    fun getBadgeData(player: ServerPlayer): BadgeManager = getBadgeData(player.uuid)
-
-    fun getBadgeData(playerId: UUID): BadgeManager =
-        get(playerId, PlayerInstancedDataStoreTypes.BADGES) as BadgeManager
 }

common/src/main/kotlin/com/cobblemon/mod/common/api/storage/player/PlayerInstancedDataStoreTypes.kt

@@ -9,7 +9,6 @@
 package com.cobblemon.mod.common.api.storage.player
 
 import com.cobblemon.mod.common.Cobblemon
-import com.cobblemon.mod.common.api.storage.player.client.ClientBadgeManager
 import com.cobblemon.mod.common.api.storage.player.client.ClientPokedexManager
 import com.cobblemon.mod.common.api.storage.player.client.ClientGeneralPlayerData
 import com.cobblemon.mod.common.api.storage.player.client.ClientTMMoveManager
@@ -36,12 +35,6 @@ object PlayerInstancedDataStoreTypes {
         ClientTMMoveManager::runAction,
         ClientTMMoveManager::runIncremental
     ))
-    val BADGES = register(PlayerInstancedDataStoreType(
-        cobblemonResource("badge_collection"),
-        ClientBadgeManager::decode,
-        ClientBadgeManager::runAction,
-        ClientBadgeManager::runIncremental
-    ))
 
     fun register(type: PlayerInstancedDataStoreType): PlayerInstancedDataStoreType {
         Cobblemon.LOGGER.debug("Registering PlayerInstancedDataStoreType: {}", type.id)

common/src/main/kotlin/com/cobblemon/mod/common/api/storage/player/adapter/BadgeMongoBackend.kt

@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.storage.player.adapter
-
-import com.cobblemon.mod.common.api.badges.BadgeManager
-import com.cobblemon.mod.common.api.storage.player.PlayerInstancedDataStoreTypes
-import com.cobblemon.mod.common.util.adapters.CodecBackedAdapter
-import com.google.gson.GsonBuilder
-import com.google.gson.reflect.TypeToken
-import com.mongodb.client.MongoClient
-import java.util.UUID
-
-class BadgeMongoBackend(
-    mongoClient: MongoClient,
-    databaseName: String,
-    collectionName: String
-) : MongoBackedPlayerDataStoreBackend<BadgeManager>(
-    mongoClient,
-    databaseName,
-    collectionName,
-    PlayerInstancedDataStoreTypes.BADGES
-) {
-    override val gson = GsonBuilder()
-        .registerTypeAdapter(BadgeManager::class.java, CodecBackedAdapter(BadgeManager.CODEC))
-        .create()
-    override val classToken = TypeToken.get(BadgeManager::class.java)
-    override val defaultData = defaultDataFunc
-
-    companion object {
-        val defaultDataFunc = { uuid: UUID -> BadgeManager(uuid) }
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/api/storage/player/adapter/BadgeNbtBackend.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.storage.player.adapter
-
-import com.cobblemon.mod.common.api.badges.BadgeManager
-import com.cobblemon.mod.common.api.storage.player.PlayerInstancedDataStoreTypes
-import java.util.UUID
-
-class BadgeNbtBackend : NbtBackedPlayerData<BadgeManager>("badges", PlayerInstancedDataStoreTypes.BADGES) {
-    override val codec = BadgeManager.CODEC
-    override val defaultData = defaultDataFunc
-
-    companion object {
-        val defaultDataFunc = { uuid: UUID -> BadgeManager(uuid) }
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/api/storage/player/adapter/FileBasedPlayerDataStoreBackend.kt

@@ -52,7 +52,7 @@ abstract class FileBasedPlayerDataStoreBackend<T : InstancedPlayerData>(
         val playerFile = filePath(uuid)
         val playerFileOld = filePath(uuid, OLD_FILE_EXTENSION)
         playerFile.parentFile.mkdirs()
-        val loadFallback: (Boolean) -> T = { primaryFileCorrupt ->
+        val loadFallback: () -> T = {
             playerFile.delete()
             if (playerFileOld.exists() && playerFileOld.length() > 0L) {
                 try {
@@ -68,9 +68,7 @@ abstract class FileBasedPlayerDataStoreBackend<T : InstancedPlayerData>(
                 }
             }
             else {
-                if (primaryFileCorrupt) {
-                    Cobblemon.LOGGER.error(".old File $subfolder for $uuid is corrupt or missing. Data is lost")
-                }
+                Cobblemon.LOGGER.error(".old File $subfolder for $uuid is corrupt or missing. Data is lost")
                 playerFileOld.delete()
                 defaultData.invoke(uuid).also(::save)
             }
@@ -82,10 +80,10 @@ abstract class FileBasedPlayerDataStoreBackend<T : InstancedPlayerData>(
             catch (e: Exception) {
                 Cobblemon.LOGGER.warn("Failed to load $subfolder for $uuid due to ${e.message}")
                 Cobblemon.LOGGER.warn(e)
-                loadFallback(true)
+                loadFallback()
             }
         } else {
-            loadFallback(false)
+            loadFallback()
         }.also { it.initialize() }
     }
 

common/src/main/kotlin/com/cobblemon/mod/common/api/storage/player/client/ClientBadgeManager.kt

@@ -1,42 +0,0 @@
-package com.cobblemon.mod.common.api.storage.player.client
-
-import com.cobblemon.mod.common.api.storage.player.PlayerInstancedDataStoreTypes
-import com.cobblemon.mod.common.client.CobblemonClient
-import com.cobblemon.mod.common.net.messages.client.SetClientPlayerDataPacket
-import com.cobblemon.mod.common.util.readString
-import com.cobblemon.mod.common.util.writeString
-import net.minecraft.network.RegistryFriendlyByteBuf
-import net.minecraft.resources.ResourceLocation
-
-class ClientBadgeManager(
-    val obtainedBadges: MutableSet<ResourceLocation>
-) : ClientInstancedPlayerData {
-
-    override fun encode(buf: RegistryFriendlyByteBuf) {
-        buf.writeCollection(obtainedBadges) { _, id, -> buf.writeString(id.toString()) }
-    }
-
-    companion object {
-        fun decode(buf: RegistryFriendlyByteBuf): SetClientPlayerDataPacket {
-            val badges = buf.readCollection(
-                { mutableSetOf<ResourceLocation>() },
-                { buf.readString().let(ResourceLocation::tryParse) ?: ResourceLocation("minecraft", "empty") }
-            )
-            return SetClientPlayerDataPacket(
-                PlayerInstancedDataStoreTypes.BADGES,
-                ClientBadgeManager(badges)
-            )
-        }
-
-        fun runAction(data: ClientInstancedPlayerData) {
-            if (data !is ClientBadgeManager) return
-            CobblemonClient.clientBadgeData = data
-        }
-
-        fun runIncremental(data: ClientInstancedPlayerData) {
-            if (data !is ClientBadgeManager) return
-            CobblemonClient.clientBadgeData.obtainedBadges.addAll(data.obtainedBadges)
-        }
-    }
-
-}

common/src/main/kotlin/com/cobblemon/mod/common/client/CobblemonClient.kt

@@ -17,12 +17,12 @@ import com.cobblemon.mod.common.CobblemonItems
 import com.cobblemon.mod.common.CobblemonMenuType
 import com.cobblemon.mod.common.api.berry.Berries
 import com.cobblemon.mod.common.api.scheduling.ClientTaskTracker
-import com.cobblemon.mod.common.api.storage.player.client.ClientBadgeManager
 import com.cobblemon.mod.common.api.storage.player.client.ClientGeneralPlayerData
 import com.cobblemon.mod.common.api.storage.player.client.ClientPokedexManager
 import com.cobblemon.mod.common.api.storage.player.client.ClientTMMoveManager
 import com.cobblemon.mod.common.api.tags.CobblemonItemTags
 import com.cobblemon.mod.common.block.entity.TintBlockEntity
+import com.cobblemon.mod.common.block.sign.CobblemonSignBlock
 import com.cobblemon.mod.common.client.battle.ClientBattle
 import com.cobblemon.mod.common.client.gui.PartyOverlay
 import com.cobblemon.mod.common.client.gui.PartyOverlayDataControl
@@ -101,7 +101,6 @@ object CobblemonClient {
     var clientPlayerData = ClientGeneralPlayerData()
     var clientPokedexData = ClientPokedexManager(mutableMapOf())
     var clientTMMoveData = ClientTMMoveManager(mutableSetOf())
-    var clientBadgeData = ClientBadgeManager(mutableSetOf())
 
     /** If true then we won't bother them anymore about choosing a starter even if it's a thing they can do. */
     var checkedStarterScreen = false
@@ -119,7 +118,6 @@ object CobblemonClient {
         teamData = ClientPlayerTeamData()
         clientPokedexData = ClientPokedexManager(mutableMapOf())
         clientTMMoveData = ClientTMMoveManager(mutableSetOf())
-        clientBadgeData = ClientBadgeManager(mutableSetOf())
         storage.onLogin()
 //        CobblemonDataProvider.canReload = false
     }

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/PartyOverlay.kt

@@ -85,7 +85,6 @@ class PartyOverlay : Gui(Minecraft.getInstance()) {
             if (HidePartyBinding.shouldHide) {
                 return false
             }
-
             return true
         }
     }
@@ -559,4 +558,4 @@ class PartyOverlay : Gui(Minecraft.getInstance()) {
             }
         }
     }
-}
+}

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/pc/BoxStorageSlot.kt

@@ -29,7 +29,8 @@ class BoxStorageSlot(
 
         val grabbedSlot = parent.grabbedSlot
         return if (grabbedSlot == null) {
-            true
+            val pokemon = getPokemon()
+            pokemon == null || !parent.isInMultiSelection(pokemon, position)
         } else {
             grabbedSlot.getPokemon() != getPokemon()
         }

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/pc/PCGUI.kt

@@ -50,6 +50,7 @@ import net.minecraft.network.chat.Component
 import net.minecraft.sounds.SoundEvent
 import kotlin.isInitialized
 import net.minecraft.resources.ResourceLocation
+import net.minecraft.util.FastColor
 
 class PCGUI(
     val pc: ClientPC,
@@ -129,6 +130,55 @@ class PCGUI(
     var selectPointerOffsetIncrement = false
     var displayOptions = false
 
+    private var dragStartX: Int? = null
+    private var dragStartY: Int? = null
+    private var dragEndX: Int? = null
+    private var dragEndY: Int? = null
+    private var selectionDragActive = false
+
+    data class SelectionArea(val left: Int, val top: Int, val right: Int, val bottom: Int)
+
+    private data class BoxGridBounds(val left: Int, val top: Int, val right: Int, val bottom: Int) {
+        fun contains(x: Int, y: Int) = x in left..< right && y >= top && y < bottom
+    }
+
+    private fun getBoxGridBounds(): BoxGridBounds {
+        val left = storageWidget.x
+        val top = storageWidget.y
+        return BoxGridBounds(
+            left,
+            top,
+            left + StorageWidget.SCREEN_WIDTH,
+            top + StorageWidget.SCREEN_HEIGHT
+        )
+    }
+
+    fun getSelectionArea(): SelectionArea? {
+        if (!selectionDragActive) return null
+        val startX = dragStartX ?: return null
+        val startY = dragStartY ?: return null
+        val endX = dragEndX ?: return null
+        val endY = dragEndY ?: return null
+        val bounds = getBoxGridBounds()
+        if (!bounds.contains(startX, startY)) return null
+
+        val columns = 6
+        val rows = 5
+        val slotPitch = StorageSlot.SIZE + StorageWidget.BOX_SLOT_PADDING
+        val gridLeft = bounds.left + StorageWidget.BOX_SLOT_START_OFFSET_X
+        val gridTop = bounds.top + StorageWidget.BOX_SLOT_START_OFFSET_Y + if (displayOptions) 5 else 0
+        val startColumn = ((startX - gridLeft) / slotPitch).coerceIn(0, columns - 1)
+        val endColumn = (((endX.coerceIn(bounds.left, bounds.right - 1)) - gridLeft) / slotPitch).coerceIn(0, columns - 1)
+        val startRow = ((startY - gridTop) / slotPitch).coerceIn(0, rows - 1)
+        val endRow = (((endY.coerceIn(bounds.top, bounds.bottom - 1)) - gridTop) / slotPitch).coerceIn(0, rows - 1)
+        return SelectionArea(
+            gridLeft + minOf(startColumn, endColumn) * slotPitch, // left
+            gridTop + minOf(startRow, endRow) * slotPitch, // top
+            gridLeft + (maxOf(startColumn, endColumn) * slotPitch) + StorageSlot.SIZE, // right
+            gridTop + (maxOf(startRow, endRow) * slotPitch) + StorageSlot.SIZE // bottom
+        )
+    }
+
     override fun renderBlurredBackground(delta: Float) {}
 
     override fun renderMenuBackground(context: GuiGraphics) {}
@@ -250,7 +300,7 @@ class PCGUI(
                 configuration.showParty = isVisible
                 wallpaperWidget.visible = !isVisible
                 (it as IconButton).highlighted = !isVisible
-                if (!unseenWallpapers.isEmpty()) MarkPCBoxWallpapersSeenPacket(unseenWallpapers).sendToServer()
+                if (unseenWallpapers.isNotEmpty()) MarkPCBoxWallpapersSeenPacket(unseenWallpapers).sendToServer()
             }.also {
                 it.visible = displayOptions
                 optionButtons.add(it)
@@ -315,6 +365,20 @@ class PCGUI(
         super.init()
     }
 
+    private fun renderSelectionBox(context: GuiGraphics, area: SelectionArea) {
+        context.pose().pushPose()
+        context.pose().translate(0.0, 0.0, 1500.0)
+        val borderColor = FastColor.ARGB32.color(255, 205, 212, 255)
+        val bgColor = FastColor.ARGB32.color(75, 133, 183, 230)
+        val thickness = 1
+        context.fill(area.left, area.top, area.right, area.bottom, bgColor)
+        context.fill(area.left, area.top, area.right, area.top + thickness, borderColor)
+        context.fill(area.left, area.bottom - thickness, area.right, area.bottom, borderColor)
+        context.fill(area.left, area.top, area.left + thickness, area.bottom, borderColor)
+        context.fill(area.right - thickness, area.top, area.right, area.bottom, borderColor)
+        context.pose().popPose()
+    }
+
     override fun render(context: GuiGraphics, mouseX: Int, mouseY: Int, delta: Float) {
         val matrices = context.pose()
         renderBackground(context, mouseX, mouseY, delta)
@@ -685,12 +749,14 @@ class PCGUI(
             scale = SCALE
         )
 
-        if (!optionButtons.isEmpty() && displayOptions) {
+        if (optionButtons.isNotEmpty() && displayOptions) {
             for (button in optionButtons) button.showAlt = hasShiftDown()
         }
 
         super.render(context, mouseX, mouseY, delta)
 
+        getSelectionArea()?.let { renderSelectionBox(context, it) }
+
         // Item Tooltip
         if (pokemon != null) {
             val displayedItem = if (showCosmeticItem) pokemon.cosmeticItem else pokemon.heldItemNoCopy()
@@ -712,6 +778,20 @@ class PCGUI(
     }
 
     override fun mouseClicked(mouseX: Double, mouseY: Double, button: Int): Boolean {
+        storageWidget.clearPendingStorageSlotClick()
+        selectionDragActive = false
+        val clickX = mouseX.toInt()
+        val clickY = mouseY.toInt()
+        if (storageWidget.multiSelection == null && button == 0 &&
+            getBoxGridBounds().contains(clickX, clickY) &&
+            storageWidget.pastureWidget == null) {
+            dragStartX = clickX
+            dragStartY = clickY
+        } else {
+            dragStartX = null
+            dragStartY = null
+        }
+
         // Trigger child component function as they will need to check the entire screen click area
         if (::boxNameWidget.isInitialized) boxNameWidget.mouseClicked(mouseX, mouseY, button)
         return super.mouseClicked(mouseX, mouseY, button)
@@ -740,9 +820,43 @@ class PCGUI(
         storageWidget.pastureWidget?.let { pasture ->
             if (pasture.pastureScrollList.isHovered) pasture.pastureScrollList.mouseDragged(mouseX, mouseY, button, deltaX, deltaY)
         }
+        if (button == 0 && storageWidget.pastureWidget == null) {
+            val startX = dragStartX
+            val startY = dragStartY
+            if (startX != null && startY != null) {
+                val offsetX = mouseX - startX
+                val offsetY = mouseY - startY
+                if (offsetX * offsetX + offsetY * offsetY >= 25.0) {
+                    selectionDragActive = true
+                    storageWidget.clearPendingStorageSlotClick()
+                    dragEndX = mouseX.toInt()
+                    dragEndY = mouseY.toInt()
+                }
+            }
+        }
         return super.mouseDragged(mouseX, mouseY, button, deltaX, deltaY)
     }
 
+    override fun mouseReleased(mouseX: Double, mouseY: Double, button: Int): Boolean {
+        val handled = super.mouseReleased(mouseX, mouseY, button)
+        if (button == 0) {
+            if (selectionDragActive) {
+                dragEndX = mouseX.toInt()
+                dragEndY = mouseY.toInt()
+                storageWidget.updateSelection()
+                storageWidget.clearPendingStorageSlotClick()
+            } else {
+                storageWidget.completePendingStorageSlotClick(mouseX, mouseY)
+            }
+        }
+        dragStartX = null
+        dragStartY = null
+        dragEndX = null
+        dragEndY = null
+        selectionDragActive = false
+        return handled
+    }
+
     override fun keyPressed(keyCode: Int, scanCode: Int, modifiers: Int): Boolean {
         val boxNameFocused = this::boxNameWidget.isInitialized && boxNameWidget.isFocused
         val filterFocused = this::filterWidget.isInitialized && filterWidget.isFocused

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/pc/PCMultiSelection.kt

@@ -0,0 +1,37 @@
+package com.cobblemon.mod.common.client.gui.pc
+
+import com.cobblemon.mod.common.pokemon.Pokemon
+
+data class PCMultiSelection(
+    private val grid: MutableList<MutableList<Pokemon?>> = mutableListOf(),
+    val sourceBox: Int = 0,
+    val sourceColumn: Int = 0,
+    val sourceRow: Int = 0
+) {
+    fun getHorizontalSize(): Int = grid.firstOrNull()?.size ?: 0
+    fun getVerticalSize(): Int = grid.size
+
+    constructor(horizontalSize: Int, verticalSize: Int, sourceBox: Int, sourceColumn: Int, sourceRow: Int) : this(
+        MutableList(verticalSize) { MutableList<Pokemon?>(horizontalSize) { null } },
+        sourceBox,
+        sourceColumn,
+        sourceRow
+    )
+
+    fun getPokemon(x: Int, y: Int): Pokemon? {
+        return grid[y][x]
+    }
+
+    fun setPokemon(x: Int, y: Int, pokemon: Pokemon?) {
+        grid[y][x] = pokemon
+    }
+
+    fun pokemonEntries(): List<Triple<Int, Int, Pokemon>> {
+        return grid.flatMapIndexed { y, row ->
+            row.mapIndexedNotNull { x, pokemon -> pokemon?.let { Triple(x, y, it) } }
+        }
+    }
+
+    fun getPokemonCount(): Int = pokemonEntries().size
+
+}

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/pc/ReleaseButton.kt

@@ -45,11 +45,13 @@ class ReleaseButton(
                 vOffset = if (isHovered(mouseX.toDouble(), mouseY.toDouble())) HEIGHT else 0,
                 textureHeight = HEIGHT * 2
             )
+            val pokemonCount = parent.multiSelection?.getPokemonCount() ?: 0
 
             drawScaledText(
                 context = context,
                 font = CobblemonResources.DEFAULT_LARGE,
-                text = lang("ui.pc.release").bold(),
+                text = if (pokemonCount > 1)
+                    { lang("ui.pc.release_all").bold() } else { lang("ui.pc.release").bold() },
                 x = x + (WIDTH / 2),
                 y = y + 3.5,
                 centered = true,

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/pc/StorageSlot.kt

@@ -9,6 +9,7 @@
 package com.cobblemon.mod.common.client.gui.pc
 
 import com.cobblemon.mod.common.Cobblemon
+import com.cobblemon.mod.common.api.gui.ColourLibrary
 import com.cobblemon.mod.common.api.gui.blitk
 import com.cobblemon.mod.common.client.gui.CobblemonRenderable
 import com.cobblemon.mod.common.client.gui.drawProfilePokemon
@@ -54,9 +55,17 @@ open class StorageSlot(
     }
 
     override fun renderWidget(context: GuiGraphics, mouseX: Int, mouseY: Int, delta: Float) {
+        val selectionArea = parent.pcGui.getSelectionArea()
+        if (selectionArea != null && parent.getSelectedPokemon(selectionArea).contains(this)) {
+            val highlightColor = 0x40FFFFFF
+            context.fill(x + 1, y, x + (SIZE - 1), y + SIZE, highlightColor)
+            context.fill(x, y + 1, x + 1, y + (SIZE - 1), highlightColor)
+            context.fill(x + SIZE - 1, y + 1, x + SIZE, y + (SIZE - 1), highlightColor)
+        }
         if (shouldRender()) {
             renderSlot(context, x, y, delta)
         }
+
     }
 
     fun renderSlot(context: GuiGraphics, posX: Int, posY: Int, partialTicks: Float) {

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/pc/StorageWidget.kt

@@ -11,7 +11,6 @@ package com.cobblemon.mod.common.client.gui.pc
 import com.cobblemon.mod.common.CobblemonNetwork
 import com.cobblemon.mod.common.CobblemonSounds
 import com.cobblemon.mod.common.api.gui.blitk
-import com.cobblemon.mod.common.api.storage.StorePosition
 import com.cobblemon.mod.common.api.storage.party.PartyPosition
 import com.cobblemon.mod.common.api.storage.pc.PCPosition
 import com.cobblemon.mod.common.api.text.bold
@@ -39,8 +38,9 @@ import net.minecraft.client.gui.components.Button
 import net.minecraft.client.gui.screens.Screen
 import net.minecraft.client.resources.sounds.SimpleSoundInstance
 import net.minecraft.network.chat.Component
-import net.minecraft.resources.ResourceLocation
 import net.minecraft.sounds.SoundEvent
+import java.util.UUID
+import com.cobblemon.mod.common.net.messages.server.storage.pc.MovePCPokemonBatchPacket.PCPokemonMove
 
 class StorageWidget(
     pX: Int, pY: Int,
@@ -77,9 +77,13 @@ class StorageWidget(
 
     var displayConfirmRelease = false
     var screenLoaded = false
-    var selectedPosition: StorePosition? = null
+    var selectedPosition: PartyPosition? = null
     var grabbedSlot: GrabbedStorageSlot? = null
 
+    var multiSelection: PCMultiSelection? = null
+    private val multiGrabbedSlots = mutableMapOf<UUID, GrabbedStorageSlot>()
+    private var pendingStorageSlotClick: Button? = null
+
     var box = 0
         set(value) {
             field =
@@ -113,16 +117,22 @@ class StorageWidget(
             subKey = "ui.generic.yes",
             onPress = {
                 if (canDeleteSelected() && displayConfirmRelease) {
-                    val position = selectedPosition ?: return@ReleaseConfirmButton
-                    val pokemon = getSelectedPokemon() ?: return@ReleaseConfirmButton
+                    val selection = multiSelection
+                    if (selection != null) {
+                        selection.pokemonEntries().forEach { (column, row, pokemon) ->
+                            val position = PCPosition(
+                                selection.sourceBox,
+                                (selection.sourceRow + row) * 6 + selection.sourceColumn + column
+                            )
+                            CobblemonNetwork.sendToServer(ReleasePCPokemonPacket(pokemon.uuid, position))
+                        }
+                    } else {
+                        val position = selectedPosition ?: return@ReleaseConfirmButton
+                        val pokemon = getSelectedPokemon() ?: return@ReleaseConfirmButton
 
-                    val packet = when (position) {
-                        is PartyPosition -> ReleasePartyPokemonPacket(pokemon.uuid, position)
-                        is PCPosition -> ReleasePCPokemonPacket(pokemon.uuid, position)
-                        else -> return@ReleaseConfirmButton
+                        CobblemonNetwork.sendToServer(ReleasePartyPokemonPacket(pokemon.uuid, position))
                     }
 
-                    CobblemonNetwork.sendToServer(packet)
                     playSound(CobblemonSounds.PC_RELEASE)
                     resetSelected()
                     displayConfirmRelease = false
@@ -149,9 +159,8 @@ class StorageWidget(
     }
 
     fun canDeleteSelected(): Boolean {
-        return !(selectedPosition is PartyPosition && party.filterNotNull().size <= 1)
-                && selectedPosition != null
-                && grabbedSlot != null
+        multiSelection?.let { return it.pokemonEntries().isNotEmpty() }
+        return party.filterNotNull().size > 1 && selectedPosition != null && grabbedSlot != null
     }
 
     fun setupStorageSlots() {
@@ -170,7 +179,7 @@ class StorageWidget(
                     parent = this,
                     pc = pc,
                     position = PCPosition(box, index),
-                    onPress = { this.onStorageSlotClicked(it) }
+                    onPress = { pendingStorageSlotClick = it }
                 ).also {  widget ->
                     this.addWidget(widget)
                     this.boxSlots.add(widget)
@@ -200,7 +209,7 @@ class StorageWidget(
                 parent = this,
                 party = party,
                 position = PartyPosition(partyIndex),
-                onPress = { this.onStorageSlotClicked(it) }
+                onPress = { pendingStorageSlotClick = it }
             ).also { widget ->
                 this.addWidget(widget)
                 this.partySlots.add(widget)
@@ -210,13 +219,115 @@ class StorageWidget(
 
     private fun getSelectedPokemon(): Pokemon? {
         val selectedPosition = this.selectedPosition ?: return null
-        return when (selectedPosition) {
-            is PCPosition -> pc.get(selectedPosition)
-            is PartyPosition -> party.get(selectedPosition)
-            else -> null
+        return party.get(selectedPosition)
+    }
+
+    fun getSelectedPokemon(area: PCGUI.SelectionArea): List<BoxStorageSlot> {
+        return boxSlots.filter { slot ->
+            slot.x < area.right && slot.x + StorageSlot.SIZE > area.left &&
+                slot.y < area.bottom && slot.y + StorageSlot.SIZE > area.top &&
+                slot.getPokemon()?.let(pcGui.search::passes) == true
         }
     }
 
+    fun clearPendingStorageSlotClick() {
+        pendingStorageSlotClick = null
+    }
+
+    fun completePendingStorageSlotClick(mouseX: Double, mouseY: Double) {
+        val button = pendingStorageSlotClick ?: return
+        pendingStorageSlotClick = null
+        if (button.isMouseOver(mouseX, mouseY)) {
+            onStorageSlotClicked(button)
+        }
+    }
+
+    fun updateSelection() {
+        val area = pcGui.getSelectionArea()
+        if (area == null) {
+            multiSelection = null
+            return
+        }
+
+        selectedPosition = null
+        grabbedSlot = null
+        pcGui.setPreviewPokemon(null)
+
+        val selectedSlots = getSelectedPokemon(area)
+        if (selectedSlots.isEmpty()) {
+            multiSelection = null
+            return
+        }
+
+        val minColumn = selectedSlots.minOf { it.position.slot % 6 }
+        val maxColumn = selectedSlots.maxOf { it.position.slot % 6 }
+        val minRow = selectedSlots.minOf { it.position.slot / 6 }
+        val maxRow = selectedSlots.maxOf { it.position.slot / 6 }
+        val selection = PCMultiSelection(maxColumn - minColumn + 1, maxRow - minRow + 1, box, minColumn, minRow)
+
+        selectedSlots.forEach { slot ->
+            val pokemon = slot.getPokemon() ?: return@forEach
+            val slotIndex = slot.position.slot
+            val column = slotIndex % 6
+            val row = slotIndex / 6
+            if (column in minColumn..maxColumn && row in minRow..maxRow) {
+                selection.setPokemon(column - minColumn, row - minRow, pokemon)
+            }
+        }
+        playSound(CobblemonSounds.PC_GRAB)
+
+        multiSelection = selection
+    }
+
+    private fun moveMultiSelectionTo(destination: PCPosition): Boolean {
+        val selection = multiSelection ?: return false
+
+        val width = selection.getHorizontalSize()
+        val height = selection.getVerticalSize()
+        val destinationColumn = destination.slot % 6
+        val destinationRow = destination.slot / 6
+        if (destinationColumn + width > 6 || destinationRow + height > 5) return false
+
+        val moves = mutableListOf<PCPokemonMove>()
+        val selectedSources = mutableSetOf<PCPosition>()
+        for (row in 0 until height) {
+            for (column in 0 until width) {
+                val pokemon = selection.getPokemon(column, row) ?: continue
+                val source = PCPosition(selection.sourceBox, (selection.sourceRow + row) * 6 + selection.sourceColumn + column)
+                val target = PCPosition(destination.box, (destinationRow + row) * 6 + destinationColumn + column)
+                selectedSources.add(source)
+                moves.add(PCPokemonMove(pokemon.uuid, source, target))
+            }
+        }
+
+        if (moves.isEmpty()) return false
+
+        for (row in 0 until height) {
+            for (column in 0 until width) {
+                if (selection.getPokemon(column, row) == null) continue
+                val target = PCPosition(destination.box, (destinationRow + row) * 6 + destinationColumn + column)
+                val displacedPokemon = pc.get(target) ?: continue
+                if (target in selectedSources) continue
+
+                val displacedSource = PCPosition(
+                    selection.sourceBox,
+                    (selection.sourceRow + row) * 6 + selection.sourceColumn + column
+                )
+                if (pc.get(displacedSource) != null && displacedSource !in selectedSources) return false
+                moves.add(PCPokemonMove(displacedPokemon.uuid, target, displacedSource))
+            }
+        }
+
+        if (moves.map { it.newPosition }.toSet().size != moves.size) return false
+        MovePCPokemonBatchPacket(moves).sendToServer()
+        return true
+    }
+
+    fun isInMultiSelection(pokemon: Pokemon, position: PCPosition): Boolean {
+        val selection = multiSelection ?: return false
+        return selection.sourceBox == position.box && selection.pokemonEntries().any { it.third == pokemon }
+    }
+
     override fun renderWidget(context: GuiGraphics, mouseX: Int, mouseY: Int, delta: Float) {
         val matrices = context.pose()
         // Party  Label
@@ -240,11 +351,14 @@ class StorageWidget(
                 shadow = true
             )
 
+            val pokemonCount = multiSelection?.getPokemonCount() ?: 0
+
             if (canDeleteSelected() && displayConfirmRelease) {
                 drawScaledText(
                     context = context,
                     font = CobblemonResources.DEFAULT_LARGE,
-                    text = lang("ui.pc.release").bold(),
+                    text = if (pokemonCount > 1)
+                    { lang("ui.pc.release_all").bold() } else { lang("ui.pc.release").bold() },
                     x = x + 223,
                     y = y + 119,
                     centered = true
@@ -308,6 +422,7 @@ class StorageWidget(
                 slot.render(context, mouseX, mouseY, delta)
                 val pokemon = slot.getPokemon()
                 if (grabbedSlot == null && slot.isHovered(mouseX, mouseY)
+                    && multiSelection == null
                     && pokemon != null && pokemon != pcGui.previewPokemon
                 ) {
                     pcGui.setPreviewPokemon(pokemon, pcGui.isPreviewInParty ?: false)
@@ -324,6 +439,7 @@ class StorageWidget(
                 slot.render(context, mouseX, mouseY, delta)
                 val pokemon = slot.getPokemon()
                 if (grabbedSlot == null && slot.isHovered(mouseX, mouseY)
+                    && multiSelection == null
                     && pokemon != null && pokemon != pcGui.previewPokemon
                 ) {
                     pcGui.setPreviewPokemon(pokemon, pcGui.isPreviewInParty ?: true)
@@ -335,10 +451,31 @@ class StorageWidget(
         pastureWidget?.render(context, mouseX, mouseY, delta)
         matrices.pushPose()
         matrices.translate(0.0, 0.0, 1000.0)
-        grabbedSlot?.render(context, mouseX, mouseY, delta)
+        renderSelectedPokemon(context, mouseX, mouseY, delta)
         matrices.popPose()
     }
 
+    private fun renderSelectedPokemon(context: GuiGraphics, mouseX: Int, mouseY: Int, delta: Float) {
+        val selection = multiSelection
+        if (selection == null) {
+            grabbedSlot?.render(context, mouseX, mouseY, delta)
+            return
+        }
+
+        val slotOffset = StorageSlot.SIZE + BOX_SLOT_PADDING
+        selection.pokemonEntries().forEach { (column, row, pokemon) ->
+            val grabbed = multiGrabbedSlots.getOrPut(pokemon.uuid) {
+                GrabbedStorageSlot(0, 0, this, pokemon)
+            }
+            grabbed.render(
+                context,
+                mouseX + column * slotOffset,
+                mouseY + row * slotOffset,
+                delta
+            )
+        }
+    }
+
     override fun mouseClicked(pMouseX: Double, pMouseY: Double, pButton: Int): Boolean {
         if (displayConfirmRelease) {
             if (releaseYesButton.isHovered(pMouseX, pMouseY)) releaseYesButton.mouseClicked(pMouseX, pMouseY, pButton)
@@ -371,23 +508,55 @@ class StorageWidget(
             else -> return
         }
 
+        val clickedPokemon = when (clickedPosition) {
+            is PCPosition -> pc.get(clickedPosition)
+            is PartyPosition -> party.get(clickedPosition)
+            else -> null
+        }
+
+        multiSelection?.let { selection ->
+            when (clickedPosition) {
+                is PCPosition -> {
+                    if (clickedPosition.box == selection.sourceBox &&
+                        clickedPosition.slot == selection.sourceRow * 6 + selection.sourceColumn
+                    ) {
+                        resetSelected()
+                    } else if (moveMultiSelectionTo(clickedPosition)) {
+                        playSound(CobblemonSounds.PC_DROP)
+                        resetSelected()
+                    }
+                }
+                is PartyPosition -> {
+                    val selectedPokemon = selection.pokemonEntries().singleOrNull() ?: return
+                    val (column, row, pokemon) = selectedPokemon
+                    val source = PCPosition(
+                        selection.sourceBox,
+                        (selection.sourceRow + row) * 6 + selection.sourceColumn + column
+                    )
+                    if (pc.get(source) !== pokemon) return
+                    val packet = clickedPokemon?.let {
+                        SwapPCPartyPokemonPacket(it.uuid, clickedPosition, pokemon.uuid, source)
+                    } ?: MovePCPokemonToPartyPacket(pokemon.uuid, source, clickedPosition)
+                    packet.sendToServer()
+                    playSound(CobblemonSounds.PC_DROP)
+                    resetSelected()
+                }
+                else -> Unit
+            }
+            return
+        }
+
         // Reset release confirmation
         displayConfirmRelease = false
 
         // Clicking on itself, so unselect position
-        if (this.selectedPosition != null && this.selectedPosition == clickedPosition) {
+        if (selectedPosition == clickedPosition) {
             if (grabbedSlot != null) playSound(CobblemonSounds.PC_DROP)
             resetSelected()
             return
         }
 
         // Check for selecting a Pokémon
-        val clickedPokemon = when(button) {
-            is BoxStorageSlot -> pc.get(clickedPosition as PCPosition)
-            is PartyStorageSlot -> party.get(clickedPosition as PartyPosition)
-            else -> null
-        }
-
         val selectOverride = pcGui.configuration.selectOverride
         if (selectOverride != null) {
             selectOverride(pcGui, clickedPosition, clickedPokemon)
@@ -420,56 +589,44 @@ class StorageWidget(
                     }
                 }
 
-                this.selectedPosition = clickedPosition
-                this.pcGui.setPreviewPokemon(clickedPokemon, pcGui.isPreviewInParty ?: false)
-                grabbedSlot = GrabbedStorageSlot(
-                    x = button.x,
-                    y = button.y,
-                    parent = this,
-                    pokemon = clickedPokemon
-                )
-                playSound(CobblemonSounds.PC_GRAB)
-
+                if (clickedPosition is PCPosition) {
+                    val column = clickedPosition.slot % 6
+                    val row = clickedPosition.slot / 6
+                    multiSelection = PCMultiSelection(1, 1, clickedPosition.box, column, row).also {
+                        it.setPokemon(0, 0, clickedPokemon)
+                    }
+                    playSound(CobblemonSounds.PC_GRAB)
+                    return
+                } else if (clickedPosition is PartyPosition) {
+                    this.selectedPosition = clickedPosition
+                    this.pcGui.setPreviewPokemon(clickedPokemon, pcGui.isPreviewInParty ?: false)
+                    grabbedSlot = GrabbedStorageSlot(
+                        x = button.x,
+                        y = button.y,
+                        parent = this,
+                        pokemon = clickedPokemon
+                    )
+                    playSound(CobblemonSounds.PC_GRAB)
+                }
             }
         } else  {
-            // Handle movement within the Box
-            val selectedPokemon = when(this.selectedPosition) {
-                is PCPosition -> pc.get(this.selectedPosition as PCPosition)
-                is PartyPosition -> party.get(this.selectedPosition as PartyPosition)
-                else -> null
-            } ?: return
-
-            // Box to Box
-            if (this.selectedPosition is PCPosition && clickedPosition is PCPosition) {
-                val packet = clickedPokemon?.let { SwapPCPokemonPacket(it.uuid, clickedPosition, selectedPokemon.uuid, this.selectedPosition as PCPosition) }
-                    ?: MovePCPokemonPacket(selectedPokemon.uuid, selectedPosition as PCPosition, clickedPosition)
-                packet.sendToServer()
-                playSound(CobblemonSounds.PC_DROP)
-                resetSelected()
-            }
-            // Box to Party
-            else if (this.selectedPosition is PCPosition && clickedPosition is PartyPosition) {
-                val packet = clickedPokemon?.let { SwapPCPartyPokemonPacket(clickedPokemon.uuid, clickedPosition, selectedPokemon.uuid, this.selectedPosition as PCPosition) }
-                    ?: MovePCPokemonToPartyPacket(selectedPokemon.uuid, this.selectedPosition as PCPosition, clickedPosition)
-                packet.sendToServer()
-                playSound(CobblemonSounds.PC_DROP)
-                resetSelected()
-            }
+            val sourcePosition = selectedPosition ?: return
+            val selectedPokemon = party.get(sourcePosition) ?: return
             // Party to Box
-            else if (this.selectedPosition is PartyPosition && clickedPosition is PCPosition) {
+            if (clickedPosition is PCPosition) {
                 if (ServerSettings.preventCompletePartyDeposit && this.party.filterNotNull().size == 1 && clickedPokemon == null) {
                     return
                 }
-                val packet = clickedPokemon?.let { SwapPCPartyPokemonPacket(selectedPokemon.uuid, this.selectedPosition as PartyPosition, clickedPokemon.uuid, clickedPosition) }
-                    ?: MovePartyPokemonToPCPacket(selectedPokemon.uuid, this.selectedPosition as PartyPosition, clickedPosition)
+                val packet = clickedPokemon?.let { SwapPCPartyPokemonPacket(selectedPokemon.uuid, sourcePosition, clickedPokemon.uuid, clickedPosition) }
+                    ?: MovePartyPokemonToPCPacket(selectedPokemon.uuid, sourcePosition, clickedPosition)
                 packet.sendToServer()
                 playSound(CobblemonSounds.PC_DROP)
                 resetSelected()
             }
             // Party to Party
-            else if (this.selectedPosition is PartyPosition && clickedPosition is PartyPosition) {
-                val packet = clickedPokemon?.let { SwapPartyPokemonPacket(it.uuid, clickedPosition, selectedPokemon.uuid, this.selectedPosition as PartyPosition) }
-                    ?: MovePartyPokemonPacket(selectedPokemon.uuid, selectedPosition as PartyPosition, clickedPosition)
+            else if (clickedPosition is PartyPosition) {
+                val packet = clickedPokemon?.let { SwapPartyPokemonPacket(it.uuid, clickedPosition, selectedPokemon.uuid, sourcePosition) }
+                    ?: MovePartyPokemonPacket(selectedPokemon.uuid, sourcePosition, clickedPosition)
                 packet.sendToServer()
                 playSound(CobblemonSounds.PC_DROP)
                 resetSelected()
@@ -480,6 +637,8 @@ class StorageWidget(
     fun resetSelected() {
         selectedPosition = null
         grabbedSlot = null
+        multiSelection = null
+        multiGrabbedSlots.clear()
         pcGui.setPreviewPokemon(null)
     }
 }

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/trainercard/BadgesScrollingWidget.kt

@@ -1,167 +0,0 @@
-package com.cobblemon.mod.common.client.gui.trainercard
-
-import com.cobblemon.mod.common.api.badges.Badge
-import com.cobblemon.mod.common.api.gui.blitk
-import com.cobblemon.mod.common.client.CobblemonClient
-import com.cobblemon.mod.common.client.gui.ScrollingWidget
-import com.cobblemon.mod.common.client.gui.pokedex.renderTooltip
-import com.cobblemon.mod.common.util.lang
-import net.minecraft.client.gui.GuiGraphics
-import net.minecraft.network.chat.Component
-import net.minecraft.network.chat.MutableComponent
-import net.minecraft.util.FastColor
-import net.minecraft.util.Mth
-
-class BadgesScrollingWidget(
-    x: Int,
-    y: Int,
-    width: Int,
-    height: Int,
-    private val columns: Int
-) : ScrollingWidget<BadgesScrollingWidget.BadgeRow>(
-    width = width,
-    height = height,
-    left = x,
-    top = y - height,
-    slotHeight = SLOT_SIZE + SLOT_SPACING
-) {
-
-    private var tooltip: MutableComponent? = null
-    private var tooltipX = 0
-    private var tooltipY = 0
-
-    companion object {
-        const val SLOT_SIZE = 16
-        const val SLOT_SPACING = 3
-        const val MAX_VISIBLE_ROWS = 2
-    }
-
-    fun createEntries(badges: List<Badge>) {
-
-        val obtainedBadgeList = badges.filter { CobblemonClient.clientBadgeData.obtainedBadges.contains(it.identifier) }
-            .sortedBy { it.order }
-        val unobtainedBadgesList = badges.filter { !obtainedBadgeList.contains(it) }
-            .sortedBy { it.order }
-        val sortedBadgeList = obtainedBadgeList.plus(unobtainedBadgesList)
-
-        sortedBadgeList.chunked(columns).forEach { listChunk ->
-            addEntry(BadgeRow(this, listChunk))
-        }
-    }
-
-    private val visibleRows: Int
-        get() = (height / itemHeight).coerceAtLeast(1)
-
-    private fun hasScrollbar(): Boolean = children().size > visibleRows
-
-    override fun getRowLeft(): Int = if (hasScrollbar()) left + 1 else left
-    override fun getScrollbarPosition(): Int = rowLeft + width - 3
-
-    override fun renderWidget(context: GuiGraphics, mouseX: Int, mouseY: Int, delta: Float) {
-        tooltip = null
-        super.renderWidget(context, mouseX, mouseY, delta)
-        tooltip?.let { renderTooltip(context, it, tooltipX, tooltipY, delta) }
-    }
-
-    fun setTooltip(text: MutableComponent, mouseX: Int, mouseY: Int) {
-        if (mouseX in left until left + width && mouseY in this.y until bottom) {
-            tooltip = text
-            tooltipX = mouseX + 20
-            tooltipY = mouseY - 10
-        }
-    }
-
-    override fun renderScrollbar(context: GuiGraphics, mouseX: Int, mouseY: Int, delta: Float) {
-        if (hasScrollbar()) {
-            val xLeft = this.scrollbarPosition
-            val xRight = xLeft + 3
-
-            val barHeight = this.bottom - this.y
-
-            var yBottom = ((barHeight * barHeight).toFloat() / this.maxPosition.toFloat()).toInt()
-            yBottom = Mth.clamp(yBottom, minOf(32, barHeight), maxOf(minOf(32, barHeight), barHeight - 8))
-            var yTop = scrollAmount.toInt() * (barHeight - yBottom) / this.maxScroll + this.y
-            if (yTop < this.y) {
-                yTop = this.y
-            }
-
-            context.fill(xLeft, this.y, xRight, this.bottom, FastColor.ARGB32.color(255, 75, 75, 75))
-            context.fill(xLeft, yTop, xRight, yTop + yBottom, FastColor.ARGB32.color(255, 141, 141, 141))
-        }
-    }
-
-    private fun renderEntry(context: GuiGraphics, mouseX: Int, mouseY: Int, index: Int, x: Int, y: Int) {
-        getEntry(index).renderRow(context, y, x, mouseX, mouseY)
-    }
-
-    override fun renderListItems(context: GuiGraphics, mouseX: Int, mouseY: Int, delta: Float) {
-        val rowX = rowLeft
-
-        for (index in 0 until this.itemCount) {
-            val rowY = this.getRowTop(index)
-            val o = this.getRowBottom(index)
-            if (o >= this.y && rowY <= this.bottom) {
-                this.renderEntry(context, mouseX, mouseY, index, rowX, rowY)
-            }
-        }
-    }
-
-    override fun mouseDragged(mouseX: Double, mouseY: Double, button: Int, dragX: Double, dragY: Double): Boolean =
-        if (hasScrollbar()) super.mouseDragged(mouseX, mouseY, button, dragX, dragY) else true
-
-    override fun mouseScrolled(mouseX: Double, mouseY: Double, scrollX: Double, scrollY: Double): Boolean =
-        if (hasScrollbar()) super.mouseScrolled(mouseX, mouseY, scrollX, scrollY) else true
-
-    class BadgeRow(
-        val parent: BadgesScrollingWidget,
-        val badgeList: List<Badge?>
-    ) : Slot<BadgeRow>() {
-
-        fun renderRow(context: GuiGraphics, y: Int, x: Int, mouseX: Int, mouseY: Int) {
-            badgeList.forEachIndexed { index, badge ->
-                val startPosX = x + ((SLOT_SPACING + SLOT_SIZE) * index)
-                val startPosY = y + SLOT_SPACING
-
-                if (badge != null) {
-                    val obtained = CobblemonClient.clientBadgeData.obtainedBadges.contains(badge.identifier)
-                    blitk(
-                        matrixStack = context.pose(),
-                        texture = badge.texture,
-                        x = startPosX,
-                        y = startPosY,
-                        width = SLOT_SIZE,
-                        height = SLOT_SIZE,
-                        red = if (obtained) 1 else 0,
-                        green = if (obtained) 1 else 0,
-                        blue = if (obtained) 1 else 0
-                    )
-                    if (mouseX in startPosX until startPosX + SLOT_SIZE &&
-                        mouseY in startPosY until startPosY + SLOT_SIZE
-                    ) {
-                        parent.setTooltip(
-                            if (obtained) Component.translatable(badge.name) else lang("badge.unobtained"),
-                            mouseX, mouseY
-                        )
-                    }
-                }
-            }
-        }
-
-        override fun getNarration(): Component? {
-            return badgeList.firstOrNull()?.let { Component.translatable(it.name) }
-        }
-
-        override fun render(
-            guiGraphics: GuiGraphics,
-            index: Int,
-            top: Int,
-            left: Int,
-            width: Int,
-            height: Int,
-            mouseX: Int,
-            mouseY: Int,
-            hovering: Boolean,
-            partialTick: Float
-        ) {}
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/trainercard/TrainerCardMenu.kt

@@ -1,221 +0,0 @@
-package com.cobblemon.mod.common.client.gui.trainercard
-
-import com.cobblemon.mod.common.Cobblemon
-import com.cobblemon.mod.common.api.badges.Badges
-import com.cobblemon.mod.common.api.pokedex.CaughtCount
-import com.cobblemon.mod.common.api.stats.CobblemonStats.getStat
-import com.cobblemon.mod.common.api.text.text
-import com.cobblemon.mod.common.client.CobblemonClient
-import com.cobblemon.mod.common.client.gui.CobblemonRenderable
-import com.cobblemon.mod.common.client.render.drawScaledText
-import com.cobblemon.mod.common.util.cobblemonResource
-import com.cobblemon.mod.common.util.lang
-import net.minecraft.client.Minecraft
-import net.minecraft.client.gui.GuiGraphics
-import net.minecraft.client.gui.components.Button
-import net.minecraft.client.gui.screens.Screen
-import net.minecraft.client.gui.screens.inventory.InventoryScreen
-import net.minecraft.client.sounds.SoundManager
-import net.minecraft.network.chat.Component
-import net.minecraft.network.protocol.game.ServerboundClientCommandPacket
-import net.minecraft.stats.Stats
-import net.minecraft.util.CommonColors
-import kotlin.math.ceil
-
-class TrainerCardMenu : Screen(
-    Component.translatable("cobblemon.ui.trainercard.title")
-), CobblemonRenderable {
-
-    private var elapsedTicks = 0
-    private var lastSyncedTimePlayed = 0
-    private var panelLeft = 0
-    private var panelTop = 0
-    private lateinit var badgeScrollList: BadgesScrollingWidget
-    private lateinit var leftPageArrow: TrainerCardPageArrow
-    private lateinit var rightPageArrow: TrainerCardPageArrow
-    private var currentPage = 0
-    private val maxPages = 3
-
-    override fun isPauseScreen(): Boolean = false
-
-    override fun init() {
-        super.init()
-        elapsedTicks = 0
-        lastSyncedTimePlayed = getTimePlayed()
-        // stats need to update when we open the menu, otherwise time played only updates when stats menu is opened
-        Minecraft.getInstance().connection?.send(
-            ServerboundClientCommandPacket(ServerboundClientCommandPacket.Action.REQUEST_STATS)
-        )
-
-        val badges = Badges.all().sortedBy { it.order }
-        val panelWidth = minOf(220, (width - 16).coerceAtLeast(1))
-        panelLeft = (width - panelWidth) / 2
-        val leftColumnWidth = panelWidth / 2
-        val badgeAreaWidth = panelWidth - leftColumnWidth - 8
-        val columns = ((badgeAreaWidth + BadgesScrollingWidget.SLOT_SPACING) /
-            (BadgesScrollingWidget.SLOT_SIZE + BadgesScrollingWidget.SLOT_SPACING)).coerceIn(1, 4)
-        val badgeWidth = columns * BadgesScrollingWidget.SLOT_SIZE +
-            (columns - 1) * BadgesScrollingWidget.SLOT_SPACING + 4
-        val rowCount = ceil(badges.size.toDouble() / columns).toInt().coerceAtLeast(1)
-        val rowHeight = BadgesScrollingWidget.SLOT_SIZE + BadgesScrollingWidget.SLOT_SPACING
-        val badgeHeight = minOf(rowCount, BadgesScrollingWidget.MAX_VISIBLE_ROWS) * rowHeight
-        val panelHeight = maxOf(92, badgeHeight + 20)
-        panelTop = ((height - panelHeight) / 2).coerceAtLeast(8)
-
-        badgeScrollList = BadgesScrollingWidget(
-            x = panelLeft + panelWidth - badgeWidth,
-            y = panelTop + 10,
-            width = badgeWidth,
-            height = badgeHeight,
-            columns = columns
-        )
-        badgeScrollList.createEntries(badges)
-        addRenderableWidget(badgeScrollList)
-
-        leftPageArrow = TrainerCardPageArrow(
-            buttonX = panelLeft - 10,
-            buttonY = panelTop,
-            width = 16,
-            height = 16,
-            onPress = {},
-            parent = this,
-            isRight = false
-        )
-        rightPageArrow = TrainerCardPageArrow(
-            buttonX = panelLeft + panelWidth + 10,
-            buttonY = panelTop,
-            width = 16,
-            height = 16,
-            onPress = {},
-            parent = this,
-            isRight = true
-        )
-
-        addRenderableWidget(leftPageArrow)
-        addRenderableWidget(rightPageArrow)
-    }
-
-    override fun tick() {
-        super.tick()
-        // make our own live playtime update, otherwise we have to send a packet a second to retrieve the playtime stat
-        val timePlayed = getTimePlayed()
-        if (timePlayed != lastSyncedTimePlayed) {
-            lastSyncedTimePlayed = timePlayed
-            elapsedTicks = 0
-        } else { elapsedTicks++ }
-    }
-
-    override fun render(context: GuiGraphics, mouseX: Int, mouseY: Int, partialTick: Float) {
-        when(currentPage) {
-            0 -> {
-                val portraitX = panelLeft
-                val portraitY = minOf(panelTop + 48, (height - 32).coerceAtLeast(0))
-                val portraitSize = 30
-                val statsTextWidth = (badgeScrollList.x - panelLeft - 8).coerceAtLeast(1)
-
-                val player = Minecraft.getInstance().player ?: return // unsure of why this would ever not return a player but if you're here maybe it's because it did
-                val entity = Minecraft.getInstance().level?.getPlayerByUUID(player.uuid) ?: return
-
-                context.enableScissor(portraitX, portraitY, portraitX + portraitSize, portraitY + portraitSize)
-                InventoryScreen.renderEntityInInventoryFollowsMouse(context,
-                    portraitX, portraitY, portraitX + portraitSize, portraitY + portraitSize, 28, 0.5f, mouseX.toFloat(), mouseY.toFloat(),
-                    entity
-                )
-
-                context.disableScissor()
-
-                val totalSeconds = (getTimePlayed() + elapsedTicks) / 20
-                val timePlayed = "%d:%02d:%02d:%02d".format(
-                    totalSeconds / 86_400, // days
-                    totalSeconds % 86_400 / 3_600, // hours
-                    totalSeconds % 3_600 / 60, // minutes
-                    totalSeconds % 60 // seconds
-                )
-
-                drawScaledText(
-                    context = context,
-                    text = lang("ui.trainermenu.timeplayed", timePlayed),
-                    x = panelLeft,
-                    y = panelTop + 4,
-                    maxCharacterWidth = statsTextWidth
-                )
-
-                drawScaledText(
-                    context = context,
-                    text = lang("ui.trainermenu.pokemon_registered",
-                        CobblemonClient.clientPokedexData.getDexCalculatedValue(cobblemonResource("national"), CaughtCount)),
-                    x = panelLeft,
-                    y = panelTop + 14,
-                    maxCharacterWidth = statsTextWidth
-                )
-
-                val playerBattlesWon = player.stats.getValue(Stats.CUSTOM.get(getStat(Cobblemon.statistics.PVP_BATTLES_WON)))
-                val playerBattlesLost = player.stats.getValue(Stats.CUSTOM.get(getStat(Cobblemon.statistics.PVP_BATTLES_LOST)))
-
-                if (playerBattlesWon > 0 || playerBattlesLost > 0) {
-                    drawScaledText(
-                        context = context,
-                        text = lang("ui.trainermenu.battle_stats",
-                            playerBattlesWon,
-                            playerBattlesLost
-                        ),
-                        x = panelLeft,
-                        y = panelTop + 24,
-                        maxCharacterWidth = statsTextWidth
-                    )
-                }
-
-                badgeScrollList.render(context, mouseX, mouseY, partialTick)
-            }
-        }
-
-        drawScaledText(
-            context = context,
-            text = Component.literal("$currentPage"),
-            x = panelLeft - 30,
-            y = panelTop
-        )
-
-        if (leftPageArrow.shouldExist()) {
-            leftPageArrow.render(context, mouseX, mouseY, partialTick)
-        }
-
-        if (rightPageArrow.shouldExist()) {
-            rightPageArrow.render(context, mouseX, mouseY, partialTick)
-        }
-
-    }
-
-    private class TrainerCardPageArrow(
-        buttonX: Int,
-        buttonY: Int, width: Int, height: Int, onPress: OnPress,
-        val parent: TrainerCardMenu,
-        val isRight: Boolean
-    ): Button(
-        buttonX, buttonY, width, height, "".text(), onPress, DEFAULT_NARRATION
-    ) {
-
-        fun shouldExist(): Boolean {
-            if (isRight && parent.currentPage == parent.maxPages - 1) return false
-            if (!isRight && parent.currentPage == 0) return false
-            return true
-        }
-
-        override fun renderWidget(context: GuiGraphics, mouseX: Int, mouseY: Int, partialTick: Float) {
-            context.fill(x, y, x + width, y + height, CommonColors.WHITE)
-        }
-
-        override fun playDownSound(handler: SoundManager) {
-            if (shouldExist()) super.playDownSound(handler)
-        }
-
-        override fun onClick(mouseX: Double, mouseY: Double) {
-            if (!shouldExist()) return
-            parent.currentPage += if (isRight) 1 else -1
-        }
-    }
-
-    private fun getTimePlayed(): Int =
-        Minecraft.getInstance().player?.stats?.getValue(Stats.CUSTOM.get(Stats.PLAY_TIME)) ?: 0
-
-}

common/src/main/kotlin/com/cobblemon/mod/common/client/keybind/CobblemonKeyBinds.kt

@@ -39,7 +39,6 @@ object CobblemonKeyBinds {
     val PARTY_OVERLAY_UP = this.queue(UpShiftPartyBinding)
     val SEND_OUT_POKEMON = this.queue(PartySendBinding)
     val RIDING_FREELOOK = this.queue(RidingFreelookBinding)
-    val TRAINER_MENU = this.queue(TrainerMenuBinding)
 
     fun register(registrar: (KeyMapping) -> Unit) {
         this.keyBinds.forEach(registrar::invoke)

common/src/main/kotlin/com/cobblemon/mod/common/client/keybind/keybinds/TrainerMenuBinding.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.client.keybind.keybinds
-
-import com.cobblemon.mod.common.Cobblemon
-import com.cobblemon.mod.common.client.CobblemonClient
-import com.cobblemon.mod.common.client.gui.summary.Summary
-import com.cobblemon.mod.common.client.gui.trainercard.TrainerCardMenu
-import com.cobblemon.mod.common.client.keybind.CobblemonPartyLockedKeyBinding
-import com.cobblemon.mod.common.client.keybind.KeybindCategories
-import com.mojang.blaze3d.platform.InputConstants
-import net.minecraft.client.Minecraft
-
-object TrainerMenuBinding : CobblemonPartyLockedKeyBinding(
-    "key.cobblemon.trainermenu",
-    InputConstants.Type.KEYSYM,
-    InputConstants.KEY_N,
-    KeybindCategories.COBBLEMON_CATEGORY
-) {
-    override fun onPress() {
-        Minecraft.getInstance().setScreen(TrainerCardMenu())
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/command/BadgeCommand.kt

@@ -1,69 +0,0 @@
-package com.cobblemon.mod.common.command
-
-import com.cobblemon.mod.common.Cobblemon
-import com.cobblemon.mod.common.api.permission.CobblemonPermissions
-import com.cobblemon.mod.common.command.argument.BadgeArgumentType
-import com.cobblemon.mod.common.util.permission
-import com.mojang.brigadier.Command
-import com.mojang.brigadier.CommandDispatcher
-import com.mojang.brigadier.context.CommandContext
-import net.minecraft.commands.CommandSourceStack
-import net.minecraft.commands.Commands
-import net.minecraft.commands.arguments.EntityArgument
-import net.minecraft.network.chat.Component
-import net.minecraft.server.level.ServerPlayer
-
-object BadgeCommand {
-
-    private const val NAME = "badge"
-    private const val GIVE = "give"
-    private const val REMOVE = "remove"
-    private const val PLAYER = "player"
-
-    fun register(dispatcher: CommandDispatcher<CommandSourceStack>) {
-        val command =
-            Commands.literal(NAME)
-                .permission(CobblemonPermissions.BADGE)
-                .then(Commands.literal(GIVE)
-                    .then(Commands.argument(PLAYER, EntityArgument.player())
-                        .then(Commands.argument(BADGE, BadgeArgumentType.badge())
-                            .executes { executeGive(it, EntityArgument.getPlayer(it, PLAYER)) }
-                        )
-                    )
-                )
-                .then(Commands.literal(REMOVE)
-                    .then(Commands.argument(PLAYER, EntityArgument.player())
-                        .then(Commands.argument(BADGE, BadgeArgumentType.badge())
-                            .executes { executeRemove(it, EntityArgument.getPlayer(it, PLAYER)) }
-                        )
-                    )
-                )
-        dispatcher.register(command)
-    }
-
-    private fun executeGive(context: CommandContext<CommandSourceStack>, player: ServerPlayer): Int {
-        val badge = BadgeArgumentType.getBadge(context, BADGE)
-        val changed = Cobblemon.playerDataManager.getBadgeData(player).give(badge)
-        val message = if (changed) {
-            "Gave ${badge.name} to ${player.name.string}."
-        } else {
-            "${player.name.string} already has ${badge.name}."
-        }
-        context.source.sendSuccess({ Component.literal(message) }, true)
-        return Command.SINGLE_SUCCESS
-    }
-
-    private fun executeRemove(context: CommandContext<CommandSourceStack>, player: ServerPlayer): Int {
-        val badge = BadgeArgumentType.getBadge(context, BADGE)
-        val changed = Cobblemon.playerDataManager.getBadgeData(player).remove(badge)
-        val message = if (changed) {
-            "Removed ${badge} from ${player.name.string}." // TODO move this to lang
-        } else {
-            "${player.name.string} does not have ${badge.name}."
-        }
-        context.source.sendSuccess({ Component.literal(message) }, true)
-        return Command.SINGLE_SUCCESS
-    }
-
-    private const val BADGE = "badge"
-}

common/src/main/kotlin/com/cobblemon/mod/common/command/argument/BadgeArgumentType.kt

@@ -1,51 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.command.argument
-
-import com.cobblemon.mod.common.api.badges.Badge
-import com.cobblemon.mod.common.api.badges.Badges
-import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
-import com.mojang.brigadier.StringReader
-import com.mojang.brigadier.arguments.ArgumentType
-import com.mojang.brigadier.context.CommandContext
-import com.mojang.brigadier.exceptions.SimpleCommandExceptionType
-import com.mojang.brigadier.suggestion.Suggestions
-import com.mojang.brigadier.suggestion.SuggestionsBuilder
-import net.minecraft.commands.SharedSuggestionProvider
-import net.minecraft.network.chat.Component
-import java.util.concurrent.CompletableFuture
-
-class BadgeArgumentType : ArgumentType<Badge> {
-
-    override fun parse(reader: StringReader): Badge {
-        val identifier = try {
-            reader.asIdentifierDefaultingNamespace()
-        } catch (exception: Exception) {
-            throw SimpleCommandExceptionType(INVALID_BADGE).createWithContext(reader)
-        }
-        return Badges.getByIdentifier(identifier)
-            ?: throw SimpleCommandExceptionType(INVALID_BADGE).createWithContext(reader)
-    }
-
-    override fun <S : Any> listSuggestions(
-        context: CommandContext<S>,
-        builder: SuggestionsBuilder
-    ): CompletableFuture<Suggestions> {
-        return SharedSuggestionProvider.suggest(Badges.all().map { it.identifier.toString() }, builder)
-    }
-
-    companion object {
-        private val INVALID_BADGE = Component.translatable("cobblemon.command.badge.invalid")
-
-        fun badge() = BadgeArgumentType()
-
-        fun <S> getBadge(context: CommandContext<S>, name: String): Badge =
-            context.getArgument(name, Badge::class.java)
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/data/CobblemonDataProvider.kt

@@ -11,7 +11,6 @@ package com.cobblemon.mod.common.data
 import com.cobblemon.mod.common.*
 import com.cobblemon.mod.common.Cobblemon.LOGGER
 import com.cobblemon.mod.common.api.abilities.Abilities
-import com.cobblemon.mod.common.api.badges.Badges
 import com.cobblemon.mod.common.api.berry.Berries
 import com.cobblemon.mod.common.api.cooking.Seasonings
 import com.cobblemon.mod.common.api.data.DataProvider
@@ -121,7 +120,6 @@ object CobblemonDataProvider : DataProvider {
         this.register(SpawnBaitEffects, reloadable = false)
         this.register(CobblemonRideSettings, reloadable = true)
         this.register(TechnicalMachines, reloadable = false)
-        this.register(Badges, reloadable = true)
         SpawnBait.Effects.setupEffects()
 
         PlatformEvents.SERVER_PLAYER_LOGOUT.subscribe {

common/src/main/kotlin/com/cobblemon/mod/common/events/StatHandler.kt

@@ -78,21 +78,10 @@ object StatHandler : EventHandler {
 
     fun onWinBattle(event : BattleVictoryEvent) {
         if (!event.wasWildCapture) {
-            if(event.battle.isPvP) {
-                event.winners
-                    .flatMap { it.getPlayerUUIDs().mapNotNull(UUID::getPlayer) }
-                    .forEach { player -> player.awardStat(getStat(Cobblemon.statistics.PVP_BATTLES_WON)) }
-                event.losers
-                    .flatMap { it.getPlayerUUIDs().mapNotNull(UUID::getPlayer) }
-                    .forEach { player -> player.awardStat(getStat(Cobblemon.statistics.PVP_BATTLES_LOST)) }
-            }
             if (event.battle.isPvW) {
                 event.winners
                     .flatMap { it.getPlayerUUIDs().mapNotNull(UUID::getPlayer) }
                     .forEach { player -> player.awardStat(getStat(Cobblemon.statistics.BATTLES_WON)) }
-                event.losers
-                    .flatMap { it.getPlayerUUIDs().mapNotNull(UUID::getPlayer) }
-                    .forEach { player -> player.awardStat(getStat(Cobblemon.statistics.BATTLES_LOST)) }
             }
         }
     }

common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/data/BadgeRegistrySyncPacket.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.net.messages.client.data
-
-import com.cobblemon.mod.common.api.badges.Badge
-import com.cobblemon.mod.common.api.badges.Badges
-import com.cobblemon.mod.common.util.cobblemonResource
-import com.cobblemon.mod.common.util.readIdentifier
-import com.cobblemon.mod.common.util.readString
-import com.cobblemon.mod.common.util.writeIdentifier
-import com.cobblemon.mod.common.util.writeString
-import net.minecraft.network.RegistryFriendlyByteBuf
-
-class BadgeRegistrySyncPacket(badges: List<Badge>) : DataRegistrySyncPacket<Badge, BadgeRegistrySyncPacket>(badges) {
-    companion object {
-        val ID = cobblemonResource("badges")
-        fun decode(buffer: RegistryFriendlyByteBuf) = BadgeRegistrySyncPacket(emptyList()).apply { decodeBuffer(buffer) }
-    }
-
-
-    override val id = ID
-    override fun encodeEntry(buffer: RegistryFriendlyByteBuf, entry: Badge) {
-        buffer.writeIdentifier(entry.identifier)
-        buffer.writeString(entry.name)
-        buffer.writeResourceLocation(entry.texture)
-        buffer.writeInt(entry.order)
-    }
-
-    override fun decodeEntry(buffer: RegistryFriendlyByteBuf): Badge {
-        return Badge(
-            order = buffer.readInt(),
-            texture = buffer.readResourceLocation(),
-            name = buffer.readString(),
-            identifier = buffer.readIdentifier()
-        )
-    }
-
-    override fun synchronizeDecoded(entries: Collection<Badge>) {
-        Badges.reload(entries.associateBy { it.identifier })
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/net/messages/server/storage/pc/MovePCPokemonBatchPacket.kt

@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://www.mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.net.messages.server.storage.pc
+
+import com.cobblemon.mod.common.api.net.NetworkPacket
+import com.cobblemon.mod.common.api.storage.pc.PCPosition
+import com.cobblemon.mod.common.util.cobblemonResource
+import com.cobblemon.mod.common.util.readPCPosition
+import com.cobblemon.mod.common.util.writePCPosition
+import java.util.UUID
+import net.minecraft.network.RegistryFriendlyByteBuf
+
+class MovePCPokemonBatchPacket(val moves: List<PCPokemonMove>) : NetworkPacket<MovePCPokemonBatchPacket> {
+    override val id = ID
+
+    data class PCPokemonMove(
+        val pokemonID: UUID,
+        val oldPosition: PCPosition,
+        val newPosition: PCPosition
+    )
+
+    override fun encode(buffer: RegistryFriendlyByteBuf) {
+        buffer.writeVarInt(moves.size)
+        moves.forEach { move ->
+            buffer.writeUUID(move.pokemonID)
+            buffer.writePCPosition(move.oldPosition)
+            buffer.writePCPosition(move.newPosition)
+        }
+    }
+
+    companion object {
+        val ID = cobblemonResource("move_pc_pokemon_batch")
+        const val MAX_MOVES = 60
+
+        fun decode(buffer: RegistryFriendlyByteBuf): MovePCPokemonBatchPacket {
+            val size = buffer.readVarInt()
+            require(size in 1..MAX_MOVES) { "Invalid batch PC move size: $size" }
+            return MovePCPokemonBatchPacket(
+                List(size) {
+                    PCPokemonMove(
+                        pokemonID = buffer.readUUID(),
+                        oldPosition = buffer.readPCPosition(),
+                        newPosition = buffer.readPCPosition()
+                    )
+                }
+            )
+        }
+    }
+}

common/src/main/kotlin/com/cobblemon/mod/common/net/serverhandling/storage/pc/MovePCPokemonBatchHandler.kt

@@ -0,0 +1,23 @@
+/*
+ * 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://www.mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.net.serverhandling.storage.pc
+
+import com.cobblemon.mod.common.api.net.ServerNetworkPacketHandler
+import com.cobblemon.mod.common.api.storage.pc.link.PCLinkManager
+import com.cobblemon.mod.common.net.messages.client.storage.pc.ClosePCPacket
+import com.cobblemon.mod.common.net.messages.server.storage.pc.MovePCPokemonBatchPacket
+import net.minecraft.server.MinecraftServer
+import net.minecraft.server.level.ServerPlayer
+
+object MovePCPokemonBatchHandler : ServerNetworkPacketHandler<MovePCPokemonBatchPacket> {
+    override fun handle(packet: MovePCPokemonBatchPacket, server: MinecraftServer, player: ServerPlayer) {
+        val pc = PCLinkManager.getPC(player) ?: return run { ClosePCPacket(null).sendToPlayer(player) }
+        pc.moveBatch(packet.moves.map { Triple(it.pokemonID, it.oldPosition, it.newPosition) })
+    }
+}

common/src/main/kotlin/com/cobblemon/mod/common/platform/events/PlatformEvents.kt

@@ -55,8 +55,6 @@ object PlatformEvents {
     @JvmField
     val CLIENT_PLAYER_LOGOUT = EventObservable<ClientPlayerEvent.Logout>()
     @JvmField
-    val PLAYER_RESPAWN = EventObservable<ServerPlayerEvent.Respawn>()
-    @JvmField
     val PLAYER_DEATH = CancelableObservable<ServerPlayerEvent.Death>()
     @JvmField
     val RIGHT_CLICK_BLOCK = CancelableObservable<ServerPlayerEvent.RightClickBlock>()

common/src/main/kotlin/com/cobblemon/mod/common/platform/events/ServerPlayerEvent.kt

@@ -50,11 +50,6 @@ interface ServerPlayerEvent {
      */
     data class Logout(override val player: ServerPlayer) : ServerPlayerEvent
 
-    /**
-     * Fired when the [player] respawns (either by coming back from the end or dying).
-     */
-    data class Respawn(override val player: ServerPlayer) : ServerPlayerEvent
-
     /**
      * Fired when the [player] dies.
      * If canceled the death will be prevented but healing is required in order to not be stuck in a loop.

common/src/main/resources/assets/cobblemon/lang/en_us.json

@@ -844,19 +844,6 @@
   "cobblemon.fossil.root": "Root",
   "cobblemon.fossil.sail": "Sail",
   "cobblemon.fossil.skull": "Skull",
-
-  "cobblemon.badge.unobtained": "?????",
-  "cobblemon.badge.awesome_badge": "Awesome Badge",
-  "cobblemon.badge.awesome_badge2": "Awesome Badge 2",
-  "cobblemon.badge.dummy_badge": "Dummy Badge",
-  "cobblemon.badge.dummy_badge2": "Dummy Badge 2",
-  "cobblemon.badge.funny_badge": "Funny Badge",
-  "cobblemon.badge.funny_badge2": "Funny Badge 2",
-  "cobblemon.badge.interesting_badge": "Interesting Badge",
-  "cobblemon.badge.interesting_badge2": "Interesting Badge 2",
-  "cobblemon.badge.weird_badge": "Weird Badge",
-  "cobblemon.badge.weird_badge2": "Weird Badge 2",
-
   "cobblemon.gender.female": "Female",
   "cobblemon.gender.male": "Male",
   "cobblemon.gender.genderless": "Genderless",
@@ -1212,13 +1199,10 @@
   "cobblemon.ui.edit.habitat.validation.min_light": "Min Light must be between 0 and 15.",
   "cobblemon.ui.edit.habitat.validation.max_light": "Max Light must be between 0 and 15.",
 
+
   "cobblemon.ui.pokenav.title": "PokéNav",
   "cobblemon.ui.pokenav.narrator.backbutton": "PokéNav button pressed",
 
-  "cobblemon.ui.trainermenu.timeplayed": "Time played: %1$s",
-  "cobblemon.ui.trainermenu.pokemon_registered": "Pokémon registered: %1$s",
-  "cobblemon.ui.trainermenu.battle_stats": "Win/loss rate: %1$s/%2$s",
-
   "cobblemon.ui.summary.title": "Summary",
   "cobblemon.ui.starter.title": "Starter Selection",
   "cobblemon.ui.starter.choosebutton": "I choose you!",
@@ -1315,6 +1299,7 @@
   "cobblemon.ui.pc.filter.tooltip": "Format: pikachu shiny held_item lvl=1...",
   "cobblemon.ui.pc.options": "Options",
   "cobblemon.ui.pc.release": "Release",
+  "cobblemon.ui.pc.release_all": "Release All",
   "cobblemon.ui.sort.name": "Sort by name",
   "cobblemon.ui.sort.level": "Sort by level",
   "cobblemon.ui.sort.pokedex_number": "Sort by Pokédex number",
@@ -2403,7 +2388,6 @@
   "cobblemon.command.takemark": "%1$s was taken from %2$s's %3$s.",
   "cobblemon.command.takemark.does_not_have": "%1$s's %2$s does not have a %3$s!",
   "cobblemon.command.mark.invalid": "Invalid mark name.",
-  "cobblemon.command.badge.invalid": "Invalid badge identifier.",
   "cobblemon.command.molang.out": "MoLang output: %1$s",
   "cobblemon.command.pokeheal.in_battle": "You cannot heal your party while in a battle!",
   "cobblemon.command.spawnpokemonfrompool": "A %1$s has spawned in the area.",
@@ -9601,10 +9585,8 @@
   "cobblemon.snapshots.warning.dont_show_again_tip": "This setting may be ignored on newer Cobblemon snapshots (e.g. 1.7.0 vs 1.8.0)",
   "stat.cobblemon.battles_fled": "Pokémon Battles Fled",
   "stat.cobblemon.battles_lost": "Pokémon Battles Lost",
-  "stat.cobblemon.pvp_battles_lost": "Trainer Battles Lost",
   "stat.cobblemon.battles_total": "Pokémon Total Battles",
   "stat.cobblemon.battles_won": "Pokémon Battles Won",
-  "stat.cobblemon.pvp_battles_won": "Trainer Battles Won",
   "stat.cobblemon.captured": "Pokémon Captured",
   "stat.cobblemon.dex_entries": "Pokémon Pokédex Entries",
   "stat.cobblemon.eggs_collected": "Pokémon Eggs Collected",

common/src/main/resources/data/cobblemon/badges/awesome_badge.json

@@ -1,5 +0,0 @@
-{
-  "name": "cobblemon.badge.awesome_badge",
-  "texture": "cobblemon:textures/gui/mark/mark_alpha.png",
-  "order": 2
-}

common/src/main/resources/data/cobblemon/badges/awesome_badge2.json

@@ -1,5 +0,0 @@
-{
-  "name": "cobblemon.badge.awesome_badge2",
-  "texture": "cobblemon:textures/gui/mark/mark_alpha.png",
-  "order": 6
-}

common/src/main/resources/data/cobblemon/badges/dummy_badge.json

@@ -1,5 +0,0 @@
-{
-  "name": "cobblemon.badge.dummy_badge",
-  "texture": "cobblemon:textures/gui/mark/mark_gourmand.png",
-  "order": 1
-}

common/src/main/resources/data/cobblemon/badges/dummy_badge2.json

@@ -1,5 +0,0 @@
-{
-  "name": "cobblemon.badge.dummy_badge",
-  "texture": "cobblemon:textures/gui/mark/mark_gourmand.png",
-  "order": 7
-}

common/src/main/resources/data/cobblemon/badges/funny_badge.json

@@ -1,5 +0,0 @@
-{
-  "name": "cobblemon.badge.funny_badge",
-  "texture": "cobblemon:textures/gui/mark/mark_destiny.png",
-  "order": 5
-}

common/src/main/resources/data/cobblemon/badges/funny_badge2.json

@@ -1,5 +0,0 @@
-{
-  "name": "cobblemon.badge.funny_badge",
-  "texture": "cobblemon:textures/gui/mark/mark_destiny.png",
-  "order": 8
-}

common/src/main/resources/data/cobblemon/badges/interesting_badge.json

@@ -1,5 +0,0 @@
-{
-  "name": "cobblemon.badge.interesting_badge",
-  "texture": "cobblemon:textures/gui/mark/mark_fishing.png",
-  "order": 4
-}

common/src/main/resources/data/cobblemon/badges/interesting_badge2.json

@@ -1,5 +0,0 @@
-{
-  "name": "cobblemon.badge.interesting_badge",
-  "texture": "cobblemon:textures/gui/mark/mark_fishing.png",
-  "order": 9
-}

common/src/main/resources/data/cobblemon/badges/weird_badge.json

@@ -1,5 +0,0 @@
-{
-  "name": "cobblemon.badge.weird_badge",
-  "texture": "cobblemon:textures/gui/mark/mark_curry.png",
-  "order": 3
-}

common/src/main/resources/data/cobblemon/badges/weird_badge2.json

@@ -1,5 +0,0 @@
-{
-  "name": "cobblemon.badge.weird_badge",
-  "texture": "cobblemon:textures/gui/mark/mark_curry.png",
-  "order": 10
-}

common/src/main/resources/data/cobblemon/recipe/campfire_pot/exp_candy_l.json

@@ -1,6 +1,6 @@
 {
     "type": "cobblemon:cooking_pot_shapeless",
-    "category": "misc",
+    "category": "medicines",
     "ingredients": [
         {
             "item": "cobblemon:exp_candy_m"

common/src/main/resources/data/cobblemon/recipe/campfire_pot/exp_candy_m.json

@@ -1,6 +1,6 @@
 {
     "type": "cobblemon:cooking_pot_shapeless",
-    "category": "misc",
+    "category": "medicines",
     "ingredients": [
         {
             "item": "cobblemon:exp_candy_s"

common/src/main/resources/data/cobblemon/recipe/campfire_pot/exp_candy_s.json

@@ -1,6 +1,6 @@
 {
     "type": "cobblemon:cooking_pot_shapeless",
-    "category": "misc",
+    "category": "medicines",
     "ingredients": [
         {
             "item": "cobblemon:exp_candy_xs"

common/src/main/resources/data/cobblemon/recipe/campfire_pot/exp_candy_xl.json

@@ -1,6 +1,6 @@
 {
     "type": "cobblemon:cooking_pot_shapeless",
-    "category": "misc",
+    "category": "medicines",
     "ingredients": [
         {
             "item": "cobblemon:exp_candy_l"

common/src/main/resources/data/cobblemon/recipe/campfire_pot/exp_candy_xs.json

@@ -1,6 +1,6 @@
 {
     "type": "cobblemon:cooking_pot_shapeless",
-    "category": "misc",
+    "category": "medicines",
     "ingredients": [
         {
             "item": "minecraft:sculk"

fabric/build.gradle.kts

@@ -85,9 +85,6 @@ dependencies {
 
     minecraftServerLibraries(libs.icu4j)
 
-    // AppleSkin stores api under `api` classifier in their coordinates
-    // Because of that, we cannot just add it to integrations bundle
-    modCompileOnly(variantOf(libs.appleskin.api.fabric) { classifier("api") })
 }
 
 publishing {

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

@@ -11,22 +11,27 @@ package com.cobblemon.mod.fabric.mixin;
 import com.cobblemon.mod.common.platform.events.PlatformEvents;
 import com.cobblemon.mod.common.platform.events.ServerPlayerTickEvent;
 import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.entity.player.Player;
 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(ServerPlayer.class)
-public class ServerPlayerMixin {
+@Mixin(Player.class)
+public class PlayerMixin {
     @Inject(method = "tick", at = @At("HEAD"))
     private void onPreTick(CallbackInfo ci) {
-        ServerPlayer player = (ServerPlayer)(Object)this;
-        PlatformEvents.SERVER_PLAYER_TICK_PRE.emit(new ServerPlayerTickEvent.Pre(player));
+        Player player = (Player)(Object)this;
+        if (player instanceof ServerPlayer) {
+            PlatformEvents.SERVER_PLAYER_TICK_PRE.emit(new ServerPlayerTickEvent.Pre((ServerPlayer)player));
+        }
     }
 
     @Inject(method = "tick", at = @At("TAIL"))
     private void onPostTick(CallbackInfo ci) {
-        ServerPlayer player = (ServerPlayer)(Object)this;
-        PlatformEvents.SERVER_PLAYER_TICK_POST.emit(new ServerPlayerTickEvent.Post(player));
+        Player player = (Player)(Object)this;
+        if (player instanceof ServerPlayer) {
+            PlatformEvents.SERVER_PLAYER_TICK_POST.emit(new ServerPlayerTickEvent.Post((ServerPlayer)player));
+        }
     }
 }

fabric/src/main/java/com/cobblemon/mod/fabric/mixin/RecipeBookCategoriesMixin.java

@@ -56,7 +56,7 @@ public class RecipeBookCategoriesMixin {
         types.add(cobblemon$createCategory("COBBLEMON_COOKING_POT_FOODS", $VALUES.length + 1, new ItemStack(CobblemonItems.LEEK_AND_POTATO_STEW)));
         types.add(cobblemon$createCategory("COBBLEMON_COOKING_POT_MEDICINES", $VALUES.length + 2, new ItemStack(CobblemonItems.POTION)));
         types.add(cobblemon$createCategory("COBBLEMON_COOKING_POT_COMPLEX_DISHES", $VALUES.length + 3, new ItemStack(CobblemonItems.APRIJUICE_RED)));
-        types.add(cobblemon$createCategory("COBBLEMON_COOKING_POT_MISC", $VALUES.length + 4, new ItemStack(CobblemonItems.HEALTH_CANDY)));
+        types.add(cobblemon$createCategory("COBBLEMON_COOKING_POT_MISC", $VALUES.length + 4, new ItemStack(CobblemonItems.PROTEIN)));
         $VALUES = types.toArray(RecipeBookCategories[]::new);
     }
 

fabric/src/main/kotlin/com/cobblemon/mod/fabric/CobblemonFabric.kt

@@ -37,7 +37,6 @@ import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback
 import net.fabricmc.fabric.api.entity.event.v1.EntitySleepEvents
 import net.fabricmc.fabric.api.entity.event.v1.ServerEntityWorldChangeEvents
 import net.fabricmc.fabric.api.entity.event.v1.ServerLivingEntityEvents
-import net.fabricmc.fabric.api.entity.event.v1.ServerPlayerEvents
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents
 import net.fabricmc.fabric.api.event.player.UseBlockCallback
@@ -176,7 +175,6 @@ object CobblemonFabric : CobblemonImplementation {
         ServerPlayConnectionEvents.DISCONNECT.register { handler, server ->
             if (!server.isStopped) server.executeIfPossible { PlatformEvents.SERVER_PLAYER_LOGOUT.post(ServerPlayerEvent.Logout(handler.player)) }
         }
-        ServerPlayerEvents.AFTER_RESPAWN.register { oldPlayer, newPlayer, alive -> PlatformEvents.PLAYER_RESPAWN.post(ServerPlayerEvent.Respawn(newPlayer)) }
         ServerLivingEntityEvents.ALLOW_DEATH.register { entity, _, _ ->
             if (entity is ServerPlayer) {
                 PlatformEvents.PLAYER_DEATH.postThen(

fabric/src/main/kotlin/com/cobblemon/mod/fabric/client/integration/appleskin/AppleSkinClientEventHandler.kt

@@ -1,28 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.fabric.client.integration.appleskin
-
-import com.cobblemon.mod.common.client.CobblemonClient
-import squeek.appleskin.api.AppleSkinApi
-import squeek.appleskin.api.event.HUDOverlayEvent
-
-class AppleSkinClientEventHandler: AppleSkinApi {
-    override fun registerEvents() {
-        HUDOverlayEvent.Exhaustion.EVENT.register(::checkIsScanning)
-        HUDOverlayEvent.Saturation.EVENT.register(::checkIsScanning)
-        HUDOverlayEvent.HealthRestored.EVENT.register(::checkIsScanning)
-        HUDOverlayEvent.HungerRestored.EVENT.register(::checkIsScanning)
-    }
-
-    private fun checkIsScanning(e: HUDOverlayEvent) {
-        if (CobblemonClient.pokedexUsageContext.scanningGuiOpen) {
-            e.isCanceled = true
-        }
-    }
-}

fabric/src/main/resources/fabric.mod.json

@@ -33,9 +33,6 @@
     ],
     "modmenu": [
       "com.cobblemon.mod.fabric.client.integration.modmenu.CobblemonModMenu"
-    ],
-    "appleskin": [
-      "com.cobblemon.mod.fabric.client.integration.appleskin.AppleSkinClientEventHandler"
     ]
   },
   "mixins": [

fabric/src/main/resources/mixins.cobblemon-fabric.json

@@ -15,7 +15,7 @@
     "EntityMixin",
     "FabricBrewingStandMenuMixin",
     "FabricSoundEngineMixin",
-    "ServerPlayerMixin",
+    "PlayerMixin",
     "RecipeBookSettingsMixin",
     "RecipeBookTypeMixin",
     "ServerEntityMixin"

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

@@ -37,9 +37,6 @@ repositories {
     //JEI
     maven("https://maven.blamejared.com/")
     maven("https://maven.parchmentmc.org")
-
-    // AppleSkin
-    maven("https://maven.ryanliptak.com/")
 }
 
 license {

gradle/libs.versions.toml

@@ -16,7 +16,6 @@ moddev = "1.0.11"
 # Common
 molang = "1.1.20"
 jei-api = "19.22.1.316"
-appleskin-api = "mc1.21-3.0.5"
 
 # Graal
 graal = "22.3.0"
@@ -86,7 +85,6 @@ jei-fabric = { group = "mezz.jei", name = "jei-1.21.1-fabric", version.ref = "je
 fabric-debugutils = { group = "maven.modrinth", name = "debugutils", version.ref = "debugutils-fabric"}
 mod-menu = { group = "com.terraformersmc", name = "modmenu", version.ref = "mod-menu" }
 c2me-fabric = { group = "maven.modrinth", name = "c2me-fabric", version.ref = "c2me-fabric" }
-appleskin-api-fabric = { group = "squeek.appleskin", name = "appleskin-fabric", version.ref = "appleskin-api" }
 
 # NeoForge
 neoforge-api = { group = "net.neoforged", name = "neoforge", version.ref = "neoforge" }
@@ -94,7 +92,6 @@ neo-kotlin-forge = { group = "thedarkcolour", name = "kotlinforforge-neoforge",
 neoforge-debugutils = { group = "maven.modrinth", name = "debugutils", version.ref = "debugutils-forge"}
 jei-neoforge = { group = "mezz.jei", name = "jei-1.21.1-neoforge", version.ref = "jei-api"}
 c2me-neoforge = { group = "maven.modrinth", name = "c2me-neoforge", version.ref = "c2me-neoforge" }
-appleskin-api-neoforge = { group = "squeek.appleskin", name = "appleskin-neoforge", version.ref = "appleskin-api" }
 
 # Data Storage
 mongo-driver-core = { group = "org.mongodb", name = "mongodb-driver-core", version.ref = "mongo" }

neoforge/build.gradle.kts

@@ -68,9 +68,6 @@ dependencies {
         bundle(it)
     }
 
-    // AppleSkin stores api under `api` classifier in their coordinates
-    // Because of that, we cannot just add it to integrations bundle
-    modCompileOnly(variantOf(libs.appleskin.api.neoforge) { classifier("api") })
 }
 
 tasks {

neoforge/src/main/kotlin/com/cobblemon/mod/neoforge/CobblemonEnumExtensions.kt

@@ -34,5 +34,5 @@ object CobblemonEnumExtensions {
         Supplier<List<ItemStack>> { listOf(ItemStack(CobblemonItems.APRIJUICE_RED)) as List<ItemStack> })
     @JvmField
     val COOKING_POT_MISC = EnumProxy(RecipeBookCategories::class.java,
-        Supplier<List<ItemStack>> { listOf(ItemStack(CobblemonItems.HEALTH_CANDY)) as List<ItemStack> })
+        Supplier<List<ItemStack>> { listOf(ItemStack(CobblemonItems.PROTEIN)) as List<ItemStack> })
 }

neoforge/src/main/kotlin/com/cobblemon/mod/neoforge/CobblemonNeoForge.kt

@@ -22,7 +22,6 @@ import com.cobblemon.mod.common.item.group.CobblemonItemGroups
 import com.cobblemon.mod.common.loot.LootInjector
 import com.cobblemon.mod.common.particle.CobblemonParticles
 import com.cobblemon.mod.common.sherds.CobblemonSherds
-import com.cobblemon.mod.common.util.adapters.RegistryAccessResolver
 import com.cobblemon.mod.common.util.cobblemonResource
 import com.cobblemon.mod.common.util.didSleep
 import com.cobblemon.mod.common.world.CobblemonStructures
@@ -40,6 +39,7 @@ import com.mojang.brigadier.arguments.ArgumentType
 import net.minecraft.commands.synchronization.ArgumentTypeInfo
 import net.minecraft.commands.synchronization.ArgumentTypeInfos
 import net.minecraft.core.HolderLookup
+import net.minecraft.core.RegistryAccess
 import net.minecraft.core.registries.Registries
 import net.minecraft.resources.ResourceKey
 import net.minecraft.resources.ResourceLocation
@@ -63,8 +63,6 @@ import net.minecraft.world.item.ItemStack
 import net.minecraft.world.level.GameRules
 import net.minecraft.world.level.ItemLike
 import net.minecraft.world.level.biome.Biome
-import net.minecraft.world.level.block.Blocks
-import net.minecraft.world.level.block.FlowerPotBlock
 import net.minecraft.world.level.levelgen.GenerationStep
 import net.minecraft.world.level.levelgen.placement.PlacedFeature
 import net.neoforged.api.distmarker.Dist
@@ -288,26 +286,7 @@ class CobblemonNeoForge : CobblemonImplementation {
     override fun registerBlocks() {
         MOD_BUS.addListener<RegisterEvent> { event ->
             event.register(CobblemonBlocks.resourceKey) { helper ->
-                CobblemonBlocks.register { identifier, block ->
-                    if (block !is FlowerPotBlock) helper.register(identifier, block)
-                }
-            }
-        }
-
-        MOD_BUS.addListener<RegisterEvent>(EventPriority.LOW) { event ->
-            // Register the pots after registering main blocks to solve race condition when pottable blocks are still not registered
-            event.register(CobblemonBlocks.resourceKey) { helper ->
-                CobblemonBlocks.register { identifier, block ->
-                    if (block is FlowerPotBlock) {
-                        helper.register(identifier, block)
-
-                        val pottedIdentifier = RegistryAccessResolver.getAccess()
-                            .registryOrThrow(Registries.BLOCK)
-                            .getKeyOrNull(block.potted)!!
-
-                        (Blocks.FLOWER_POT as FlowerPotBlock).addPlant(pottedIdentifier) { block }
-                    }
-                }
+                CobblemonBlocks.register { identifier, block -> helper.register(identifier, block) }
             }
         }
     }

neoforge/src/main/kotlin/com/cobblemon/mod/neoforge/client/CobblemonNeoForgeClient.kt

@@ -26,7 +26,6 @@ import com.cobblemon.mod.common.item.PokedexItem
 import com.cobblemon.mod.common.particle.CobblemonParticles
 import com.cobblemon.mod.common.particle.SnowstormParticleType
 import com.cobblemon.mod.common.util.isUsingPokedex
-import com.cobblemon.mod.neoforge.client.integration.appleskin.AppleSkinClientEventHandler
 import java.util.concurrent.CompletableFuture
 import java.util.function.Supplier
 import net.minecraft.client.Minecraft
@@ -93,9 +92,7 @@ object CobblemonNeoForgeClient : CobblemonClientImplementation {
         event.enqueueWork {
             CobblemonClient.initialize(this)
             CobblemonModelPredicateRegistry.registerPredicates()
-            this.attemptClientModCompat()
         }
-
         NeoForgeClientPlatformEventHandler.register()
 
         val modContainer = ModList.get().getModContainerById(Cobblemon.MODID).get()
@@ -236,10 +233,4 @@ object CobblemonNeoForgeClient : CobblemonClientImplementation {
             }
         }
     }
-
-    private fun attemptClientModCompat() {
-        if (Cobblemon.implementation.isModInstalled("appleskin")) {
-            AppleSkinClientEventHandler.register()
-        }
-    }
 }

neoforge/src/main/kotlin/com/cobblemon/mod/neoforge/client/NeoForgeClientPlatformEventHandler.kt

@@ -8,13 +8,11 @@
 
 package com.cobblemon.mod.neoforge.client
 
-import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.platform.events.ClientEntityEvent
 import com.cobblemon.mod.common.platform.events.ClientPlayerEvent
 import com.cobblemon.mod.common.platform.events.ClientTickEvent
 import com.cobblemon.mod.common.platform.events.PlatformEvents
 import com.cobblemon.mod.common.platform.events.RenderEvent
-import com.cobblemon.mod.neoforge.client.integration.appleskin.AppleSkinClientEventHandler
 import net.minecraft.client.Minecraft
 import net.minecraft.client.multiplayer.ClientLevel
 import net.neoforged.api.distmarker.Dist

neoforge/src/main/kotlin/com/cobblemon/mod/neoforge/client/integration/appleskin/AppleSkinClientEventHandler.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.neoforge.client.integration.appleskin
-
-import com.cobblemon.mod.common.client.CobblemonClient
-import net.neoforged.bus.api.SubscribeEvent
-import net.neoforged.neoforge.common.NeoForge
-import squeek.appleskin.api.event.HUDOverlayEvent
-
-object AppleSkinClientEventHandler {
-    fun register() {
-        NeoForge.EVENT_BUS.register(this)
-    }
-
-    @SubscribeEvent
-    fun onHudLayerEvent(e: HUDOverlayEvent) {
-        if (CobblemonClient.pokedexUsageContext.scanningGuiOpen) {
-            e.isCanceled = true
-        }
-    }
-}

neoforge/src/main/kotlin/com/cobblemon/mod/neoforge/event/NeoForgePlatformEventHandler.kt

@@ -24,7 +24,7 @@ import net.neoforged.neoforge.event.server.ServerAboutToStartEvent
 import net.neoforged.neoforge.event.server.ServerStartedEvent
 import net.neoforged.neoforge.event.server.ServerStoppedEvent
 import net.neoforged.neoforge.event.server.ServerStoppingEvent
-import net.neoforged.neoforge.event.tick.EntityTickEvent
+import net.neoforged.neoforge.event.tick.PlayerTickEvent
 
 object NeoForgePlatformEventHandler {
 
@@ -53,14 +53,14 @@ object NeoForgePlatformEventHandler {
     }
 
     @SubscribeEvent
-    fun prePlayerTick(e: EntityTickEvent.Pre) {
+    fun prePlayerTick(e: PlayerTickEvent.Pre) {
         if (e.entity is ServerPlayer) {
             PlatformEvents.SERVER_PLAYER_TICK_PRE.post(ServerPlayerTickEvent.Pre(e.entity as ServerPlayer))
         }
     }
 
     @SubscribeEvent
-    fun postPlayerTick(e: EntityTickEvent.Post) {
+    fun postPlayerTick(e: PlayerTickEvent.Post) {
         if (e.entity is ServerPlayer) {
             PlatformEvents.SERVER_PLAYER_TICK_POST.post(ServerPlayerTickEvent.Post(e.entity as ServerPlayer))
         }
@@ -98,12 +98,6 @@ object NeoForgePlatformEventHandler {
         )
     }
 
-    @SubscribeEvent
-    fun onRespawn(e: PlayerEvent.PlayerRespawnEvent) {
-        val player = e.entity as? ServerPlayer ?: return
-        PlatformEvents.PLAYER_RESPAWN.post(ServerPlayerEvent.Respawn(player))
-    }
-
     @SubscribeEvent
     fun onRightClickBlock(e: PlayerInteractEvent.RightClickBlock) {
         val player = e.entity as? ServerPlayer ?: return