Update PosableState.kt

CHANGELOG.md

@@ -3,8 +3,8 @@
 
 ### Additions
 - The following items can now be placed on the ground as blocks:
-  - King's Rock, Galarica Cuff, Unremarkable Teacup, Masterpiece Teacup, Chipped Pot, Cracked Pot, Sachet, Metal Powder, Quick Powder, Bright Powder, Soft Sand, Electirizer, Magmarizer, Icy Rock, Heat Rock, Smooth Rock, Damp Rock, Destiny Knot, Luminous Moss, Never-Melt Ice, Wide Lens, Scope Lens, and Zoom Lens.
-  - Iron Ball, Metal Coat, Throat Spray, Terrain Extender, Medicinal Brew, Moomoo Milk, HP Up, Protein, Iron, Carbos, Calcium, Zinc, PP Up, PP Max, Upgrade, Dubious Disc, and Loaded Dice.
+  - King's Rock, Galarica Cuff, Unremarkable Teacup, Masterpiece Teacup, Chipped Pot, Cracked Pot, Sachet, Metal Powder, Quick Powder, Bright Powder, Icy Rock, Heat Rock, Smooth Rock, Damp Rock, Destiny Knot, Luminous Moss, Never-Melt Ice, Wide Lens, Scope Lens, and Zoom Lens.
+  - Iron Ball, Metal Coat, Throat Spray, HP Up, Protein, Iron, Carbos, Calcium, Zinc, PP Up, PP Max, Upgrade, Dubious Disc, and Loaded Dice.
 - The following items can now be placed on various surfaces:
   - Galarica Wreath, Magnet, Flame Orb, Life Orb, Toxic Orb, Light Ball, and Smoke Ball.
 - The following items can now be placed as blocks and have additional functionality:
@@ -13,10 +13,6 @@
   - Galarica Wreath, Cleanse Tag, Spell Tag, Sharp Beak, Covert Cloak, Shell Helmet, and Never-Melt Ice.
 - Wearable items can now be equipped by a player by holding it and right-clicking (or rebound use/interact)
   - Wearable items that can be placed down are exempt from this behaviour.
-- Mint Leaves can now be placed on the ground as Leaf Litter, or in Flower Pots
-- Added Oricorio Flowers
-- Added Terrain Plants
-- Berries can now be placed in Flower Pots
 - The evolution tree can now be viewed on the Pokédex, showing a Pokémon's full family line and what's needed to evolve into each stage.
 - Added custom sounds to a bunch of items that can be placed as blocks: liquid bottles, pill bottles, powders and dice.
 
@@ -85,28 +81,11 @@
 - Bellossom
 
 ### Changes
-- Restructured Botany Pots integration folder structure
-- Decrease default pastured mon wander radius to 32.
-- Factor in the weight of pokemon when calculating pushing forces between hitboxes.
-- Remade the Starter Selection Screen with new assets
-- Refactored berry trees to be less impactful on TPS (more performant)
-- Trading has been overhauled to allow offering multiple Pokémon, up to the entire party, in a single trade
-  - Selected Pokémon are now highlighted in both parties with new party slot assets
-  - Hovering an offered Pokémon now shows its summary, and clicking the active Pokémon no longer exits the summary view
-  - The trade animation now moves the offered Pokémon towards the Poké Ball
-  - Parties are compacted after a trade so no empty slots are left between Pokémon
-- Terrain Seeds can now be planted
-- Terrain Seeds are now consumed during PvP and NPC battles
-- Glow Item Frames can be crafted using Bright Powder as an alternative to Glow Ink Sacs
-- Bright Powder can be used on Signs and Hanging Signs to make text glow, as an alternative to Glow Ink Sacs
 - Updated various recipes to display in Recipe Groups within the Recipe Book
 - Updated most recipes to display more logically/consistently within the Recipe Book's categories
-- Updated the following recipes
-  - Never-Melt Ice, Focus Sash, Blunder Policy, Weakness Policy, Blank TM
 - Make ride rotations less jittery in multiplayer.
-- Changes Disc Shelf TMs to use textures instead of tinting and overlays to line up with item display
+- Changes tm shelf discs to use textures instead of tinting and overlays to line up with item display
 - Blank TM can now be inserted into the Disc Shelf
-- Added TM creative tab
 - Recall animation now renders ball in hand with the player arm raised.
 - Made regional and Vivillon split-evo locations now mutually exclusive
 - Item evolutions now unlock **all** locked evolutions whose requirements are met instead of stopping after the first.
@@ -143,11 +122,6 @@
 - Fixed Safari Ball catch rate outside of battle
 
 ### Developer
-- Added `PokeSnackSpawnerFactory` which allows influence registration on PokeSnack encounters
-- Added `FishingSpawnerFactory` which allows influence registration on fishing encounters
-- Added `BattleFleeAttemptEvent` fired from `PokemonBattle.checkFleeAttempt`, allowing developers to intercept and control flee attempts
-- Trade network packets (`TradeUpdatedPacket`, `UpdateTradeOfferPacket`, and `TradeCompletedPacket`) now receive an array of Pokémon instead of a single Pokémon to execute trades
-- `TradeEvent.Pre` and `TradeEvent.Post` now expose every Pokémon each participant receives (`tradeParticipant1Pokemon` and `tradeParticipant2Pokemon` are now lists), and their Molang context includes `trade_participant_1_pokemon_list` and `trade_participant_2_pokemon_list`
 - Evolution requirements can now set `pokedexIcon` and `pokedexTooltip` directly in their JSON to control how they're shown on the Pokédex's evolution tree, for example:
   ```json
   {

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

@@ -109,21 +109,4 @@ object CobblemonBlockEntities : PlatformRegistry<Registry<BlockEntityType<*>>, R
         "poke_snack",
         BlockEntityType.Builder.of(::PokeSnackBlockEntity, CobblemonBlocks.POKE_SNACK, CobblemonBlocks.POKE_CAKE).build(null)
     )
-
-    @JvmField
-    val TERRAIN_PLANT: BlockEntityType<TerrainPlantBlockEntity> = this.create(
-        "terrain_plant",
-        BlockEntityType.Builder.of(::TerrainPlantBlockEntity,
-            CobblemonBlocks.VOLTACONIA,
-            CobblemonBlocks.LUCIBELL,
-            CobblemonBlocks.VERDROOT
-        ).build(null)
-    )
-    @JvmField
-    val MISTLEAF_FLOWER: BlockEntityType<MistleafFlowerBlockEntity> = this.create(
-        "mistleaf",
-        BlockEntityType.Builder.of(::MistleafFlowerBlockEntity,
-            CobblemonBlocks.MISTLEAF
-        ).build(null)
-    )
 }

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

@@ -16,7 +16,8 @@ import com.cobblemon.mod.common.block.MintBlock.MintType
 import com.cobblemon.mod.common.block.campfirepot.CampfireBlock
 import com.cobblemon.mod.common.block.campfirepot.CampfirePotBlock
 import com.cobblemon.mod.common.block.chest.GildedChestBlock
-import com.cobblemon.mod.common.block.decor.*
+import com.cobblemon.mod.common.block.decor.ActivatableDecorationBlock
+import com.cobblemon.mod.common.block.decor.RingTargetBlock
 import com.cobblemon.mod.common.block.general.BaleBlock
 import com.cobblemon.mod.common.block.general.HorizontalRotationCarpetBlock
 import com.cobblemon.mod.common.block.general.HorizontalRotationalBlock
@@ -27,7 +28,6 @@ import com.cobblemon.mod.common.block.sign.CobblemonSignBlock
 import com.cobblemon.mod.common.block.sign.CobblemonWallHangingSignBlock
 import com.cobblemon.mod.common.block.sign.CobblemonWallSignBlock
 import com.cobblemon.mod.common.block.tmmachine.TMMachineBlock
-import com.cobblemon.mod.common.block.general.MintLitterBlock
 import com.cobblemon.mod.common.mixin.invoker.BlocksInvoker
 import com.cobblemon.mod.common.mixin.invoker.DoorBlockInvoker
 import com.cobblemon.mod.common.mixin.invoker.FireBlockInvoker
@@ -653,10 +653,6 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<
     val CHIPPED_POT = create("chipped_pot", DecorativeItemBlock(BlockBehaviour.Properties.of().sound(SoundType.DECORATED_POT).mapColor(MapColor.NONE).noOcclusion(), DecorativeItemBlock.DecorativeItemBlockType.TEAPOT))
     @JvmField
     val CRACKED_POT = create("cracked_pot", DecorativeItemBlock(BlockBehaviour.Properties.of().sound(SoundType.DECORATED_POT).mapColor(MapColor.NONE).noOcclusion(), DecorativeItemBlock.DecorativeItemBlockType.TEAPOT))
-    @JvmField
-    val ELECTIRIZER = create("electirizer", DecorativeItemBlock(BlockBehaviour.Properties.of().sound(SoundType.METAL).mapColor(MapColor.NONE).noOcclusion(), DecorativeItemBlock.DecorativeItemBlockType.IZER))
-    @JvmField
-    val MAGMARIZER = create("magmarizer", DecorativeItemBlock(BlockBehaviour.Properties.of().sound(SoundType.METAL).mapColor(MapColor.NONE).noOcclusion(), DecorativeItemBlock.DecorativeItemBlockType.IZER))
 
     @JvmField
     val SACHET = create("sachet", DecorativeItemBlock(BlockBehaviour.Properties.of().sound(SoundType.WOOL).mapColor(MapColor.NONE).noOcclusion(), DecorativeItemBlock.DecorativeItemBlockType.POUCH))
@@ -666,8 +662,6 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<
     val QUICK_POWDER = create("quick_powder", DecorativeItemBlock(BlockBehaviour.Properties.of().sound(CobblemonSounds.ITEM_BLOCK_POWDER_SOUNDS).mapColor(MapColor.NONE).noOcclusion(), DecorativeItemBlock.DecorativeItemBlockType.POUCH))
     @JvmField
     val BRIGHT_POWDER = create("bright_powder", DecorativeItemBlock(BlockBehaviour.Properties.of().sound(CobblemonSounds.ITEM_BLOCK_POWDER_SOUNDS).mapColor(MapColor.NONE).noOcclusion().lightLevel{3}, DecorativeItemBlock.DecorativeItemBlockType.POUCH))
-    @JvmField
-    val SOFT_SAND = create("soft_sand", DecorativeItemBlock(BlockBehaviour.Properties.of().sound(CobblemonSounds.ITEM_BLOCK_POWDER_SOUNDS).mapColor(MapColor.NONE).noOcclusion(), DecorativeItemBlock.DecorativeItemBlockType.POUCH))
 
     @JvmField
     val NEVER_MELT_ICE = create("never_melt_ice", DecorativeItemBlock(BlockBehaviour.Properties.of().sound(SoundType.GLASS).mapColor(MapColor.NONE).noOcclusion().friction(0.989F), DecorativeItemBlock.DecorativeItemBlockType.NEVERMELT))
@@ -709,12 +703,6 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<
 
     @JvmField
     val THROAT_SPRAY = create("throat_spray", StackableItemBlock(BlockBehaviour.Properties.of().sound(CobblemonSounds.ITEM_BLOCK_BOTTLE_LIQUID_SOUNDS).mapColor(MapColor.NONE).noOcclusion(), StackableItemBlock.StackableItemBlockType.THROAT_SPRAY))
-    @JvmField
-    val TERRAIN_EXTENDER = create("terrain_extender", StackableItemBlock(BlockBehaviour.Properties.of().sound(SoundType.CANDLE).mapColor(MapColor.NONE).noOcclusion(), StackableItemBlock.StackableItemBlockType.EXTENDER))
-    @JvmField
-    val MOOMOO_MILK = create("moomoo_milk", StackableItemBlock(BlockBehaviour.Properties.of().sound(CobblemonSounds.ITEM_BLOCK_BOTTLE_LIQUID_SOUNDS).mapColor(MapColor.NONE).noOcclusion(), StackableItemBlock.StackableItemBlockType.GLASS_BOTTLE))
-    @JvmField
-    val MEDICINAL_BREW = create("medicinal_brew", StackableItemBlock(BlockBehaviour.Properties.of().sound(CobblemonSounds.ITEM_BLOCK_BOTTLE_LIQUID_SOUNDS).mapColor(MapColor.NONE).noOcclusion(), StackableItemBlock.StackableItemBlockType.GLASS_BOTTLE))
 
     @JvmField
     val FULL_HEAL = create("full_heal", StackableItemBlock(BlockBehaviour.Properties.of().sound(CobblemonSounds.ITEM_BLOCK_BOTTLE_LIQUID_SOUNDS).mapColor(MapColor.NONE).noOcclusion(), StackableItemBlock.StackableItemBlockType.STATUS_RESTORE))
@@ -869,64 +857,6 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<
     @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.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.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.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.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.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.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)))
-    @JvmField
-    val POMOHANA = this.create("pomohana", PomohanaFlowerBlock(BlockBehaviour.Properties.of().mapColor(MapColor.PLANT).noCollission().instabreak().sound(SoundType.GRASS).ignitedByLava().pushReaction(PushReaction.DESTROY)))
-    @JvmField
-    val PAUVILLEA = this.create("pauvillea",PauvilleaFlowerBlock(BlockBehaviour.Properties.of().mapColor(MapColor.PLANT).noCollission().sound(SoundType.GRASS).instabreak().ignitedByLava().pushReaction(PushReaction.DESTROY)))
-    @JvmField
-    val WISTENSU = this.create("wistensu", WistensuFlowerHeadBlock(BlockBehaviour.Properties.of().mapColor(MapColor.PLANT).noCollission().sound(SoundType.GRASS).instabreak().ignitedByLava().pushReaction(PushReaction.DESTROY).lightLevel{11}))
-    @JvmField
-    val WISTENSU_VINE = this.create("wistensu_vine", WistensuFlowerVineBlock(BlockBehaviour.Properties.of().mapColor(MapColor.PLANT).noCollission().sound(SoundType.GRASS).instabreak().ignitedByLava().pushReaction(PushReaction.DESTROY)))
-
-    @JvmField
-    val ELECTRIC_SEED = this.terrainSeed("electric_seed", TerrainSeedBlock.TerrainSeedType.ELECTRIC)
-    @JvmField
-    val PSYCHIC_SEED = this.terrainSeed("psychic_seed", TerrainSeedBlock.TerrainSeedType.PSYCHIC)
-    @JvmField
-    val MISTY_SEED = this.terrainSeed("misty_seed", TerrainSeedBlock.TerrainSeedType.MISTY)
-    @JvmField
-    val GRASSY_SEED = this.terrainSeed("grassy_seed", TerrainSeedBlock.TerrainSeedType.GRASSY)
-    @JvmField
-    val VOLTACONIA = this.terrainPlant("voltaconia") { state -> if (state.getValue(TerrainPlantBlock.GLOWING)) 8 else 0 }
-    @JvmField
-    val VERDROOT = this.terrainPlant("verdroot") { state -> if (state.getValue(TerrainPlantBlock.GLOWING)) 5 else 0 }
-    @JvmField
-    val LUCIBELL = this.terrainPlant("lucibell") { state -> if (state.getValue(TerrainPlantBlock.GLOWING)) 8 else 0 }
-    @JvmField
-    val MISTLEAF = this.create(
-        "mistleaf",
-        MistleafFlowerBlock {
-            if ((it.getValue(MistleafFlowerBlock.GLOWING) >= 1)) it.getValue(MistleafFlowerBlock.GLOWING) + 2 else 0
-        }
-    )
-
     @JvmField
     val HEARTY_GRAIN_BALE = this.create("hearty_grain_bale", BaleBlock(BlockBehaviour.Properties.of().mapColor(MapColor.PLANT).instrument(NoteBlockInstrument.BANJO).strength(0.5F).sound(CobblemonSounds.HEARTY_GRAIN_BALE_SOUNDS)))
     @JvmField
@@ -1103,147 +1033,6 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<
     val YACHE_BERRY = this.berryBlock("yache")
     //val BINDING_SOIL = this.create("binding_soil", BindingSoilBlock(BlockBehaviour.Properties.of()))
 
-    @JvmField
-    val POTTED_AGUAV_BERRY = this.create("potted_aguav_berry", BlocksInvoker.createFlowerPotBlock(AGUAV_BERRY))
-    @JvmField
-    val POTTED_APICOT_BERRY = this.create("potted_apicot_berry", BlocksInvoker.createFlowerPotBlock(APICOT_BERRY))
-    @JvmField
-    val POTTED_ASPEAR_BERRY = this.create("potted_aspear_berry", BlocksInvoker.createFlowerPotBlock(ASPEAR_BERRY))
-    @JvmField
-    val POTTED_BABIRI_BERRY = this.create("potted_babiri_berry", BlocksInvoker.createFlowerPotBlock(BABIRI_BERRY))
-    @JvmField
-    val POTTED_BELUE_BERRY = this.create("potted_belue_berry", BlocksInvoker.createFlowerPotBlock(BELUE_BERRY))
-    @JvmField
-    val POTTED_BLUK_BERRY = this.create("potted_bluk_berry", BlocksInvoker.createFlowerPotBlock(BLUK_BERRY))
-    @JvmField
-    val POTTED_CHARTI_BERRY = this.create("potted_charti_berry", BlocksInvoker.createFlowerPotBlock(CHARTI_BERRY))
-    @JvmField
-    val POTTED_CHERI_BERRY = this.create("potted_cheri_berry", BlocksInvoker.createFlowerPotBlock(CHERI_BERRY))
-    @JvmField
-    val POTTED_CHESTO_BERRY = this.create("potted_chesto_berry", BlocksInvoker.createFlowerPotBlock(CHESTO_BERRY))
-    @JvmField
-    val POTTED_CHILAN_BERRY = this.create("potted_chilan_berry", BlocksInvoker.createFlowerPotBlock(CHILAN_BERRY))
-    @JvmField
-    val POTTED_CHOPLE_BERRY = this.create("potted_chople_berry", BlocksInvoker.createFlowerPotBlock(CHOPLE_BERRY))
-    @JvmField
-    val POTTED_COBA_BERRY = this.create("potted_coba_berry", BlocksInvoker.createFlowerPotBlock(COBA_BERRY))
-    @JvmField
-    val POTTED_COLBUR_BERRY = this.create("potted_colbur_berry", BlocksInvoker.createFlowerPotBlock(COLBUR_BERRY))
-    @JvmField
-    val POTTED_CORNN_BERRY = this.create("potted_cornn_berry", BlocksInvoker.createFlowerPotBlock(CORNN_BERRY))
-    @JvmField
-    val POTTED_CUSTAP_BERRY = this.create("potted_custap_berry", BlocksInvoker.createFlowerPotBlock(CUSTAP_BERRY))
-    @JvmField
-    val POTTED_DURIN_BERRY = this.create("potted_durin_berry", BlocksInvoker.createFlowerPotBlock(DURIN_BERRY))
-    @JvmField
-    val POTTED_EGGANT_BERRY = this.create("potted_eggant_berry", BlocksInvoker.createFlowerPotBlock(EGGANT_BERRY))
-    @JvmField
-    val POTTED_ENIGMA_BERRY = this.create("potted_enigma_berry", BlocksInvoker.createFlowerPotBlock(ENIGMA_BERRY))
-    @JvmField
-    val POTTED_FIGY_BERRY = this.create("potted_figy_berry", BlocksInvoker.createFlowerPotBlock(FIGY_BERRY))
-    @JvmField
-    val POTTED_GANLON_BERRY = this.create("potted_ganlon_berry", BlocksInvoker.createFlowerPotBlock(GANLON_BERRY))
-    @JvmField
-    val POTTED_GREPA_BERRY = this.create("potted_grepa_berry", BlocksInvoker.createFlowerPotBlock(GREPA_BERRY))
-    @JvmField
-    val POTTED_HABAN_BERRY = this.create("potted_haban_berry", BlocksInvoker.createFlowerPotBlock(HABAN_BERRY))
-    @JvmField
-    val POTTED_HONDEW_BERRY = this.create("potted_hondew_berry", BlocksInvoker.createFlowerPotBlock(HONDEW_BERRY))
-    @JvmField
-    val POTTED_HOPO_BERRY = this.create("potted_hopo_berry", BlocksInvoker.createFlowerPotBlock(HOPO_BERRY))
-    @JvmField
-    val POTTED_IAPAPA_BERRY = this.create("potted_iapapa_berry", BlocksInvoker.createFlowerPotBlock(IAPAPA_BERRY))
-    @JvmField
-    val POTTED_JABOCA_BERRY = this.create("potted_jaboca_berry", BlocksInvoker.createFlowerPotBlock(JABOCA_BERRY))
-    @JvmField
-    val POTTED_KASIB_BERRY = this.create("potted_kasib_berry", BlocksInvoker.createFlowerPotBlock(KASIB_BERRY))
-    @JvmField
-    val POTTED_KEBIA_BERRY = this.create("potted_kebia_berry", BlocksInvoker.createFlowerPotBlock(KEBIA_BERRY))
-    @JvmField
-    val POTTED_KEE_BERRY = this.create("potted_kee_berry", BlocksInvoker.createFlowerPotBlock(KEE_BERRY))
-    @JvmField
-    val POTTED_KELPSY_BERRY = this.create("potted_kelpsy_berry", BlocksInvoker.createFlowerPotBlock(KELPSY_BERRY))
-    @JvmField
-    val POTTED_LANSAT_BERRY = this.create("potted_lansat_berry", BlocksInvoker.createFlowerPotBlock(LANSAT_BERRY))
-    @JvmField
-    val POTTED_LEPPA_BERRY = this.create("potted_leppa_berry", BlocksInvoker.createFlowerPotBlock(LEPPA_BERRY))
-    @JvmField
-    val POTTED_LIECHI_BERRY = this.create("potted_liechi_berry", BlocksInvoker.createFlowerPotBlock(LIECHI_BERRY))
-    @JvmField
-    val POTTED_LUM_BERRY = this.create("potted_lum_berry", BlocksInvoker.createFlowerPotBlock(LUM_BERRY))
-    @JvmField
-    val POTTED_MAGO_BERRY = this.create("potted_mago_berry", BlocksInvoker.createFlowerPotBlock(MAGO_BERRY))
-    @JvmField
-    val POTTED_MAGOST_BERRY = this.create("potted_magost_berry", BlocksInvoker.createFlowerPotBlock(MAGOST_BERRY))
-    @JvmField
-    val POTTED_MARANGA_BERRY = this.create("potted_maranga_berry", BlocksInvoker.createFlowerPotBlock(MARANGA_BERRY))
-    @JvmField
-    val POTTED_MICLE_BERRY = this.create("potted_micle_berry", BlocksInvoker.createFlowerPotBlock(MICLE_BERRY))
-    @JvmField
-    val POTTED_NANAB_BERRY = this.create("potted_nanab_berry", BlocksInvoker.createFlowerPotBlock(NANAB_BERRY))
-    @JvmField
-    val POTTED_NOMEL_BERRY = this.create("potted_nomel_berry", BlocksInvoker.createFlowerPotBlock(NOMEL_BERRY))
-    @JvmField
-    val POTTED_OCCA_BERRY = this.create("potted_occa_berry", BlocksInvoker.createFlowerPotBlock(OCCA_BERRY))
-    @JvmField
-    val POTTED_ORAN_BERRY = this.create("potted_oran_berry", BlocksInvoker.createFlowerPotBlock(ORAN_BERRY))
-    @JvmField
-    val POTTED_PAMTRE_BERRY = this.create("potted_pamtre_berry", BlocksInvoker.createFlowerPotBlock(PAMTRE_BERRY))
-    @JvmField
-    val POTTED_PASSHO_BERRY = this.create("potted_passho_berry", BlocksInvoker.createFlowerPotBlock(PASSHO_BERRY))
-    @JvmField
-    val POTTED_PAYAPA_BERRY = this.create("potted_payapa_berry", BlocksInvoker.createFlowerPotBlock(PAYAPA_BERRY))
-    @JvmField
-    val POTTED_PECHA_BERRY = this.create("potted_pecha_berry", BlocksInvoker.createFlowerPotBlock(PECHA_BERRY))
-    @JvmField
-    val POTTED_PERSIM_BERRY = this.create("potted_persim_berry", BlocksInvoker.createFlowerPotBlock(PERSIM_BERRY))
-    @JvmField
-    val POTTED_PETAYA_BERRY = this.create("potted_petaya_berry", BlocksInvoker.createFlowerPotBlock(PETAYA_BERRY))
-    @JvmField
-    val POTTED_PINAP_BERRY = this.create("potted_pinap_berry", BlocksInvoker.createFlowerPotBlock(PINAP_BERRY))
-    @JvmField
-    val POTTED_POMEG_BERRY = this.create("potted_pomeg_berry", BlocksInvoker.createFlowerPotBlock(POMEG_BERRY))
-    @JvmField
-    val POTTED_QUALOT_BERRY = this.create("potted_qualot_berry", BlocksInvoker.createFlowerPotBlock(QUALOT_BERRY))
-    @JvmField
-    val POTTED_RABUTA_BERRY = this.create("potted_rabuta_berry", BlocksInvoker.createFlowerPotBlock(RABUTA_BERRY))
-    @JvmField
-    val POTTED_RAWST_BERRY = this.create("potted_rawst_berry", BlocksInvoker.createFlowerPotBlock(RAWST_BERRY))
-    @JvmField
-    val POTTED_RAZZ_BERRY = this.create("potted_razz_berry", BlocksInvoker.createFlowerPotBlock(RAZZ_BERRY))
-    @JvmField
-    val POTTED_RINDO_BERRY = this.create("potted_rindo_berry", BlocksInvoker.createFlowerPotBlock(RINDO_BERRY))
-    @JvmField
-    val POTTED_ROSELI_BERRY = this.create("potted_roseli_berry", BlocksInvoker.createFlowerPotBlock(ROSELI_BERRY))
-    @JvmField
-    val POTTED_ROWAP_BERRY = this.create("potted_rowap_berry", BlocksInvoker.createFlowerPotBlock(ROWAP_BERRY))
-    @JvmField
-    val POTTED_SALAC_BERRY = this.create("potted_salac_berry", BlocksInvoker.createFlowerPotBlock(SALAC_BERRY))
-    @JvmField
-    val POTTED_SHUCA_BERRY = this.create("potted_shuca_berry", BlocksInvoker.createFlowerPotBlock(SHUCA_BERRY))
-    @JvmField
-    val POTTED_SITRUS_BERRY = this.create("potted_sitrus_berry", BlocksInvoker.createFlowerPotBlock(SITRUS_BERRY))
-    @JvmField
-    val POTTED_SPELON_BERRY = this.create("potted_spelon_berry", BlocksInvoker.createFlowerPotBlock(SPELON_BERRY))
-    @JvmField
-    val POTTED_STARF_BERRY = this.create("potted_starf_berry", BlocksInvoker.createFlowerPotBlock(STARF_BERRY))
-    @JvmField
-    val POTTED_TAMATO_BERRY = this.create("potted_tamato_berry", BlocksInvoker.createFlowerPotBlock(TAMATO_BERRY))
-    @JvmField
-    val POTTED_TANGA_BERRY = this.create("potted_tanga_berry", BlocksInvoker.createFlowerPotBlock(TANGA_BERRY))
-    @JvmField
-    val POTTED_TOUGA_BERRY = this.create("potted_touga_berry", BlocksInvoker.createFlowerPotBlock(TOUGA_BERRY))
-    @JvmField
-    val POTTED_WACAN_BERRY = this.create("potted_wacan_berry", BlocksInvoker.createFlowerPotBlock(WACAN_BERRY))
-    @JvmField
-    val POTTED_WATMEL_BERRY = this.create("potted_watmel_berry", BlocksInvoker.createFlowerPotBlock(WATMEL_BERRY))
-    @JvmField
-    val POTTED_WEPEAR_BERRY = this.create("potted_wepear_berry", BlocksInvoker.createFlowerPotBlock(WEPEAR_BERRY))
-    @JvmField
-    val POTTED_WIKI_BERRY = this.create("potted_wiki_berry", BlocksInvoker.createFlowerPotBlock(WIKI_BERRY))
-    @JvmField
-    val POTTED_YACHE_BERRY = this.create("potted_yache_berry", BlocksInvoker.createFlowerPotBlock(YACHE_BERRY))
-
     init {
         /**
          * Makes all blocks in array flammable by adding them to FireBlock's flammableRegistry.
@@ -1345,48 +1134,4 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<
     }
 
     fun typeGemClusters() = typeGemClusters.toMap()
-
-    private fun pottedPlant(name: String, flower: Block) = this.create(name, BlocksInvoker.createFlowerPotBlock(flower))
-
-    private fun mintLitter(name: String, color: MapColor) = this.create(
-        name,
-        MintLitterBlock(
-            BlockBehaviour.Properties.of()
-                .sound(CobblemonSounds.MINT_SOUNDS)
-                .mapColor(color)
-                .noOcclusion()
-                .noCollission()
-                .pushReaction(PushReaction.DESTROY)
-        )
-    )
-
-    private fun terrainSeed(name: String, type: TerrainSeedBlock.TerrainSeedType) = this.create(
-        name,
-        TerrainSeedBlock(
-            type,
-            BlockBehaviour.Properties.of()
-                .pushReaction(PushReaction.DESTROY)
-                .ignitedByLava()
-                .mapColor(MapColor.PLANT)
-                .offsetType(BlockBehaviour.OffsetType.XZ)
-                .noCollission()
-                .randomTicks()
-                .instabreak()
-        )
-    )
-
-    private fun terrainPlant(name: String, lightLevel: (BlockState) -> Int) = this.create(
-        name,
-        TerrainPlantBlock(
-            BlockBehaviour.Properties.of()
-                .mapColor(MapColor.PLANT)
-                .noCollission()
-                .instabreak()
-                .sound(SoundType.GRASS)
-                .offsetType(BlockBehaviour.OffsetType.XZ)
-                .ignitedByLava()
-                .pushReaction(PushReaction.DESTROY)
-                .lightLevel(lightLevel)
-        )
-    )
 }

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

@@ -477,8 +477,8 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
     @JvmField val DUBIOUS_DISC = itemNameBlockItem("dubious_disc", CobblemonBlocks.DUBIOUS_DISC)
     @JvmField val DEEP_SEA_SCALE = noSettingsItem("deep_sea_scale")
     @JvmField val DEEP_SEA_TOOTH = noSettingsItem("deep_sea_tooth")
-    @JvmField val ELECTIRIZER = itemNameBlockItem("electirizer", CobblemonBlocks.ELECTIRIZER)
-    @JvmField val MAGMARIZER = itemNameBlockItem("magmarizer", CobblemonBlocks.MAGMARIZER)
+    @JvmField val ELECTIRIZER = noSettingsItem("electirizer")
+    @JvmField val MAGMARIZER = noSettingsItem("magmarizer")
     @JvmField val OVAL_STONE = noSettingsItem("oval_stone")
     @JvmField val PROTECTOR = noSettingsItem("protector")
     @JvmField val REAPER_CLOTH = noSettingsItem("reaper_cloth")
@@ -711,7 +711,7 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
     @JvmField
     val PEP_UP_FLOWER = compostableBlockItem("pep_up_flower", CobblemonBlocks.PEP_UP_FLOWER)
     @JvmField
-    val MEDICINAL_BREW = itemNameBlockItem("medicinal_brew", CobblemonBlocks.MEDICINAL_BREW)
+    val MEDICINAL_BREW = noSettingsItem("medicinal_brew")
     @JvmField
     val REMEDY = compostableItem("remedy", RemedyItem(RemedyItem.NORMAL), 0.65f)
     @JvmField
@@ -719,7 +719,7 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
     @JvmField
     val SUPERB_REMEDY = compostableItem("superb_remedy", RemedyItem(RemedyItem.SUPERB), 1f)
     @JvmField
-    val MOOMOO_MILK = create("moomoo_milk", MoomooMilk(Item.Properties().craftRemainder(Items.GLASS_BOTTLE).stacksTo((16)), CobblemonBlocks.MOOMOO_MILK))
+    val MOOMOO_MILK = create("moomoo_milk", MoomooMilk(Item.Properties().craftRemainder(Items.GLASS_BOTTLE).stacksTo((16))))
 
     @JvmField
     val POTION = create("potion", PotionItem(PotionType.POTION, CobblemonBlocks.POTION))
@@ -748,27 +748,27 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
     @JvmField
     val RED_MINT_SEEDS = mintSeed("red", MintType.RED.getCropBlock())
     @JvmField
-    val RED_MINT_LEAF = compostableItemNameBlockItem("red_mint_leaf", CobblemonBlocks.RED_MINT_LEAF_LITTER, 0.50f)
+    val RED_MINT_LEAF = mintLeaf("red", MintLeafItem(MintType.RED))
     @JvmField
     val BLUE_MINT_SEEDS = mintSeed("blue", MintType.BLUE.getCropBlock())
     @JvmField
-    val BLUE_MINT_LEAF = compostableItemNameBlockItem("blue_mint_leaf", CobblemonBlocks.BLUE_MINT_LEAF_LITTER, 0.50f)
+    val BLUE_MINT_LEAF = mintLeaf("blue", MintLeafItem(MintType.BLUE))
     @JvmField
     val CYAN_MINT_SEEDS = mintSeed("cyan", MintType.CYAN.getCropBlock())
     @JvmField
-    val CYAN_MINT_LEAF = compostableItemNameBlockItem("cyan_mint_leaf", CobblemonBlocks.CYAN_MINT_LEAF_LITTER, 0.50f)
+    val CYAN_MINT_LEAF = mintLeaf("cyan", MintLeafItem(MintType.CYAN))
     @JvmField
     val PINK_MINT_SEEDS = mintSeed("pink", MintType.PINK.getCropBlock())
     @JvmField
-    val PINK_MINT_LEAF = compostableItemNameBlockItem("pink_mint_leaf", CobblemonBlocks.PINK_MINT_LEAF_LITTER, 0.50f)
+    val PINK_MINT_LEAF = mintLeaf("pink", MintLeafItem(MintType.PINK))
     @JvmField
     val GREEN_MINT_SEEDS = mintSeed("green", MintType.GREEN.getCropBlock())
     @JvmField
-    val GREEN_MINT_LEAF = compostableItemNameBlockItem("green_mint_leaf", CobblemonBlocks.GREEN_MINT_LEAF_LITTER, 0.50f)
+    val GREEN_MINT_LEAF = mintLeaf("green", MintLeafItem(MintType.GREEN))
     @JvmField
     val WHITE_MINT_SEEDS = mintSeed("white", MintType.WHITE.getCropBlock())
     @JvmField
-    val WHITE_MINT_LEAF = compostableItemNameBlockItem("white_mint_leaf", CobblemonBlocks.WHITE_MINT_LEAF_LITTER, 0.50f)
+    val WHITE_MINT_LEAF = mintLeaf("white", MintLeafItem(MintType.WHITE))
 
     val mints = mutableMapOf<String, MintItem>()
 
@@ -969,7 +969,7 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
     @JvmField
     val EJECT_PACK = heldItem("eject_pack")
     @JvmField
-    val ELECTRIC_SEED = itemNameBlockItem("electric_seed", CobblemonBlocks.ELECTRIC_SEED)
+    val ELECTRIC_SEED = heldItem("electric_seed")
     @JvmField
     val EVERSTONE = heldItem("everstone")
     @JvmField
@@ -985,7 +985,7 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
     @JvmField
     val FOCUS_SASH = heldItem("focus_sash")
     @JvmField
-    val GRASSY_SEED = itemNameBlockItem("grassy_seed", CobblemonBlocks.GRASSY_SEED)
+    val GRASSY_SEED = heldItem("grassy_seed")
     @JvmField
     val GRIP_CLAW = heldItem("grip_claw")
     @JvmField
@@ -1033,7 +1033,7 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
     @JvmField
     val POWER_WEIGHT = heldItem("power_weight")
     @JvmField
-    val PSYCHIC_SEED = itemNameBlockItem("psychic_seed", CobblemonBlocks.PSYCHIC_SEED)
+    val PSYCHIC_SEED = heldItem("psychic_seed")
     @JvmField
     val PROTECTIVE_PADS = heldItem("protective_pads")
     @JvmField
@@ -1057,7 +1057,7 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
     @JvmField
     val SILVER_POWDER = heldItem("silver_powder")
     @JvmField
-    val SOFT_SAND = itemNameBlockItem("soft_sand", CobblemonBlocks.SOFT_SAND)
+    val SOFT_SAND = heldItem("soft_sand")
     @JvmField
     val SMOKE_BALL = itemNameBlockItem("smoke_ball", CobblemonBlocks.SMOKE_BALL)
     @JvmField
@@ -1065,7 +1065,7 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
     @JvmField
     val STICKY_BARB = heldItem("sticky_barb")
     @JvmField
-    val TERRAIN_EXTENDER = itemNameBlockItem("terrain_extender", CobblemonBlocks.TERRAIN_EXTENDER)
+    val TERRAIN_EXTENDER = heldItem("terrain_extender")
     @JvmField
     val THROAT_SPRAY = itemNameBlockItem("throat_spray", CobblemonBlocks.THROAT_SPRAY)
     @JvmField
@@ -1085,13 +1085,13 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
     @JvmField
     val MIRROR_HERB = compostableHeldItem("mirror_herb", null, 0.85F)
     @JvmField
-    val MISTY_SEED = itemNameBlockItem("misty_seed", CobblemonBlocks.MISTY_SEED)
+    val MISTY_SEED = heldItem("misty_seed")
     @JvmField
     val POWER_HERB = compostableHeldItem("power_herb", null, 0.85F)
     @JvmField
     val WHITE_HERB = compostableHeldItem("white_herb", null, 0.85F)
     @JvmField
-    val BRIGHT_POWDER = glowItem("bright_powder", CobblemonBlocks.BRIGHT_POWDER)
+    val BRIGHT_POWDER = itemNameBlockItem("bright_powder", CobblemonBlocks.BRIGHT_POWDER)
     @JvmField
     val METAL_POWDER = itemNameBlockItem("metal_powder", CobblemonBlocks.METAL_POWDER)
     @JvmField
@@ -1103,7 +1103,7 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
     @JvmField
     val SMOOTH_ROCK = itemNameBlockItem("smooth_rock", CobblemonBlocks.SMOOTH_ROCK)
     @JvmField
-    val ICY_ROCK = heldItem("icy_rock")
+    val ICY_ROCK = itemNameBlockItem("icy_rock", CobblemonBlocks.ICY_ROCK)
 
     // Mulch
     @JvmField
@@ -1558,25 +1558,6 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
     //@JvmField
     //val BINDING_SOIL = blockItem("binding_soil", CobblemonBlocks.BINDING_SOIL)
 
-    // Plants, Flora, and Flowers
-    @JvmField
-    val LOBAILA = compostableBlockItem("lobaila", CobblemonBlocks.LOBAILA, 0.65f)
-    @JvmField
-    val POMOHANA = compostableBlockItem("pomohana", CobblemonBlocks.POMOHANA, 0.3f)
-    @JvmField
-    val PAUVILLEA = compostableBlockItem("pauvillea", CobblemonBlocks.PAUVILLEA, 0.65f)
-    @JvmField
-    val WISTENSU = compostableBlockItem("wistensu", CobblemonBlocks.WISTENSU, 0.5f)
-
-    @JvmField
-    val VOLTACONIA = compostableBlockItem("voltaconia", CobblemonBlocks.VOLTACONIA, 0.85f)
-    @JvmField
-    val VERDROOT = compostableBlockItem("verdroot", CobblemonBlocks.VERDROOT, 0.85f)
-    @JvmField
-    val MISTLEAF = compostableBlockItem("mistleaf", CobblemonBlocks.MISTLEAF, 0.85f)
-    @JvmField
-    val LUCIBELL = compostableBlockItem("lucibell", CobblemonBlocks.LUCIBELL, 0.85f)
-
     private fun blockItem(name: String, block: Block, rarity: Rarity = Rarity.COMMON): BlockItem = this.create(name, BlockItem(block, Item.Properties().rarity(rarity)))
 
     private fun itemNameBlockItem(name: String, block: Block, rarity: Rarity = Rarity.COMMON): ItemNameBlockItem = this.create(name, ItemNameBlockItem(block, Item.Properties().rarity(rarity)))
@@ -1779,6 +1760,4 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
     private fun foodItem(nutrition: Int, saturationModifier: Float): Item {
         return CobblemonItem(Item.Properties().food(FoodProperties.Builder().nutrition(nutrition).saturationModifier(saturationModifier).build()))
     }
-
-    private fun glowItem(name: String, block: Block): GlowItem  = this.create(name, GlowItem(block, Item.Properties()))
 }

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

@@ -148,9 +148,6 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, ResourceKey<Regi
     @JvmField
     val MONITOR_GLITCHING = this.create("block.monitor.glitching")
 
-    @JvmField
-    val BRIGHT_POWDER_USE = this.create("block.bright_powder.use")
-
     @JvmField
     val FOSSIL_MACHINE_ACTIVATE = this.create("block.fossil_machine.activate")
     @JvmField

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

@@ -9,14 +9,12 @@
 package com.cobblemon.mod.common.api.events.pokemon
 
 import com.bedrockk.molang.runtime.value.DoubleValue
-import com.bedrockk.molang.runtime.value.MoValue
 import com.cobblemon.mod.common.api.events.Cancelable
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMoLangValue
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.moLangFunctionMap
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.pokemon.Pokemon
 import com.cobblemon.mod.common.trade.TradeParticipant
-import com.cobblemon.mod.common.util.asArrayValue
 import com.cobblemon.mod.common.util.getPlayer
 
 /**
@@ -33,9 +31,9 @@ interface TradeEvent {
     val tradeParticipant1: TradeParticipant
 
     /**
-     * All the [Pokemon] the first participant receives in the trade.
+     * The [Pokemon] being traded by the first participant.
      */
-    val tradeParticipant1Pokemon: List<Pokemon>
+    val tradeParticipant1Pokemon: Pokemon
 
     /**
      * The second [TradeParticipant].
@@ -43,19 +41,9 @@ interface TradeEvent {
     val tradeParticipant2: TradeParticipant
 
     /**
-     * All the [Pokemon] the second participant receives in the trade.
+     * The [Pokemon] being traded by the second participant.
      */
-    val tradeParticipant2Pokemon: List<Pokemon>
-
-    fun createContext(): MutableMap<String, MoValue> = mutableMapOf(
-        "trade_participant_1" to (tradeParticipant1.uuid.getPlayer()?.asMoLangValue() ?: DoubleValue.ZERO),
-        "trade_participant_2" to (tradeParticipant2.uuid.getPlayer()?.asMoLangValue() ?: DoubleValue.ZERO),
-        // Kept for backwards compatibility, this is the first Pokémon of each side.
-        "trade_participant_1_pokemon" to tradeParticipant1Pokemon.first().struct,
-        "trade_participant_2_pokemon" to tradeParticipant2Pokemon.first().struct,
-        "trade_participant_1_pokemon_list" to tradeParticipant1Pokemon.asArrayValue { it.struct },
-        "trade_participant_2_pokemon_list" to tradeParticipant2Pokemon.asArrayValue { it.struct }
-    )
+    val tradeParticipant2Pokemon: Pokemon
 
     /**
      * Event fired when a trade is about to happen. Cancelling this event prevents the trade from occurring.
@@ -65,11 +53,16 @@ interface TradeEvent {
      */
     data class Pre(
         override val tradeParticipant1: TradeParticipant,
-        override val tradeParticipant1Pokemon: List<Pokemon>,
+        override val tradeParticipant1Pokemon: Pokemon,
         override val tradeParticipant2: TradeParticipant,
-        override val tradeParticipant2Pokemon: List<Pokemon>
+        override val tradeParticipant2Pokemon: Pokemon
     ) : TradeEvent, Cancelable() {
-        val context = createContext()
+        val context = mutableMapOf(
+            "trade_participant_1" to (tradeParticipant1.uuid.getPlayer()?.asMoLangValue() ?: DoubleValue.ZERO),
+            "trade_participant_2" to (tradeParticipant2.uuid.getPlayer()?.asMoLangValue() ?: DoubleValue.ZERO),
+            "trade_participant_1_pokemon" to tradeParticipant1Pokemon.struct,
+            "trade_participant_2_pokemon" to tradeParticipant2Pokemon.struct
+        )
 
         val functions = moLangFunctionMap(
             cancelFunc
@@ -84,10 +77,15 @@ interface TradeEvent {
      */
     data class Post(
         override val tradeParticipant1: TradeParticipant,
-        override val tradeParticipant1Pokemon: List<Pokemon>,
+        override val tradeParticipant1Pokemon: Pokemon,
         override val tradeParticipant2: TradeParticipant,
-        override val tradeParticipant2Pokemon: List<Pokemon>
+        override val tradeParticipant2Pokemon: Pokemon
     ) : TradeEvent {
-        val context = createContext()
+        val context = mutableMapOf(
+            "trade_participant_1" to (tradeParticipant1.uuid.getPlayer()?.asMoLangValue() ?: DoubleValue.ZERO),
+            "trade_participant_2" to (tradeParticipant2.uuid.getPlayer()?.asMoLangValue() ?: DoubleValue.ZERO),
+            "trade_participant_1_pokemon" to tradeParticipant1Pokemon.struct,
+            "trade_participant_2_pokemon" to tradeParticipant2Pokemon.struct
+        )
     }
 }

common/src/main/kotlin/com/cobblemon/mod/common/api/types/ElementalType.kt

@@ -34,7 +34,6 @@ class ElementalType(
     val resourceLocation: ResourceLocation = ResourceLocation.fromNamespaceAndPath(Cobblemon.MODID, "ui/types.png"),
     val showdownId: String = ShowdownIdentifiable.REGEX.replace(name.lowercase(), ""),
     val typeGem: ResourceLocation = ResourceLocation.fromNamespaceAndPath(Cobblemon.MODID, showdownId + "_gem"),
-    val order: Int = 1000
     ) : ShowdownIdentifiable {
 
     override fun showdownId(): String {

common/src/main/kotlin/com/cobblemon/mod/common/api/types/ElementalTypes.kt

@@ -25,8 +25,7 @@ object ElementalTypes {
         hue = 0xE8E8DA,
         textureXMultiplier = 0,
         primaryColor = 0x8FA689,
-        secondaryColor = 0xFFFBE2,
-        order = 0
+        secondaryColor = 0xFFFBE2
     )
 
     @JvmField
@@ -36,8 +35,7 @@ object ElementalTypes {
         hue = 0xFF6E21,
         textureXMultiplier = 1,
         primaryColor = 0xF92D2D,
-        secondaryColor = 0xF99B1D,
-        order = 1
+        secondaryColor = 0xF99B1D
     )
 
     @JvmField
@@ -47,8 +45,7 @@ object ElementalTypes {
         hue = 0x3FA5FF,
         textureXMultiplier = 2,
         primaryColor = 0x377AF6,
-        secondaryColor = 0x50DDF9,
-        order = 2
+        secondaryColor = 0x50DDF9
     )
 
     @JvmField
@@ -58,8 +55,7 @@ object ElementalTypes {
         hue = 0x62D14F,
         textureXMultiplier = 3,
         primaryColor = 0x0EAE95,
-        secondaryColor = 0xC6F554,
-        order = 3
+        secondaryColor = 0xC6F554
     )
 
     @JvmField
@@ -69,8 +65,7 @@ object ElementalTypes {
         hue = 0xFFD314,
         textureXMultiplier = 4,
         primaryColor = 0xF7AB19,
-        secondaryColor = 0xFFF257,
-        order = 4
+        secondaryColor = 0xFFF257
     )
 
     @JvmField
@@ -80,8 +75,7 @@ object ElementalTypes {
         hue = 0x54F2F2,
         textureXMultiplier = 5,
         primaryColor = 0x41BAED,
-        secondaryColor = 0x91F4F9,
-        order = 5
+        secondaryColor = 0x91F4F9
     )
 
     @JvmField
@@ -91,8 +85,7 @@ object ElementalTypes {
         hue = 0xEF565D,
         textureXMultiplier = 6,
         primaryColor = 0xC8356B,
-        secondaryColor = 0xF36A3F,
-        order = 6
+        secondaryColor = 0xF36A3F
     )
 
     @JvmField
@@ -102,8 +95,7 @@ object ElementalTypes {
         hue = 0xD651FF,
         textureXMultiplier = 7,
         primaryColor = 0x7B41DD,
-        secondaryColor = 0xE568F4,
-        order = 7
+        secondaryColor = 0xE568F4
     )
 
     @JvmField
@@ -113,8 +105,7 @@ object ElementalTypes {
         hue = 0xF4A453,
         textureXMultiplier = 8,
         primaryColor = 0xE08835,
-        secondaryColor = 0xFFD057,
-        order = 8
+        secondaryColor = 0xFFD057
     )
 
     @JvmField
@@ -124,8 +115,7 @@ object ElementalTypes {
         hue = 0xB8B2FF,
         textureXMultiplier = 9,
         primaryColor = 0x6083F6,
-        secondaryColor = 0xD5CCFA,
-        order = 9
+        secondaryColor = 0xD5CCFA
     )
 
     @JvmField
@@ -135,8 +125,7 @@ object ElementalTypes {
         hue = 0xFF5E9E,
         textureXMultiplier = 10,
         primaryColor = 0xE553CE,
-        secondaryColor = 0xF69DD5,
-        order = 10
+        secondaryColor = 0xF69DD5
     )
 
     @JvmField
@@ -146,8 +135,7 @@ object ElementalTypes {
         hue = 0xD3D319,
         textureXMultiplier = 11,
         primaryColor = 0x9FBE1B,
-        secondaryColor = 0xE9FB5B,
-        order = 11
+        secondaryColor = 0xE9FB5B
     )
 
     @JvmField
@@ -157,8 +145,7 @@ object ElementalTypes {
         hue = 0xB7A16E,
         textureXMultiplier = 12,
         primaryColor = 0x9F814A,
-        secondaryColor = 0xEECB7A,
-        order = 12
+        secondaryColor = 0xEECB7A
     )
 
     @JvmField
@@ -168,8 +155,7 @@ object ElementalTypes {
         hue = 0x9C80F7,
         textureXMultiplier = 13,
         primaryColor = 0x4F57DD,
-        secondaryColor = 0xC182F1,
-        order = 13
+        secondaryColor = 0xC182F1
     )
 
     @JvmField
@@ -179,8 +165,7 @@ object ElementalTypes {
         hue = 0x7580FF,
         textureXMultiplier = 14,
         primaryColor = 0x4E68E2,
-        secondaryColor = 0x47C7F7,
-        order = 14
+        secondaryColor = 0x47C7F7
     )
 
     @JvmField
@@ -190,8 +175,7 @@ object ElementalTypes {
         hue = 0x587DA0,
         textureXMultiplier = 15,
         primaryColor = 0x465B99,
-        secondaryColor = 0x689EBF,
-        order = 15
+        secondaryColor = 0x689EBF
     )
 
     @JvmField
@@ -201,8 +185,7 @@ object ElementalTypes {
         hue = 0xABD1F4,
         textureXMultiplier = 16,
         primaryColor = 0x628CB9,
-        secondaryColor = 0xD6F7F3,
-        order = 16
+        secondaryColor = 0xD6F7F3
     )
 
     @JvmField
@@ -212,21 +195,18 @@ object ElementalTypes {
         hue = 0xFF7FE5,
         textureXMultiplier = 17,
         primaryColor = 0xE2678C,
-        secondaryColor = 0xF5A7B7,
-        order = 17
+        secondaryColor = 0xF5A7B7
     )
 
     @JvmStatic
-    @JvmOverloads
-    fun register(name: String, displayName: MutableComponent, hue: Int, textureXMultiplier: Int, primaryColor: Int, secondaryColor: Int, order: Int = 1000): ElementalType {
+    fun register(name: String, displayName: MutableComponent, hue: Int, textureXMultiplier: Int, primaryColor: Int, secondaryColor: Int): ElementalType {
         return ElementalType(
             name = name,
             displayName = displayName,
             hue = hue,
             textureXMultiplier = textureXMultiplier,
             primaryColor =  primaryColor,
-            secondaryColor = secondaryColor,
-            order = order
+            secondaryColor = secondaryColor
         ).also {
             allTypes.add(it)
         }

common/src/main/kotlin/com/cobblemon/mod/common/block/DecorativeItemBlock.kt

@@ -48,8 +48,7 @@ class DecorativeItemBlock(settings: Properties, val type: DecorativeItemBlockTyp
         NEVERMELT,
         SCOPE,
         WIDE,
-        ZOOM,
-        IZER;
+        ZOOM;
 
         override fun getSerializedName(): String = this.name.lowercase()
 
@@ -77,7 +76,6 @@ class DecorativeItemBlock(settings: Properties, val type: DecorativeItemBlockTyp
         val SCOPE_HITBOX = Shapes.box(0.625, 0.0, 0.4375, 0.9375, 0.125, 0.75)
         val WIDE_HITBOX = Shapes.box(0.625, 0.0, 0.125, 0.9375, 0.0625, 0.625)
         val ZOOM_HITBOX = Shapes.box(0.125, 0.0, 0.1875, 0.375, 0.1875, 0.5)
-        val IZER_HITBOX = Shapes.box(0.25, 0.0, 0.25, 0.75, 0.375, 0.75)
 
         fun getShape(type: DecorativeItemBlockType): VoxelShape {
             return when (type) {
@@ -89,7 +87,6 @@ class DecorativeItemBlock(settings: Properties, val type: DecorativeItemBlockTyp
                 DecorativeItemBlockType.SCOPE -> SCOPE_HITBOX
                 DecorativeItemBlockType.WIDE -> WIDE_HITBOX
                 DecorativeItemBlockType.ZOOM -> ZOOM_HITBOX
-                DecorativeItemBlockType.IZER -> IZER_HITBOX
                 DecorativeItemBlockType.FLATTENED_10x4 -> SMOOSHED4_HITBOX
                 DecorativeItemBlockType.FLATTENED_8x4 -> FLAT4_HITBOX
                 DecorativeItemBlockType.FLATTENED_8x6 -> FLAT6_HITBOX

common/src/main/kotlin/com/cobblemon/mod/common/block/MintBlock.kt

@@ -103,15 +103,15 @@ class MintBlock(private val mintType: MintType, settings: Properties) : CropBloc
             GREEN -> CobblemonItems.GREEN_MINT_SEEDS
             WHITE -> CobblemonItems.WHITE_MINT_SEEDS
         }
-// These don't seem to get called to anywhere besides the direct item, and since I'm trying to do funny stuff there, just commenting this out
-//        fun getLeaf(): MintLeafItem = when (this) {
-//            RED -> CobblemonItems.RED_MINT_LEAF
-//            BLUE -> CobblemonItems.BLUE_MINT_LEAF
-//            CYAN -> CobblemonItems.CYAN_MINT_LEAF
-//            PINK -> CobblemonItems.PINK_MINT_LEAF
-//            GREEN -> CobblemonItems.GREEN_MINT_LEAF
-//            WHITE -> CobblemonItems.WHITE_MINT_LEAF
-//        }
+
+        fun getLeaf(): MintLeafItem = when (this) {
+            RED -> CobblemonItems.RED_MINT_LEAF
+            BLUE -> CobblemonItems.BLUE_MINT_LEAF
+            CYAN -> CobblemonItems.CYAN_MINT_LEAF
+            PINK -> CobblemonItems.PINK_MINT_LEAF
+            GREEN -> CobblemonItems.GREEN_MINT_LEAF
+            WHITE -> CobblemonItems.WHITE_MINT_LEAF
+        }
 
         fun getCropBlock(): MintBlock = when (this) {
             RED -> CobblemonBlocks.RED_MINT

common/src/main/kotlin/com/cobblemon/mod/common/block/StackableItemBlock.kt

@@ -45,9 +45,7 @@ class StackableItemBlock(settings: Properties, val type: StackableItemBlockType)
         IRON_BALL,
         THROAT_SPRAY,
         UPGRADE,
-        DICE,
-        GLASS_BOTTLE,
-        EXTENDER;
+        DICE;
 
         override fun getSerializedName(): String = this.name.lowercase()
 
@@ -135,18 +133,6 @@ class StackableItemBlock(settings: Properties, val type: StackableItemBlockType)
                     Shapes.box(0.125, 0.0, 0.625, 0.5625, 0.1875, 0.875),
                     Shapes.box(0.125, 0.0, 0.4375, 0.5625, 0.1875, 0.875),
                     Shapes.box(0.125, 0.0, 0.4375, 0.5625, 0.375, 0.875)
-                ),
-                StackableItemBlockType.GLASS_BOTTLE to listOf(
-                    Shapes.box(0.375, 0.0, 0.375, 0.625, 0.375, 0.625),
-                    Shapes.box(0.1875, 0.0, 0.1875, 0.8125, 0.375, 0.6875),
-                    Shapes.box(0.125, 0.0, 0.125, 0.8125, 0.375, 0.875),
-                    Shapes.box(0.125, 0.0, 0.125, 0.875, 0.375, 0.875)
-                ),
-                StackableItemBlockType.EXTENDER to listOf(
-                    Shapes.box(0.25, 0.0, 0.375, 0.625, 0.5625, 0.625),
-                    Shapes.box(0.125, 0.0, 0.25, 0.875, 0.5625, 0.75),
-                    Shapes.box(0.0625, 0.0, 0.0625, 0.875, 0.5625, 0.875),
-                    Shapes.box(0.0625, 0.0, 0.0625, 0.9375, 0.5625, 0.9375)
                 )
             )
 

common/src/main/kotlin/com/cobblemon/mod/common/block/decor/LobailaFlowerBlock.kt

@@ -1,59 +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.block.decor
-
-import net.minecraft.core.BlockPos
-import net.minecraft.world.item.context.BlockPlaceContext
-import net.minecraft.world.level.BlockGetter
-import net.minecraft.world.level.block.Block
-import net.minecraft.world.level.block.SimpleWaterloggedBlock
-import net.minecraft.world.level.block.TallFlowerBlock
-import net.minecraft.world.level.block.state.BlockState
-import net.minecraft.world.level.block.state.StateDefinition
-import net.minecraft.world.level.block.state.properties.BlockStateProperties.WATERLOGGED
-import net.minecraft.world.level.block.state.properties.DoubleBlockHalf
-import net.minecraft.world.level.material.FluidState
-import net.minecraft.world.level.material.Fluids
-import net.minecraft.world.phys.shapes.CollisionContext
-import net.minecraft.world.phys.shapes.Shapes
-import net.minecraft.world.phys.shapes.VoxelShape
-
-
-class LobailaFlowerBlock(properties: Properties?) : TallFlowerBlock(properties), SimpleWaterloggedBlock {
-
-    init {
-        registerDefaultState(stateDefinition.any()
-            .setValue(HALF, DoubleBlockHalf.LOWER)
-            .setValue(WATERLOGGED, false))
-    }
-
-    override fun getFluidState(blockState: BlockState): FluidState? {
-        return if (blockState.getValue(WATERLOGGED)) Fluids.WATER.getSource(false) else super.getFluidState(blockState);
-    }
-
-    override fun createBlockStateDefinition(builder: StateDefinition.Builder<Block, BlockState>) {
-        builder.add(HALF, WATERLOGGED)
-    }
-
-    override fun getStateForPlacement(context: BlockPlaceContext): BlockState? {
-        val fluidState = context.level.getFluidState(context.clickedPos)
-        return this.defaultBlockState()
-            .setValue(
-                WATERLOGGED,
-                fluidState.type === Fluids.WATER
-            )
-    }
-
-    override fun getShape(state: BlockState, world: BlockGetter, pos: BlockPos, context: CollisionContext): VoxelShape = AABB
-
-    companion object {
-        private val AABB = Shapes.box(0.125, 0.0, 0.125, 0.875, 1.0, 0.875)
-    }
-
-}

common/src/main/kotlin/com/cobblemon/mod/common/block/decor/MistleafFlowerBlock.kt

@@ -1,87 +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.block.decor
-
-import com.cobblemon.mod.common.CobblemonBlockEntities
-import com.cobblemon.mod.common.block.entity.MistleafFlowerBlockEntity
-import net.minecraft.core.BlockPos
-import net.minecraft.world.level.BlockGetter
-import net.minecraft.world.level.Level
-import net.minecraft.world.level.LevelReader
-import net.minecraft.world.level.block.BaseEntityBlock
-import net.minecraft.world.level.block.Block
-import net.minecraft.world.level.block.EntityBlock
-import net.minecraft.world.level.block.SoundType
-import net.minecraft.world.level.block.TallFlowerBlock
-import net.minecraft.world.level.block.entity.BlockEntity
-import net.minecraft.world.level.block.entity.BlockEntityTicker
-import net.minecraft.world.level.block.entity.BlockEntityType
-import net.minecraft.world.level.block.state.BlockBehaviour
-import net.minecraft.world.level.block.state.BlockState
-import net.minecraft.world.level.block.state.StateDefinition
-import net.minecraft.world.level.block.state.properties.DoubleBlockHalf
-import net.minecraft.world.level.block.state.properties.IntegerProperty
-import net.minecraft.world.level.material.MapColor
-import net.minecraft.world.level.material.PushReaction
-import net.minecraft.world.phys.shapes.CollisionContext
-import net.minecraft.world.phys.shapes.Shapes
-import net.minecraft.world.phys.shapes.VoxelShape
-
-class MistleafFlowerBlock(lightLevel: (BlockState) -> Int) :
-    EntityBlock,
-    TallFlowerBlock(
-        Properties.of()
-            .mapColor(MapColor.PLANT)
-            .noCollission()
-            .instabreak()
-            .sound(SoundType.GRASS)
-            .offsetType(OffsetType.XZ)
-            .ignitedByLava()
-            .pushReaction(PushReaction.DESTROY)
-            .lightLevel(lightLevel)
-    ) {
-
-    init {
-        registerDefaultState(stateDefinition.any()
-            .setValue(HALF, DoubleBlockHalf.LOWER)
-            .setValue(GLOWING, 0))
-    }
-
-    override fun createBlockStateDefinition(builder: StateDefinition.Builder<Block, BlockState>) {
-        builder.add(HALF, GLOWING)
-    }
-    override fun isValidBonemealTarget(level: LevelReader, pos: BlockPos, state: BlockState): Boolean {
-        return false
-    }
-
-    override fun getShape(state: BlockState, world: BlockGetter, pos: BlockPos, context: CollisionContext): VoxelShape = AABB
-
-    override fun newBlockEntity(pos: BlockPos, state: BlockState): BlockEntity? {
-        return MistleafFlowerBlockEntity(pos, state)
-    }
-
-    override fun <T : BlockEntity?> getTicker(
-        level: Level,
-        state: BlockState,
-        blockEntityType: BlockEntityType<T?>
-    ): BlockEntityTicker<T?>? {
-        return if (level.isClientSide) null else BaseEntityBlock.createTickerHelper(blockEntityType as BlockEntityType<*>,
-            CobblemonBlockEntities.MISTLEAF_FLOWER, MistleafFlowerBlockEntity::serverTick) as BlockEntityTicker<T?>?
-    }
-
-    companion object {
-        private val AABB = Shapes.box(0.125, 0.0, 0.125, 0.875, 1.0, 0.875)
-        val GLOWING = IntegerProperty.create("glowing", 0, 8)
-    }
-
-    override fun hasAnalogOutputSignal(state: BlockState): Boolean { return true }
-    override fun getAnalogOutputSignal(state: BlockState, level: Level, pos: BlockPos): Int {
-        return state.getValue(GLOWING) as Int
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/block/decor/PauvilleaFlowerBlock.kt

@@ -1,104 +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.block.decor
-
-import com.mojang.serialization.MapCodec
-import com.mojang.serialization.codecs.RecordCodecBuilder
-import net.minecraft.core.BlockPos
-import net.minecraft.core.Direction
-import net.minecraft.server.level.ServerLevel
-import net.minecraft.util.RandomSource
-import net.minecraft.world.item.ItemStack
-import net.minecraft.world.item.context.BlockPlaceContext
-import net.minecraft.world.level.BlockGetter
-import net.minecraft.world.level.Level
-import net.minecraft.world.level.LevelAccessor
-import net.minecraft.world.level.LevelReader
-import net.minecraft.world.level.block.Block
-import net.minecraft.world.level.block.Blocks
-import net.minecraft.world.level.block.BonemealableBlock
-import net.minecraft.world.level.block.DirectionalBlock
-import net.minecraft.world.level.block.state.BlockState
-import net.minecraft.world.level.block.state.StateDefinition
-import net.minecraft.world.phys.shapes.CollisionContext
-import net.minecraft.world.phys.shapes.Shapes
-import net.minecraft.world.phys.shapes.VoxelShape
-
-class PauvilleaFlowerBlock(properties: Properties?) : DirectionalBlock(properties), BonemealableBlock {
-    init {
-        registerDefaultState(stateDefinition.any()
-            .setValue(FACING, Direction.DOWN))
-    }
-
-    override fun createBlockStateDefinition(builder: StateDefinition.Builder<Block, BlockState>) {
-        builder.add(FACING)
-    }
-
-    override fun getStateForPlacement(ctx: BlockPlaceContext): BlockState? {
-        var blockState = defaultBlockState()
-        val worldView = ctx.level
-        val blockPos = ctx.clickedPos
-        blockState = blockState.setValue(FACING, ctx.clickedFace) as BlockState
-        if (blockState.canSurvive(worldView, blockPos)) {
-            return blockState
-        }
-        return null
-    }
-
-    override fun updateShape(state: BlockState, direction: Direction, neighborState: BlockState, level: LevelAccessor, pos: BlockPos, neighborPos: BlockPos): BlockState {
-        val facing = state.getValue(FACING)
-        if (direction == facing.opposite && !canSurvive(state, level, pos)) {
-            return Blocks.AIR.defaultBlockState()
-        }
-        return super.updateShape(state, direction, neighborState, level, pos, neighborPos)
-    }
-
-    override fun canSurvive(state: BlockState, level: LevelReader, pos: BlockPos): Boolean {
-        val direction = state.getValue(FACING) as Direction
-        val blockState = level.getBlockState(pos.relative(direction.opposite))
-        return blockState.isCollisionShapeFullBlock(level, pos) or blockState.canOcclude()
-    }
-
-    override fun codec(): MapCodec<PauvilleaFlowerBlock> = CODEC
-
-    override fun getShape(state: BlockState, blockGetter: BlockGetter, pos: BlockPos, collisionContext: CollisionContext): VoxelShape {
-        return when (state.getValue(FACING)) {
-            Direction.DOWN -> CEILING
-            Direction.NORTH -> WALL_NORTH
-            Direction.EAST -> WALL_EAST
-            Direction.SOUTH -> WALL_SOUTH
-            Direction.WEST -> WALL_WEST
-            Direction.UP -> FLOOR
-        }
-    }
-
-    companion object {
-        val CODEC: MapCodec<PauvilleaFlowerBlock> = RecordCodecBuilder.mapCodec {
-            it.group(propertiesCodec()).apply(it, ::PauvilleaFlowerBlock)
-        }
-        val FLOOR = Shapes.box(0.075, 0.0, 0.075, 0.925, 0.4375, 0.925)
-        val WALL_NORTH = Shapes.box(0.0, 0.0, 0.8125, 1.0, 1.0, 1.0)
-        val WALL_EAST = Shapes.box(0.0, 0.0, 0.0, 0.1875, 1.0, 1.0)
-        val WALL_SOUTH = Shapes.box(0.0, 0.0, 0.0, 1.0, 1.0, 0.1875)
-        val WALL_WEST = Shapes.box(0.8125, 0.0, 0.0, 1.0, 1.0, 1.0)
-        val CEILING = Shapes.box(0.075, 0.0, 0.075, 0.925, 1.0, 0.925)
-    }
-
-    override fun isValidBonemealTarget(level: LevelReader?, pos: BlockPos?, state: BlockState?): Boolean {
-        return true
-    }
-
-    override fun isBonemealSuccess(level: Level?, random: RandomSource?, pos: BlockPos?, state: BlockState?): Boolean {
-        return true
-    }
-
-    override fun performBonemeal(level: ServerLevel, random: RandomSource?, pos: BlockPos, state: BlockState?) {
-        popResource(level, pos, ItemStack(this))
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/block/decor/PomohanaFlowerBlock.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.block.decor
-
-
-import net.minecraft.core.BlockPos
-import net.minecraft.world.level.BlockGetter
-import net.minecraft.world.level.block.PinkPetalsBlock
-import net.minecraft.world.level.block.state.BlockState
-import net.minecraft.world.phys.shapes.CollisionContext
-import net.minecraft.world.phys.shapes.Shapes
-import net.minecraft.world.phys.shapes.VoxelShape
-
-
-class PomohanaFlowerBlock(properties: Properties?) : PinkPetalsBlock(properties) {
-
-    override fun getShape(state: BlockState, world: BlockGetter, pos: BlockPos, context: CollisionContext): VoxelShape = AABB
-
-    companion object {
-        private val AABB = Shapes.box(0.125, 0.0, 0.125, 0.875, 1.0, 0.875)
-    }
-
-}

common/src/main/kotlin/com/cobblemon/mod/common/block/decor/TerrainPlantBlock.kt

@@ -1,105 +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.block.decor
-
-import com.cobblemon.mod.common.CobblemonBlockEntities
-import com.cobblemon.mod.common.CobblemonBlocks
-import com.cobblemon.mod.common.block.entity.TerrainPlantBlockEntity
-import net.minecraft.core.BlockPos
-import net.minecraft.server.level.ServerLevel
-import net.minecraft.util.RandomSource
-import net.minecraft.world.entity.Entity
-import net.minecraft.world.level.BlockGetter
-import net.minecraft.world.level.Level
-import net.minecraft.world.level.LevelReader
-import net.minecraft.world.level.block.BaseEntityBlock
-import net.minecraft.world.level.block.Block
-import net.minecraft.world.level.block.EntityBlock
-import net.minecraft.world.level.block.TallFlowerBlock
-import net.minecraft.world.level.block.entity.BlockEntity
-import net.minecraft.world.level.block.entity.BlockEntityTicker
-import net.minecraft.world.level.block.entity.BlockEntityType
-import net.minecraft.world.level.block.state.BlockState
-import net.minecraft.world.level.block.state.StateDefinition
-import net.minecraft.world.level.block.state.properties.BooleanProperty
-import net.minecraft.world.level.block.state.properties.DoubleBlockHalf
-import net.minecraft.world.phys.shapes.CollisionContext
-import net.minecraft.world.phys.shapes.Shapes
-import net.minecraft.world.phys.shapes.VoxelShape
-
-class TerrainPlantBlock(properties: Properties) : TallFlowerBlock(properties), EntityBlock {
-
-    init {
-        registerDefaultState(stateDefinition.any()
-            .setValue(HALF, DoubleBlockHalf.LOWER)
-            .setValue(GLOWING, false))
-    }
-
-    override fun createBlockStateDefinition(builder: StateDefinition.Builder<Block, BlockState>) {
-        builder.add(HALF, GLOWING)
-    }
-    override fun isValidBonemealTarget(level: LevelReader, pos: BlockPos, state: BlockState): Boolean {
-        return false
-    }
-
-    override fun tick(state: BlockState, level: ServerLevel, pos: BlockPos, random: RandomSource) {
-        if (state.`is`(CobblemonBlocks.LUCIBELL)) { this.checkInside(level, pos, state) }
-    }
-
-    private fun checkInside(level: Level, pos: BlockPos, state: BlockState) {
-        // Only lower will handle this
-        val upperState = level.getBlockState(pos.above()).takeIf { it.`is`(CobblemonBlocks.LUCIBELL) && it.getValue(HALF) == DoubleBlockHalf.UPPER }
-
-        val entityInside = level.getEntities(null, state.getShape(level, pos).bounds().move(pos)).isNotEmpty()
-                || upperState?.let { level.getEntities(null, it.getShape(level, pos.above()).bounds().move(pos.above())).isNotEmpty() } ?: false
-
-        val glowingState = state.getValue(GLOWING)
-        if (glowingState != entityInside) {
-            level.setBlock(pos, state.setValue(GLOWING, entityInside), UPDATE_CLIENTS)
-            upperState?.let { level.setBlock(pos.above(), it.setValue(GLOWING, entityInside), UPDATE_CLIENTS) }
-        }
-        if (entityInside) level.scheduleTick(pos, this, 30) // tick occasionally to check if player inside
-    }
-
-    override fun entityInside(state: BlockState, level: Level, pos: BlockPos, entity: Entity) {
-        // Lucibell lower block will be our 'driver'
-        if (!level.isClientSide && !state.getValue(GLOWING) && state.`is`(CobblemonBlocks.LUCIBELL)) {
-            val halfState = state.getValue(HALF)
-            if (halfState == DoubleBlockHalf.UPPER) {
-                val lowerState = level.getBlockState(pos.below())
-                    .takeIf { it.`is`(CobblemonBlocks.LUCIBELL) && it.getValue(HALF) == DoubleBlockHalf.LOWER }
-                    ?: return
-                (lowerState.block as TerrainPlantBlock).checkInside(level, pos.below(), lowerState)
-            } else {
-                checkInside(level, pos, state)
-            }
-        }
-    }
-
-    override fun getShape(state: BlockState, world: BlockGetter, pos: BlockPos, context: CollisionContext): VoxelShape = AABB
-
-    override fun newBlockEntity(pos: BlockPos, state: BlockState): BlockEntity {
-        return TerrainPlantBlockEntity(pos, state)
-    }
-
-    override fun <T : BlockEntity> getTicker(
-        level: Level,
-        state: BlockState,
-        blockEntityType: BlockEntityType<T?>
-    ): BlockEntityTicker<T?>? {
-        return if (level.isClientSide) null else BaseEntityBlock.createTickerHelper(blockEntityType as BlockEntityType<*>,
-            CobblemonBlockEntities.TERRAIN_PLANT, TerrainPlantBlockEntity::serverTick) as BlockEntityTicker<T?>?
-    }
-
-    companion object {
-        private val AABB = Shapes.box(0.125, 0.0, 0.125, 0.875, 1.0, 0.875)
-        val GLOWING = BooleanProperty.create("glowing")
-
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/block/decor/TerrainSeedBlock.kt

@@ -1,273 +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.block.decor
-
-import com.cobblemon.mod.common.CobblemonBlocks
-import com.cobblemon.mod.common.CobblemonItems
-import com.cobblemon.mod.common.CobblemonSounds
-import com.mojang.serialization.MapCodec
-import com.mojang.serialization.codecs.RecordCodecBuilder
-import net.minecraft.core.BlockPos
-import net.minecraft.core.Direction
-import net.minecraft.server.level.ServerLevel
-import net.minecraft.util.RandomSource
-import net.minecraft.util.StringRepresentable
-import net.minecraft.world.entity.player.Player
-import net.minecraft.world.item.Item
-import net.minecraft.world.item.ItemStack
-import net.minecraft.world.level.*
-import net.minecraft.world.level.block.*
-import net.minecraft.world.level.block.entity.BlockEntity
-import net.minecraft.world.level.block.state.BlockState
-import net.minecraft.world.level.block.state.StateDefinition
-import net.minecraft.world.level.block.state.properties.BlockStateProperties
-import net.minecraft.world.level.block.state.properties.DoubleBlockHalf
-import net.minecraft.world.level.block.state.properties.EnumProperty
-import net.minecraft.world.level.block.state.properties.IntegerProperty
-import net.minecraft.world.level.material.Fluids
-import net.minecraft.world.phys.shapes.CollisionContext
-import net.minecraft.world.phys.shapes.VoxelShape
-
-@Suppress("OVERRIDE_DEPRECATION")
-class TerrainSeedBlock(private val terrainSeedType: TerrainSeedType, settings: Properties) : CropBlock(settings) {
-    companion object {
-        val CODEC: MapCodec<TerrainSeedBlock> = RecordCodecBuilder.mapCodec { it.group(
-            TerrainSeedType.CODEC.fieldOf("terrainSeedType").forGetter(TerrainSeedBlock::terrainSeedType),
-            propertiesCodec()
-        ).apply(it, ::TerrainSeedBlock) }
-        const val MATURE_AGE = 4
-        val AGE: IntegerProperty = IntegerProperty.create("age", 0, MATURE_AGE)
-        val HALF: EnumProperty<DoubleBlockHalf> = BlockStateProperties.DOUBLE_BLOCK_HALF
-
-        val AGE_TO_SHAPE = arrayOf(
-            box(2.0, 0.0, 2.0, 14.0, 6.0, 14.0), // Stage 0
-            box(2.0, 0.0, 2.0, 14.0, 16.0, 14.0), // Stage 1
-            box(2.0, 0.0, 2.0, 14.0, 16.0, 14.0), // Stage 2
-            box(2.0, 0.0, 2.0, 14.0, 16.0, 14.0), // Stage 3
-            box(2.0, 0.0, 2.0, 14.0, 16.0, 14.0),  // Stage 4
-        )
-
-        val AGE_TO_SHAPE_TOP = arrayOf(
-            box(2.0, 0.0, 2.0, 14.0, 1.0, 14.0), // Stage 0
-            box(2.0, 0.0, 2.0, 14.0, 1.0, 14.0), // Stage 1
-            box(2.0, 0.0, 2.0, 14.0, 8.0, 14.0), // Stage 2
-            box(2.0, 0.0, 2.0, 14.0, 16.0, 14.0), // Stage 3
-            box(2.0, 0.0, 2.0, 14.0, 16.0, 14.0),  // Stage 4
-        )
-    }
-
-    override fun codec(): MapCodec<out CropBlock> {
-        return CODEC
-    }
-
-    init {
-        this.registerDefaultState(
-            this.stateDefinition.any()
-                .setValue(AGE, 0)
-                .setValue(HALF, DoubleBlockHalf.LOWER)
-        )
-    }
-
-    override fun getAgeProperty(): IntegerProperty = AGE
-
-    override fun getMaxAge(): Int = MATURE_AGE
-
-    override fun createBlockStateDefinition(builder: StateDefinition.Builder<Block, BlockState>) {
-        builder.add(AGE, HALF)
-    }
-
-    override fun getBaseSeedId(): ItemLike = this.terrainSeedType.getSeed()
-
-    override fun getShape(state: BlockState, world: BlockGetter, pos: BlockPos, context: CollisionContext): VoxelShape =
-        if (state.getValue(HALF) == DoubleBlockHalf.UPPER) AGE_TO_SHAPE_TOP[getAge(state)] else AGE_TO_SHAPE[this.getAge(state)]
-
-    override fun randomTick(state: BlockState, world: ServerLevel, pos: BlockPos, random: RandomSource) {
-        if (state.getValue(HALF) == DoubleBlockHalf.UPPER || !canGrow(world, pos, state)) return
-
-        if (hasSufficientLight(world, pos) && random.nextInt(32) == 0) {
-            grow(world, pos, state, 1)
-        }
-    }
-
-    private fun canGrow(world: LevelReader, pos: BlockPos, state: BlockState): Boolean {
-        return !this.isMaxAge(state) && canSurvive(state, world, pos) && !(!canGrowInto(world, pos.above()) && state.getValue(AGE) >= 4)
-    }
-
-    private fun canGrowInto(world: LevelReader, pos: BlockPos): Boolean {
-        val blockState = world.getBlockState(pos)
-        return blockState.isAir || blockState.`is`(this.terrainSeedType.getCropBlock())
-    }
-
-    override fun updateShape(state: BlockState, direction: Direction, neighborState: BlockState, world: LevelAccessor, pos: BlockPos, neighborPos: BlockPos): BlockState {
-        return if (state.getValue(AGE) >= 2) {
-            super.updateShape(state, direction, neighborState, world, pos, neighborPos)
-        } else {
-            if (state.canSurvive(world, pos)) state else Blocks.AIR.defaultBlockState()
-        }
-    }
-
-    override fun isValidBonemealTarget(level: LevelReader, pos: BlockPos, state: BlockState): Boolean {
-        val posAndState = getLowerHalf(level, pos, state)
-        return if (posAndState == null) false else this.canGrow(
-            level,
-            posAndState.first,
-            posAndState.second
-        )
-    }
-
-    override fun performBonemeal(level: ServerLevel, random: RandomSource, pos: BlockPos, state: BlockState) {
-        val posAndState = getLowerHalf(level, pos, state)
-        if (posAndState != null) {
-            grow(level, posAndState.first, posAndState.second, getBonemealAgeIncrease(level))
-        }
-    }
-
-    fun grow(world: Level, pos: BlockPos, state: BlockState, increment: Int) {
-        if (!canGrow(world, pos, state)) return
-
-        val newAge = (this.getAge(state) + increment).coerceAtMost(this.maxAge)
-        world.setBlock(pos, state.setValue(this.ageProperty, newAge), UPDATE_CLIENTS)
-
-        val abovePos = pos.above()
-        val stateAbove = world.getBlockState(abovePos)
-        // Set top half depending on age
-        if (newAge >= (2)) {
-            if (stateAbove.isAir) {
-                world.setBlock(
-                    abovePos,
-                    this.defaultBlockState().setValue(AGE, newAge).setValue(HALF, DoubleBlockHalf.UPPER),
-                    UPDATE_CLIENTS
-                )
-            }
-            else if (stateAbove.hasProperty(HALF) && stateAbove.getValue(HALF) == DoubleBlockHalf.UPPER) {
-                world.setBlock(
-                    abovePos,
-                    stateAbove.setValue(AGE, newAge),
-                    UPDATE_CLIENTS
-                )
-            }
-        }
-        // Swaps blocks to the actual Flower when fully grown
-        if (newAge == this.maxAge) {
-            val nextStateLower = this.terrainSeedType.getFlowerBlock().defaultBlockState().setValue(HALF, DoubleBlockHalf.LOWER)
-            val nextStateUpper = this.terrainSeedType.getFlowerBlock().defaultBlockState().setValue(HALF, DoubleBlockHalf.UPPER)
-            world.setBlock(abovePos, nextStateUpper, UPDATE_CLIENTS)
-            world.setBlock(pos, nextStateLower, UPDATE_CLIENTS)
-        }
-    }
-
-    override fun getBonemealAgeIncrease(level: Level): Int {
-        return 1
-    }
-
-    override fun canSurvive(state: BlockState, world: LevelReader, pos: BlockPos): Boolean {
-        return when (state.getValue(HALF)) {
-            DoubleBlockHalf.LOWER -> {
-                val floorBlock = pos.below()
-                val floor = world.getBlockState(floorBlock)
-
-                floor.`is`(Blocks.FARMLAND)
-            }
-            DoubleBlockHalf.UPPER -> {
-                getLowerHalf(world, pos, state) != null
-                // Upper part survives only if the lower part is valid
-            }
-        }
-    }
-
-    private fun getLowerHalf(level: LevelReader, pos: BlockPos, state: BlockState): Pair<BlockPos, BlockState>? {
-        if (isLower(state)) {
-            return Pair(pos, state)
-        } else {
-            val blockPos = pos.below()
-            val blockState = level.getBlockState(blockPos)
-            return if (isLower(blockState)) Pair(
-                blockPos,
-                blockState
-            ) else null
-        }
-    }
-
-    private fun isLower(state: BlockState): Boolean =
-        state.`is`(this.terrainSeedType.getCropBlock()) && state.getValue(HALF) == DoubleBlockHalf.LOWER
-
-    override fun getSoundType(state: BlockState): SoundType {
-        return CobblemonSounds.HEARTY_GRAINS_SOUNDS
-    }
-
-    @Suppress("unused")
-    enum class TerrainSeedType : StringRepresentable {
-        ELECTRIC,
-        PSYCHIC,
-        MISTY,
-        GRASSY;
-        fun getSeed(): Item = when (this) {
-            ELECTRIC -> CobblemonItems.ELECTRIC_SEED
-            PSYCHIC -> CobblemonItems.PSYCHIC_SEED
-            MISTY -> CobblemonItems.MISTY_SEED
-            GRASSY -> CobblemonItems.GRASSY_SEED
-        }
-        fun getCropBlock(): TerrainSeedBlock = when (this) {
-            ELECTRIC -> CobblemonBlocks.ELECTRIC_SEED
-            PSYCHIC -> CobblemonBlocks.PSYCHIC_SEED
-            MISTY -> CobblemonBlocks.MISTY_SEED
-            GRASSY -> CobblemonBlocks.GRASSY_SEED
-        }
-        fun getFlowerBlock(): Block = when (this) {
-            ELECTRIC -> CobblemonBlocks.VOLTACONIA
-            PSYCHIC -> CobblemonBlocks.LUCIBELL
-            MISTY -> CobblemonBlocks.MISTLEAF
-            GRASSY -> CobblemonBlocks.VERDROOT
-        }
-
-        override fun getSerializedName(): String = this.name.lowercase()
-
-        companion object {
-            val CODEC = StringRepresentable.fromEnum(::values)
-        }
-    }
-
-    override fun playerWillDestroy(level: Level, pos: BlockPos, state: BlockState, player: Player): BlockState {
-        if (!level.isClientSide) {
-            if (player.isCreative()) {
-                preventDropFromBottomPart(level, pos, state, player)
-            } else {
-                dropResources(state, level, pos, null as BlockEntity?, player, player.getMainHandItem())
-            }
-        }
-
-        return super.playerWillDestroy(level, pos, state, player)
-    }
-
-    override fun playerDestroy(
-        level: Level,
-        player: Player,
-        pos: BlockPos,
-        state: BlockState,
-        blockEntity: BlockEntity?,
-        tool: ItemStack
-    ) {
-        super.playerDestroy(level, player, pos, Blocks.AIR.defaultBlockState(), blockEntity, tool)
-    }
-
-    fun preventDropFromBottomPart(level: Level, pos: BlockPos, state: BlockState, player: Player?) {
-        val doubleblockhalf = state.getValue<DoubleBlockHalf?>(DoublePlantBlock.HALF) as DoubleBlockHalf
-        if (doubleblockhalf == DoubleBlockHalf.UPPER) {
-            val blockpos = pos.below()
-            val blockstate = level.getBlockState(blockpos)
-            if (blockstate.`is`(state.getBlock()) && blockstate.getValue<DoubleBlockHalf?>(DoublePlantBlock.HALF) == DoubleBlockHalf.LOWER) {
-                val blockstate1 = if (blockstate.getFluidState()
-                        .`is`(Fluids.WATER)
-                ) Blocks.WATER.defaultBlockState() else Blocks.AIR.defaultBlockState()
-                level.setBlock(blockpos, blockstate1, 35)
-                level.levelEvent(player, 2001, blockpos, getId(blockstate))
-            }
-        }
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/block/decor/WistensuFlowerBlock.kt

@@ -1,80 +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.block.decor
-
-import com.cobblemon.mod.common.CobblemonBlocks
-import net.minecraft.core.BlockPos
-import net.minecraft.core.Direction
-import net.minecraft.world.item.context.BlockPlaceContext
-import net.minecraft.world.level.LevelAccessor
-import net.minecraft.world.level.LevelReader
-import net.minecraft.world.level.block.Block
-import net.minecraft.world.level.block.state.BlockState
-import net.minecraft.world.level.block.state.StateDefinition
-import net.minecraft.world.level.block.state.properties.BlockStateProperties
-import net.minecraft.world.level.block.state.properties.BooleanProperty
-
-interface WistensuFlowerBlock {
-    fun additionalBlockStateDefinition(builder: StateDefinition.Builder<Block, BlockState>) {
-        builder.add(BlockStateProperties.FACING)
-        builder.add(ROOT)
-    }
-
-    fun adjustStateForPlacement(context: BlockPlaceContext, defaultState: BlockState): BlockState {
-        val upperBlock = context.level.getBlockState(context.clickedPos.relative(Direction.UP))
-        if (upperBlock.`is`(CobblemonBlocks.WISTENSU) || upperBlock.`is`(CobblemonBlocks.WISTENSU_VINE)) {
-            return defaultState
-                .setValue(BlockStateProperties.FACING, Direction.DOWN)
-                .setValue(ROOT, false)
-        } else {
-            var placeDirection = context.clickedFace
-            if (placeDirection == Direction.UP) placeDirection = Direction.DOWN
-            return defaultState
-                .setValue(BlockStateProperties.FACING, placeDirection)
-                .setValue(ROOT, true)
-        }
-    }
-
-    fun copyStateValues(target: BlockState, source: BlockState): BlockState {
-        return target
-            .setValue(ROOT, source.getValue(ROOT))
-            .setValue(BlockStateProperties.FACING, source.getValue(BlockStateProperties.FACING))
-    }
-
-    fun wisternCanSurvive(state: BlockState, level: LevelReader, pos: BlockPos): Boolean {
-        if (state.getValue(ROOT)) {
-            val facing = state.getValue(BlockStateProperties.FACING)
-            val targetPos = pos.relative(facing.opposite)
-            val directionState = level.getBlockState(targetPos)
-            return directionState.isFaceSturdy(level, targetPos, facing)
-        } else {
-            val topState = level.getBlockState(pos.relative(Direction.UP))
-            return topState.`is`(CobblemonBlocks.WISTENSU) || topState.`is`(CobblemonBlocks.WISTENSU_VINE)
-        }
-    }
-
-    fun wisternUpdateShape(state: BlockState, direction: Direction, neighborState: BlockState, level: LevelAccessor, pos: BlockPos, neighborPos: BlockPos, block: Block): BlockState? {
-        if (!wisternCanSurvive(state, level, pos)) {
-            level.scheduleTick(pos, block, 1)
-        }
-
-        if (direction == Direction.UP &&
-            (neighborState.`is`(CobblemonBlocks.WISTENSU) || neighborState.`is`(CobblemonBlocks.WISTENSU_VINE))) {
-            return state
-                .setValue(ROOT, false)
-                .setValue(BlockStateProperties.FACING, Direction.DOWN)
-        }
-
-        return null
-    }
-
-    companion object {
-        val ROOT = BooleanProperty.create("root")
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/block/decor/WistensuFlowerHeadBlock.kt

@@ -1,114 +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.block.decor
-
-
-import com.cobblemon.mod.common.CobblemonBlocks
-import com.mojang.serialization.MapCodec
-import com.mojang.serialization.codecs.RecordCodecBuilder
-import net.minecraft.core.BlockPos
-import net.minecraft.core.Direction
-import net.minecraft.server.level.ServerLevel
-import net.minecraft.util.RandomSource
-import net.minecraft.world.item.context.BlockPlaceContext
-import net.minecraft.world.level.LevelAccessor
-import net.minecraft.world.level.LevelReader
-import net.minecraft.world.level.block.Block
-import net.minecraft.world.level.block.GrowingPlantHeadBlock
-import net.minecraft.world.level.block.state.BlockState
-import net.minecraft.world.level.block.state.StateDefinition
-import net.minecraft.world.level.block.state.properties.BlockStateProperties
-import net.minecraft.world.phys.shapes.VoxelShape
-import kotlin.math.min
-
-//TODO: Root/connection shit
-class WistensuFlowerHeadBlock(properties: Properties?) : GrowingPlantHeadBlock(properties, Direction.DOWN, SHAPE, false, 0.1), WistensuFlowerBlock {
-    companion object {
-        val CODEC: MapCodec<WistensuFlowerHeadBlock> = RecordCodecBuilder.mapCodec {
-            it.group(propertiesCodec()).apply(it, ::WistensuFlowerHeadBlock)
-        }
-        val SHAPE: VoxelShape = box(1.0, 2.0, 1.0, 15.0, 16.0, 15.0)
-    }
-    override fun codec(): MapCodec<WistensuFlowerHeadBlock> = CODEC
-
-    override fun getBlocksToGrowWhenBonemealed(random: RandomSource): Int {
-        var d = 1.0
-        var i = 0
-        while (random.nextDouble() < d) {
-            d *= 0.826
-            ++i
-        }
-        return i
-    }
-
-    override fun canGrowInto(state: BlockState): Boolean {
-        return state.isAir
-    }
-
-    override fun getBodyBlock(): Block {
-        return CobblemonBlocks.WISTENSU_VINE
-    }
-
-    override fun createBlockStateDefinition(builder: StateDefinition.Builder<Block, BlockState>) {
-        super.createBlockStateDefinition(builder)
-        additionalBlockStateDefinition(builder)
-    }
-
-    override fun updateShape(
-        state: BlockState,
-        direction: Direction,
-        neighborState: BlockState,
-        level: LevelAccessor,
-        pos: BlockPos,
-        neighborPos: BlockPos
-    ): BlockState {
-        val updateState = wisternUpdateShape(state, direction, neighborState, level, pos, neighborPos, this)
-        if (updateState != null) return updateState
-
-        if (direction == Direction.DOWN &&
-            (neighborState.`is`(CobblemonBlocks.WISTENSU) || neighborState.`is`(CobblemonBlocks.WISTENSU_VINE))) {
-            return updateBodyAfterConvertedFromHead(state, bodyBlock.defaultBlockState())
-        }
-        return state
-    }
-
-    override fun getStateForPlacement(context: BlockPlaceContext): BlockState {
-        val defaultState = super.getStateForPlacement(context)!!
-        return adjustStateForPlacement(context, defaultState)
-    }
-
-    override fun getGrowIntoState(state: BlockState, random: RandomSource): BlockState {
-        return super.getGrowIntoState(state, random)
-            .setValue(WistensuFlowerBlock.ROOT, false)
-            .setValue(BlockStateProperties.FACING, Direction.DOWN)
-    }
-
-    override fun updateBodyAfterConvertedFromHead(head: BlockState, body: BlockState): BlockState {
-        return copyStateValues(body, head)
-    }
-
-    override fun performBonemeal(level: ServerLevel, random: RandomSource, pos: BlockPos, state: BlockState) {
-        var blockPos = pos.relative(growthDirection)
-        var i = min(state.getValue(AGE), MAX_AGE)
-        val j = getBlocksToGrowWhenBonemealed(random)
-        var currentState = state
-
-        for (k in 0..<j) {
-            if (!canGrowInto(level.getBlockState(blockPos))) break
-            level.setBlockAndUpdate(blockPos, getGrowIntoState(currentState, random))
-            currentState = level.getBlockState(blockPos)
-            blockPos = blockPos.relative(growthDirection)
-            i = min(i + 1, MAX_AGE)
-        }
-    }
-
-    override fun canSurvive(state: BlockState, level: LevelReader, pos: BlockPos): Boolean {
-        return wisternCanSurvive(state, level, pos)
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/block/decor/WistensuFlowerVineBlock.kt

@@ -1,77 +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.block.decor
-
-import com.cobblemon.mod.common.CobblemonBlocks
-import com.mojang.serialization.MapCodec
-import com.mojang.serialization.codecs.RecordCodecBuilder
-import net.minecraft.core.BlockPos
-import net.minecraft.core.Direction
-import net.minecraft.world.item.context.BlockPlaceContext
-import net.minecraft.world.level.LevelAccessor
-import net.minecraft.world.level.LevelReader
-import net.minecraft.world.level.block.Block
-import net.minecraft.world.level.block.GrowingPlantBodyBlock
-import net.minecraft.world.level.block.GrowingPlantHeadBlock
-import net.minecraft.world.level.block.state.BlockState
-import net.minecraft.world.level.block.state.StateDefinition
-import net.minecraft.world.level.block.state.properties.BlockStateProperties
-import net.minecraft.world.phys.shapes.VoxelShape
-
-//TODO: Root/connection shit
-class WistensuFlowerVineBlock(properties: Properties?) : GrowingPlantBodyBlock(properties, Direction.DOWN, SHAPE, false), WistensuFlowerBlock
-{
-    companion object {
-        val CODEC: MapCodec<WistensuFlowerVineBlock> = RecordCodecBuilder.mapCodec {
-            it.group(propertiesCodec()).apply(it, ::WistensuFlowerVineBlock)
-        }
-        val SHAPE: VoxelShape = box(1.0, 0.0, 1.0, 15.0, 16.0, 15.0)
-    }
-    override fun codec(): MapCodec<WistensuFlowerVineBlock> = CODEC
-
-    override fun getHeadBlock(): GrowingPlantHeadBlock {
-        return CobblemonBlocks.WISTENSU
-    }
-
-    override fun createBlockStateDefinition(builder: StateDefinition.Builder<Block, BlockState>) {
-        super.createBlockStateDefinition(builder)
-        additionalBlockStateDefinition(builder)
-    }
-
-    override fun updateShape(
-        state: BlockState,
-        direction: Direction,
-        neighborState: BlockState,
-        level: LevelAccessor,
-        pos: BlockPos,
-        neighborPos: BlockPos
-    ): BlockState {
-        val updateState = wisternUpdateShape(state, direction, neighborState, level, pos, neighborPos, this)
-        if (updateState != null) return updateState
-
-        if (direction == Direction.DOWN &&
-                !neighborState.`is`(CobblemonBlocks.WISTENSU) && !neighborState.`is`(CobblemonBlocks.WISTENSU_VINE)) {
-            return updateHeadAfterConvertedFromBody(state, headBlock.getStateForPlacement(level))
-        }
-        return state
-    }
-
-    override fun getStateForPlacement(context: BlockPlaceContext): BlockState {
-        val defaultState = super.getStateForPlacement(context)!!
-        return adjustStateForPlacement(context, defaultState)
-    }
-
-    override fun updateHeadAfterConvertedFromBody(head: BlockState, body: BlockState): BlockState {
-        return copyStateValues(body, head)
-    }
-
-    override fun canSurvive(state: BlockState, level: LevelReader, pos: BlockPos): Boolean {
-        return wisternCanSurvive(state, level, pos)
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/block/entity/MistleafFlowerBlockEntity.kt

@@ -1,46 +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.block.entity
-
-import com.cobblemon.mod.common.CobblemonBlockEntities
-import com.cobblemon.mod.common.CobblemonBlocks
-import com.cobblemon.mod.common.block.decor.MistleafFlowerBlock
-import net.minecraft.core.BlockPos
-import net.minecraft.world.level.Level
-import net.minecraft.world.level.block.Block
-import net.minecraft.world.level.block.entity.BlockEntity
-import net.minecraft.world.level.block.state.BlockState
-
-class MistleafFlowerBlockEntity(pos: BlockPos, state: BlockState): BlockEntity(CobblemonBlockEntities.MISTLEAF_FLOWER, pos, state) {
-    companion object {
-        fun serverTick(level: Level, pos: BlockPos, state: BlockState, mistleafFlowerBlockEntity: MistleafFlowerBlockEntity) {
-            if (level.isClientSide) return
-            if (state.block !is MistleafFlowerBlock) return
-
-            val glowing = state.getValue(MistleafFlowerBlock.GLOWING)
-
-            val wantedState = when (state.`is`(CobblemonBlocks.MISTLEAF)) {
-                //The light level and comparator output increases on odds from New to Full, and decreases on the evens from Full to New
-                ((level.dayTime().toInt().mod(24000) in 12542..23459) && level.moonPhase == 4) -> 1 //New Moon
-                ((level.dayTime().toInt().mod(24000) in 12542..23459) && level.moonPhase == 5) -> 3 //Waxing Crescent
-                ((level.dayTime().toInt().mod(24000) in 12542..23459) && level.moonPhase == 6) -> 5 //First Quarter
-                ((level.dayTime().toInt().mod(24000) in 12542..23459) && level.moonPhase == 7) -> 7 //Waxing Gibbous
-                ((level.dayTime().toInt().mod(24000) in 12542..23459) && level.moonPhase == 0) -> 8 //Full Moon
-                ((level.dayTime().toInt().mod(24000) in 12542..23459) && level.moonPhase == 1) -> 6 //Waning Gibbous
-                ((level.dayTime().toInt().mod(24000) in 12542..23459) && level.moonPhase == 2) -> 4 // Third Quarter
-                ((level.dayTime().toInt().mod(24000) in 12542..23459) && level.moonPhase == 3) -> 2 //Waning Crescent
-                else -> 0 //Daytime, and likely dimensions with no concept of day/night cycle or moon phase
-            }
-
-            if (glowing != wantedState) {
-                level.setBlock(pos, state.setValue(MistleafFlowerBlock.GLOWING, wantedState), Block.UPDATE_ALL)
-            }
-        }
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/block/entity/TerrainPlantBlockEntity.kt

@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.block.entity
-
-import com.cobblemon.mod.common.CobblemonBlockEntities
-import com.cobblemon.mod.common.CobblemonBlocks
-import com.cobblemon.mod.common.block.decor.TerrainPlantBlock
-import net.minecraft.core.BlockPos
-import net.minecraft.world.level.Level
-import net.minecraft.world.level.block.Block
-import net.minecraft.world.level.block.entity.BlockEntity
-import net.minecraft.world.level.block.state.BlockState
-
-class TerrainPlantBlockEntity(pos: BlockPos, state: BlockState): BlockEntity(CobblemonBlockEntities.TERRAIN_PLANT, pos, state) {
-    companion object {
-        fun serverTick(level: Level, pos: BlockPos, state: BlockState, terrainPlantBlockEntity: TerrainPlantBlockEntity) {
-            if (level.isClientSide) return
-            if (state.block !is TerrainPlantBlock) return
-
-            val glowing = state.getValue(TerrainPlantBlock.GLOWING)
-
-            val wantedState = if (state.`is`(CobblemonBlocks.VOLTACONIA)) level.isThundering
-                else if (state.`is`(CobblemonBlocks.VERDROOT)) level.isRaining && !level.isThundering
-                else null // We dont control glowing here
-
-            if (wantedState != null && glowing != wantedState) {
-                level.setBlock(pos, state.setValue(TerrainPlantBlock.GLOWING, wantedState), Block.UPDATE_CLIENTS)
-            }
-        }
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/block/general/MintLitterBlock.kt

@@ -1,133 +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.block.general
-
-import com.cobblemon.mod.common.util.rotateShape
-import com.mojang.serialization.MapCodec
-import com.mojang.serialization.codecs.RecordCodecBuilder
-import net.minecraft.core.BlockPos
-import net.minecraft.core.Direction
-import net.minecraft.world.item.context.BlockPlaceContext
-import net.minecraft.world.level.BlockGetter
-import net.minecraft.world.level.LevelAccessor
-import net.minecraft.world.level.LevelReader
-import net.minecraft.world.level.block.*
-import net.minecraft.world.level.block.state.BlockState
-import net.minecraft.world.level.block.state.StateDefinition
-import net.minecraft.world.level.block.HorizontalDirectionalBlock.FACING
-import net.minecraft.world.level.block.state.properties.BlockStateProperties.HORIZONTAL_FACING
-import net.minecraft.world.level.block.state.properties.IntegerProperty
-import net.minecraft.world.phys.shapes.CollisionContext
-import net.minecraft.world.phys.shapes.Shapes
-import net.minecraft.world.phys.shapes.VoxelShape
-import kotlin.math.min
-
-class MintLitterBlock(properties: Properties?) : Block(properties) {
-    init {
-        registerDefaultState(stateDefinition.any()
-            .setValue(FACING, Direction.NORTH)
-            .setValue(AMOUNT, 1))
-    }
-
-    override fun getStateForPlacement(context: BlockPlaceContext): BlockState? {
-        val blockState = context.getLevel().getBlockState(context.getClickedPos())
-        return if (blockState.`is`(this)) blockState.setValue<Int?, Int?>(
-            AMOUNT,
-            min(4, blockState.getValue<Int?>(AMOUNT) as Int + 1)
-        ) as BlockState else this.defaultBlockState().setValue<Direction?, Direction?>(
-            FACING,
-            context.getHorizontalDirection().getOpposite()
-        ) as BlockState
-    }
-
-    override fun createBlockStateDefinition(builder: StateDefinition.Builder<Block, BlockState>) {
-        builder.add(FACING)
-        builder.add(AMOUNT)
-    }
-
-    override fun updateShape(
-        state: BlockState,
-        direction: Direction?,
-        neighborState: BlockState?,
-        level: LevelAccessor?,
-        pos: BlockPos?,
-        neighborPos: BlockPos?
-    ): BlockState {
-        return if (!state.canSurvive(level, pos)) Blocks.AIR.defaultBlockState() else super.updateShape(
-            state,
-            direction,
-            neighborState,
-            level,
-            pos,
-            neighborPos
-        )
-    }
-
-    override fun canSurvive(state: BlockState?, level: LevelReader, pos: BlockPos): Boolean {
-        val posBelow = pos.below()
-        return level.getBlockState(posBelow).isFaceSturdy(level, posBelow, Direction.UP)
-    }
-
-    override fun propagatesSkylightDown(state: BlockState, level: BlockGetter?, pos: BlockPos?): Boolean {
-        return state.getFluidState().isEmpty()
-    }
-
-    public override fun canBeReplaced(state: BlockState, useContext: BlockPlaceContext): Boolean {
-        return if (!useContext.isSecondaryUseActive && useContext.itemInHand.`is`(this.asItem()) && state.getValue(
-                AMOUNT
-            ) <= MAX_AMOUNT
-        ) true else super.canBeReplaced(state, useContext)
-    }
-
-    @Deprecated("Deprecated in Java")
-    override fun rotate(state: BlockState, rotation: Rotation): BlockState {
-        return state.setValue(HORIZONTAL_FACING, rotation.rotate(state.getValue(HORIZONTAL_FACING)))
-    }
-
-    override fun getShape(state: BlockState, level: BlockGetter, pos: BlockPos, context: CollisionContext): VoxelShape? {
-        val litterBoxes = when (state.getValue(FACING)) {
-            Direction.SOUTH -> SOUTH_SHAPES
-            Direction.WEST -> WEST_SHAPES
-            Direction.EAST -> EAST_SHAPES
-            else -> NORTH_SHAPES
-        }
-
-        var litterBox = litterBoxes[state.getValue(AMOUNT)]
-        return litterBox
-    }
-
-    companion object {
-        val CODEC: MapCodec<MintLitterBlock> = RecordCodecBuilder.mapCodec {
-            it.group(
-                propertiesCodec()
-            ).apply(it, ::MintLitterBlock) }
-
-        val AMOUNT = IntegerProperty.create("amount", 1, 4)
-        const val MAX_AMOUNT: Int = 4
-
-        private val NORTH_SHAPES = listOf(
-            Shapes.box(0.0, 0.0, 0.0, 1.0, 0.125, 1.0),
-            Shapes.box(0.0, 0.0, 0.0, 0.5, 0.0625, 0.5),
-            Shapes.box(0.0, 0.0, 0.0, 0.5, 0.0625, 1.0),
-            Shapes.or(
-                Shapes.box(0.0, 0.0, 0.0, 0.5, 0.0625, 1.0),
-                Shapes.box(0.5, 0.0, 0.5, 1.0, 0.0625, 1.0)
-            ),
-            Shapes.box(0.0, 0.0, 0.0, 1.0, 0.0625, 1.0)
-        )
-
-        private val SOUTH_SHAPES = createShapes(Direction.SOUTH)
-        private val WEST_SHAPES = createShapes(Direction.WEST)
-        private val EAST_SHAPES = createShapes(Direction.EAST)
-
-        private fun createShapes(to: Direction): List<VoxelShape> {
-            return NORTH_SHAPES.map { rotateShape(Direction.NORTH, to, it) }
-        }
-    }
-}

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

@@ -391,7 +391,7 @@ object CobblemonClient {
             CobblemonBlocks.X_SP_ATK,
             CobblemonBlocks.X_SP_DEF,
             CobblemonBlocks.X_SPEED,
-            CobblemonBlocks.TM_MACHINE,   
+            CobblemonBlocks.TM_MACHINE,
 
             CobblemonBlocks.GALARICA_CUFF,
             CobblemonBlocks.GALARICA_WREATH,
@@ -415,108 +415,7 @@ object CobblemonClient {
             CobblemonBlocks.NEVER_MELT_ICE,
             CobblemonBlocks.WIDE_LENS,
             CobblemonBlocks.ZOOM_LENS,
-            CobblemonBlocks.SCOPE_LENS,
-            CobblemonBlocks.MOOMOO_MILK,
-            CobblemonBlocks.MEDICINAL_BREW,
-            CobblemonBlocks.TERRAIN_EXTENDER,
-            
-            CobblemonBlocks.RED_MINT_LEAF_LITTER,
-            CobblemonBlocks.POTTED_RED_MINT,
-            CobblemonBlocks.BLUE_MINT_LEAF_LITTER,
-            CobblemonBlocks.POTTED_BLUE_MINT,
-            CobblemonBlocks.CYAN_MINT_LEAF_LITTER,
-            CobblemonBlocks.POTTED_CYAN_MINT,
-            CobblemonBlocks.PINK_MINT_LEAF_LITTER,
-            CobblemonBlocks.POTTED_PINK_MINT,
-            CobblemonBlocks.GREEN_MINT_LEAF_LITTER,
-            CobblemonBlocks.POTTED_GREEN_MINT,
-            CobblemonBlocks.WHITE_MINT_LEAF_LITTER,
-            CobblemonBlocks.POTTED_WHITE_MINT,
-
-            CobblemonBlocks.LOBAILA,
-            CobblemonBlocks.POMOHANA,
-            CobblemonBlocks.PAUVILLEA,
-            CobblemonBlocks.WISTENSU,
-            CobblemonBlocks.WISTENSU_VINE,
-            CobblemonBlocks.ELECTRIC_SEED,
-            CobblemonBlocks.VOLTACONIA,
-            CobblemonBlocks.GRASSY_SEED,
-            CobblemonBlocks.VERDROOT,
-            CobblemonBlocks.MISTY_SEED,
-            CobblemonBlocks.MISTLEAF,
-            CobblemonBlocks.PSYCHIC_SEED,
-            CobblemonBlocks.LUCIBELL,
-
-            CobblemonBlocks.POTTED_AGUAV_BERRY,
-            CobblemonBlocks.POTTED_APICOT_BERRY,
-            CobblemonBlocks.POTTED_ASPEAR_BERRY,
-            CobblemonBlocks.POTTED_BABIRI_BERRY,
-            CobblemonBlocks.POTTED_BELUE_BERRY,
-            CobblemonBlocks.POTTED_BLUK_BERRY,
-            CobblemonBlocks.POTTED_CHARTI_BERRY,
-            CobblemonBlocks.POTTED_CHERI_BERRY,
-            CobblemonBlocks.POTTED_CHESTO_BERRY,
-            CobblemonBlocks.POTTED_CHILAN_BERRY,
-            CobblemonBlocks.POTTED_CHOPLE_BERRY,
-            CobblemonBlocks.POTTED_COBA_BERRY,
-            CobblemonBlocks.POTTED_COLBUR_BERRY,
-            CobblemonBlocks.POTTED_CORNN_BERRY,
-            CobblemonBlocks.POTTED_CUSTAP_BERRY,
-            CobblemonBlocks.POTTED_DURIN_BERRY,
-            CobblemonBlocks.POTTED_EGGANT_BERRY,
-            CobblemonBlocks.POTTED_ENIGMA_BERRY,
-            CobblemonBlocks.POTTED_FIGY_BERRY,
-            CobblemonBlocks.POTTED_GANLON_BERRY,
-            CobblemonBlocks.POTTED_GREPA_BERRY,
-            CobblemonBlocks.POTTED_HABAN_BERRY,
-            CobblemonBlocks.POTTED_HONDEW_BERRY,
-            CobblemonBlocks.POTTED_HOPO_BERRY,
-            CobblemonBlocks.POTTED_IAPAPA_BERRY,
-            CobblemonBlocks.POTTED_JABOCA_BERRY,
-            CobblemonBlocks.POTTED_KASIB_BERRY,
-            CobblemonBlocks.POTTED_KEBIA_BERRY,
-            CobblemonBlocks.POTTED_KEE_BERRY,
-            CobblemonBlocks.POTTED_KELPSY_BERRY,
-            CobblemonBlocks.POTTED_LANSAT_BERRY,
-            CobblemonBlocks.POTTED_LEPPA_BERRY,
-            CobblemonBlocks.POTTED_LIECHI_BERRY,
-            CobblemonBlocks.POTTED_LUM_BERRY,
-            CobblemonBlocks.POTTED_MAGOST_BERRY,
-            CobblemonBlocks.POTTED_MAGO_BERRY,
-            CobblemonBlocks.POTTED_MARANGA_BERRY,
-            CobblemonBlocks.POTTED_MICLE_BERRY,
-            CobblemonBlocks.POTTED_NANAB_BERRY,
-            CobblemonBlocks.POTTED_NOMEL_BERRY,
-            CobblemonBlocks.POTTED_OCCA_BERRY,
-            CobblemonBlocks.POTTED_ORAN_BERRY,
-            CobblemonBlocks.POTTED_PAMTRE_BERRY,
-            CobblemonBlocks.POTTED_PASSHO_BERRY,
-            CobblemonBlocks.POTTED_PAYAPA_BERRY,
-            CobblemonBlocks.POTTED_PECHA_BERRY,
-            CobblemonBlocks.POTTED_PERSIM_BERRY,
-            CobblemonBlocks.POTTED_PETAYA_BERRY,
-            CobblemonBlocks.POTTED_PINAP_BERRY,
-            CobblemonBlocks.POTTED_POMEG_BERRY,
-            CobblemonBlocks.POTTED_QUALOT_BERRY,
-            CobblemonBlocks.POTTED_RABUTA_BERRY,
-            CobblemonBlocks.POTTED_RAWST_BERRY,
-            CobblemonBlocks.POTTED_RAZZ_BERRY,
-            CobblemonBlocks.POTTED_RINDO_BERRY,
-            CobblemonBlocks.POTTED_ROSELI_BERRY,
-            CobblemonBlocks.POTTED_ROWAP_BERRY,
-            CobblemonBlocks.POTTED_SALAC_BERRY,
-            CobblemonBlocks.POTTED_SHUCA_BERRY,
-            CobblemonBlocks.POTTED_SITRUS_BERRY,
-            CobblemonBlocks.POTTED_SPELON_BERRY,
-            CobblemonBlocks.POTTED_STARF_BERRY,
-            CobblemonBlocks.POTTED_TAMATO_BERRY,
-            CobblemonBlocks.POTTED_TANGA_BERRY,
-            CobblemonBlocks.POTTED_TOUGA_BERRY,
-            CobblemonBlocks.POTTED_WACAN_BERRY,
-            CobblemonBlocks.POTTED_WATMEL_BERRY,
-            CobblemonBlocks.POTTED_WEPEAR_BERRY,
-            CobblemonBlocks.POTTED_WIKI_BERRY,
-            CobblemonBlocks.POTTED_YACHE_BERRY
+            CobblemonBlocks.SCOPE_LENS
         )
 
         this.createBoatModelLayers()

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

@@ -28,9 +28,9 @@ import org.joml.Vector3f
 
 open class PartySlot(
     x: Int, y: Int,
-    val pokemon: TradeStartedPacket.TradeablePokemon?,
+    private val pokemon: TradeStartedPacket.TradeablePokemon?,
     private val parent: TradeGUI,
-    val isOpposing: Boolean = false,
+    private val isOpposing: Boolean = false,
     onPress: OnPress
 ) : Button(x, y, SIZE, SIZE, Component.literal("PartySlot"), onPress, DEFAULT_NARRATION), CobblemonRenderable {
     val state = FloatingState()
@@ -42,8 +42,6 @@ open class PartySlot(
         private val genderIconFemale = cobblemonResource("textures/gui/pc/gender_icon_female.png")
         private val selectPointerResource = cobblemonResource("textures/gui/pc/pc_pointer.png")
         private val untradeableResource = cobblemonResource("textures/gui/trade/trade_slot_icon_locked.png")
-        private val tradePartySlotSelectedResource = cobblemonResource("textures/gui/trade/trade_party_slot_selected.png")
-        private val tradePartySlotSelectedOpposingResource = cobblemonResource("textures/gui/trade/trade_party_slot_selected_opposing.png")
     }
 
     override fun playDownSound(soundManager: SoundManager) {
@@ -62,17 +60,6 @@ open class PartySlot(
             )
         }
 
-        if (hasSelected()) {
-            blitk(
-                matrixStack = matrices,
-                texture = if (isOpposing) tradePartySlotSelectedOpposingResource else tradePartySlotSelectedResource,
-                x = x - 2,
-                y = y - 2,
-                width = 29,
-                height = 29
-            )
-        }
-
         if (pokemon != null) {
             // context.enableScissor(x - 2, y + 2, x + SIZE + 4, y + SIZE + 4)
             // Render Pokémon
@@ -131,16 +118,7 @@ open class PartySlot(
             }
 
             matrices.popPose()
-            
-            val isViewed = if (isOpposing) {
-                parent.opposingOfferedPokemon?.uuid == pokemon.pokemonId
-            } else {
-                parent.offeredPokemon?.uuid == pokemon.pokemonId
-            }
-
-            if (isViewed && pokemon.tradeable) {
-                matrices.pushPose()
-                matrices.translate(0.0, 0.0, 200.0)
+            if (hasSelected()) {
                 blitk(
                     matrixStack = matrices,
                     texture = selectPointerResource,
@@ -150,7 +128,6 @@ open class PartySlot(
                     height = 8,
                     scale = TradeGUI.SCALE
                 )
-                matrices.popPose()
             }
 
             // Held Item
@@ -168,9 +145,8 @@ open class PartySlot(
     }
 
     open fun hasSelected(): Boolean {
-        if (pokemon == null) return false
-        val offeredPokemons = if (isOpposing) parent.trade.oppositeOffer.get() else parent.trade.myOffer.get()
-        return offeredPokemons.any { it.uuid == pokemon.pokemonId }
+        val offeredPokemon = if (isOpposing) parent.trade.oppositeOffer.get() else parent.trade.myOffer.get()
+        return pokemon?.pokemonId == offeredPokemon?.uuid && pokemon != null
     }
 
     fun isHovered(mouseX: Int, mouseY: Int) = pokemon?.tradeable != false && mouseX.toFloat() in (x.toFloat()..(x.toFloat() + SIZE)) && mouseY.toFloat() in (y.toFloat()..(y.toFloat() + SIZE))

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

@@ -25,7 +25,6 @@ import com.cobblemon.mod.common.client.gui.summary.widgets.common.reformatNature
 import com.cobblemon.mod.common.client.render.drawScaledText
 import com.cobblemon.mod.common.client.render.drawScaledTextJustifiedRight
 import com.cobblemon.mod.common.client.trade.ClientTrade
-import com.cobblemon.mod.common.net.messages.client.trade.TradeStartedPacket
 import com.cobblemon.mod.common.net.messages.client.trade.TradeStartedPacket.TradeablePokemon
 import com.cobblemon.mod.common.net.messages.server.trade.*
 import com.cobblemon.mod.common.pokemon.Gender
@@ -99,23 +98,15 @@ class TradeGUI(
         private val tradeAnimationArrowsResource = cobblemonResource("textures/gui/trade/trade_animation_arrows.png")
     }
 
-    private var offeredPokemonModels: MutableList<ModelWidget> = mutableListOf()
-    private var opposingOfferedPokemonModels: MutableList<ModelWidget> = mutableListOf()
+    private var offeredPokemonModel: ModelWidget? = null
+    private var opposingOfferedPokemonModel: ModelWidget? = null
 
     private lateinit var offeredPokemonMarkings: MarkingsWidget
     private lateinit var opposingOfferedPokemonMarkings: MarkingsWidget
 
-    var selectedPartyIndices = mutableListOf<Int>()
-    var offeredPokemons: MutableList<Pokemon> = mutableListOf()
-    var opposingPokemons: MutableList<Pokemon> = mutableListOf()
-
-    // For backwards compatibility where single is referenced in rendering text info
     var offeredPokemon: Pokemon? = null
     var opposingOfferedPokemon: Pokemon? = null
 
-    var myGridMode = true
-    var opposingGridMode = true
-
     var ticksElapsed = 0
     var protectiveTicks = 0
     var selectPointerOffsetY = 0
@@ -134,67 +125,30 @@ class TradeGUI(
         }
 
         trade.completedEmitter.subscribe {
-            val (pokemonIds1, pokemonIds2) = it
-            val myTradedPokemons = pokemonIds1.mapNotNull { id -> party.find { it?.pokemonId == id } }
-            val theirTradedPokemons = pokemonIds2.mapNotNull { id -> traderParty.find { it?.pokemonId == id } }
-            if (myTradedPokemons.isEmpty() || theirTradedPokemons.isEmpty()) {
+            val (pokemonId1, pokemonId2) = it
+            val myTradedPokemon = party.find { it?.pokemonId == pokemonId1 }
+            val theirTradedPokemon = traderParty.find { it?.pokemonId == pokemonId2 }
+            if (myTradedPokemon == null || theirTradedPokemon == null) {
                 CobblemonNetwork.sendToServer(CancelTradePacket())
                 return@subscribe onClose()
             }
-
-            myTradedPokemons.forEach { pk ->
-                val idx = party.indexOf(pk)
-                if (idx != -1) party[idx] = null
-            }
-            theirTradedPokemons.forEach { pk ->
-                val idx = traderParty.indexOf(pk)
-                if (idx != -1) traderParty[idx] = null
-            }
-
-            val newSelectedIndices = mutableListOf<Int>()
-            theirTradedPokemons.forEach { pk ->
-                val emptyIdx = party.indexOf(null)
-                if (emptyIdx != -1) {
-                    party[emptyIdx] = pk
-                }
-            }
-            myTradedPokemons.forEach { pk ->
-                val emptyIdx = traderParty.indexOf(null)
-                if (emptyIdx != -1) traderParty[emptyIdx] = pk
-            }
-
-            val compactUI = { list: MutableList<TradeStartedPacket.TradeablePokemon?> ->
-                val nonNulls = list.filterNotNull()
-                list.clear()
-                list.addAll(nonNulls)
-                while (list.size < 6) list.add(null)
-            }
-            compactUI(party)
-            compactUI(traderParty)
-
-            theirTradedPokemons.forEach { pk ->
-                val idx = party.indexOf(pk)
-                if (idx != -1) newSelectedIndices.add(idx)
-            }
+            val tradedSlot = party.indexOf(myTradedPokemon)
+            val opposingTradedSlot = traderParty.indexOf(theirTradedPokemon)
+            party[tradedSlot] = theirTradedPokemon
+            traderParty[opposingTradedSlot] = myTradedPokemon
 
             trade.oppositeAcceptedMyOffer.set(false)
-            selectedPartyIndices.clear()
-            selectedPartyIndices.addAll(newSelectedIndices)
-
-            val newOffers = selectedPartyIndices.mapNotNull { idx ->
-                party[idx]?.let { it.pokemonId to PartyPosition(idx) }
-            }
-            CobblemonNetwork.sendToServer(UpdateTradeOfferPacket(newOffers))
+            CobblemonNetwork.sendToServer(UpdateTradeOfferPacket(Pair(theirTradedPokemon.pokemonId, PartyPosition(tradedSlot))))
 
             rebuildWidgets()
         }
 
-        trade.oppositeOffer.subscribe { newOffer: List<Pokemon> ->
-            setOfferedPokemon(pokemonList = newOffer, isOpposing = true)
+        trade.oppositeOffer.subscribe { newOffer: Pokemon? ->
+            setOfferedPokemon(pokemon = newOffer, isOpposing = true)
         }
 
-        trade.myOffer.subscribe { myOffer: List<Pokemon> ->
-            setOfferedPokemon(pokemonList = myOffer)
+        trade.myOffer.subscribe { myOffer: Pokemon? ->
+            setOfferedPokemon(pokemon = myOffer)
         }
 
         trade.oppositeAcceptedMyOffer.subscribe {
@@ -262,16 +216,9 @@ class TradeGUI(
                 pokemon = pokemon,
                 parent = this,
                 onPress = {
-                    if (!trade.acceptedOppositeOffer && !tradeProcessing && pokemon != null) {
-                        if (selectedPartyIndices.contains(partyIndex)) {
-                            selectedPartyIndices.remove(partyIndex)
-                        } else if (selectedPartyIndices.size < 6) {
-                            selectedPartyIndices.add(partyIndex)
-                        }
-                        val newOffers = selectedPartyIndices.mapNotNull { idx ->
-                            party[idx]?.let { it.pokemonId to PartyPosition(idx) }
-                        }
-                        CobblemonNetwork.sendToServer(UpdateTradeOfferPacket(newOffers))
+                    if (!trade.acceptedOppositeOffer && !tradeProcessing) {
+                        val pk = if (offeredPokemon?.uuid == pokemon?.pokemonId) null else pokemon
+                        CobblemonNetwork.sendToServer(UpdateTradeOfferPacket(pk?.let { it.pokemonId to PartyPosition(partyIndex) }))
                         playSound(CobblemonSounds.GUI_CLICK)
                     }
                 }
@@ -303,8 +250,8 @@ class TradeGUI(
             ).also { widget -> addRenderableWidget(widget) }
         }
 
-        setOfferedPokemon(pokemonList = offeredPokemons.toList(), isOpposing = false)
-        setOfferedPokemon(pokemonList = opposingPokemons.toList(), isOpposing = true)
+        setOfferedPokemon(pokemon = offeredPokemon, isOpposing = false)
+        setOfferedPokemon(pokemon = opposingOfferedPokemon, isOpposing = true)
 
         offeredPokemonMarkings = MarkingsWidget(x + 74.5, y + 21, offeredPokemon, false)
         opposingOfferedPokemonMarkings = MarkingsWidget(x + 177.5, y + 21, opposingOfferedPokemon, false)
@@ -337,7 +284,7 @@ class TradeGUI(
                 if (tradeAnimationProgress > REVERSE_ANIMATION_TICK)
                     (REVERSE_ANIMATION_TICK + TRADE_ANIMATION_FRAMES - tradeAnimationProgress)
                 else (tradeAnimationProgress - MODEL_SCALE_BUFFER_FRAMES)
-                ) * TRADE_ANIMATION_HEIGHT
+            ) * TRADE_ANIMATION_HEIGHT
             blitk(
                 matrixStack = matrices,
                 texture = tradeAnimationResource,
@@ -366,56 +313,20 @@ class TradeGUI(
         // Render Model Portraits
         var scale = PORTRAIT_SCALE
         var scaleOffsetY = PORTRAIT_MODEL_OFFSET_Y
-        var isShrinking = false
         if (tradeProcessing) {
             val scaleInterval = if (tradeAnimationProgress > REVERSE_ANIMATION_TICK) (MAX_TRADE_PROGRESS - tradeAnimationProgress) else tradeAnimationProgress
             scale = (PORTRAIT_SCALE - (scaleInterval * PORTRAIT_SCALE_MULTIPLIER)).coerceIn(0F, PORTRAIT_SCALE)
             scaleOffsetY = (45.0 - (45.0 / PORTRAIT_SCALE) * scale) + PORTRAIT_MODEL_OFFSET_Y
-            isShrinking = true
         }
-        val shrinkPercentage = if (isShrinking) 1.0F - (scale / PORTRAIT_SCALE) else 0.0F
-        val myCenterXDest = x + 70 + (PORTRAIT_SIZE / 2.0)
-        val myCenterYDest = y + 30 + (PORTRAIT_SIZE / 2.0)
-        val opCenterXDest = x + 145 + (PORTRAIT_SIZE / 2.0)
-        val opCenterYDest = y + 30 + (PORTRAIT_SIZE / 2.0)
-
         if (scale > 0F) {
             context.enableScissor(backgroundX, backgroundY, backgroundX + BASE_BACKGROUND_WIDTH, backgroundY +  BASE_BACKGROUND_HEIGHT)
+            offeredPokemonModel?.baseScale = scale
+            offeredPokemonModel?.offsetY = scaleOffsetY
+            offeredPokemonModel?.render(context, mouseX, mouseY, delta)
 
-            offeredPokemonModels.forEachIndexed { i, model ->
-                val posAndScale = getModelPositionAndScale(i, offeredPokemons.size, x + 70, y + 30)
-                val originalScale = posAndScale.second
-                model.baseScale = if (isShrinking) (originalScale / PORTRAIT_SCALE) * scale else originalScale
-                model.offsetY = if (isShrinking) scaleOffsetY else PORTRAIT_MODEL_OFFSET_Y
-
-                val startCenterX = posAndScale.first.first + (PORTRAIT_SIZE / 2.0)
-                val startCenterY = posAndScale.first.second + (PORTRAIT_SIZE / 2.0)
-
-                context.pose().pushPose()
-                context.pose().translate((myCenterXDest - startCenterX) * shrinkPercentage, (myCenterYDest - startCenterY) * shrinkPercentage, 0.0)
-
-                model.render(context, mouseX, mouseY, delta)
-
-                context.pose().popPose()
-            }
-
-            opposingOfferedPokemonModels.forEachIndexed { i, model ->
-                val posAndScale = getModelPositionAndScale(i, opposingPokemons.size, x + 145, y + 30)
-                val originalScale = posAndScale.second
-                model.baseScale = if (isShrinking) (originalScale / PORTRAIT_SCALE) * scale else originalScale
-                model.offsetY = if (isShrinking) scaleOffsetY else PORTRAIT_MODEL_OFFSET_Y
-
-                val startCenterX = posAndScale.first.first + (PORTRAIT_SIZE / 2.0)
-                val startCenterY = posAndScale.first.second + (PORTRAIT_SIZE / 2.0)
-
-                context.pose().pushPose()
-                context.pose().translate((opCenterXDest - startCenterX) * shrinkPercentage, (opCenterYDest - startCenterY) * shrinkPercentage, 0.0)
-
-                model.render(context, mouseX, mouseY, delta)
-
-                context.pose().popPose()
-            }
-
+            opposingOfferedPokemonModel?.baseScale = scale
+            opposingOfferedPokemonModel?.offsetY = scaleOffsetY
+            opposingOfferedPokemonModel?.render(context, mouseX, mouseY, delta)
             context.disableScissor()
         }
 
@@ -430,46 +341,8 @@ class TradeGUI(
 
         renderInfoLabels(context, x, y)
 
-        children().filterIsInstance<PartySlot>().forEach { slot ->
-            if (slot.isHovered(mouseX, mouseY)) {
-                val hoveredId = slot.pokemon?.pokemonId
-                if (slot.isOpposing && slot.hasSelected()) {
-                    opposingPokemons.find { it.uuid == hoveredId }?.let { opposingOfferedPokemon = it }
-                } else if (!slot.isOpposing) {
-                    val matchingModel = offeredPokemons.find { it.uuid == hoveredId }
-                    if (matchingModel != null) {
-                        offeredPokemon = matchingModel
-                    } else {
-                        val realPokemon = com.cobblemon.mod.common.client.CobblemonClient.storage.party.find { it?.uuid == hoveredId }
-                        if (realPokemon != null) {
-                            offeredPokemon = realPokemon
-                        }
-                    }
-                }
-            }
-        }
-
-        val currentOffered = offeredPokemon
-        if (currentOffered != null) {
-            renderPokemonInfo(currentOffered, false, context, x, y, mouseX, mouseY)
-            if (::offeredPokemonMarkings.isInitialized) {
-                offeredPokemonMarkings.visible = true
-                if (offeredPokemonMarkings.pokemon != currentOffered) offeredPokemonMarkings.setActivePokemon(currentOffered)
-            }
-        } else {
-            if (::offeredPokemonMarkings.isInitialized) offeredPokemonMarkings.visible = false
-        }
-
-        val currentOpposing = opposingOfferedPokemon
-        if (currentOpposing != null) {
-            renderPokemonInfo(currentOpposing, true, context, x, y, mouseX, mouseY)
-            if (::opposingOfferedPokemonMarkings.isInitialized) {
-                opposingOfferedPokemonMarkings.visible = true
-                if (opposingOfferedPokemonMarkings.pokemon != currentOpposing) opposingOfferedPokemonMarkings.setActivePokemon(currentOpposing)
-            }
-        } else {
-            if (::opposingOfferedPokemonMarkings.isInitialized) opposingOfferedPokemonMarkings.visible = false
-        }
+        renderPokemonInfo(offeredPokemon, false, context, x, y, mouseX, mouseY)
+        renderPokemonInfo(opposingOfferedPokemon, true, context, x, y, mouseX, mouseY)
 
         if (trade.acceptedOppositeOffer) {
             blitk(
@@ -558,25 +431,19 @@ class TradeGUI(
 
         super.render(context, mouseX, mouseY, delta)
 
-        val ttOffered = offeredPokemon
-        if (ttOffered != null) {
-            // Item Tooltip
-            if (!ttOffered.heldItemNoCopy().isEmpty) {
-                val itemX = x + 50
-                val itemY = y + 125
-                val itemHovered = mouseX.toFloat() in (itemX.toFloat()..(itemX.toFloat() + 16)) && mouseY.toFloat() in (itemY.toFloat()..(itemY.toFloat() + 16))
-                if (itemHovered) context.renderTooltip(Minecraft.getInstance().font, ttOffered.heldItemNoCopy(), mouseX, mouseY)
-            }
+        // Item Tooltip
+        if (offeredPokemon != null && !offeredPokemon!!.heldItemNoCopy().isEmpty) {
+            val itemX = x + 50
+            val itemY = y + 125
+            val itemHovered = mouseX.toFloat() in (itemX.toFloat()..(itemX.toFloat() + 16)) && mouseY.toFloat() in (itemY.toFloat()..(itemY.toFloat() + 16))
+            if (itemHovered) context.renderTooltip(Minecraft.getInstance().font, offeredPokemon!!.heldItemNoCopy(), mouseX, mouseY)
         }
 
-        val ttOpposing = opposingOfferedPokemon
-        if (ttOpposing != null) {
-            if (!ttOpposing.heldItemNoCopy().isEmpty) {
-                val itemX = x + 227
-                val itemY = y + 125
-                val itemHovered = mouseX.toFloat() in (itemX.toFloat()..(itemX.toFloat() + 16)) && mouseY.toFloat() in (itemY.toFloat()..(itemY.toFloat() + 16))
-                if (itemHovered) context.renderTooltip(Minecraft.getInstance().font, ttOpposing.heldItemNoCopy(), mouseX, mouseY)
-            }
+        if (opposingOfferedPokemon != null && !opposingOfferedPokemon!!.heldItemNoCopy().isEmpty) {
+            val itemX = x + 227
+            val itemY = y + 125
+            val itemHovered = mouseX.toFloat() in (itemX.toFloat()..(itemX.toFloat() + 16)) && mouseY.toFloat() in (itemY.toFloat()..(itemY.toFloat() + 16))
+            if (itemHovered) context.renderTooltip(Minecraft.getInstance().font, opposingOfferedPokemon!!.heldItemNoCopy(), mouseX, mouseY)
         }
     }
 
@@ -613,13 +480,11 @@ class TradeGUI(
             }
 
             if (tradeAnimationProgress == (MAX_TRADE_PROGRESS + CRY_BUFFER)) {
-                offeredPokemonModels.forEach {
-                    it.state.activeAnimations.clear()
-                    it.state.addFirstAnimation(setOf("cry"))
-                }
-                opposingOfferedPokemonModels.forEach {
-                    it.state.activeAnimations.clear()
-                    it.state.addFirstAnimation(setOf("cry"))
+                if (offeredPokemonModel !== null && opposingOfferedPokemonModel !== null) {
+                    offeredPokemonModel!!.state.activeAnimations.clear()
+                    offeredPokemonModel!!.state.addFirstAnimation(setOf("cry"))
+                    opposingOfferedPokemonModel!!.state.activeAnimations.clear()
+                    opposingOfferedPokemonModel!!.state.addFirstAnimation(setOf("cry"))
                 }
             }
 
@@ -650,140 +515,41 @@ class TradeGUI(
 
     override fun renderMenuBackground(context: GuiGraphics) {}
 
-    private fun setOfferedPokemon(pokemonList: List<Pokemon>, isOpposing: Boolean = false) {
+    private fun setOfferedPokemon(pokemon: Pokemon?, isOpposing: Boolean = false) {
         protectiveTicks = 20
-        if (isOpposing) {
-            val wasEmpty = opposingPokemons.isEmpty()
-            val currentViewedUuid = if (opposingGridMode) null else opposingOfferedPokemon?.uuid
-            opposingPokemons.clear()
-            opposingPokemons.addAll(pokemonList)
-
-            val matchingPokemon = opposingPokemons.find { it.uuid == currentViewedUuid }
-
-            if (matchingPokemon != null) {
-                opposingOfferedPokemon = matchingPokemon
-                if (::opposingOfferedPokemonMarkings.isInitialized) opposingOfferedPokemonMarkings.setActivePokemon(opposingOfferedPokemon)
-            } else {
-                opposingOfferedPokemon = opposingPokemons.lastOrNull()
-                if (::opposingOfferedPokemonMarkings.isInitialized) opposingOfferedPokemonMarkings.setActivePokemon(opposingOfferedPokemon)
-                if (wasEmpty && opposingOfferedPokemon != null) {
-                    opposingGridMode = false
-                } else if (!opposingGridMode) {
-                    opposingGridMode = true
-                }
-            }
-            trade.acceptedOppositeOffer = false
-        } else {
-            val wasEmpty = offeredPokemons.isEmpty()
-            val currentViewedUuid = if (myGridMode) null else offeredPokemon?.uuid
-            offeredPokemons.clear()
-            offeredPokemons.addAll(pokemonList)
-
-            val matchingPokemon = offeredPokemons.find { it.uuid == currentViewedUuid }
-
-            if (matchingPokemon != null) {
-                offeredPokemon = matchingPokemon
-                if (::offeredPokemonMarkings.isInitialized) offeredPokemonMarkings.setActivePokemon(offeredPokemon)
-            } else {
-                offeredPokemon = offeredPokemons.lastOrNull()
-                if (::offeredPokemonMarkings.isInitialized) offeredPokemonMarkings.setActivePokemon(offeredPokemon)
-                if (wasEmpty && offeredPokemon != null) {
-                    myGridMode = false
-                } else if (!myGridMode) {
-                    myGridMode = true
-                }
-            }
-        }
-        rebuildSelectedModels(isOpposing)
-    }
-
-    private fun rebuildSelectedModels(isOpposing: Boolean) {
         val x = (width - BASE_WIDTH) / 2
         val y = (height - BASE_HEIGHT) / 2
 
         if (isOpposing) {
-            opposingOfferedPokemonModels.clear()
-            val total = opposingPokemons.size
-            opposingPokemons.forEachIndexed { i, pk ->
-                val (pos, currentScale) = getModelPositionAndScale(i, total, x + 145, y + 30)
-                opposingOfferedPokemonModels.add(ModelWidget(
-                    pX = pos.first, pY = pos.second,
-                    pWidth = PORTRAIT_SIZE, pHeight = PORTRAIT_SIZE,
-                    pokemon = pk.asRenderablePokemon(),
-                    baseScale = currentScale,
-                    rotationY = 35F,
-                    offsetY = PORTRAIT_MODEL_OFFSET_Y
-                ))
-            }
+            opposingOfferedPokemon = pokemon
+            opposingOfferedPokemonModel = if (pokemon != null) ModelWidget(
+                pX = x + 145,
+                pY = y + 30,
+                pWidth = PORTRAIT_SIZE,
+                pHeight = PORTRAIT_SIZE,
+                pokemon = pokemon.asRenderablePokemon(),
+                baseScale = PORTRAIT_SCALE,
+                rotationY = 35F,
+                offsetY = PORTRAIT_MODEL_OFFSET_Y
+            ) else null
+            if (::opposingOfferedPokemonMarkings.isInitialized) opposingOfferedPokemonMarkings.setActivePokemon(opposingOfferedPokemon)
+            trade.acceptedOppositeOffer = false
         } else {
-            offeredPokemonModels.clear()
-            val total = offeredPokemons.size
-            offeredPokemons.forEachIndexed { i, pk ->
-                val (pos, currentScale) = getModelPositionAndScale(i, total, x + 70, y + 30)
-                offeredPokemonModels.add(ModelWidget(
-                    pX = pos.first, pY = pos.second,
-                    pWidth = PORTRAIT_SIZE, pHeight = PORTRAIT_SIZE,
-                    pokemon = pk.asRenderablePokemon(),
-                    baseScale = currentScale,
-                    rotationY = 325F,
-                    offsetY = PORTRAIT_MODEL_OFFSET_Y
-                ))
-            }
+            offeredPokemon = pokemon
+            offeredPokemonModel = if (pokemon != null) ModelWidget(
+                pX = x + 70,
+                pY = y + 30,
+                pWidth = PORTRAIT_SIZE,
+                pHeight = PORTRAIT_SIZE,
+                pokemon = pokemon.asRenderablePokemon(),
+                baseScale = PORTRAIT_SCALE,
+                rotationY = 325F,
+                offsetY = PORTRAIT_MODEL_OFFSET_Y
+            ) else null
+            if (::offeredPokemonMarkings.isInitialized) offeredPokemonMarkings.setActivePokemon(offeredPokemon)
         }
     }
 
-    private fun getModelPositionAndScale(index: Int, total: Int, baseX: Int, baseY: Int): Pair<Pair<Int, Int>, Float> {
-        val scale = when (total) {
-            1 -> PORTRAIT_SCALE
-            2 -> PORTRAIT_SCALE * 0.75f
-            3 -> PORTRAIT_SCALE * 0.65f
-            4 -> PORTRAIT_SCALE * 0.55f
-            else -> PORTRAIT_SCALE * 0.5f
-        }
-
-        if (total <= 1) {
-            return Pair(Pair(baseX, baseY), scale)
-        }
-
-        val rowLength1 = when (total) {
-            2, 3, 4 -> 2
-            else -> 3
-        }
-        val rowLength2 = total - rowLength1
-
-        val isBottomRow = index >= rowLength1
-        val row = if (isBottomRow) 1 else 0
-        val col = if (isBottomRow) index - rowLength1 else index
-        val currentRowLength = if (isBottomRow) rowLength2 else rowLength1
-
-        val colSpacing = when (total) {
-            2 -> 35
-            3 -> 30
-            4 -> 25
-            else -> 23
-        }
-        val rowSpacing = when (total) {
-            2, 3 -> 30
-            4 -> 28
-            else -> 25
-        }
-
-        val totalWidth = (currentRowLength - 1) * colSpacing
-        val startX = baseX - (totalWidth / 2)
-
-        val totalHeight = if (rowLength2 > 0) rowSpacing else 0
-        var startY = baseY + 12 - (totalHeight / 2)
-
-        if (total >= 4) {
-            startY += 8
-        }
-
-        val posX = startX + (col * colSpacing)
-        val posY = startY + (row * rowSpacing)
-
-        return Pair(Pair(posX, posY), scale)
-    }
-
     private fun playSound(soundEvent: SoundEvent): SoundInstance {
         val soundInstance = SimpleSoundInstance.forUI(soundEvent, 1.0F)
         Minecraft.getInstance().soundManager.play(soundInstance)
@@ -791,10 +557,10 @@ class TradeGUI(
     }
 
     private fun cancelTradeSound() {
-        if (tradeSoundInstance != null) Minecraft.getInstance().soundManager.stop(tradeSoundInstance!!)
+        if (tradeSoundInstance !== null) Minecraft.getInstance().soundManager.stop(tradeSoundInstance)
     }
 
-    public fun renderPokemonInfo(pokemon: Pokemon?, isOpposing: Boolean, context: GuiGraphics, x: Int, y: Int, mouseX: Int, mouseY: Int) {
+    private fun renderPokemonInfo(pokemon: Pokemon?, isOpposing: Boolean, context: GuiGraphics, x: Int, y: Int, mouseX: Int, mouseY: Int) {
         if (pokemon != null) {
             val matrices = context.pose()
             // Level
@@ -1281,4 +1047,4 @@ class TradeGUI(
             scale = SCALE
         )
     }
-}
+}

common/src/main/kotlin/com/cobblemon/mod/common/client/net/trade/TradeAcceptanceChangedHandler.kt

@@ -15,9 +15,9 @@ import net.minecraft.client.Minecraft
 
 object TradeAcceptanceChangedHandler : ClientNetworkPacketHandler<TradeAcceptanceChangedPacket> {
     override fun handle(packet: TradeAcceptanceChangedPacket, client: Minecraft) {
-        if (CobblemonClient.trade?.myOffer?.get()?.any { it.uuid == packet.pokemonId } == true) {
+        if (CobblemonClient.trade?.myOffer?.get()?.uuid == packet.pokemonId) {
             CobblemonClient.trade!!.oppositeAcceptedMyOffer.set(packet.accepted)
-        } else if (CobblemonClient.trade?.oppositeOffer?.get()?.any { it.uuid == packet.pokemonId } == true) {
+        } else if (CobblemonClient.trade?.oppositeOffer?.get()?.uuid == packet.pokemonId) {
             CobblemonClient.trade!!.acceptedOppositeOffer = packet.accepted
         }
     }

common/src/main/kotlin/com/cobblemon/mod/common/client/net/trade/TradeCompletedHandler.kt

@@ -16,6 +16,6 @@ import net.minecraft.client.Minecraft
 object TradeCompletedHandler : ClientNetworkPacketHandler<TradeCompletedPacket> {
     override fun handle(packet: TradeCompletedPacket, client: Minecraft) {
         val trade = CobblemonClient.trade ?: return
-        trade.completedEmitter.emit(packet.pokemonIds1 to packet.pokemonIds2)
+        trade.completedEmitter.emit(packet.pokemonId1 to packet.pokemonId2)
     }
 }

common/src/main/kotlin/com/cobblemon/mod/common/client/net/trade/TradeStartedHandler.kt

@@ -20,7 +20,7 @@ import net.minecraft.client.Minecraft
 
 object TradeStartedHandler : ClientNetworkPacketHandler<TradeStartedPacket> {
     override fun handle(packet: TradeStartedPacket, client: Minecraft) {
-        Cobblemon.LOGGER.info("Trade started with {}", packet.traderId)
+        Cobblemon.LOGGER.error("handle trade start from: " + packet.traderId)
         val trade = ClientTrade()
         CobblemonClient.trade = trade
         Minecraft.getInstance().setScreen(

common/src/main/kotlin/com/cobblemon/mod/common/client/net/trade/TradeUpdatedHandler.kt

@@ -18,9 +18,9 @@ object TradeUpdatedHandler : ClientNetworkPacketHandler<TradeUpdatedPacket> {
         val trade = CobblemonClient.trade ?: return
 
         if (packet.playerId == Minecraft.getInstance().player?.uuid) {
-            trade.myOffer.set(packet.pokemons)
+            trade.myOffer.set(packet.pokemon)
         } else {
-            trade.oppositeOffer.set(packet.pokemons)
+            trade.oppositeOffer.set(packet.pokemon)
         }
         trade.oppositeAcceptedMyOffer.set(false)
         trade.acceptedOppositeOffer = false

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/PosableState.kt

@@ -545,11 +545,12 @@ abstract class PosableState : Schedulable {
         primaryAnimation?.animation?.applyEffects(entity, this, previousSeconds, newSeconds)
         currentModel?.let { model ->
             val pose = currentPose?.let { model.poses[it] }
-            // Effects start playing from pose animations as long as the intensity is above 0.5. Pretty sloppy honestly.
             pose?.animations
                 ?.asSequence()
-                ?.filter { shouldIdleRun(it, 0.5F) && it.condition(this) }
-                ?.forEach { it.applyEffects(entity, this, previousSeconds, newSeconds) }
+                ?.filter { it.condition(this) }
+                ?.forEach {
+                    it.applyEffects(entity, this, previousSeconds, newSeconds)
+                }
         }
     }
 

common/src/main/kotlin/com/cobblemon/mod/common/client/trade/ClientTrade.kt

@@ -14,12 +14,12 @@ import com.cobblemon.mod.common.pokemon.Pokemon
 import java.util.UUID
 
 class ClientTrade {
-    var myOffer = SettableObservable<List<Pokemon>>(emptyList())
-    var oppositeOffer = SettableObservable<List<Pokemon>>(emptyList())
+    var myOffer = SettableObservable<Pokemon?>(null)
+    var oppositeOffer = SettableObservable<Pokemon?>(null)
     var tradeProcessing = SettableObservable(Pair(false, false))
     var oppositeAcceptedMyOffer = SettableObservable(false)
     var acceptedOppositeOffer = false
 
-    var completedEmitter = SimpleObservable<Pair<List<UUID>, List<UUID>>>()
+    var completedEmitter = SimpleObservable<Pair<UUID, UUID>>()
     var cancelEmitter = SimpleObservable<Unit>()
 }

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

@@ -31,7 +31,6 @@ import net.minecraft.world.item.BlockItem
 import com.cobblemon.mod.common.platform.events.ServerPlayerEvent
 import com.cobblemon.mod.common.api.storage.player.PlayerInstancedDataStoreTypes
 import com.cobblemon.mod.common.item.GemItem
-import com.cobblemon.mod.common.pokemon.Pokemon
 import com.cobblemon.mod.common.platform.events.PlatformEvents
 import com.cobblemon.mod.common.util.effectiveName
 import com.cobblemon.mod.common.util.getPlayer
@@ -165,21 +164,26 @@ object AdvancementHandler : EventHandler {
     }
 
     fun onTradeCompleted(event : TradeEvent.Post) {
-        onTradeCompleted(event.tradeParticipant1Pokemon, event.tradeParticipant2Pokemon)
-        onTradeCompleted(event.tradeParticipant2Pokemon, event.tradeParticipant1Pokemon)
-    }
-
-    private fun onTradeCompleted(received: List<Pokemon>, traded: List<Pokemon>) {
-        val player = received.firstOrNull()?.getOwnerPlayer() ?: return
-        received.forEach { receivedPokemon ->
-            traded.forEach { tradedPokemon -> CobblemonCriteria.TRADE_POKEMON.trigger(player, TradePokemonContext(tradedPokemon, receivedPokemon)) }
+        val player1 = event.tradeParticipant1Pokemon.getOwnerPlayer()
+        val player2 = event.tradeParticipant2Pokemon.getOwnerPlayer()
+        if (player1 != null) {
+            CobblemonCriteria.TRADE_POKEMON.trigger(player1, TradePokemonContext(event.tradeParticipant1Pokemon, event.tradeParticipant2Pokemon))
+            val playerData = Cobblemon.playerDataManager.getGenericData(player1)
+            val advancementData = playerData.advancementData
+            advancementData.updateTotalTradedCount()
+            advancementData.updateAspectsCollected(player1, event.tradeParticipant2Pokemon)
+            CobblemonCriteria.COLLECT_ASPECT.trigger(player1, advancementData.aspectsCollected)
+            Cobblemon.playerDataManager.saveSingle(playerData, PlayerInstancedDataStoreTypes.GENERAL)
+        }
+        if (player2 != null) {
+            CobblemonCriteria.TRADE_POKEMON.trigger(player2, TradePokemonContext(event.tradeParticipant2Pokemon, event.tradeParticipant1Pokemon))
+            val playerData = Cobblemon.playerDataManager.getGenericData(player2)
+            val advancementData = playerData.advancementData
+            advancementData.updateTotalTradedCount()
+            advancementData.updateAspectsCollected(player2, event.tradeParticipant1Pokemon)
+            CobblemonCriteria.COLLECT_ASPECT.trigger(player2, advancementData.aspectsCollected)
+            Cobblemon.playerDataManager.saveSingle(playerData, PlayerInstancedDataStoreTypes.GENERAL)
         }
-        val playerData = Cobblemon.playerDataManager.getGenericData(player)
-        val advancementData = playerData.advancementData
-        advancementData.updateTotalTradedCount()
-        received.forEach { advancementData.updateAspectsCollected(player, it) }
-        CobblemonCriteria.COLLECT_ASPECT.trigger(player, advancementData.aspectsCollected)
-        Cobblemon.playerDataManager.saveSingle(playerData, PlayerInstancedDataStoreTypes.GENERAL)
     }
 
     /**

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

@@ -110,8 +110,8 @@ object StatHandler : EventHandler {
     }
 
     fun onTradeCompleted(event : TradeEvent.Post) {
-        event.tradeParticipant1Pokemon.firstOrNull()?.getOwnerPlayer()?.awardStat(getStat(Cobblemon.statistics.TRADED))
-        event.tradeParticipant2Pokemon.firstOrNull()?.getOwnerPlayer()?.awardStat(getStat(Cobblemon.statistics.TRADED))
+        event.tradeParticipant1Pokemon.getOwnerPlayer()?.awardStat(getStat(Cobblemon.statistics.TRADED))
+        event.tradeParticipant2Pokemon.getOwnerPlayer()?.awardStat(getStat(Cobblemon.statistics.TRADED))
     }
 
     fun onFossilRevived(event : FossilRevivedEvent) {

common/src/main/kotlin/com/cobblemon/mod/common/item/GlowItem.kt

@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.item
-
-import com.cobblemon.mod.common.CobblemonSounds
-import net.minecraft.sounds.SoundSource
-import net.minecraft.world.entity.player.Player
-import net.minecraft.world.item.ItemNameBlockItem
-import net.minecraft.world.item.SignApplicator
-import net.minecraft.world.level.Level
-import net.minecraft.world.level.block.Block
-import net.minecraft.world.level.block.entity.SignBlockEntity
-import net.minecraft.world.level.block.entity.SignText
-
-class GlowItem(block: Block, settings: Properties) : ItemNameBlockItem(block, settings), SignApplicator {
-
-    override fun tryApplyToSign(level: Level, sign: SignBlockEntity, isFront: Boolean, player: Player?): Boolean {
-        if (sign.updateText({ signText: SignText? -> signText!!.setHasGlowingText(true) }, isFront)) {
-            level.playSound(
-                null as Player?,
-                sign.blockPos,
-                CobblemonSounds.BRIGHT_POWDER_USE,
-                SoundSource.BLOCKS,
-                1.0f,
-                1.0f
-            )
-            return true
-        } else {
-            return false
-        }
-    }
-
-}

common/src/main/kotlin/com/cobblemon/mod/common/item/MoomooMilk.kt

@@ -13,12 +13,10 @@ import com.cobblemon.mod.common.api.battles.model.actor.BattleActor
 import com.cobblemon.mod.common.battles.pokemon.BattlePokemon
 import com.cobblemon.mod.common.item.battle.BagItem
 import com.cobblemon.mod.common.item.battle.SimpleBagItemLike
-import net.minecraft.world.item.ItemNameBlockItem
 import net.minecraft.world.item.ItemStack
 import net.minecraft.world.item.Items
-import net.minecraft.world.level.block.Block
 
-class MoomooMilk(properties: Properties, block: Block) : ItemNameBlockItem(block, properties), SimpleBagItemLike {
+class MoomooMilk(properties: Properties) : CobblemonItem(properties), SimpleBagItemLike {
     override val bagItem = object : BagItem {
         override val itemName = "item.cobblemon.moomoo_milk"
         override val returnItem = Items.GLASS_BOTTLE

common/src/main/kotlin/com/cobblemon/mod/common/item/group/CobblemonItemGroups.kt

@@ -12,11 +12,9 @@ import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.CobblemonItemComponents
 import com.cobblemon.mod.common.CobblemonItems
 import com.cobblemon.mod.common.api.riding.stats.RidingStat
-import com.cobblemon.mod.common.api.tms.TechnicalMachines
 import com.cobblemon.mod.common.block.TypeGemClusterBlock
 import com.cobblemon.mod.common.item.AprijuiceItem
 import com.cobblemon.mod.common.item.components.RideBoostsComponent
-import com.cobblemon.mod.common.item.components.TMMoveComponent
 import com.cobblemon.mod.common.util.cobblemonResource
 import net.minecraft.core.component.DataComponents
 import net.minecraft.core.registries.BuiltInRegistries
@@ -42,111 +40,44 @@ object CobblemonItemGroups {
     private val ALL = arrayListOf<ItemGroupHolder>()
     private val INJECTORS = hashMapOf<ResourceKey<CreativeModeTab>, (injector: Injector) -> Unit>()
 
-    @JvmStatic
-    val BLOCKS_KEY = this.create("blocks", this::blockEntries) {
+    @JvmStatic val BLOCKS_KEY = this.create("blocks", this::blockEntries) {
         ItemStack(CobblemonItems.PC)
     }
-    @JvmStatic
-    val UTILITY_ITEMS_KEY = this.create("utility_item", this::utilityItemEntries) {
+    @JvmStatic val UTILITY_ITEMS_KEY = this.create("utility_item", this::utilityItemEntries) {
         ItemStack(CobblemonItems.POKE_BALL)
     }
-    @JvmStatic
-    val AGRICULTURE_KEY = this.create("agriculture", this::agricultureEntries) {
+    @JvmStatic val AGRICULTURE_KEY = this.create("agriculture", this::agricultureEntries) {
         ItemStack(CobblemonItems.MEDICINAL_LEEK)
     }
-    @JvmStatic
-    val ARCHAEOLOGY_KEY = this.create("archaeology", this::archaeologyEntries) {
+    @JvmStatic val ARCHAEOLOGY_KEY = this.create("archaeology", this::archaeologyEntries) {
         ItemStack(CobblemonItems.HELIX_FOSSIL)
     }
-    @JvmStatic
-    val CONSUMABLES_KEY = this.create("consumables", this::consumableEntries) {
+    @JvmStatic val CONSUMABLES_KEY = this.create("consumables", this::consumableEntries) {
         ItemStack(CobblemonItems.ROASTED_LEEK)
     }
-    @JvmStatic
-    val HELD_ITEMS_KEY = this.create("held_item", this::heldItemEntries) {
+    @JvmStatic val HELD_ITEMS_KEY = this.create("held_item", this::heldItemEntries) {
         ItemStack(CobblemonItems.EXP_SHARE)
     }
-    @JvmStatic
-    val EVOLUTION_ITEMS_KEY = this.create("evolution_item", this::evolutionItemEntries) {
+    @JvmStatic val EVOLUTION_ITEMS_KEY = this.create("evolution_item", this::evolutionItemEntries) {
         ItemStack(CobblemonItems.BLACK_AUGURITE)
     }
 
-    @JvmStatic
-    val TM_ITEMS_KEY = this.create("tm_item", this::tmItemEntries) {
-        ItemStack(CobblemonItems.BLANK_TM)
-    }
+    @JvmStatic val BLOCKS get() = BuiltInRegistries.CREATIVE_MODE_TAB.get(BLOCKS_KEY)
+    @JvmStatic val UTILITY_ITEMS get() = BuiltInRegistries.CREATIVE_MODE_TAB.get(UTILITY_ITEMS_KEY)
+    @JvmStatic val AGRICULTURE get() = BuiltInRegistries.CREATIVE_MODE_TAB.get(AGRICULTURE_KEY)
+    @JvmStatic val ARCHAEOLOGY get() = BuiltInRegistries.CREATIVE_MODE_TAB.get(ARCHAEOLOGY_KEY)
+    @JvmStatic val CONSUMABLES get() = BuiltInRegistries.CREATIVE_MODE_TAB.get(CONSUMABLES_KEY)
+    @JvmStatic val HELD_ITEMS get() = BuiltInRegistries.CREATIVE_MODE_TAB.get(HELD_ITEMS_KEY)
+    @JvmStatic val EVOLUTION_ITEMS get() = BuiltInRegistries.CREATIVE_MODE_TAB.get(EVOLUTION_ITEMS_KEY)
 
-    @JvmStatic
-    val BLOCKS get() = BuiltInRegistries.CREATIVE_MODE_TAB.get(BLOCKS_KEY)
-    @JvmStatic
-    val UTILITY_ITEMS get() = BuiltInRegistries.CREATIVE_MODE_TAB.get(UTILITY_ITEMS_KEY)
-    @JvmStatic
-    val AGRICULTURE get() = BuiltInRegistries.CREATIVE_MODE_TAB.get(AGRICULTURE_KEY)
-    @JvmStatic
-    val ARCHAEOLOGY get() = BuiltInRegistries.CREATIVE_MODE_TAB.get(ARCHAEOLOGY_KEY)
-    @JvmStatic
-    val CONSUMABLES get() = BuiltInRegistries.CREATIVE_MODE_TAB.get(CONSUMABLES_KEY)
-    @JvmStatic
-    val HELD_ITEMS get() = BuiltInRegistries.CREATIVE_MODE_TAB.get(HELD_ITEMS_KEY)
-    @JvmStatic
-    val EVOLUTION_ITEMS get() = BuiltInRegistries.CREATIVE_MODE_TAB.get(EVOLUTION_ITEMS_KEY)
-    @JvmStatic
-    val TM_ITEMS get() = BuiltInRegistries.CREATIVE_MODE_TAB.get(TM_ITEMS_KEY)
-
-    @JvmStatic
-    val BUILDING_BLOCKS_INJECTIONS = this.inject(
-        ResourceKey.create(
-            BuiltInRegistries.CREATIVE_MODE_TAB.key(),
-            ResourceLocation.parse("building_blocks")
-        ), this::blocksInjections
-    )
-    @JvmStatic
-    val COLORED_BLOCKS_INJECTIONS = this.inject(
-        ResourceKey.create(
-            BuiltInRegistries.CREATIVE_MODE_TAB.key(),
-            ResourceLocation.parse("colored_blocks")
-        ), this::coloredBlocksInjections
-    )
-    @JvmStatic
-    val FUNCTIONAL_BLOCKS = this.inject(
-        ResourceKey.create(
-            BuiltInRegistries.CREATIVE_MODE_TAB.key(),
-            ResourceLocation.parse("functional_blocks")
-        ), this::functionalBlocksInjections
-    )
-    @JvmStatic
-    val REDSTONE_BLOCKS = this.inject(
-        ResourceKey.create(
-            BuiltInRegistries.CREATIVE_MODE_TAB.key(),
-            ResourceLocation.parse("redstone_blocks")
-        ), this::redstoneBlocksInjections
-    )
-    @JvmStatic
-    val FOOD_INJECTIONS = this.inject(
-        ResourceKey.create(
-            BuiltInRegistries.CREATIVE_MODE_TAB.key(),
-            ResourceLocation.parse("food_and_drinks")
-        ), this::foodInjections
-    )
-    @JvmStatic
-    val TOOLS_AND_UTILITIES_INJECTIONS = this.inject(
-        ResourceKey.create(
-            BuiltInRegistries.CREATIVE_MODE_TAB.key(),
-            ResourceLocation.parse("tools_and_utilities")
-        ), this::toolsAndUtilitiesInjections
-    )
-    @JvmStatic
-    val INGREDIENTS_INJECTIONS = this.inject(
-        ResourceKey.create(
-            BuiltInRegistries.CREATIVE_MODE_TAB.key(),
-            ResourceLocation.parse("ingredients")
-        ), this::ingredientsInjections
-    )
-    @JvmStatic
-    val OP_BLOCKS_INJECTIONS = this.inject(
-        ResourceKey.create(BuiltInRegistries.CREATIVE_MODE_TAB.key(), ResourceLocation.parse("op_blocks")),
-        this::opBlocksInjections
-    )
+    @JvmStatic val BUILDING_BLOCKS_INJECTIONS = this.inject(ResourceKey.create(BuiltInRegistries.CREATIVE_MODE_TAB.key(), ResourceLocation.parse("building_blocks")), this::blocksInjections)
+    @JvmStatic val COLORED_BLOCKS_INJECTIONS = this.inject(ResourceKey.create(BuiltInRegistries.CREATIVE_MODE_TAB.key(), ResourceLocation.parse("colored_blocks")), this::coloredBlocksInjections)
+    @JvmStatic val FUNCTIONAL_BLOCKS = this.inject(ResourceKey.create(BuiltInRegistries.CREATIVE_MODE_TAB.key(), ResourceLocation.parse("functional_blocks")), this::functionalBlocksInjections)
+    @JvmStatic val REDSTONE_BLOCKS = this.inject(ResourceKey.create(BuiltInRegistries.CREATIVE_MODE_TAB.key(), ResourceLocation.parse("redstone_blocks")), this::redstoneBlocksInjections)
+    @JvmStatic val FOOD_INJECTIONS = this.inject(ResourceKey.create(BuiltInRegistries.CREATIVE_MODE_TAB.key(), ResourceLocation.parse("food_and_drinks")), this::foodInjections)
+    @JvmStatic val TOOLS_AND_UTILITIES_INJECTIONS = this.inject(ResourceKey.create(BuiltInRegistries.CREATIVE_MODE_TAB.key(), ResourceLocation.parse("tools_and_utilities")), this::toolsAndUtilitiesInjections)
+    @JvmStatic val INGREDIENTS_INJECTIONS = this.inject(ResourceKey.create(BuiltInRegistries.CREATIVE_MODE_TAB.key(), ResourceLocation.parse("ingredients")), this::ingredientsInjections)
+    @JvmStatic val OP_BLOCKS_INJECTIONS = this.inject(ResourceKey.create(BuiltInRegistries.CREATIVE_MODE_TAB.key(), ResourceLocation.parse("op_blocks")), this::opBlocksInjections)
 
     fun register(consumer: (holder: ItemGroupHolder) -> CreativeModeTab) {
         ALL.forEach(consumer::invoke)
@@ -165,20 +96,13 @@ object CobblemonItemGroups {
         val displayName: Component = Component.translatable("itemGroup.${key.location().namespace}.${key.location().path}")
     )
 
-    private fun create(
-        name: String,
-        entryCollector: DisplayItemsGenerator,
-        displayIconProvider: () -> ItemStack
-    ): ResourceKey<CreativeModeTab> {
+    private fun create(name: String, entryCollector: DisplayItemsGenerator, displayIconProvider: () -> ItemStack): ResourceKey<CreativeModeTab> {
         val key = ResourceKey.create(BuiltInRegistries.CREATIVE_MODE_TAB.key(), cobblemonResource(name))
         this.ALL += ItemGroupHolder(key, displayIconProvider, entryCollector)
         return key
     }
 
-    private fun inject(
-        key: ResourceKey<CreativeModeTab>,
-        consumer: (injector: Injector) -> Unit
-    ): (injector: Injector) -> Unit {
+    private fun inject(key: ResourceKey<CreativeModeTab>, consumer: (injector: Injector) -> Unit): (injector: Injector) -> Unit {
         this.INJECTORS[key] = consumer
         return consumer
     }
@@ -198,14 +122,6 @@ object CobblemonItemGroups {
         entries.accept(CobblemonItems.GALARICA_NUTS)
         entries.accept(CobblemonItems.HEARTY_GRAINS)
         entries.accept(CobblemonItems.TASTY_TAIL)
-        entries.accept(CobblemonItems.POMOHANA)
-        entries.accept(CobblemonItems.PAUVILLEA)
-        entries.accept(CobblemonItems.LOBAILA)
-        entries.accept(CobblemonItems.WISTENSU)
-        entries.accept(CobblemonItems.VOLTACONIA)
-        entries.accept(CobblemonItems.VERDROOT)
-        entries.accept(CobblemonItems.MISTLEAF)
-        entries.accept(CobblemonItems.LUCIBELL)
 //        entries.accept(CobblemonItems.BUGWORT) // TODO after 1.7
 
         entries.accept(CobblemonItems.RED_APRICORN)
@@ -715,6 +631,8 @@ object CobblemonItemGroups {
         entries.accept(CobblemonItems.ABILITY_CAPSULE)
         entries.accept(CobblemonItems.ABILITY_PATCH)
 
+        entries.accept(CobblemonItems.BLANK_TM)
+
         entries.accept(CobblemonItems.POKE_BAIT)
         entries.accept(CobblemonItems.POKE_SNACK)
         entries.accept(CobblemonItems.POKE_CAKE)
@@ -731,17 +649,15 @@ object CobblemonItemGroups {
 
     private fun defaultAprijuice(item: AprijuiceItem): ItemStack {
         return ItemStack(item).apply {
-            this.set(
-                CobblemonItemComponents.RIDE_BOOST, RideBoostsComponent(
-                    mapOf(
-                        RidingStat.ACCELERATION to 1,
-                        RidingStat.JUMP to 1,
-                        RidingStat.SPEED to 1,
-                        RidingStat.STAMINA to 1,
-                        RidingStat.SKILL to 1
-                    )
+            this.set(CobblemonItemComponents.RIDE_BOOST, RideBoostsComponent(
+                mapOf(
+                    RidingStat.ACCELERATION to 1,
+                    RidingStat.JUMP to 1,
+                    RidingStat.SPEED to 1,
+                    RidingStat.STAMINA to 1,
+                    RidingStat.SKILL to 1
                 )
-            )
+            ))
         }
     }
 
@@ -932,16 +848,6 @@ object CobblemonItemGroups {
         entries.accept(CobblemonItems.PSYCHIC_SEED)
     }
 
-    private fun tmItemEntries(displayContext: ItemDisplayParameters, entries: Output) {
-        entries.accept(CobblemonItems.BLANK_TM)
-        TechnicalMachines
-            .tmMap
-            .entries
-            .sortedBy { it.value.moveName.name }
-            .sortedBy { it.value.moveName.elementalType.order }
-            .forEach { entries.accept(TMMoveComponent.createStack(it.value.moveName)) }
-    }
-
     private fun utilityItemEntries(displayContext: ItemDisplayParameters, entries: Output) {
         CobblemonItems.pokeBalls.forEach(entries::accept)
         CobblemonItems.pokeRods.forEach(entries::accept)
@@ -949,7 +855,7 @@ object CobblemonItemGroups {
     }
 
     private fun blocksInjections(injector: Injector) {
-        if (Cobblemon.implementation.isModInstalled("adorn")) { //adorn modifies vanilla block tab and if we don't follow suit we crash the game
+        if(Cobblemon.implementation.isModInstalled("adorn")) { //adorn modifies vanilla block tab and if we don't follow suit we crash the game
             injector.putLast(CobblemonItems.APRICORN_LOG)
             injector.putLast(CobblemonItems.APRICORN_WOOD)
             injector.putLast(CobblemonItems.STRIPPED_APRICORN_LOG)
@@ -1068,10 +974,7 @@ object CobblemonItemGroups {
         injector.putAfter(CobblemonItems.NOSTALGIC_SHERD, CobblemonItems.HELIX_SHERD)
         injector.putAfter(CobblemonItems.SUSPICIOUS_SHERD, CobblemonItems.NOSTALGIC_SHERD)
 
-        injector.putAfter(
-            CobblemonItems.AUTOMATON_ARMOR_TRIM_SMITHING_TEMPLATE,
-            Items.SPIRE_ARMOR_TRIM_SMITHING_TEMPLATE
-        )
+        injector.putAfter(CobblemonItems.AUTOMATON_ARMOR_TRIM_SMITHING_TEMPLATE, Items.SPIRE_ARMOR_TRIM_SMITHING_TEMPLATE)
         injector.putAfter(CobblemonItems.POKEROD_SMITHING_TEMPLATE, Items.NETHERITE_UPGRADE_SMITHING_TEMPLATE)
     }
 

common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/trade/TradeCompletedPacket.kt

@@ -23,19 +23,16 @@ import java.util.UUID
  * @author Hiroku
  * @since March 5th, 2023
  */
-class TradeCompletedPacket(val pokemonIds1: List<UUID>, val pokemonIds2: List<UUID>) : NetworkPacket<TradeCompletedPacket> {
+class TradeCompletedPacket(val pokemonId1: UUID, val pokemonId2: UUID) : NetworkPacket<TradeCompletedPacket> {
     companion object {
         val ID = cobblemonResource("trade_completed")
-        fun decode(buffer: RegistryFriendlyByteBuf) = TradeCompletedPacket(
-            buffer.readList { it.readUUID() },
-            buffer.readList { it.readUUID() }
-        )
+        fun decode(buffer: RegistryFriendlyByteBuf) = TradeCompletedPacket(buffer.readUUID(), buffer.readUUID())
     }
 
     override val id = ID
 
     override fun encode(buffer: RegistryFriendlyByteBuf) {
-        buffer.writeCollection(pokemonIds1) { buf, id -> buf.writeUUID(id) }
-        buffer.writeCollection(pokemonIds2) { buf, id -> buf.writeUUID(id) }
+        buffer.writeUUID(pokemonId1)
+        buffer.writeUUID(pokemonId2)
     }
 }

common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/trade/TradeUpdatedPacket.kt

@@ -12,6 +12,10 @@ import com.cobblemon.mod.common.api.net.NetworkPacket
 import com.cobblemon.mod.common.api.net.UnsplittablePacket
 import com.cobblemon.mod.common.pokemon.Pokemon
 import com.cobblemon.mod.common.util.cobblemonResource
+import com.cobblemon.mod.common.util.readNullable
+import com.cobblemon.mod.common.util.readUUID
+import com.cobblemon.mod.common.util.writeNullable
+import com.cobblemon.mod.common.util.writeUUID
 import net.minecraft.network.RegistryFriendlyByteBuf
 import java.util.UUID
 
@@ -23,18 +27,15 @@ import java.util.UUID
  * @author Hiroku
  * @since March 5th, 2023
  */
-class TradeUpdatedPacket(val playerId: UUID, val pokemons: List<Pokemon>) : NetworkPacket<TradeUpdatedPacket>, UnsplittablePacket {
+class TradeUpdatedPacket(val playerId: UUID, val pokemon: Pokemon?) : NetworkPacket<TradeUpdatedPacket>, UnsplittablePacket {
     companion object {
         val ID = cobblemonResource("trade_updated")
-        fun decode(buffer: RegistryFriendlyByteBuf) = TradeUpdatedPacket(
-            buffer.readUUID(),
-            buffer.readList { Pokemon.S2C_CODEC.decode(it as RegistryFriendlyByteBuf) }
-        )
+        fun decode(buffer: RegistryFriendlyByteBuf) = TradeUpdatedPacket(buffer.readUUID(), buffer.readNullable { Pokemon.S2C_CODEC.decode(buffer) })
     }
 
     override val id = ID
     override fun encode(buffer: RegistryFriendlyByteBuf) {
         buffer.writeUUID(playerId)
-        buffer.writeCollection(pokemons) { buf, pokemon -> Pokemon.S2C_CODEC.encode(buf as RegistryFriendlyByteBuf, pokemon) }
+        buffer.writeNullable(pokemon) { _, pokemon -> Pokemon.S2C_CODEC.encode(buffer, pokemon) }
     }
 }

common/src/main/kotlin/com/cobblemon/mod/common/net/messages/server/trade/UpdateTradeOfferPacket.kt

@@ -11,30 +11,26 @@ package com.cobblemon.mod.common.net.messages.server.trade
 import com.cobblemon.mod.common.api.net.NetworkPacket
 import com.cobblemon.mod.common.api.storage.party.PartyPosition
 import com.cobblemon.mod.common.util.cobblemonResource
-import com.cobblemon.mod.common.util.readList
 import com.cobblemon.mod.common.util.readNullable
 import com.cobblemon.mod.common.util.readPartyPosition
 import com.cobblemon.mod.common.util.readUUID
-import com.cobblemon.mod.common.util.writeCollection
 import com.cobblemon.mod.common.util.writeNullable
 import com.cobblemon.mod.common.util.writePartyPosition
 import com.cobblemon.mod.common.util.writeUUID
 import net.minecraft.network.RegistryFriendlyByteBuf
 import java.util.UUID
 
-class UpdateTradeOfferPacket(val newOffers: List<Pair<UUID, PartyPosition>>): NetworkPacket<UpdateTradeOfferPacket> {
+class UpdateTradeOfferPacket(val newOffer: Pair<UUID, PartyPosition>?): NetworkPacket<UpdateTradeOfferPacket> {
     companion object {
         val ID = cobblemonResource("update_trade_offer")
-        fun decode(buffer: RegistryFriendlyByteBuf) = UpdateTradeOfferPacket(
-            buffer.readList { it.readUUID() to it.readPartyPosition() }
-        )
+        fun decode(buffer: RegistryFriendlyByteBuf) = UpdateTradeOfferPacket(buffer.readNullable { buffer.readUUID() to buffer.readPartyPosition() })
     }
 
     override val id = ID
     override fun encode(buffer: RegistryFriendlyByteBuf) {
-        buffer.writeCollection(newOffers) { buf, (pokemonId, partyPosition) ->
-            buf.writeUUID(pokemonId)
-            buf.writePartyPosition(partyPosition)
+        buffer.writeNullable(newOffer) { buffer, (pokemonId, partyPosition) ->
+            buffer.writeUUID(pokemonId)
+            buffer.writePartyPosition(partyPosition)
         }
     }
 }

common/src/main/kotlin/com/cobblemon/mod/common/net/serverhandling/trade/ChangeTradeAcceptanceHandler.kt

@@ -20,7 +20,7 @@ object ChangeTradeAcceptanceHandler : ServerNetworkPacketHandler<ChangeTradeAcce
     override fun handle(packet: ChangeTradeAcceptancePacket, server: MinecraftServer, player: ServerPlayer) {
         val trade = TradeManager.getActiveTrade(player.uuid) ?: return player.sendPacket(TradeCancelledPacket())
         val tradeParticipant = trade.getTradeParticipant(player.uuid)
-        if (trade.getOpposingOffer(tradeParticipant).pokemon.any { it.uuid == packet.pokemonOfferId }) {
+        if (trade.getOpposingOffer(tradeParticipant).pokemon?.uuid == packet.pokemonOfferId) {
             trade.updateAcceptance(tradeParticipant, packet.newAcceptance)
         }
     }

common/src/main/kotlin/com/cobblemon/mod/common/net/serverhandling/trade/PerformTradeHandler.kt

@@ -20,7 +20,7 @@ object PerformTradeHandler : ServerNetworkPacketHandler<PerformTradePacket> {
     override fun handle(packet: PerformTradePacket, server: MinecraftServer, player: ServerPlayer) {
         val trade = TradeManager.getActiveTrade(player.uuid) ?: return player.sendPacket(TradeCancelledPacket())
         val tradeParticipant = trade.getTradeParticipant(player.uuid)
-        if (trade.getOpposingOffer(tradeParticipant).pokemon.any { it.uuid == packet.pokemonOfferId }) {
+        if (trade.getOpposingOffer(tradeParticipant).pokemon?.uuid == packet.pokemonOfferId) {
             trade.performTrade(tradeParticipant)
         }
     }

common/src/main/kotlin/com/cobblemon/mod/common/net/serverhandling/trade/UpdateTradeOfferHandler.kt

@@ -12,7 +12,6 @@ import com.cobblemon.mod.common.CobblemonNetwork.sendPacket
 import com.cobblemon.mod.common.api.net.ServerNetworkPacketHandler
 import com.cobblemon.mod.common.net.messages.server.trade.CancelTradePacket
 import com.cobblemon.mod.common.net.messages.server.trade.UpdateTradeOfferPacket
-import com.cobblemon.mod.common.pokemon.Pokemon
 import com.cobblemon.mod.common.trade.TradeManager
 import com.cobblemon.mod.common.util.party
 import net.minecraft.server.MinecraftServer
@@ -22,16 +21,20 @@ object UpdateTradeOfferHandler : ServerNetworkPacketHandler<UpdateTradeOfferPack
     override fun handle(packet: UpdateTradeOfferPacket, server: MinecraftServer, player: ServerPlayer) {
         val trade = TradeManager.getActiveTrade(player.uuid) ?: return player.sendPacket(CancelTradePacket())
         val tradeParticipant = trade.getTradeParticipant(player.uuid)
-        val newOffers = packet.newOffers
-
-        val validPokemons = mutableListOf<Pokemon>()
-        val party = player.party()
-        for ((pokemonId, partyPosition) in newOffers) {
+        val newOffer = packet.newOffer
+        if (newOffer == null) {
+            trade.updateOffer(tradeParticipant, null)
+        } else {
+            val (pokemonId, partyPosition) = newOffer
+            val party = player.party()
             val pokemon = party[partyPosition]
-            if (pokemon != null && pokemon.uuid == pokemonId && pokemon.tradeable) {
-                validPokemons.add(pokemon)
+            if (pokemon == null || pokemon.uuid != pokemonId) {
+                return
+            } else if (!pokemon.tradeable) {
+                return
+            } else {
+                trade.updateOffer(tradeParticipant, pokemon)
             }
         }
-        trade.updateOffer(tradeParticipant, validPokemons)
     }
 }

common/src/main/kotlin/com/cobblemon/mod/common/trade/ActiveTrade.kt

@@ -19,7 +19,7 @@ class ActiveTrade(val player1: TradeParticipant, val player2: TradeParticipant)
     fun getOffer(tradeParticipant: TradeParticipant) = if (tradeParticipant == player1) player1Offer else player2Offer
     fun getOpposingOffer(tradeParticipant: TradeParticipant) = if (tradeParticipant == player1) player2Offer else player1Offer
 
-    fun updateOffer(tradeParticipant: TradeParticipant, pokemon: List<Pokemon>) {
+    fun updateOffer(tradeParticipant: TradeParticipant, pokemon: Pokemon?) {
         getOffer(tradeParticipant).updateOffer(pokemon)
         getOffer(getOppositePlayer(tradeParticipant)).accepted = false
         player1.updateOffer(this, tradeParticipant, pokemon)
@@ -30,9 +30,8 @@ class ActiveTrade(val player1: TradeParticipant, val player2: TradeParticipant)
         val offer = getOpposingOffer(tradeParticipant)
         if (offer.accepted != acceptance) {
             offer.accepted = acceptance
-            val firstId = offer.pokemon.firstOrNull()?.uuid ?: java.util.UUID.randomUUID()
-            getOppositePlayer(tradeParticipant).changeTradeAcceptance(this, firstId, acceptance)
-            tradeParticipant.changeTradeAcceptance(this, firstId, acceptance)
+            getOppositePlayer(tradeParticipant).changeTradeAcceptance(this, offer.pokemon!!.uuid, acceptance)
+            tradeParticipant.changeTradeAcceptance(this, offer.pokemon!!.uuid, acceptance)
         }
 
         if (offer.accepted && getOffer(tradeParticipant).accepted) {
@@ -52,8 +51,8 @@ class ActiveTrade(val player1: TradeParticipant, val player2: TradeParticipant)
                 activeTrade = this,
                 player1 = player1,
                 player2 = player2,
-                pokemon1 = player1Offer.pokemon,
-                pokemon2 = player2Offer.pokemon
+                pokemon1 = player1Offer.pokemon!!,
+                pokemon2 = player2Offer.pokemon!!
             )
         }
     }
@@ -65,14 +64,12 @@ class ActiveTrade(val player1: TradeParticipant, val player2: TradeParticipant)
     }
 
     fun completeTrade() {
-        val uuids1 = player1Offer.pokemon.map { it.uuid }
-        val uuids2 = player2Offer.pokemon.map { it.uuid }
-        player1.completeTrade(this, uuids1, uuids2)
-        player2.completeTrade(this, uuids2, uuids1)
+        player1.completeTrade(this, player1Offer.pokemon!!.uuid, player2Offer.pokemon!!.uuid)
+        player2.completeTrade(this, player2Offer.pokemon!!.uuid, player1Offer.pokemon!!.uuid)
 
-        player1Offer.pokemon = emptyList()
+        player1Offer.pokemon = null
         player1Offer.accepted = false
-        player2Offer.pokemon = emptyList()
+        player2Offer.pokemon = null
         player2Offer.accepted = false
     }
 }

common/src/main/kotlin/com/cobblemon/mod/common/trade/TradeManager.kt

@@ -14,7 +14,6 @@ import com.cobblemon.mod.common.api.events.CobblemonEvents
 import com.cobblemon.mod.common.api.events.pokemon.TradeEvent
 import com.cobblemon.mod.common.api.interaction.ServerPlayerActionRequest
 import com.cobblemon.mod.common.api.net.NetworkPacket
-import com.cobblemon.mod.common.api.storage.party.PartyStore
 import com.cobblemon.mod.common.api.text.aqua
 import com.cobblemon.mod.common.net.messages.client.trade.TradeOfferExpiredPacket
 import com.cobblemon.mod.common.net.messages.client.trade.TradeOfferNotificationPacket
@@ -102,98 +101,71 @@ object TradeManager : RequestManager<TradeManager.TradeRequest>() {
     fun performTrade(
         activeTrade: ActiveTrade,
         player1: TradeParticipant,
-        pokemon1: List<Pokemon>,
+        pokemon1: Pokemon,
         player2: TradeParticipant,
-        pokemon2: List<Pokemon>
+        pokemon2: Pokemon
     ) {
         val party1 = player1.party
         val party2 = player2.party
 
-        if (pokemon1.any { it !in party1 } || pokemon2.any { it !in party2 }) {
+        if (pokemon1 !in party1 || pokemon2 !in party2) {
             Cobblemon.LOGGER.warn("Attempted to perform a trade with Pokémon that aren't in the party anymore. Could be attempted duping between ${player1.name} and ${player2.name}")
             activeTrade.cancelTrade()
             return
         }
 
-        if (pokemon1.isEmpty() || pokemon2.isEmpty()) {
-            Cobblemon.LOGGER.warn("Attempted to perform a trade where one side offered no Pokémon between ${player1.name} and ${player2.name}. This should never happen.")
-            activeTrade.cancelTrade()
-            return
-        }
+        CobblemonEvents.TRADE_EVENT_PRE.postThen(TradeEvent.Pre(player1, pokemon2, player2, pokemon1)) {
+            val party1 = player1.party
+            val party2 = player2.party
 
-        CobblemonEvents.TRADE_EVENT_PRE.postThen(
-            TradeEvent.Pre(player1, pokemon2, player2, pokemon1)
-        ) {
-            val player1Removed = pokemon1.filter { party1.remove(it) }
-            val player2Removed = pokemon2.filter { party2.remove(it) }
+            val player1Removed = party1.remove(pokemon1)
+            val player2Removed = party2.remove(pokemon2)
 
-            if (player1Removed.size != pokemon1.size || player2Removed.size != pokemon2.size) {
-                (pokemon1 - player1Removed.toSet()).forEach {
-                    Cobblemon.LOGGER.warn("Failed to remove traded Pokémon ${it.species.resourceIdentifier} from ${player1.name.string}(${player1.uuid}). Aborting trade with ${player2.name.string}(${player2.uuid}), potential exploit abused.")
+            if (!player1Removed || !player2Removed) {
+                if (!player1Removed) {
+                    Cobblemon.LOGGER.warn("Failed to remove traded Pokémon ${pokemon1.species.resourceIdentifier} from ${player1.name.string}(${player1.uuid}). Aborting trade with ${player2.name.string}(${player2.uuid}), potential exploit abused.")
                 }
 
-                (pokemon2 - player2Removed.toSet()).forEach {
-                    Cobblemon.LOGGER.warn("Failed to remove traded Pokémon ${it.species.resourceIdentifier} from ${player2.name.string}(${player2.uuid}). Aborting trade with ${player1.name.string}(${player1.uuid}), potential exploit abused.")
+                if (!player2Removed) {
+                    Cobblemon.LOGGER.warn("Failed to remove traded Pokémon ${pokemon2.species.resourceIdentifier} from ${player2.name.string}(${player2.uuid}). Aborting trade with ${player1.name.string}(${player1.uuid}), potential exploit abused.")
                 }
 
                 // Revert any changes if one of the removals failed
-                player1Removed.forEach { party1.add(it) }
-                player2Removed.forEach { party2.add(it) }
+                if (player1Removed) party1.add(pokemon1)
+                if (player2Removed) party2.add(pokemon2)
                 return@postThen
             }
 
             // If player1 is the OT, keep track of the friendship
-            pokemon1.forEach { it.cacheFriendship(player1.uuid) }
+            pokemon1.cacheFriendship(player1.uuid)
             // If player2 is the OT, keep track of the friendship
-            pokemon2.forEach { it.cacheFriendship(player2.uuid) }
+            pokemon2.cacheFriendship(player2.uuid)
 
-            // If a Pokémon received by player1 was originally theirs, set the friendship back to what it was at point of trading
-            pokemon2.forEach {
-                if (!it.restoreFriendship(player1.uuid)) {
-                    // Otherwise, reset the friendship
-                    it.setFriendship(it.form.baseFriendship)
-                }
+            // If pokemon2 was originally player1's, set the friendship back to what it was at point of trading
+            if ( !pokemon2.restoreFriendship(player1.uuid) ) {
+                // Otherwise, reset the friendship
+                pokemon2.setFriendship(pokemon2.form.baseFriendship)
             }
-            // If a Pokémon received by player2 was originally theirs, set the friendship back to what it was at point of trading
-            pokemon1.forEach {
-                if (!it.restoreFriendship(player2.uuid)) {
-                    // Otherwise, reset the friendship
-                    it.setFriendship(it.form.baseFriendship)
-                }
+            // If pokemon1 was originally player2's, set the friendship back to what it was at point of trading
+            if ( !pokemon1.restoreFriendship(player2.uuid) ) {
+                // Otherwise, reset the friendship
+                pokemon1.setFriendship(pokemon1.form.baseFriendship)
             }
 
-            pokemon1.forEach { party2.add(it) }
-            pokemon2.forEach { party1.add(it) }
+            party2.add(pokemon1)
+            party1.add(pokemon2)
 
-            // Each traded Pokémon may evolve if any of the Pokémon it was traded for satisfies its context.
-            // Evolutions are resolved before any are applied so one evolving can't invalidate another's context.
-            (pokemon1.map { it to pokemon2 } + pokemon2.map { it to pokemon1 })
-                .mapNotNull { (pokemon, tradedFor) ->
-                    pokemon.lockedEvolutions.filterIsInstance<TradeEvolution>()
-                        .firstOrNull { evolution -> tradedFor.any { evolution.testContext(pokemon, it) } && evolution.test(pokemon) }
-                        ?.let { pokemon to it }
-                }
-                .forEach { (pokemon, evolution) -> evolution.evolve(pokemon) }
+            pokemon1.lockedEvolutions.filterIsInstance<TradeEvolution>().firstOrNull {
+                it.attemptEvolution(pokemon1, pokemon2)
+            }
 
-            val compactParty = { party: PartyStore ->
-                var writeIdx = 0
-                for (readIdx in 0 until party.size()) {
-                    if (party.get(readIdx) != null) {
-                        if (readIdx != writeIdx) {
-                            party.swap(readIdx, writeIdx)
-                        }
-                        writeIdx++
-                    }
-                }
+            pokemon2.lockedEvolutions.filterIsInstance<TradeEvolution>().firstOrNull {
+                it.attemptEvolution(pokemon2, pokemon1)
             }
-            compactParty(party1)
-            compactParty(party2)
 
             activeTrade.completeTrade()
 
-            CobblemonEvents.TRADE_EVENT_POST.post(
-                TradeEvent.Post(player1, pokemon2, player2, pokemon1)
-            )
+            CobblemonEvents.TRADE_EVENT_POST.post(TradeEvent.Post(player1, pokemon2, player2, pokemon1))
         }
     }
 }

common/src/main/kotlin/com/cobblemon/mod/common/trade/TradeOffer.kt

@@ -11,10 +11,10 @@ package com.cobblemon.mod.common.trade
 import com.cobblemon.mod.common.pokemon.Pokemon
 
 class TradeOffer {
-    var pokemon: List<Pokemon> = emptyList()
+    var pokemon: Pokemon? = null
     var accepted = false
 
-    fun updateOffer(pokemon: List<Pokemon>) {
+    fun updateOffer(pokemon: Pokemon?) {
         this.pokemon = pokemon
         accepted = false
     }

common/src/main/kotlin/com/cobblemon/mod/common/trade/TradeParticipant.kt

@@ -34,7 +34,7 @@ interface TradeParticipant {
      *
      * If it's null, it means they're no longer offering a Pokémon (so they're redeciding).
      */
-    fun updateOffer(trade: ActiveTrade, tradeParticipant: TradeParticipant, pokemon: List<Pokemon>)
+    fun updateOffer(trade: ActiveTrade, tradeParticipant: TradeParticipant, pokemon: Pokemon?)
 
     /**
      * Notifies the participant that the acceptance state for trading with the opponent [Pokemon] with UUID [pokemonId]
@@ -59,7 +59,7 @@ interface TradeParticipant {
     fun cancelTrade(trade: ActiveTrade)
 
     /** Notifies the participant that the trade has been completed. The actual Pokémon have already been exchanged. */
-    fun completeTrade(trade: ActiveTrade, pokemonIds1: List<UUID>, pokemonIds2: List<UUID>)
+    fun completeTrade(trade: ActiveTrade, pokemonId1: UUID, pokemonId2: UUID)
 }
 
 /**
@@ -73,7 +73,7 @@ class PlayerTradeParticipant(val player: ServerPlayer): TradeParticipant {
     override val uuid = player.uuid
     override val party = player.party()
 
-    override fun updateOffer(trade: ActiveTrade, tradeParticipant: TradeParticipant, pokemon: List<Pokemon>) {
+    override fun updateOffer(trade: ActiveTrade, tradeParticipant: TradeParticipant, pokemon: Pokemon?) {
         player.sendPacket(TradeUpdatedPacket(tradeParticipant.uuid, pokemon))
     }
 
@@ -89,8 +89,8 @@ class PlayerTradeParticipant(val player: ServerPlayer): TradeParticipant {
         player.sendPacket(TradeCancelledPacket())
     }
 
-    override fun completeTrade(trade: ActiveTrade, pokemonIds1: List<UUID>, pokemonIds2: List<UUID>) {
-        player.sendPacket(TradeCompletedPacket(pokemonIds1, pokemonIds2))
+    override fun completeTrade(trade: ActiveTrade, pokemonId1: UUID, pokemonId2: UUID) {
+        player.sendPacket(TradeCompletedPacket(pokemonId1, pokemonId2))
     }
 }
 
@@ -109,7 +109,7 @@ class DummyTradeParticipant(val pokemonList: MutableList<Pokemon>) : TradePartic
         // Don't need to do any notifying.
     }
 
-    override fun completeTrade(trade: ActiveTrade, pokemonIds1: List<UUID>, pokemonIds2: List<UUID>) {
+    override fun completeTrade(trade: ActiveTrade, pokemonId1: UUID, pokemonId2: UUID) {
         // Don't need to do any notifying.
     }
 
@@ -121,7 +121,7 @@ class DummyTradeParticipant(val pokemonList: MutableList<Pokemon>) : TradePartic
         // React, maybe. Change code and hotswap.
     }
 
-    override fun updateOffer(trade: ActiveTrade, tradeParticipant: TradeParticipant, pokemon: List<Pokemon>) {
+    override fun updateOffer(trade: ActiveTrade, tradeParticipant: TradeParticipant, pokemon: Pokemon?) {
         // React, maybe. Change code and hotswap.
     }
 }

common/src/main/resources/assets/cobblemon/blockstates/blue_mint_leaf_litter.json

@@ -1,160 +0,0 @@
-{
-  "multipart": [
-    {
-      "apply": {
-        "model": "cobblemon:block/blue_mint_leaf_litter_1"
-      },
-      "when": {
-        "facing": "north",
-        "amount": "1|2|3|4"
-      }
-    },
-    {
-      "apply": {
-        "model": "cobblemon:block/blue_mint_leaf_litter_1",
-        "y": 90
-      },
-      "when": {
-        "facing": "east",
-        "amount": "1|2|3|4"
-      }
-    },
-    {
-      "apply": {
-        "model": "cobblemon:block/blue_mint_leaf_litter_1",
-        "y": 180
-      },
-      "when": {
-        "facing": "south",
-        "amount": "1|2|3|4"
-      }
-    },
-    {
-      "apply": {
-        "model": "cobblemon:block/blue_mint_leaf_litter_1",
-        "y": 270
-      },
-      "when": {
-        "facing": "west",
-        "amount": "1|2|3|4"
-      }
-    },
-    {
-      "apply": {
-        "model": "cobblemon:block/blue_mint_leaf_litter_2"
-      },
-      "when": {
-        "facing": "north",
-        "amount": "2|3|4"
-      }
-    },
-    {
-      "apply": {
-        "model": "cobblemon:block/blue_mint_leaf_litter_2",
-        "y": 90
-      },
-      "when": {
-        "facing": "east",
-        "amount": "2|3|4"
-      }
-    },
-    {
-      "apply": {
-        "model": "cobblemon:block/blue_mint_leaf_litter_2",
-        "y": 180
-      },
-      "when": {
-        "facing": "south",
-        "amount": "2|3|4"
-      }
-    },
-    {
-      "apply": {
-        "model": "cobblemon:block/blue_mint_leaf_litter_2",
-        "y": 270
-      },
-      "when": {
-        "facing": "west",
-        "amount": "2|3|4"
-      }
-    },
-    {
-      "apply": {
-        "model": "cobblemon:block/blue_mint_leaf_litter_3"
-      },
-      "when": {
-        "facing": "north",
-        "amount": "3|4"
-      }
-    },
-    {
-      "apply": {
-        "model": "cobblemon:block/blue_mint_leaf_litter_3",
-        "y": 90
-      },
-      "when": {
-        "facing": "east",
-        "amount": "3|4"
-      }
-    },
-    {
-      "apply": {
-        "model": "cobblemon:block/blue_mint_leaf_litter_3",
-        "y": 180
-      },
-      "when": {
-        "facing": "south",
-        "amount": "3|4"
-      }
-    },
-    {
-      "apply": {
-        "model": "cobblemon:block/blue_mint_leaf_litter_3",
-        "y": 270
-      },
-      "when": {
-        "facing": "west",
-        "amount": "3|4"
-      }
-    },
-    {
-      "apply": {
-        "model": "cobblemon:block/blue_mint_leaf_litter_4"
-      },
-      "when": {
-        "facing": "north",
-        "amount": "4"
-      }
-    },
-    {
-      "apply": {
-        "model": "cobblemon:block/blue_mint_leaf_litter_4",
-        "y": 90
-      },
-      "when": {
-        "facing": "east",
-        "amount": "4"
-      }
-    },
-    {
-      "apply": {
-        "model": "cobblemon:block/blue_mint_leaf_litter_4",
-        "y": 180
-      },
-      "when": {
-        "facing": "south",
-        "amount": "4"
-      }
-    },
-    {
-      "apply": {
-        "model": "cobblemon:block/blue_mint_leaf_litter_4",
-        "y": 270
-      },
-      "when": {
-        "facing": "west",
-        "amount": "4"
-      }
-    }
-  ]
-}

common/src/main/resources/assets/cobblemon/blockstates/cyan_mint_leaf_litter.json

@@ -1,160 +0,0 @@
-{
-  "multipart": [
-    {
-      "apply": {
-        "model": "cobblemon:block/cyan_mint_leaf_litter_1"
-      },
-      "when": {
-        "facing": "north",
-        "amount": "1|2|3|4"
-      }
-    },
-    {
-      "apply": {
-        "model": "cobblemon:block/cyan_mint_leaf_litter_1",
-        "y": 90
-      },
-      "when": {
-        "facing": "east",
-        "amount": "1|2|3|4"
-      }
-    },
-    {
-      "apply": {
-        "model": "cobblemon:block/cyan_mint_leaf_litter_1",
-        "y": 180
-      },
-      "when": {
-        "facing": "south",
-        "amount": "1|2|3|4"
-      }
-    },
-    {
-      "apply": {
-        "model": "cobblemon:block/cyan_mint_leaf_litter_1",
-        "y": 270
-      },
-      "when": {
-        "facing": "west",
-        "amount": "1|2|3|4"
-      }
-    },
-    {
-      "apply": {
-        "model": "cobblemon:block/cyan_mint_leaf_litter_2"
-      },
-      "when": {
-        "facing": "north",
-        "amount": "2|3|4"
-      }
-    },
-    {
-      "apply": {
-        "model": "cobblemon:block/cyan_mint_leaf_litter_2",
-        "y": 90
-      },
-      "when": {
-        "facing": "east",
-        "amount": "2|3|4"
-      }
-    },
-    {
-      "apply": {
-        "model": "cobblemon:block/cyan_mint_leaf_litter_2",
-        "y": 180
-      },
-      "when": {
-        "facing": "south",
-        "amount": "2|3|4"
-      }
-    },
-    {
-      "apply": {
-        "model": "cobblemon:block/cyan_mint_leaf_litter_2",
-        "y": 270
-      },
-      "when": {
-        "facing": "west",
-        "amount": "2|3|4"
-      }
-    },
-    {
-      "apply": {
-        "model": "cobblemon:block/cyan_mint_leaf_litter_3"
-      },
-      "when": {
-        "facing": "north",
-        "amount": "3|4"
-      }
-    },
-    {
-      "apply": {
-        "model": "cobblemon:block/cyan_mint_leaf_litter_3",
-        "y": 90
-      },
-      "when": {
-        "facing": "east",
-        "amount": "3|4"
-      }
-    },
-    {
-      "apply": {
-        "model": "cobblemon:block/cyan_mint_leaf_litter_3",
-        "y": 180
-      },
-      "when": {
-        "facing": "south",
-        "amount": "3|4"
-      }
-    },
-    {
-      "apply": {
-        "model": "cobblemon:block/cyan_mint_leaf_litter_3",
-        "y": 270
-      },
-      "when": {
-        "facing": "west",
-        "amount": "3|4"
-      }
-    },
-    {
-      "apply": {
-        "model": "cobblemon:block/cyan_mint_leaf_litter_4"
-      },
-      "when": {
-        "facing": "north",
-        "amount": "4"
-      }
-    },
-    {
-      "apply": {
-        "model": "cobblemon:block/cyan_mint_leaf_litter_4",
-        "y": 90
-      },
-      "when": {
-        "facing": "east",
-        "amount": "4"
-      }
-    },
-    {
-      "apply": {
-        "model": "cobblemon:block/cyan_mint_leaf_litter_4",
-        "y": 180
-      },
-      "when": {
-        "facing": "south",
-        "amount": "4"
-      }
-    },
-    {
-      "apply": {
-        "model": "cobblemon:block/cyan_mint_leaf_litter_4",
-        "y": 270
-      },
-      "when": {
-        "facing": "west",
-        "amount": "4"
-      }
-    }
-  ]
-}

common/src/main/resources/assets/cobblemon/blockstates/electirizer.json

@@ -1,19 +0,0 @@
-{
-  "variants": {
-    "facing=south": {
-      "model": "cobblemon:block/electirizer",
-      "y": 180
-    },
-    "facing=west": {
-      "model": "cobblemon:block/electirizer",
-      "y": 270
-    },
-    "facing=north": {
-      "model": "cobblemon:block/electirizer"
-    },
-    "facing=east": {
-      "model": "cobblemon:block/electirizer",
-      "y": 90
-    }
-  }
-}

common/src/main/resources/assets/cobblemon/blockstates/electric_seed.json

@@ -1,14 +0,0 @@
-{
-  "variants": {
-    "age=0,half=lower": { "model": "cobblemon:block/electric_seed_stage0" },
-    "age=0,half=upper": { "model": "cobblemon:block/electric_seed_stage0" },
-    "age=1,half=lower": { "model": "cobblemon:block/electric_seed_stage1" },
-    "age=1,half=upper": { "model": "cobblemon:block/electric_seed_stage1" },
-    "age=2,half=lower": { "model": "cobblemon:block/electric_seed_bottom_stage2" },
-    "age=2,half=upper": { "model": "cobblemon:block/electric_seed_top_stage2" },
-    "age=3,half=lower": { "model": "cobblemon:block/electric_seed_bottom_stage3" },
-    "age=3,half=upper": { "model": "cobblemon:block/electric_seed_top_stage3" },
-    "age=4,half=lower": { "model": "cobblemon:block/voltaconia_bottom" },
-    "age=4,half=upper": { "model": "cobblemon:block/voltaconia_top" }
-  }
-}

common/src/main/resources/assets/cobblemon/blockstates/grassy_seed.json

@@ -1,14 +0,0 @@
-{
-  "variants": {
-    "age=0,half=lower": { "model": "cobblemon:block/grassy_seed_stage0" },
-    "age=0,half=upper": { "model": "cobblemon:block/grassy_seed_stage0" },
-    "age=1,half=lower": { "model": "cobblemon:block/grassy_seed_stage1" },
-    "age=1,half=upper": { "model": "cobblemon:block/grassy_seed_stage1" },
-    "age=2,half=lower": { "model": "cobblemon:block/grassy_seed_bottom_stage2" },
-    "age=2,half=upper": { "model": "cobblemon:block/grassy_seed_top_stage2" },
-    "age=3,half=lower": { "model": "cobblemon:block/grassy_seed_bottom_stage3" },
-    "age=3,half=upper": { "model": "cobblemon:block/grassy_seed_top_stage3" },
-    "age=4,half=lower": { "model": "cobblemon:block/verdroot_bottom" },
-    "age=4,half=upper": { "model": "cobblemon:block/verdroot_top" }
-  }
-}

common/src/main/resources/assets/cobblemon/blockstates/green_mint_leaf_litter.json

@@ -1,160 +0,0 @@
-{
-  "multipart": [
-    {
-      "apply": {
-        "model": "cobblemon:block/green_mint_leaf_litter_1"
-      },
-      "when": {
-        "facing": "north",
-        "amount": "1|2|3|4"
-      }
-    },
-    {
-      "apply": {
-        "model": "cobblemon:block/green_mint_leaf_litter_1",
-        "y": 90
-      },
-      "when": {
-        "facing": "east",
-        "amount": "1|2|3|4"
-      }
-    },
-    {
-      "apply": {
-        "model": "cobblemon:block/green_mint_leaf_litter_1",
-        "y": 180
-      },
-      "when": {
-        "facing": "south",
-        "amount": "1|2|3|4"
-      }
-    },
-    {
-      "apply": {
-        "model": "cobblemon:block/green_mint_leaf_litter_1",
-        "y": 270
-      },
-      "when": {
-        "facing": "west",
-        "amount": "1|2|3|4"
-      }
-    },
-    {
-      "apply": {
-        "model": "cobblemon:block/green_mint_leaf_litter_2"
-      },
-      "when": {
-        "facing": "north",
-        "amount": "2|3|4"
-      }
-    },
-    {
-      "apply": {
-        "model": "cobblemon:block/green_mint_leaf_litter_2",
-        "y": 90
-      },
-      "when": {
-        "facing": "east",
-        "amount": "2|3|4"
-      }
-    },
-    {
-      "apply": {
-        "model": "cobblemon:block/green_mint_leaf_litter_2",
-        "y": 180
-      },
-      "when": {
-        "facing": "south",
-        "amount": "2|3|4"
-      }
-    },
-    {
-      "apply": {
-        "model": "cobblemon:block/green_mint_leaf_litter_2",
-        "y": 270
-      },
-      "when": {
-        "facing": "west",
-        "amount": "2|3|4"
-      }
-    },
-    {
-      "apply": {
-        "model": "cobblemon:block/green_mint_leaf_litter_3"
-      },
-      "when": {
-        "facing": "north",
-        "amount": "3|4"
-      }
-    },
-    {
-      "apply": {
-        "model": "cobblemon:block/green_mint_leaf_litter_3",
-        "y": 90
-      },
-      "when": {
-        "facing": "east",
-        "amount": "3|4"
-      }
-    },
-    {
-      "apply": {
-        "model": "cobblemon:block/green_mint_leaf_litter_3",
-        "y": 180
-      },
-      "when": {
-        "facing": "south",
-        "amount": "3|4"
-      }
-    },
-    {
-      "apply": {
-        "model": "cobblemon:block/green_mint_leaf_litter_3",
-        "y": 270
-      },
-      "when": {
-        "facing": "west",
-        "amount": "3|4"
-      }
-    },
-    {
-      "apply": {
-        "model": "cobblemon:block/green_mint_leaf_litter_4"
-      },
-      "when": {
-        "facing": "north",
-        "amount": "4"
-      }
-    },
-    {
-      "apply": {
-        "model": "cobblemon:block/green_mint_leaf_litter_4",
-        "y": 90
-      },
-      "when": {
-        "facing": "east",
-        "amount": "4"
-      }
-    },
-    {
-      "apply": {
-        "model": "cobblemon:block/green_mint_leaf_litter_4",
-        "y": 180
-      },
-      "when": {
-        "facing": "south",
-        "amount": "4"
-      }
-    },
-    {
-      "apply": {
-        "model": "cobblemon:block/green_mint_leaf_litter_4",
-        "y": 270
-      },
-      "when": {
-        "facing": "west",
-        "amount": "4"
-      }
-    }
-  ]
-}

common/src/main/resources/assets/cobblemon/blockstates/lobaila.json

@@ -1,10 +0,0 @@
-{
-  "variants": {
-    "half=lower": {
-      "model": "cobblemon:block/lobaila_bottom"
-    },
-    "half=upper": {
-      "model": "cobblemon:block/lobaila_top"
-    }
-  }
-}

common/src/main/resources/assets/cobblemon/blockstates/lucibell.json

@@ -1,8 +0,0 @@
-{
-  "variants": {
-    "half=lower,glowing=false": { "model": "cobblemon:block/lucibell_bottom" },
-    "half=upper,glowing=false": { "model": "cobblemon:block/lucibell_top" },
-    "half=lower,glowing=true": { "model": "cobblemon:block/lucibell_bottom_glowing" },
-    "half=upper,glowing=true": { "model": "cobblemon:block/lucibell_top_glowing" }
-  }
-}

common/src/main/resources/assets/cobblemon/blockstates/magmarizer.json

@@ -1,19 +0,0 @@
-{
-  "variants": {
-    "facing=south": {
-      "model": "cobblemon:block/magmarizer",
-      "y": 180
-    },
-    "facing=west": {
-      "model": "cobblemon:block/magmarizer",
-      "y": 270
-    },
-    "facing=north": {
-      "model": "cobblemon:block/magmarizer"
-    },
-    "facing=east": {
-      "model": "cobblemon:block/magmarizer",
-      "y": 90
-    }
-  }
-}

common/src/main/resources/assets/cobblemon/blockstates/medicinal_brew.json

@@ -1,64 +0,0 @@
-{
-  "variants": {
-    "facing=north,amount=1": {
-      "model": "cobblemon:block/medicinal_brew_1"
-    },
-    "facing=east,amount=1": {
-      "model": "cobblemon:block/medicinal_brew_1",
-      "y": 90
-    },
-    "facing=south,amount=1": {
-      "model": "cobblemon:block/medicinal_brew_1",
-      "y": 180
-    },
-    "facing=west,amount=1": {
-      "model": "cobblemon:block/medicinal_brew_1",
-      "y": 270
-    },
-    "facing=north,amount=2": {
-      "model": "cobblemon:block/medicinal_brew_2"
-    },
-    "facing=east,amount=2": {
-      "model": "cobblemon:block/medicinal_brew_2",
-      "y": 90
-    },
-    "facing=south,amount=2": {
-      "model": "cobblemon:block/medicinal_brew_2",
-      "y": 180
-    },
-    "facing=west,amount=2": {
-      "model": "cobblemon:block/medicinal_brew_2",
-      "y": 270
-    },
-    "facing=north,amount=3": {
-      "model": "cobblemon:block/medicinal_brew_3"
-    },
-    "facing=east,amount=3": {
-      "model": "cobblemon:block/medicinal_brew_3",
-      "y": 90
-    },
-    "facing=south,amount=3": {
-      "model": "cobblemon:block/medicinal_brew_3",
-      "y": 180
-    },
-    "facing=west,amount=3": {
-      "model": "cobblemon:block/medicinal_brew_3",
-      "y": 270
-    },
-    "facing=north,amount=4": {
-      "model": "cobblemon:block/medicinal_brew_4"
-    },
-    "facing=east,amount=4": {
-      "model": "cobblemon:block/medicinal_brew_4",
-      "y": 90
-    },
-    "facing=south,amount=4": {
-      "model": "cobblemon:block/medicinal_brew_4",
-      "y": 180
-    },
-    "facing=west,amount=4": {
-      "model": "cobblemon:block/medicinal_brew_4",
-      "y": 270
-    }
-  }
-}

common/src/main/resources/assets/cobblemon/blockstates/mistleaf.json

@@ -1,22 +0,0 @@
-{
-  "variants": {
-    "half=lower,glowing=0": { "model": "cobblemon:block/mistleaf_bottom" },
-    "half=upper,glowing=0": { "model": "cobblemon:block/mistleaf_top" },
-    "half=lower,glowing=1": { "model": "cobblemon:block/mistleaf_bottom_glowing" },
-    "half=upper,glowing=1": { "model": "cobblemon:block/mistleaf_top_glowing" },
-    "half=lower,glowing=2": { "model": "cobblemon:block/mistleaf_bottom_glowing" },
-    "half=upper,glowing=2": { "model": "cobblemon:block/mistleaf_top_glowing" },
-    "half=lower,glowing=3": { "model": "cobblemon:block/mistleaf_bottom_glowing" },
-    "half=upper,glowing=3": { "model": "cobblemon:block/mistleaf_top_glowing" },
-    "half=lower,glowing=4": { "model": "cobblemon:block/mistleaf_bottom_glowing" },
-    "half=upper,glowing=4": { "model": "cobblemon:block/mistleaf_top_glowing" },
-    "half=lower,glowing=5": { "model": "cobblemon:block/mistleaf_bottom_glowing" },
-    "half=upper,glowing=5": { "model": "cobblemon:block/mistleaf_top_glowing" },
-    "half=lower,glowing=6": { "model": "cobblemon:block/mistleaf_bottom_glowing" },
-    "half=upper,glowing=6": { "model": "cobblemon:block/mistleaf_top_glowing" },
-    "half=lower,glowing=7": { "model": "cobblemon:block/mistleaf_bottom_glowing" },
-    "half=upper,glowing=7": { "model": "cobblemon:block/mistleaf_top_glowing" },
-    "half=lower,glowing=8": { "model": "cobblemon:block/mistleaf_bottom_glowing" },
-    "half=upper,glowing=8": { "model": "cobblemon:block/mistleaf_top_glowing" }
-  }
-}

common/src/main/resources/assets/cobblemon/blockstates/misty_seed.json

@@ -1,14 +0,0 @@
-{
-  "variants": {
-    "age=0,half=lower": { "model": "cobblemon:block/misty_seed_stage0" },
-    "age=0,half=upper": { "model": "cobblemon:block/misty_seed_stage0" },
-    "age=1,half=lower": { "model": "cobblemon:block/misty_seed_stage1" },
-    "age=1,half=upper": { "model": "cobblemon:block/misty_seed_stage1" },
-    "age=2,half=lower": { "model": "cobblemon:block/misty_seed_bottom_stage2" },
-    "age=2,half=upper": { "model": "cobblemon:block/misty_seed_top_stage2" },
-    "age=3,half=lower": { "model": "cobblemon:block/misty_seed_bottom_stage3" },
-    "age=3,half=upper": { "model": "cobblemon:block/misty_seed_top_stage3" },
-    "age=4,half=lower": { "model": "cobblemon:block/mistleaf_bottom" },
-    "age=4,half=upper": { "model": "cobblemon:block/mistleaf_top" }
-  }
-}

common/src/main/resources/assets/cobblemon/blockstates/moomoo_milk.json

@@ -1,64 +0,0 @@
-{
-  "variants": {
-    "facing=north,amount=1": {
-      "model": "cobblemon:block/moomoo_milk_1"
-    },
-    "facing=east,amount=1": {
-      "model": "cobblemon:block/moomoo_milk_1",
-      "y": 90
-    },
-    "facing=south,amount=1": {
-      "model": "cobblemon:block/moomoo_milk_1",
-      "y": 180
-    },
-    "facing=west,amount=1": {
-      "model": "cobblemon:block/moomoo_milk_1",
-      "y": 270
-    },
-    "facing=north,amount=2": {
-      "model": "cobblemon:block/moomoo_milk_2"
-    },
-    "facing=east,amount=2": {
-      "model": "cobblemon:block/moomoo_milk_2",
-      "y": 90
-    },
-    "facing=south,amount=2": {
-      "model": "cobblemon:block/moomoo_milk_2",
-      "y": 180
-    },
-    "facing=west,amount=2": {
-      "model": "cobblemon:block/moomoo_milk_2",
-      "y": 270
-    },
-    "facing=north,amount=3": {
-      "model": "cobblemon:block/moomoo_milk_3"
-    },
-    "facing=east,amount=3": {
-      "model": "cobblemon:block/moomoo_milk_3",
-      "y": 90
-    },
-    "facing=south,amount=3": {
-      "model": "cobblemon:block/moomoo_milk_3",
-      "y": 180
-    },
-    "facing=west,amount=3": {
-      "model": "cobblemon:block/moomoo_milk_3",
-      "y": 270
-    },
-    "facing=north,amount=4": {
-      "model": "cobblemon:block/moomoo_milk_4"
-    },
-    "facing=east,amount=4": {
-      "model": "cobblemon:block/moomoo_milk_4",
-      "y": 90
-    },
-    "facing=south,amount=4": {
-      "model": "cobblemon:block/moomoo_milk_4",
-      "y": 180
-    },
-    "facing=west,amount=4": {
-      "model": "cobblemon:block/moomoo_milk_4",
-      "y": 270
-    }
-  }
-}

common/src/main/resources/assets/cobblemon/blockstates/pauvillea.json

@@ -1,25 +0,0 @@
-{
-  "variants": {
-    "facing=down": {
-      "model": "cobblemon:block/pauvillea_hanging"
-    },
-    "facing=east": {
-      "model": "cobblemon:block/pauvillea_wall",
-      "y": 90
-    },
-    "facing=north": {
-      "model": "cobblemon:block/pauvillea_wall"
-    },
-    "facing=south": {
-      "model": "cobblemon:block/pauvillea_wall",
-      "y": 180
-    },
-    "facing=up": {
-      "model": "cobblemon:block/pauvillea_floor"
-    },
-    "facing=west": {
-      "model": "cobblemon:block/pauvillea_wall",
-      "y": 270
-    }
-  }
-}

common/src/main/resources/assets/cobblemon/blockstates/pink_mint_leaf_litter.json

@@ -1,160 +0,0 @@
-{
-  "multipart": [
-    {
-      "apply": {
-        "model": "cobblemon:block/pink_mint_leaf_litter_1"
-      },
-      "when": {
-        "facing": "north",
-        "amount": "1|2|3|4"
-      }
-    },
-    {
-      "apply": {
-        "model": "cobblemon:block/pink_mint_leaf_litter_1",
-        "y": 90
-      },
-      "when": {
-        "facing": "east",
-        "amount": "1|2|3|4"
-      }
-    },
-    {
-      "apply": {
-        "model": "cobblemon:block/pink_mint_leaf_litter_1",
-        "y": 180
-      },
-      "when": {
-        "facing": "south",
-        "amount": "1|2|3|4"
-      }
-    },
-    {
-      "apply": {
-        "model": "cobblemon:block/pink_mint_leaf_litter_1",
-        "y": 270
-      },
-      "when": {
-        "facing": "west",
-        "amount": "1|2|3|4"
-      }
-    },
-    {
-      "apply": {
-        "model": "cobblemon:block/pink_mint_leaf_litter_2"
-      },
-      "when": {
-        "facing": "north",
-        "amount": "2|3|4"
-      }
-    },
-    {
-      "apply": {
-        "model": "cobblemon:block/pink_mint_leaf_litter_2",
-        "y": 90
-      },
-      "when": {
-        "facing": "east",
-        "amount": "2|3|4"
-      }
-    },
-    {
-      "apply": {
-        "model": "cobblemon:block/pink_mint_leaf_litter_2",
-        "y": 180
-      },
-      "when": {
-        "facing": "south",
-        "amount": "2|3|4"
-      }
-    },
-    {
-      "apply": {
-        "model": "cobblemon:block/pink_mint_leaf_litter_2",
-        "y": 270
-      },
-      "when": {
-        "facing": "west",
-        "amount": "2|3|4"
-      }
-    },
-    {
-      "apply": {
-        "model": "cobblemon:block/pink_mint_leaf_litter_3"
-      },
-      "when": {
-        "facing": "north",
-        "amount": "3|4"
-      }
-    },
-    {
-      "apply": {
-        "model": "cobblemon:block/pink_mint_leaf_litter_3",
-        "y": 90
-      },
-      "when": {
-        "facing": "east",
-        "amount": "3|4"
-      }
-    },
-    {
-      "apply": {
-        "model": "cobblemon:block/pink_mint_leaf_litter_3",
-        "y": 180
-      },
-      "when": {
-        "facing": "south",
-        "amount": "3|4"
-      }
-    },
-    {
-      "apply": {
-        "model": "cobblemon:block/pink_mint_leaf_litter_3",
-        "y": 270
-      },
-      "when": {
-        "facing": "west",
-        "amount": "3|4"
-      }
-    },
-    {
-      "apply": {
-        "model": "cobblemon:block/pink_mint_leaf_litter_4"
-      },
-      "when": {
-        "facing": "north",
-        "amount": "4"
-      }
-    },
-    {
-      "apply": {
-        "model": "cobblemon:block/pink_mint_leaf_litter_4",
-        "y": 90
-      },
-      "when": {
-        "facing": "east",
-        "amount": "4"
-      }
-    },
-    {
-      "apply": {
-        "model": "cobblemon:block/pink_mint_leaf_litter_4",
-        "y": 180
-      },
-      "when": {
-        "facing": "south",
-        "amount": "4"
-      }
-    },
-    {
-      "apply": {
-        "model": "cobblemon:block/pink_mint_leaf_litter_4",
-        "y": 270
-      },
-      "when": {
-        "facing": "west",
-        "amount": "4"
-      }
-    }
-  ]
-}

common/src/main/resources/assets/cobblemon/blockstates/pomohana.json

@@ -1,160 +0,0 @@
-{
-  "multipart": [
-    {
-      "apply": {
-        "model": "cobblemon:block/pomohana_1"
-      },
-      "when": {
-        "facing": "north",
-        "flower_amount": "1|2|3|4"
-      }
-    },
-    {
-      "apply": {
-        "model": "cobblemon:block/pomohana_1",
-        "y": 90
-      },
-      "when": {
-        "facing": "east",
-        "flower_amount": "1|2|3|4"
-      }
-    },
-    {
-      "apply": {
-        "model": "cobblemon:block/pomohana_1",
-        "y": 180
-      },
-      "when": {
-        "facing": "south",
-        "flower_amount": "1|2|3|4"
-      }
-    },
-    {
-      "apply": {
-        "model": "cobblemon:block/pomohana_1",
-        "y": 270
-      },
-      "when": {
-        "facing": "west",
-        "flower_amount": "1|2|3|4"
-      }
-    },
-    {
-      "apply": {
-        "model": "cobblemon:block/pomohana_2"
-      },
-      "when": {
-        "facing": "north",
-        "flower_amount": "2|3|4"
-      }
-    },
-    {
-      "apply": {
-        "model": "cobblemon:block/pomohana_2",
-        "y": 90
-      },
-      "when": {
-        "facing": "east",
-        "flower_amount": "2|3|4"
-      }
-    },
-    {
-      "apply": {
-        "model": "cobblemon:block/pomohana_2",
-        "y": 180
-      },
-      "when": {
-        "facing": "south",
-        "flower_amount": "2|3|4"
-      }
-    },
-    {
-      "apply": {
-        "model": "cobblemon:block/pomohana_2",
-        "y": 270
-      },
-      "when": {
-        "facing": "west",
-        "flower_amount": "2|3|4"
-      }
-    },
-    {
-      "apply": {
-        "model": "cobblemon:block/pomohana_3"
-      },
-      "when": {
-        "facing": "north",
-        "flower_amount": "3|4"
-      }
-    },
-    {
-      "apply": {
-        "model": "cobblemon:block/pomohana_3",
-        "y": 90
-      },
-      "when": {
-        "facing": "east",
-        "flower_amount": "3|4"
-      }
-    },
-    {
-      "apply": {
-        "model": "cobblemon:block/pomohana_3",
-        "y": 180
-      },
-      "when": {
-        "facing": "south",
-        "flower_amount": "3|4"
-      }
-    },
-    {
-      "apply": {
-        "model": "cobblemon:block/pomohana_3",
-        "y": 270
-      },
-      "when": {
-        "facing": "west",
-        "flower_amount": "3|4"
-      }
-    },
-    {
-      "apply": {
-        "model": "cobblemon:block/pomohana_4"
-      },
-      "when": {
-        "facing": "north",
-        "flower_amount": "4"
-      }
-    },
-    {
-      "apply": {
-        "model": "cobblemon:block/pomohana_4",
-        "y": 90
-      },
-      "when": {
-        "facing": "east",
-        "flower_amount": "4"
-      }
-    },
-    {
-      "apply": {
-        "model": "cobblemon:block/pomohana_4",
-        "y": 180
-      },
-      "when": {
-        "facing": "south",
-        "flower_amount": "4"
-      }
-    },
-    {
-      "apply": {
-        "model": "cobblemon:block/pomohana_4",
-        "y": 270
-      },
-      "when": {
-        "facing": "west",
-        "flower_amount": "4"
-      }
-    }
-  ]
-}

common/src/main/resources/assets/cobblemon/blockstates/potted_aguav_berry.json

@@ -1,7 +0,0 @@
-{
-  "variants": {
-    "": {
-      "model": "cobblemon:block/berries/potted_aguav_berry"
-    }
-  }
-}

common/src/main/resources/assets/cobblemon/blockstates/potted_apicot_berry.json

@@ -1,7 +0,0 @@
-{
-  "variants": {
-    "": {
-      "model": "cobblemon:block/berries/potted_apicot_berry"
-    }
-  }
-}

common/src/main/resources/assets/cobblemon/blockstates/potted_aspear_berry.json

@@ -1,7 +0,0 @@
-{
-  "variants": {
-    "": {
-      "model": "cobblemon:block/berries/potted_aspear_berry"
-    }
-  }
-}

common/src/main/resources/assets/cobblemon/blockstates/potted_babiri_berry.json

@@ -1,7 +0,0 @@
-{
-  "variants": {
-    "": {
-      "model": "cobblemon:block/berries/potted_babiri_berry"
-    }
-  }
-}

common/src/main/resources/assets/cobblemon/blockstates/potted_belue_berry.json

@@ -1,7 +0,0 @@
-{
-  "variants": {
-    "": {
-      "model": "cobblemon:block/berries/potted_belue_berry"
-    }
-  }
-}

common/src/main/resources/assets/cobblemon/blockstates/potted_blue_mint.json

@@ -1,7 +0,0 @@
-{
-  "variants": {
-    "": {
-      "model": "cobblemon:block/potted_blue_mint"
-    }
-  }
-}

common/src/main/resources/assets/cobblemon/blockstates/potted_bluk_berry.json

@@ -1,7 +0,0 @@
-{
-  "variants": {
-    "": {
-      "model": "cobblemon:block/berries/potted_bluk_berry"
-    }
-  }
-}

common/src/main/resources/assets/cobblemon/blockstates/potted_charti_berry.json

@@ -1,7 +0,0 @@
-{
-  "variants": {
-    "": {
-      "model": "cobblemon:block/berries/potted_charti_berry"
-    }
-  }
-}

common/src/main/resources/assets/cobblemon/blockstates/potted_cheri_berry.json

@@ -1,7 +0,0 @@
-{
-  "variants": {
-    "": {
-      "model": "cobblemon:block/berries/potted_cheri_berry"
-    }
-  }
-}

common/src/main/resources/assets/cobblemon/blockstates/potted_chesto_berry.json

@@ -1,7 +0,0 @@
-{
-  "variants": {
-    "": {
-      "model": "cobblemon:block/berries/potted_chesto_berry"
-    }
-  }
-}

common/src/main/resources/assets/cobblemon/blockstates/potted_chilan_berry.json

@@ -1,7 +0,0 @@
-{
-  "variants": {
-    "": {
-      "model": "cobblemon:block/berries/potted_chilan_berry"
-    }
-  }
-}

common/src/main/resources/assets/cobblemon/blockstates/potted_chople_berry.json

@@ -1,7 +0,0 @@
-{
-  "variants": {
-    "": {
-      "model": "cobblemon:block/berries/potted_chople_berry"
-    }
-  }
-}

common/src/main/resources/assets/cobblemon/blockstates/potted_coba_berry.json

@@ -1,7 +0,0 @@
-{
-  "variants": {
-    "": {
-      "model": "cobblemon:block/berries/potted_coba_berry"
-    }
-  }
-}

common/src/main/resources/assets/cobblemon/blockstates/potted_colbur_berry.json

@@ -1,7 +0,0 @@
-{
-  "variants": {
-    "": {
-      "model": "cobblemon:block/berries/potted_colbur_berry"
-    }
-  }
-}

common/src/main/resources/assets/cobblemon/blockstates/potted_cornn_berry.json

@@ -1,7 +0,0 @@
-{
-  "variants": {
-    "": {
-      "model": "cobblemon:block/berries/potted_cornn_berry"
-    }
-  }
-}

common/src/main/resources/assets/cobblemon/blockstates/potted_custap_berry.json

@@ -1,7 +0,0 @@
-{
-  "variants": {
-    "": {
-      "model": "cobblemon:block/berries/potted_custap_berry"
-    }
-  }
-}

common/src/main/resources/assets/cobblemon/blockstates/potted_cyan_mint.json

@@ -1,7 +0,0 @@
-{
-  "variants": {
-    "": {
-      "model": "cobblemon:block/potted_cyan_mint"
-    }
-  }
-}

common/src/main/resources/assets/cobblemon/blockstates/potted_durin_berry.json

@@ -1,7 +0,0 @@
-{
-  "variants": {
-    "": {
-      "model": "cobblemon:block/berries/potted_durin_berry"
-    }
-  }
-}

common/src/main/resources/assets/cobblemon/blockstates/potted_eggant_berry.json

@@ -1,7 +0,0 @@
-{
-  "variants": {
-    "": {
-      "model": "cobblemon:block/berries/potted_eggant_berry"
-    }
-  }
-}

common/src/main/resources/assets/cobblemon/blockstates/potted_enigma_berry.json

@@ -1,7 +0,0 @@
-{
-  "variants": {
-    "": {
-      "model": "cobblemon:block/berries/potted_enigma_berry"
-    }
-  }
-}

common/src/main/resources/assets/cobblemon/blockstates/potted_figy_berry.json

@@ -1,7 +0,0 @@
-{
-  "variants": {
-    "": {
-      "model": "cobblemon:block/berries/potted_figy_berry"
-    }
-  }
-}

common/src/main/resources/assets/cobblemon/blockstates/potted_ganlon_berry.json

@@ -1,7 +0,0 @@
-{
-  "variants": {
-    "": {
-      "model": "cobblemon:block/berries/potted_ganlon_berry"
-    }
-  }
-}

common/src/main/resources/assets/cobblemon/blockstates/potted_green_mint.json

@@ -1,7 +0,0 @@
-{
-  "variants": {
-    "": {
-      "model": "cobblemon:block/potted_green_mint"
-    }
-  }
-}

common/src/main/resources/assets/cobblemon/blockstates/potted_grepa_berry.json

@@ -1,7 +0,0 @@
-{
-  "variants": {
-    "": {
-      "model": "cobblemon:block/berries/potted_grepa_berry"
-    }
-  }
-}

common/src/main/resources/assets/cobblemon/blockstates/potted_haban_berry.json

@@ -1,7 +0,0 @@
-{
-  "variants": {
-    "": {
-      "model": "cobblemon:block/berries/potted_haban_berry"
-    }
-  }
-}

common/src/main/resources/assets/cobblemon/blockstates/potted_hondew_berry.json

@@ -1,7 +0,0 @@
-{
-  "variants": {
-    "": {
-      "model": "cobblemon:block/berries/potted_hondew_berry"
-    }
-  }
-}

common/src/main/resources/assets/cobblemon/blockstates/potted_hopo_berry.json

@@ -1,7 +0,0 @@
-{
-  "variants": {
-    "": {
-      "model": "cobblemon:block/berries/potted_hopo_berry"
-    }
-  }
-}

common/src/main/resources/assets/cobblemon/blockstates/potted_iapapa_berry.json

@@ -1,7 +0,0 @@
-{
-  "variants": {
-    "": {
-      "model": "cobblemon:block/berries/potted_iapapa_berry"
-    }
-  }
-}

common/src/main/resources/assets/cobblemon/blockstates/potted_jaboca_berry.json

@@ -1,7 +0,0 @@
-{
-  "variants": {
-    "": {
-      "model": "cobblemon:block/berries/potted_jaboca_berry"
-    }
-  }
-}

common/src/main/resources/assets/cobblemon/blockstates/potted_kasib_berry.json

@@ -1,7 +0,0 @@
-{
-  "variants": {
-    "": {
-      "model": "cobblemon:block/berries/potted_kasib_berry"
-    }
-  }
-}

common/src/main/resources/assets/cobblemon/blockstates/potted_kebia_berry.json

@@ -1,7 +0,0 @@
-{
-  "variants": {
-    "": {
-      "model": "cobblemon:block/berries/potted_kebia_berry"
-    }
-  }
-}

common/src/main/resources/assets/cobblemon/blockstates/potted_kee_berry.json

@@ -1,7 +0,0 @@
-{
-  "variants": {
-    "": {
-      "model": "cobblemon:block/berries/potted_kee_berry"
-    }
-  }
-}

common/src/main/resources/assets/cobblemon/blockstates/potted_kelpsy_berry.json

@@ -1,7 +0,0 @@
-{
-  "variants": {
-    "": {
-      "model": "cobblemon:block/berries/potted_kelpsy_berry"
-    }
-  }
-}

common/src/main/resources/assets/cobblemon/blockstates/potted_lansat_berry.json

@@ -1,7 +0,0 @@
-{
-  "variants": {
-    "": {
-      "model": "cobblemon:block/berries/potted_lansat_berry"
-    }
-  }
-}

common/src/main/resources/assets/cobblemon/blockstates/potted_leppa_berry.json

@@ -1,7 +0,0 @@
-{
-  "variants": {
-    "": {
-      "model": "cobblemon:block/berries/potted_leppa_berry"
-    }
-  }
-}

common/src/main/resources/assets/cobblemon/blockstates/potted_liechi_berry.json

@@ -1,7 +0,0 @@
-{
-  "variants": {
-    "": {
-      "model": "cobblemon:block/berries/potted_liechi_berry"
-    }
-  }
-}

common/src/main/resources/assets/cobblemon/blockstates/potted_lum_berry.json

@@ -1,7 +0,0 @@
-{
-  "variants": {
-    "": {
-      "model": "cobblemon:block/berries/potted_lum_berry"
-    }
-  }
-}