Update PosableState.kt

CHANGELOG.md

@@ -1,30 +1,20 @@
 # Changelog
-## [1.8.2 (October 11th, 2026)](#1-8-2)
+## [1.8.2 (MONTH xth, 2026)](#1-8-2)
 
 ### 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.
-  - I wasn't finished. 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:
   - Ring Target, Metronome, and Eject Button.
 - The following items can now be worn by Players and Pokémon:
   - 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 whatever you've rebound use/interact to).
+- 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.
-- The recall animation now renders the ball in hand with the player's arm raised.
-- Added Oricorio Flowers.
-- Added Terrain Plants, four plants grown from Electric, Grassy, Misty, and Psychic Seeds, which glow under specific environmental conditions and can be farmed for more of their seeds.
-- Berries can now be placed in Flower Pots.
-- The evolution tree for a Pokémon can now be viewed in the Pokédex, showing the 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.
-- Added paper as a new cosmetic item for Pikachu.
-- Burmy changes its cloak after a battle it took part in, based on the biome.
-  - Trash Cloak in the Deep Dark, Nether and End.
-  - Plant Cloak in lush biomes such as forests, jungles, plains and swamps.
-  - Sandy Cloak in sandy biomes, beaches and caves.
+- 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.
 
 ### Pokémon Added
 #### Generation 4
@@ -76,23 +66,6 @@
 - Vileplume
 - Bellossom
 - Shroomish
-- Chespin
-- Quilladin
-- Chesnaught
-- Fennekin
-- Braixen
-- Delphox
-- Froakie
-- Frogadier
-- Greninja
-- Shinx
-- Luxio
-- Luxray
-- Slakoth
-- Riolu
-- Lucario
-- Corsola
-- Mime Jr.
 
 ### Animation updates for the following Pokémon
 - Treecko (New Shoulder Mount!)
@@ -106,81 +79,47 @@
 - Gloom
 - Vileplume
 - Bellossom
-- Pichu
-- Pikachu
-- Raichu (+ Alolan)
-- Greninja
-- Slakoth
 
 ### Changes
-- Slowed the speed of Type Gem growth, and revamped their generation to grow in a more crystal-like shape.
-- 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 and consistently within the Recipe Book's categories.
-- Updated the following recipes
-  - Never-Melt Ice, Focus Sash, Blunder Policy, Weakness Policy, Blank TM.
-- Made ride rotations less jittery in multiplayer.
-- Changes Disc Shelf TMs 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 a TM creative tab.
-- Made regional and Vivillon split-evo locations mutually exclusive.
-- Vivillon's patterns are now viewable as forms with form names and unique Pokédex entries displayed.
+- 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
+- Make ride rotations less jittery in multiplayer.
+- 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
+- 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.
-  - Exceptions being "forced" evolutions which stop after the first one.
-- Removed Mega Drain as a TM.
-- PokeSnacks (and other area spawns) will now start the vertical offset checking from the center rather than base coordinate
-  - This will help PokeSnacks to work inside caves or tighter spaces better.
+  - Exceptions being "forced" evolutions which will continue to stop after the first one
 
 ### Fixes
-- Type Gem blocks now properly generate clusters off of the block.
-- Correctly grant "They're Minerals!" advancement when planting a Type Gem.
+- Correctly grants "They're Minerals!" advancement when planting a type gem
 - Shoulder mounted Pokémon now follow player body animations, improving their positioning with custom player animations and default actions.
 - Shoulder mounted Pokémon now sit slightly higher with chest armor equipped for better alignment, with a configurable blacklist.
-- Type Gem Blocks now have advancements to give you the recipe in the recipe book (the data for the advancements were inside the recipes somehow??).
-  - Some other recipes without advancements have also been corrected.
-- Corrected the TM Recipes for Charge Beam and Payday.
-- Starter Screen Categories will no longer stop rendering if they are bigger than the viewport and you are not viewing the top or bottom edges.
-- The Random Starter option no longer runs off into other categories or becomes unaccessible due to scroll limits if it causes a new row.
-- Mochi and Feathers no longer drop glass bottles on use.
-- Fixed a rare set of concurrency bugs related to reloading packs on NeoForge; fixes a ModernFix compatibility issue.
+- Type Gem Blocks now have advancements to give you the recipe in the recipe book (the data for the advancements were inside the recipes somehow??)
+- Some other recipes without advancements have also been corrected
+- Corrected the TM Recipes for Charge Beam and Payday
+- Type Gem blocks now properly generate clusters off of the block.
+- Starter Screen Categories will no longer stop rendering if they are bigger than the viewport, and you are not viewing top or bottom edges
+- Random Starter option now properly handled in height calculation, so now it won't run off into other categories or be un-accessible due to scroll limits if it causes a new row
+- Mochi and Feathers no longer drop glass bottles on use
+- Fixed a rare set of concurrency bugs related to reloading packs on NeoForge; fixes a ModernFix issue
 - Removed unnecessary conditions for Mimikyu's standing pose. Hopefully fixes the rare instance of it using its shoulder animations during battle in multiplayer scenarios.
-- Fixed Rockruff line not blinking.
-- Fixed Flygon sometimes using its running animation instead of walking.
-- Fixed Bramblin always sleeping outside of battle.
-- Fixed Dragonair using its battle idle as a normal idle.
-- Fixed Lycanroc's head movement.
-- Added head movement to Archaludon.
-- Fixed Duraludon line not having any sleep animations.
-- Fixed Diglett line not having their faint animations.
-- Fixed Kingambit moving its legs while walking.
-- Fixed Alolan Diglett's cry not playing.
-- Fixed shiny alpha Snorlax using the non-shiny texture.
-- Fixed Crabominable's head breaking when looking around.
-- Fixed Shiny Dipplin and Hydrapple's textures.
-- Various structure fixes.
-- Fixed shiny Pokémon under certain circumstances forgetting taught TMs.
-- Fixed certain Pokémon sounds sometimes being doubled when played at specific times in their animations.
+- Fixed Rockruff line not blinking
+- Fixed Flygon sometimes using its running animation instead of walking
+- Fixed Bramblin always sleeping outside of battle
+- Fixed Dragonair using its battle idle as a normal idle
+- Fixed Lycanroc's head movement
+- Added head movement to Archaludon
+- Fixed Duraludon line not having any sleep animations
+- Fixed Diglett line not having their faint animations
+- Fixed Kingambit moving its legs while walking
+- Fixed Alolan Diglett's cry not playing
+- Fixed shiny alpha Snorlax using the non-shiny texture
+- Various Structure fixes
+- Fixed shiny Pokémon under certain circumstances forgetting taught TMs
+- Fixed certain Pokémon sounds sometimes being doubled when played at specific times in their animations
 - Fixed ball capture beam origin coming from behind the ball.
-- Fixed Safari Ball catch rate outside of battle.
-- Fixed alpha eye (and other) particles not respecting the client particle density setting in video options.
-- Fixed the TM Machine UI not closing when player is moving away from it.
-- Moved the config category for alpha/shiny chance config fields for fossil machine and honey log slathering to Spawning.
-- Fixed crashes for addon species with non-Cobblemon namespaces in evolution, fishing bait, and Pokédex lookups.
-- Bees will now grow Apricorns and the Galarica Nut Bush, which were in the bee growables tag but never handled, and correctly spend their nectar when they do.
-- Saccharine Leaves can now be bone mealed.
-- Fixed equipping a stack of wearable items instead of one item of a stack.
-- Fixed TM stack consumption in TM Machine screen when a player teaches a move to a Pokémon.
-- Fixed every Miltank giving mushroom stew, not only mushroom variants.
-- Medicinal Leeks can now be eaten when they aren't being planted, matching their food properties.
-- Sweeping attacks no longer set owned Pokémon on fire (e.g. with Fire Aspect) or knock them back. Friendly Fire is now off.
-- Fixed Pokémon not losing their previous form's signature moves when changing forms (e.g. Rotom keeping Overheat after leaving its Heat form).
-- Form-specific moves gained from a form change are now only granted if the Pokémon is high enough level to learn them, and no longer create duplicates in benched moves.
-- Spinda now learns Teeter Dance at level 32 instead of via TM.
-- Fixed Oricorio Pa'u form description in the Pokédex.
-- Fixed PC playing sound on close when opened via command.
+- Fixed Safari Ball catch rate outside of battle
 
 ### Developer
 - 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:
@@ -191,15 +130,12 @@
     "pokedexTooltip": "cobblemon.ui.pokedex.requirement.attack_defence_ratio.tooltip"
   }
   ```
-- Fixed the wrong order of operations in the code flow prior to the `FOSSIL_REVIVED` event causing Pokémon to appear without the entity link.
-- Fixed TestPartySlot command not correctly comparing the provided spec with the target Pokémon.
+- Fixed wrong order of operations in the code flow prior to the `FOSSIL_REVIVED` event causing pokemon to appear without entity link
+- Fixed TestPartySlot command not correctly comparing the provided spec with the target Pokémon
 
 ### Molang & Datapacks
 - A new `negate` variant for evolution requirements has been added, which will negate (invert) the provided inner condition.
 - Added Molang functions for individual Pokédex ids, wherein a subdex is passed in as a string to `dex_caught_count` etc.
-- Added a `battle_ended` callback, backed by the new `BATTLE_ENDED` event, which fires whenever a battle ends for any reason, alongside a multitude of flags not previously covered by `BATTLE_VICTORY`.
-- Added `battle_pokemon` to battle actor structs and `has_faced_opponents` to battle Pokémon structs.
-- Added the `cobblemon:form_change/bagworm_cloak/plant_cloak`, `sandy_cloak` and `trash_cloak` biome tags, which control Burmy's cloak after battle.
 
 ### Particles
 
@@ -207,9 +143,3 @@
 
 ### Localization
 - Updated translations for:
-  - Brazilian Portuguese
-  - Canadian French
-  - Japanese
-  - Korean
-  - Russian
-  - Ukrainian

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

@@ -8,42 +8,54 @@
 
 package com.cobblemon.mod.common.mixin;
 
-import com.llamalad7.mixinextras.sugar.Local;
+import com.cobblemon.mod.common.block.SaccharineLeafBlock;
 import net.minecraft.core.BlockPos;
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.world.entity.animal.Bee;
-import net.minecraft.world.level.block.Blocks;
-import net.minecraft.world.level.block.BonemealableBlock;
+import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.state.BlockState;
-import org.spongepowered.asm.mixin.Final;
+import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.ModifyVariable;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
 
 
 @Mixin(targets = "net.minecraft.world.entity.animal.Bee$BeeGrowCropGoal")
 public abstract class BeeEntityMixin {
 
-    @Shadow(aliases = {"this$0", "field_20373"}) @Final private Bee bee;
+    @Unique
+    private BlockState cobblemon$result = null;
+
+    @Inject(method = "tick()V", at = @At(
+            value = "INVOKE",
+            target = "Lnet/minecraft/world/level/block/BonemealableBlock;performBonemeal(Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/util/RandomSource;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;)V",
+            shift = At.Shift.BY,
+            by = 2
+        ),
+        locals = LocalCapture.CAPTURE_FAILHARD
+    )
+    private void injectCustomGrowth(CallbackInfo ci, int i, BlockPos blockPos, BlockState blockState, Block block) {
+        if (block instanceof SaccharineLeafBlock) {
+
+            int age = blockState.getValue(SaccharineLeafBlock.Companion.getAGE());
+            boolean waterlogged = blockState.getValue(BlockStateProperties.WATERLOGGED);
+
+            if (age < 2 && !waterlogged) {
+                this.cobblemon$result = blockState.setValue(SaccharineLeafBlock.Companion.getAGE(), age + 1);
+            }
+        }
+    }
 
-    // Grows bonemealable blocks vanilla's hardcoded checks miss, returning the state so it handles the rest.
     @ModifyVariable(method = "tick", at = @At(value = "LOAD", ordinal = 0), index = 5)
-    private BlockState cobblemon$growBonemealableBlocks(BlockState grownState, @Local(ordinal = 0) BlockState blockState, @Local BlockPos pos) {
-        if (grownState != null || blockState.is(Blocks.CAVE_VINES) || blockState.is(Blocks.CAVE_VINES_PLANT)) {
-            return grownState;
+    private BlockState applyCustomBlockState(BlockState before) {
+        if(this.cobblemon$result != null && before == null) {
+            BlockState result = this.cobblemon$result;
+            this.cobblemon$result = null;
+            return result;
         }
 
-        if (!(blockState.getBlock() instanceof BonemealableBlock bonemealable)) {
-            return null;
-        }
-
-        ServerLevel level = (ServerLevel) this.bee.level();
-        if (!bonemealable.isValidBonemealTarget(level, pos, blockState)) {
-            return null;
-        }
-
-        bonemealable.performBonemeal(level, this.bee.getRandom(), pos, blockState);
-        return level.getBlockState(pos);
+        return before;
     }
 }

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

@@ -15,7 +15,6 @@ import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
 import com.mojang.serialization.MapCodec;
 import java.util.Optional;
 import java.util.function.Supplier;
-import net.minecraft.SharedConstants;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.IntTag;
 import net.minecraft.resources.ResourceKey;
@@ -46,24 +45,4 @@ public class ChunkStorageMixin {
         int curVersion = vanillaFixed.contains(VERSION_KEY) ? vanillaFixed.getInt(VERSION_KEY) : 0;
         return DataFixTypes.CHUNK.update(CobblemonSchemas.getDATA_FIXER(), vanillaFixed, curVersion, CobblemonSchemas.DATA_VERSION);
     }
-
-    // Our update on the same MC version still needs its own fixes so run them here in that case.
-    @Inject(
-        method = "upgradeChunkTag(Lnet/minecraft/resources/ResourceKey;Ljava/util/function/Supplier;Lnet/minecraft/nbt/CompoundTag;Ljava/util/Optional;)Lnet/minecraft/nbt/CompoundTag;",
-        at = @At("HEAD"),
-        cancellable = true
-    )
-    private void cobblemon$doChunkFixOnCurrentVersion(
-        ResourceKey<Level> levelKey,
-        Supplier<DimensionDataStorage> storage,
-        CompoundTag chunkData,
-        Optional<ResourceKey<MapCodec<? extends ChunkGenerator>>> chunkGeneratorKey,
-        CallbackInfoReturnable<CompoundTag> cir
-    ) {
-        if (ChunkStorage.getVersion(chunkData) != SharedConstants.getCurrentVersion().getDataVersion().getVersion()) {
-            return;
-        }
-        int curVersion = chunkData.contains(VERSION_KEY) ? chunkData.getInt(VERSION_KEY) : 0;
-        cir.setReturnValue(DataFixTypes.CHUNK.update(CobblemonSchemas.getDATA_FIXER(), chunkData, curVersion, CobblemonSchemas.DATA_VERSION));
-    }
 }

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

@@ -35,16 +35,13 @@ import com.cobblemon.mod.common.util.DataKeys;
 import com.cobblemon.mod.common.world.gamerules.CobblemonGameRules;
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
-import com.llamalad7.mixinextras.sugar.Local;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.Tag;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.util.Mth;
 import net.minecraft.world.damagesource.DamageSource;
-import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.EntityDimensions;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.LivingEntity;
@@ -53,7 +50,6 @@ import net.minecraft.world.entity.item.ItemEntity;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.food.FoodProperties;
 import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.enchantment.EnchantmentHelper;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.phys.Vec3;
 import org.jetbrains.annotations.Nullable;
@@ -375,33 +371,4 @@ public abstract class PlayerMixin extends LivingEntity implements ScannableEntit
         this.cobblemon$rideEyePos = rideEyePos;
     }
 
-    /**
-     * Sweeping attacks apply post-attack enchantment effects (e.g. Fire Aspect) to every entity caught
-     * in the sweep, even if the damage itself was blocked. Skip them for Pokémon immune to the attack.
-     */
-    @WrapOperation(
-            method = "attack",
-            at = @At(value = "INVOKE", target = "Lnet/minecraft/world/item/enchantment/EnchantmentHelper;doPostAttackEffects(Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/Entity;Lnet/minecraft/world/damagesource/DamageSource;)V")
-    )
-    private void cobblemon$skipPostAttackEffectsOnImmunePokemon(ServerLevel level, Entity target, DamageSource source, Operation<Void> original) {
-        if (target instanceof PokemonEntity pokemonEntity && pokemonEntity.isInvulnerableTo(source)) {
-            return;
-        }
-        original.call(level, target, source);
-    }
-
-    /**
-     * Sweeping attacks also knock back every entity caught in the sweep regardless of whether it took damage.
-     */
-    @WrapOperation(
-            method = "attack",
-            at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/LivingEntity;knockback(DDD)V")
-    )
-    private void cobblemon$skipKnockbackOnImmunePokemon(LivingEntity target, double strength, double x, double z, Operation<Void> original, @Local DamageSource source) {
-        if (target instanceof PokemonEntity pokemonEntity && pokemonEntity.isInvulnerableTo(source)) {
-            return;
-        }
-        original.call(target, strength, x, z);
-    }
-
 }

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(CobblemonSounds.ITEM_BLOCK_METAL_CAN_SOUNDS).mapColor(MapColor.NONE).noOcclusion(), StackableItemBlock.StackableItemBlockType.EXTENDER))
-    @JvmField
-    val MOOMOO_MILK = create("moomoo_milk", StackableItemBlock(BlockBehaviour.Properties.of().sound(CobblemonSounds.ITEM_BLOCK_JAR_GLASS_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_JAR_GLASS_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
@@ -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/CobblemonNetwork.kt

@@ -425,7 +425,7 @@ object CobblemonNetwork {
         list.add(PacketRegisterInfo(MovesRegistrySyncPacket.ID, MovesRegistrySyncPacket::decode, DataRegistrySyncPacketHandler()))
         list.add(PacketRegisterInfo(BerryRegistrySyncPacket.ID, BerryRegistrySyncPacket::decode, DataRegistrySyncPacketHandler()))
         list.add(PacketRegisterInfo(SpeciesRegistrySyncPacket.ID, SpeciesRegistrySyncPacket::decode, DataRegistrySyncPacketHandler()))
-        list.add(PacketRegisterInfo(DexEvolutionDisplaySyncPacket.ID, DexEvolutionDisplaySyncPacket::decode, DataRegistrySyncPacketHandler()))
+        list.add(PacketRegisterInfo(SpeciesEvolutionSyncPacket.ID, SpeciesEvolutionSyncPacket::decode, DataRegistrySyncPacketHandler()))
         list.add(PacketRegisterInfo(PropertiesCompletionRegistrySyncPacket.ID, PropertiesCompletionRegistrySyncPacket::decode, DataRegistrySyncPacketHandler()))
         list.add(PacketRegisterInfo(StandardSpeciesFeatureSyncPacket.ID, StandardSpeciesFeatureSyncPacket::decode, DataRegistrySyncPacketHandler()))
         list.add(PacketRegisterInfo(GlobalSpeciesFeatureSyncPacket.ID, GlobalSpeciesFeatureSyncPacket::decode, DataRegistrySyncPacketHandler()))

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
@@ -720,35 +717,5 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, ResourceKey<Regi
         ITEM_BLOCK_DICE_STEP
     )
 
-    @JvmField
-    val ITEM_BLOCK_METAL_CAN_PLACE = this.create("block.item_block.metal_can.place")
-    @JvmField
-    val ITEM_BLOCK_METAL_CAN_BREAK = this.create("block.item_block.metal_can.break")
-    @JvmField
-    val ITEM_BLOCK_METAL_CAN_STEP = this.create("block.item_block.metal_can.step")
-    @JvmField
-    val ITEM_BLOCK_METAL_CAN_SOUNDS = SoundType(1f, 1.1f,
-        ITEM_BLOCK_METAL_CAN_BREAK,
-        ITEM_BLOCK_METAL_CAN_STEP,
-        ITEM_BLOCK_METAL_CAN_PLACE,
-        ITEM_BLOCK_METAL_CAN_STEP,
-        ITEM_BLOCK_METAL_CAN_STEP
-    )
-
-    @JvmField
-    val ITEM_BLOCK_JAR_GLASS_LIQUID_PLACE = this.create("block.item_block.jar_glass_liquid.place")
-    @JvmField
-    val ITEM_BLOCK_JAR_GLASS_LIQUID_BREAK = this.create("block.item_block.jar_glass_liquid.break")
-    @JvmField
-    val ITEM_BLOCK_JAR_GLASS_LIQUID_STEP = this.create("block.item_block.jar_glass_liquid.step")
-    @JvmField
-    val ITEM_BLOCK_JAR_GLASS_LIQUID_SOUNDS = SoundType(1f, 1.1f,
-        ITEM_BLOCK_JAR_GLASS_LIQUID_BREAK,
-        ITEM_BLOCK_JAR_GLASS_LIQUID_STEP,
-        ITEM_BLOCK_JAR_GLASS_LIQUID_PLACE,
-        ITEM_BLOCK_JAR_GLASS_LIQUID_STEP,
-        ITEM_BLOCK_JAR_GLASS_LIQUID_STEP
-    )
-
     private fun create(name: String): SoundEvent = this.create(name, SoundEvent.createVariableRangeEvent(cobblemonResource(name)))
 }

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

@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.battles.model
-
-/**
- * How a [PokemonBattle] came to an end.
- */
-enum class BattleEndResult {
-    /** One side defeated the other. */
-    VICTORY,
-    /** A wild Pokémon was captured, ending the battle. */
-    CAPTURE,
-    /** An actor forfeited, giving the victory to the other side. */
-    FORFEIT,
-    /** A player fled from a wild Pokémon. */
-    FLED,
-    /** The battle was stopped without a winner, such as by a command, a player disconnecting or an error. */
-    STOPPED
-}

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

@@ -21,7 +21,6 @@ import com.cobblemon.mod.common.api.battles.model.actor.BattleActor
 import com.cobblemon.mod.common.api.battles.model.actor.EntityBackedBattleActor
 import com.cobblemon.mod.common.api.battles.model.actor.FleeableBattleActor
 import com.cobblemon.mod.common.api.events.CobblemonEvents
-import com.cobblemon.mod.common.api.events.battles.BattleEndedEvent
 import com.cobblemon.mod.common.api.events.battles.BattleFledEvent
 import com.cobblemon.mod.common.api.events.battles.BattleFleeAttemptEvent
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMoLangValue
@@ -125,12 +124,6 @@ open class PokemonBattle(
     var winners = listOf<BattleActor>()
     var losers = listOf<BattleActor>()
     var ended = false
-    /** How the battle ended, or null if it hasn't ended yet. */
-    var endResult: BattleEndResult? = null
-    /** The actor that forfeited the battle, if any. */
-    var forfeitedBy: BattleActor? = null
-    /** Whether a player fled from the battle. */
-    var fled = false
     // TEMP battle showcase stuff
     var announcingRules = false
     var turn: Int = 0
@@ -258,14 +251,6 @@ open class PokemonBattle(
 
     fun end() {
         ended = true
-        val result = when {
-            winners.isNotEmpty() && showdownMessages.any { "capture" in it } -> BattleEndResult.CAPTURE
-            winners.isNotEmpty() && forfeitedBy != null -> BattleEndResult.FORFEIT
-            winners.isNotEmpty() -> BattleEndResult.VICTORY
-            fled -> BattleEndResult.FLED
-            else -> BattleEndResult.STOPPED
-        }
-        endResult = result
         val awardToFainted = Cobblemon.config.awardExperienceToFaintedPokemon
         val awardOnLoss = Cobblemon.config.awardExperienceOnBattleLoss
         this.actors.forEach { actor ->
@@ -347,7 +332,6 @@ open class PokemonBattle(
                 }
             }
         }
-        CobblemonEvents.BATTLE_ENDED.post(BattleEndedEvent(this, result, forfeitedBy.takeIf { result == BattleEndResult.FORFEIT }))
         sendUpdate(BattleEndPacket())
         BattleRegistry.closeBattle(this)
     }
@@ -518,7 +502,6 @@ open class PokemonBattle(
                 .forEach{it.pokemon.heal()}
             CobblemonEvents.BATTLE_FLED.post(BattleFledEvent(this, actors.asSequence().filterIsInstance<PlayerBattleActor>().iterator().next()))
             actors.filterIsInstance<EntityBackedBattleActor<*>>().mapNotNull { it.entity }.forEach { it.sendSystemMessage(battleLang("flee").yellow()) }
-            fled = true
             stop()
         }
     }
@@ -556,7 +539,6 @@ open class PokemonBattle(
     private fun checkForfeit(): Boolean {
         val forfeit = actors.find { it.responses.any { it is ForfeitActionResponse } }
         return forfeit?.let {
-            forfeitedBy = it
             this.dispatchWaiting { this.broadcastChatMessage(battleLang("forfeit", it.getName()).red()) }
             writeShowdownAction(">forcelose ${it.showdownId}")
             true

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

@@ -11,6 +11,9 @@ package com.cobblemon.mod.common.api.conditional
 import com.google.gson.JsonDeserializationContext
 import com.google.gson.JsonDeserializer
 import com.google.gson.JsonElement
+import com.google.gson.JsonPrimitive
+import com.google.gson.JsonSerializationContext
+import com.google.gson.JsonSerializer
 import java.lang.reflect.Type
 
 /**
@@ -21,11 +24,19 @@ import java.lang.reflect.Type
  * @author Hiroku
  * @since July 17th, 2022
  */
-interface RegistryLikeAdapter<B> : JsonDeserializer<RegistryLikeCondition<B>> {
+interface RegistryLikeAdapter<B> : JsonDeserializer<RegistryLikeCondition<B>>, JsonSerializer<RegistryLikeCondition<B>> {
     val registryLikeConditions: MutableList<(JsonElement) -> RegistryLikeCondition<B>?>
 
     override fun deserialize(json: JsonElement, type: Type, ctx: JsonDeserializationContext): RegistryLikeCondition<B> {
         return registryLikeConditions.firstNotNullOfOrNull { it(json) }
             ?: throw IllegalArgumentException("Unable to deserialize $json")
     }
+
+    override fun serialize(src: RegistryLikeCondition<B>, typeOfSrc: Type, ctx: JsonSerializationContext): JsonElement {
+        return when (src) {
+            is RegistryLikeTagCondition<B> -> JsonPrimitive(RegistryLikeTagCondition.PREFIX + src.tag.location())
+            is RegistryLikeIdentifierCondition<B> -> JsonPrimitive(src.identifier.toString())
+            else -> throw IllegalArgumentException("Unable to serialize $src")
+        }
+    }
 }

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

@@ -12,7 +12,6 @@ import com.cobblemon.mod.common.api.events.battles.BattleFaintedEvent
 import com.cobblemon.mod.common.api.events.battles.BattleFledEvent
 import com.cobblemon.mod.common.api.events.battles.BattleFleeAttemptEvent
 import com.cobblemon.mod.common.api.events.battles.BattleStartedEvent
-import com.cobblemon.mod.common.api.events.battles.BattleEndedEvent
 import com.cobblemon.mod.common.api.events.battles.BattleVictoryEvent
 import com.cobblemon.mod.common.api.events.battles.instruction.FormeChangeEvent
 import com.cobblemon.mod.common.api.events.battles.instruction.MegaEvolutionEvent
@@ -140,9 +139,6 @@ object CobblemonEvents {
     @JvmField
     val BATTLE_FAINTED = EventObservable<BattleFaintedEvent>()
 
-    @JvmField
-    val BATTLE_ENDED = EventObservable<BattleEndedEvent>()
-
     // instructions
     @JvmField
     val MEGA_EVOLUTION = EventObservable<MegaEvolutionEvent>()

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

@@ -1,69 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.events.battles
-
-import com.bedrockk.molang.runtime.value.DoubleValue
-import com.bedrockk.molang.runtime.value.MoValue
-import com.bedrockk.molang.runtime.value.StringValue
-import com.cobblemon.mod.common.api.battles.model.BattleEndResult
-import com.cobblemon.mod.common.api.battles.model.PokemonBattle
-import com.cobblemon.mod.common.api.battles.model.actor.BattleActor
-import com.cobblemon.mod.common.api.battles.model.actor.ActorType
-import com.cobblemon.mod.common.util.asArrayValue
-
-/**
- * Event fired whenever a [PokemonBattle] ends, regardless of how it ended (victory, fleeing, being stopped, etc).
- *
- * [PokemonBattle.winners] and [PokemonBattle.losers] are only populated if the [result] has a winner,
- * that is [BattleEndResult.VICTORY], [BattleEndResult.CAPTURE] or [BattleEndResult.FORFEIT].
- *
- * @param result How the battle ended.
- * @param forfeitedBy The actor that forfeited, if the [result] is [BattleEndResult.FORFEIT].
- */
-data class BattleEndedEvent(
-    override val battle: PokemonBattle,
-    val result: BattleEndResult,
-    val forfeitedBy: BattleActor?
-) : BattleEvent {
-    /** Whether one side won the battle, which includes captures and forfeits. */
-    val hasWinner = battle.winners.isNotEmpty()
-    val wasVictory = result == BattleEndResult.VICTORY
-    val wasCapture = result == BattleEndResult.CAPTURE
-    val wasForfeit = result == BattleEndResult.FORFEIT
-    val wasFled = result == BattleEndResult.FLED
-    val wasStopped = result == BattleEndResult.STOPPED
-
-    /** Whether the battle was between players and wild Pokémon. */
-    val isPvW = battle.isPvW
-    /** Whether the battle was between players and NPCs. */
-    val isPvN = battle.isPvN
-    /** Whether the battle was between players. */
-    val isPvP = battle.isPvP
-
-    val context = mutableMapOf<String, MoValue>(
-        "battle" to battle.struct,
-        "result" to StringValue(result.name.lowercase()),
-        "has_winner" to DoubleValue(hasWinner),
-        "was_victory" to DoubleValue(wasVictory),
-        "was_capture" to DoubleValue(wasCapture),
-        "was_forfeit" to DoubleValue(wasForfeit),
-        "was_fled" to DoubleValue(wasFled),
-        "was_stopped" to DoubleValue(wasStopped),
-        "is_pvw" to DoubleValue(isPvW),
-        "is_pvn" to DoubleValue(isPvN),
-        "is_pvp" to DoubleValue(isPvP),
-        "winners" to battle.winners.asArrayValue { it.struct },
-        "losers" to battle.losers.asArrayValue { it.struct },
-        "players" to battle.actors.filter { it.type == ActorType.PLAYER }.asArrayValue { it.struct },
-        "npcs" to battle.actors.filter { it.type == ActorType.NPC }.asArrayValue { it.struct },
-        "wild_pokemon" to battle.actors.filter { it.type == ActorType.WILD }.asArrayValue { it.struct }
-    ).apply {
-        forfeitedBy?.let { put("forfeited_by", it.struct) }
-    }
-}

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

@@ -16,7 +16,6 @@ import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMoLangValue
 import com.cobblemon.mod.common.battles.actor.PlayerBattleActor
 import com.cobblemon.mod.common.battles.actor.PokemonBattleActor
 import com.cobblemon.mod.common.entity.npc.NPCBattleActor
-import com.cobblemon.mod.common.util.asArrayValue
 
 object BattleActorMoLangFunctions : AbstractMoLangFunctionHolder<BattleActor>() {
     override fun BattleActor.moLangFunctions(): MutableMap<String, (MoParams) -> Any> {
@@ -26,7 +25,6 @@ object BattleActorMoLangFunctions : AbstractMoLangFunctionHolder<BattleActor>()
         functions["is_npc"] = { DoubleValue(actor.type == ActorType.NPC) }
         functions["is_player"] = { DoubleValue(actor.type == ActorType.PLAYER) }
         functions["is_wild"] = { DoubleValue(actor.type == ActorType.WILD) }
-        functions["battle_pokemon"] = { actor.pokemonList.asArrayValue { it.struct } }
 
         when (actor) {
             is NPCBattleActor -> {

common/src/main/kotlin/com/cobblemon/mod/common/api/pokedex/Dexes.kt

@@ -72,6 +72,30 @@ object Dexes : JsonDataRegistry<PokedexDef> {
         return findDexEntryBySpeciesId(cobblemonResource("national"), speciesId)
     }
 
+    fun findRootDexEntryBySpeciesId(speciesId: ResourceLocation, formName: String): Pair<PokedexEntry, PokedexForm> {
+        var rootSpecies = PokemonSpecies.getByIdentifier(speciesId)!!
+        val initialFormEquivalents = getFormEquivalents(formName)
+        var rootForm = rootSpecies.forms.firstOrNull { initialFormEquivalents.contains(it.name.lowercase()) }
+            ?: rootSpecies.standardForm
+
+        var preEvolution = rootForm.preEvolution
+        while (preEvolution != null) {
+            rootSpecies = preEvolution.species
+            rootForm = preEvolution.resolveForm(rootForm.aspects.toSet())
+            preEvolution = rootForm.preEvolution
+        }
+
+        val entry = findDexEntryBySpeciesId(rootSpecies.resourceIdentifier)
+            ?: throw RuntimeException("Root dex entry not found")
+
+        val formEquivalents = getFormEquivalents(rootForm.name)
+        val form =
+            entry.forms.firstOrNull { formEquivalents.contains(it.displayForm.lowercase()) } ?:
+            entry.forms.first { it.displayForm.equals("Normal", ignoreCase = true) }
+
+        return entry to form
+    }
+
     fun getFormEquivalents(formName: String): List<String> {
         val key = equivalentFormsLookup[formName.lowercase()]
         return equivalentForms[key] ?: listOf(formName.lowercase())

common/src/main/kotlin/com/cobblemon/mod/common/api/pokedex/entry/DexEntries.kt

@@ -8,19 +8,13 @@
 
 package com.cobblemon.mod.common.api.pokedex.entry
 
-import com.cobblemon.mod.common.CobblemonItems
 import com.cobblemon.mod.common.api.data.JsonDataRegistry
 import com.cobblemon.mod.common.api.molang.ExpressionLike
-import com.cobblemon.mod.common.api.pokemon.PokemonSpecies
 import com.cobblemon.mod.common.api.reactive.SimpleObservable
 import com.cobblemon.mod.common.net.messages.client.data.DexEntrySyncPacket
-import com.cobblemon.mod.common.net.messages.client.data.DexEvolutionDisplaySyncPacket
-import com.cobblemon.mod.common.pokemon.FormData
 import com.cobblemon.mod.common.util.adapters.ExpressionLikeAdapter
 import com.cobblemon.mod.common.util.adapters.IdentifierAdapter
-import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
 import com.cobblemon.mod.common.util.cobblemonResource
-import com.cobblemon.mod.common.util.lang
 import com.google.gson.Gson
 import com.google.gson.GsonBuilder
 import com.google.gson.reflect.TypeToken
@@ -44,8 +38,6 @@ object DexEntries : JsonDataRegistry<PokedexEntry> {
 
     val entries = mutableMapOf<ResourceLocation, PokedexEntry>()
 
-    val evolutionDisplays = mutableListOf<DexEvolutionDisplay>()
-
     override fun reload(data: Map<ResourceLocation, PokedexEntry>) {
         data.forEach { _, entry ->
             entries[entry.id] = entry
@@ -58,7 +50,6 @@ object DexEntries : JsonDataRegistry<PokedexEntry> {
                 }
             }
         }
-        computeEvolutionDisplays()
         observable.emit(this)
     }
 
@@ -66,53 +57,5 @@ object DexEntries : JsonDataRegistry<PokedexEntry> {
 
     override fun sync(player: ServerPlayer) {
         DexEntrySyncPacket(entries.values).sendToPlayer(player)
-        DexEvolutionDisplaySyncPacket(evolutionDisplays).sendToPlayer(player)
-    }
-
-    fun computeEvolutionDisplays() {
-        evolutionDisplays.clear()
-        PokemonSpecies.species.forEach {
-            evolutionDisplays.addAll(buildDisplays(it.standardForm))
-            evolutionDisplays.addAll(it.forms.flatMap { form -> buildDisplays(form) })
-        }
-    }
-
-    fun buildDisplays(form: FormData): List<DexEvolutionDisplay> {
-        val result = mutableListOf<DexEvolutionDisplay>()
-        (form.ownEvolutions ?: form.evolutions).forEach { evolution ->
-            val requirements = mutableListOf<DexEvolutionRequirementDisplay>()
-            getToolTipHeaderIcon(evolution)?.let { header ->
-                requirements.add(header)
-            }
-            evolution.requirements.mapNotNull { resolveRequirementData(it) }.forEach { requirement ->
-                requirements.add(requirement)
-            }
-
-            listOfNotNull(evolution.result, evolution.shedder).forEach resultLoop@{ resultProperties ->
-                val resultSpecies = resultProperties.species
-                    ?.let { PokemonSpecies.getByIdentifier(it.asIdentifierDefaultingNamespace()) }
-                    ?: return@resultLoop
-
-                // Carry the source form's aspects over like a real evolution does (Alola-Bias Pichu -> Alola-Bias Pikachu)
-                val resultForm = resultSpecies.getForm(form.aspects.toSet() + resultProperties.aspects)
-                val toAspects = resultProperties.aspects + resultForm.aspects
-                val resultRequirements = if (resultProperties === evolution.shedder) {
-                    requirements + CobblemonDexEvolutionRequirementDisplay(CobblemonItems.POKE_BALL, lang("ui.pokedex.evolution.shedder.tooltip"))
-                } else {
-                    requirements
-                }
-
-                result.add(DexEvolutionDisplay(
-                    fromSpecies = form.species.resourceIdentifier,
-                    fromForm = form.name,
-                    fromAspects = form.aspects.toSet(),
-                    toSpecies = resultSpecies.resourceIdentifier,
-                    toForm = resultForm.name,
-                    toAspects = toAspects,
-                    requirements = resultRequirements,
-                ))
-            }
-        }
-        return result
     }
 }

common/src/main/kotlin/com/cobblemon/mod/common/api/pokedex/entry/DexEvolutionDisplay.kt

@@ -1,464 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.pokedex.entry
-
-import com.cobblemon.mod.common.CobblemonItems
-import com.cobblemon.mod.common.api.conditional.RegistryLikeCondition
-import com.cobblemon.mod.common.api.conditional.RegistryLikeIdentifierCondition
-import com.cobblemon.mod.common.api.conditional.RegistryLikeTagCondition
-import com.cobblemon.mod.common.api.pokemon.PokemonSpecies
-import com.cobblemon.mod.common.api.pokemon.evolution.Evolution
-import com.cobblemon.mod.common.api.pokemon.feature.IntSpeciesFeatureProvider
-import com.cobblemon.mod.common.api.pokemon.feature.SpeciesFeatures
-import com.cobblemon.mod.common.api.pokemon.requirement.Requirement
-import com.cobblemon.mod.common.api.pokemon.stats.Stats
-import com.cobblemon.mod.common.api.text.add
-import com.cobblemon.mod.common.api.text.green
-import com.cobblemon.mod.common.api.types.ElementalTypes
-import com.cobblemon.mod.common.pokemon.evolution.variants.ItemInteractionEvolution
-import com.cobblemon.mod.common.pokemon.evolution.variants.TradeEvolution
-import com.cobblemon.mod.common.pokemon.requirements.*
-import com.cobblemon.mod.common.util.adapters.RegistryAccessResolver
-import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
-import com.cobblemon.mod.common.util.asTranslated
-import com.cobblemon.mod.common.util.lang
-import net.minecraft.core.registries.BuiltInRegistries
-import net.minecraft.core.registries.Registries
-import net.minecraft.network.chat.Component
-import net.minecraft.network.chat.MutableComponent
-import net.minecraft.resources.ResourceLocation
-import net.minecraft.util.ExtraCodecs
-import net.minecraft.world.item.Item
-import net.minecraft.world.item.Items
-import net.minecraft.world.level.biome.Biome
-import net.minecraft.world.level.levelgen.structure.Structure
-import kotlin.jvm.optionals.getOrNull
-
-data class DexEvolutionDisplay(
-    val fromSpecies: ResourceLocation,
-    val fromForm: String,
-    val fromAspects: Set<String>,
-    val toSpecies: ResourceLocation,
-    val toForm: String,
-    val toAspects: Set<String>,
-    val requirements: List<DexEvolutionRequirementDisplay>,
-)
-
-interface DexEvolutionRequirementDisplay {
-    val icon: Item
-    val tooltip: MutableComponent
-}
-
-data class CobblemonDexEvolutionRequirementDisplay(
-    override val icon: Item,
-    override val tooltip: MutableComponent,
-) : DexEvolutionRequirementDisplay
-
-data class CobblemonBiomeDexEvolutionRequirementDisplay(
-    override val icon: Item,
-    override val tooltip: MutableComponent,
-    val condition: ExtraCodecs.TagOrElementLocation? = null,
-    val antiCondition: ExtraCodecs.TagOrElementLocation? = null,
-) : DexEvolutionRequirementDisplay
-
-fun getToolTipHeaderIcon(evolution: Evolution): DexEvolutionRequirementDisplay? {
-    when (evolution) {
-        is ItemInteractionEvolution -> return getToolTipHeaderIcon(evolution)
-        is TradeEvolution -> return getToolTipHeaderIcon(evolution)
-    }
-
-    return null
-}
-
-
-fun getToolTipHeaderIcon(itemInteractionEvolution: ItemInteractionEvolution): CobblemonDexEvolutionRequirementDisplay {
-    val item = itemInteractionEvolution.requiredContext.items.get().first().value()
-    return CobblemonDexEvolutionRequirementDisplay(item, lang("ui.pokedex.evolution.item_interact.tooltip", item.description.plainCopy().green()))
-}
-
-fun getToolTipHeaderIcon(tradeEvolution: TradeEvolution): CobblemonDexEvolutionRequirementDisplay {
-    val species = tradeEvolution.requiredContext.species
-    val tooltip = if (species == null) {
-        lang("ui.pokedex.evolution.trade.tooltip.with_any_species")
-    } else {
-        lang("ui.pokedex.evolution.trade.tooltip.with_species", PokemonSpecies.getByIdentifier(species.asIdentifierDefaultingNamespace())!!.translatedName.green())
-    }
-    return CobblemonDexEvolutionRequirementDisplay(CobblemonItems.LINK_CABLE, tooltip)
-}
-
-fun resolveRequirementData(requirement: Requirement): DexEvolutionRequirementDisplay? {
-    val icon = requirement.pokedexIcon?.let {
-        RegistryAccessResolver.getAccess().registryOrThrow(Registries.ITEM).get(it)
-    }
-
-    val tooltip = requirement.pokedexTooltip?.let {
-        Component.translatable(it)
-    }
-
-    if (icon != null && tooltip != null) {
-        return CobblemonDexEvolutionRequirementDisplay(icon, tooltip)
-    }
-
-    return buildRequirementData(requirement)
-}
-
-fun buildRequirementData(requirement: Requirement): DexEvolutionRequirementDisplay? {
-    when (requirement) {
-        is AdvancementRequirement -> return buildAdvancementRequirement(requirement)
-        is BattleCriticalHitsRequirement -> return buildBattleCriticalHitsRequirement(requirement)
-        is BiomeRequirement -> return buildBiomeRequirement(requirement)
-        is BlocksTraveledRequirement -> return buildBlocksTraveledRequirement(requirement)
-        is DamageTakenRequirement -> return buildDamageTakenRequirement(requirement)
-        is DefeatRequirement -> return buildDefeatRequirement(requirement)
-        is FriendshipRequirement -> return buildFriendshipRequirement(requirement)
-        is HeldItemRequirement -> return buildHeldItemRequirement(requirement)
-        is LevelRequirement -> return buildLevelRequirement(requirement)
-        is MoonPhaseRequirement -> return buildMoonPhaseRequirement(requirement)
-        is MoveSetRequirement -> return buildMoveSetRequirement(requirement)
-        is MoveTypeRequirement -> return buildMoveTypeRequirement(requirement)
-        is NegateRequirement -> return buildNegateRequirement(requirement)
-        is OwnerHoldsItemRequirement -> return buildOwnerHoldsItemRequirement(requirement)
-        is PartyMemberRequirement -> return buildPartyMemberRequirement(requirement)
-        is PokemonPropertiesRequirement -> return buildPokemonPropertiesRequirement(requirement)
-        is PropertyRangeRequirement -> return buildPropertyRangeRequirement(requirement)
-        is RecoilRequirement -> return buildRecoilRequirement(requirement)
-        is StatCompareRequirement -> return buildStatCompareRequirement(requirement)
-        is StatEqualRequirement -> return buildStatEqualRequirement(requirement)
-        is StructureRequirement -> return buildStructureRequirement(requirement)
-        is TimeRangeRequirement -> return buildTimeRangeRequirement(requirement)
-        is UseMoveRequirement -> return buildUseMoveRequirement(requirement)
-        is WeatherRequirement -> return buildWeatherRequirement(requirement)
-    }
-
-    return null
-}
-
-fun buildAdvancementRequirement(advancementRequirement: AdvancementRequirement): DexEvolutionRequirementDisplay {
-    val icon = Items.BOOK
-    val identifier = advancementRequirement.requiredAdvancement
-    val advancementLanguageKey = "${identifier.namespace}.${identifier.path.substringAfterLast('/')}"
-    val advancementComponent = Component.translatable("advancements.$advancementLanguageKey").green()
-    val tooltip = lang("ui.pokedex.requirement.advancement.tooltip", advancementComponent)
-
-    return CobblemonDexEvolutionRequirementDisplay(icon, tooltip)
-}
-
-fun buildBattleCriticalHitsRequirement(battleCriticalHitsRequirement: BattleCriticalHitsRequirement): DexEvolutionRequirementDisplay {
-    val icon = CobblemonItems.MEDICINAL_LEEK
-    val criticalsComponent = Component.literal(battleCriticalHitsRequirement.amount.toString()).green()
-    val tooltip = lang("ui.pokedex.requirement.battle_critical_hits.tooltip", criticalsComponent)
-
-    return CobblemonDexEvolutionRequirementDisplay(icon, tooltip)
-}
-
-private fun tagDisplayName(registry: String, id: ResourceLocation): MutableComponent {
-    return Component.translatableWithFallback("tag.$registry.${id.namespace}.${id.path.replace('/', '.')}", prettifyPath(id.path))
-}
-
-private fun prettifyPath(path: String): String {
-    return path.substringAfterLast('/').removePrefix("is_").split('_').joinToString(" ") { part -> part.replaceFirstChar(Char::titlecase) }
-}
-
-fun buildNegateRequirement(negateRequirement: NegateRequirement): DexEvolutionRequirementDisplay? {
-    val inner = negateRequirement.inner
-    when (inner) {
-        is BiomeRequirement -> buildBiomeRequirement(inner, negated = true)?.let { return it }
-        is StructureRequirement -> buildStructureRequirement(inner, negated = true)?.let { return it }
-    }
-    val innerDisplay = resolveRequirementData(inner) ?: return null
-    return CobblemonDexEvolutionRequirementDisplay(innerDisplay.icon, lang("ui.pokedex.requirement.negate.tooltip", innerDisplay.tooltip))
-}
-
-fun buildBiomeRequirement(biomeRequirement: BiomeRequirement, negated: Boolean = false): DexEvolutionRequirementDisplay? {
-    // Negating "in X" is "not in X"; negating both a condition and an anticondition isn't expressible as one line
-    if (negated && biomeRequirement.biomeCondition != null && biomeRequirement.biomeAnticondition != null) return null
-    val condition = if (negated) biomeRequirement.biomeAnticondition else biomeRequirement.biomeCondition
-    val antiCondition = if (negated) biomeRequirement.biomeCondition else biomeRequirement.biomeAnticondition
-    if (condition == null && antiCondition == null) {
-        return null
-    }
-
-    val icon = Items.COMPASS
-    val displayName: (RegistryLikeCondition<Biome>) -> MutableComponent = {
-        when (it) {
-            is RegistryLikeTagCondition -> tagDisplayName("worldgen.biome", it.tag.location())
-            is RegistryLikeIdentifierCondition -> Component.translatable("biome.${it.identifier.namespace}.${it.identifier.path}")
-            else -> Component.literal(it.toString())
-        }
-    }
-
-    val tooltip = if (condition != null && antiCondition != null) {
-        lang("ui.pokedex.requirement.biome.both.tooltip", displayName(condition).green(), displayName(antiCondition).green())
-    } else if (condition != null) {
-        lang("ui.pokedex.requirement.biome.tooltip", displayName(condition).green())
-    } else {
-        lang("ui.pokedex.requirement.biome.anticondition.tooltip", displayName(antiCondition!!).green())
-    }
-
-    var conditionConverted: ExtraCodecs.TagOrElementLocation? = null
-    if (condition != null) {
-        val conditionIdentifier = if (condition is RegistryLikeIdentifierCondition) condition.identifier else (condition as RegistryLikeTagCondition).tag.location
-        conditionConverted = ExtraCodecs.TagOrElementLocation(conditionIdentifier, condition is RegistryLikeTagCondition)
-    }
-
-    var antiConditionConverted: ExtraCodecs.TagOrElementLocation? = null
-    if (antiCondition != null) {
-        val conditionIdentifier = if (antiCondition is RegistryLikeIdentifierCondition) antiCondition.identifier else (antiCondition as RegistryLikeTagCondition).tag.location
-        antiConditionConverted = ExtraCodecs.TagOrElementLocation(conditionIdentifier, antiCondition is RegistryLikeTagCondition)
-    }
-
-    return CobblemonBiomeDexEvolutionRequirementDisplay(icon, tooltip, conditionConverted, antiConditionConverted)
-}
-
-fun buildBlocksTraveledRequirement(blocksTraveledRequirement: BlocksTraveledRequirement): DexEvolutionRequirementDisplay {
-    val icon = Items.LEATHER_BOOTS
-    val blocksComponent = Component.literal(blocksTraveledRequirement.amount.toString()).green()
-    val tooltip = lang("ui.pokedex.requirement.blocks_traveled.tooltip", blocksComponent)
-
-    return CobblemonDexEvolutionRequirementDisplay(icon, tooltip)
-}
-
-fun buildDamageTakenRequirement(damageTakenRequirement: DamageTakenRequirement): DexEvolutionRequirementDisplay {
-    val icon = CobblemonItems.PUNCHING_GLOVE
-    val blocksComponent = Component.literal(damageTakenRequirement.amount.toString()).green()
-    val tooltip = lang("ui.pokedex.requirement.damage_taken.tooltip", blocksComponent)
-
-    return CobblemonDexEvolutionRequirementDisplay(icon, tooltip)
-}
-
-fun buildDefeatRequirement(defeatRequirement: DefeatRequirement): DexEvolutionRequirementDisplay? {
-    val description = describePokemonProperties(defeatRequirement.target) ?: return null
-    val icon = CobblemonItems.PUNCHING_GLOVE
-    val defeatedAmount = defeatRequirement.amount
-
-    val descriptionComponent = Component.literal(defeatedAmount.toString()).green().add(" ").add(description)
-    val tooltip = lang("ui.pokedex.requirement.defeat.tooltip", descriptionComponent)
-
-    return CobblemonDexEvolutionRequirementDisplay(icon, tooltip)
-}
-
-fun buildFriendshipRequirement(friendshipRequirement: FriendshipRequirement): DexEvolutionRequirementDisplay {
-    val icon = CobblemonItems.SOOTHE_BELL
-    val friendshipAmountComponent = Component.literal(friendshipRequirement.amount.toString()).green()
-    val tooltip = lang("ui.pokedex.requirement.friendship.tooltip", friendshipAmountComponent)
-
-    return CobblemonDexEvolutionRequirementDisplay(icon, tooltip)
-}
-
-fun buildHeldItemRequirement(heldItemRequirement: HeldItemRequirement): DexEvolutionRequirementDisplay? {
-    val items = heldItemRequirement.itemCondition.items.getOrNull() ?: return null
-    val item = items.firstOrNull()?.value() ?: return null
-    val itemComponent = items.unwrapKey().map { tag ->
-        val id = tag.location()
-        val fallback = id.path.substringAfterLast('/').split('_').joinToString(" ") { part -> part.replaceFirstChar(Char::titlecase) }
-        Component.translatableWithFallback("tag.item.${id.namespace}.${id.path.replace('/', '.')}", fallback)
-    }.orElseGet { item.description.plainCopy() }
-    val tooltip = lang("ui.pokedex.requirement.held_item.tooltip", itemComponent.green())
-
-    return CobblemonDexEvolutionRequirementDisplay(item, tooltip)
-}
-
-fun buildLevelRequirement(levelRequirement: LevelRequirement): DexEvolutionRequirementDisplay {
-    val minLevel = levelRequirement.minLevel
-    val maxLevel = levelRequirement.maxLevel
-
-    val icon = CobblemonItems.RARE_CANDY
-    val tooltip =
-        if (minLevel == maxLevel || maxLevel == Int.MAX_VALUE)
-            lang("ui.pokedex.requirement.level.tooltip.min", Component.literal(minLevel.toString()).green())
-        else
-            lang("ui.pokedex.requirement.level.tooltip.between", Component.literal(minLevel.toString()).green(), Component.literal(maxLevel.toString()).green())
-
-    return CobblemonDexEvolutionRequirementDisplay(icon, tooltip)
-}
-
-fun buildMoonPhaseRequirement(moonPhaseRequirement: MoonPhaseRequirement): DexEvolutionRequirementDisplay {
-    val icon = Items.CLOCK
-    val moonPhaseComponent = moonPhaseRequirement.moonPhase.displayName().green()
-    val tooltip = lang("ui.pokedex.requirement.moon_phase.tooltip", moonPhaseComponent)
-
-    return CobblemonDexEvolutionRequirementDisplay(icon, tooltip)
-}
-
-fun buildMoveSetRequirement(moveSetRequirement: MoveSetRequirement): DexEvolutionRequirementDisplay {
-    val icon = CobblemonItems.TECHNICAL_MACHINE
-    val tooltip = lang("ui.pokedex.requirement.has_move.tooltip", moveSetRequirement.move.displayName.green())
-
-    return CobblemonDexEvolutionRequirementDisplay(icon, tooltip)
-}
-
-fun buildMoveTypeRequirement(moveTypeRequirement: MoveTypeRequirement): DexEvolutionRequirementDisplay {
-    val type = ElementalTypes.get(moveTypeRequirement.type.name)
-    val icon = when (type) {
-        ElementalTypes.NORMAL -> CobblemonItems.NORMAL_GEM
-        ElementalTypes.FIRE -> CobblemonItems.FIRE_GEM
-        ElementalTypes.WATER -> CobblemonItems.WATER_GEM
-        ElementalTypes.GRASS -> CobblemonItems.GRASS_GEM
-        ElementalTypes.ELECTRIC -> CobblemonItems.ELECTRIC_GEM
-        ElementalTypes.ICE -> CobblemonItems.ICE_GEM
-        ElementalTypes.FIGHTING -> CobblemonItems.FIGHTING_GEM
-        ElementalTypes.POISON -> CobblemonItems.POISON_GEM
-        ElementalTypes.GROUND -> CobblemonItems.GROUND_GEM
-        ElementalTypes.FLYING -> CobblemonItems.FLYING_GEM
-        ElementalTypes.PSYCHIC -> CobblemonItems.PSYCHIC_GEM
-        ElementalTypes.BUG -> CobblemonItems.BUG_GEM
-        ElementalTypes.ROCK -> CobblemonItems.ROCK_GEM
-        ElementalTypes.GHOST -> CobblemonItems.GHOST_GEM
-        ElementalTypes.DRAGON -> CobblemonItems.DRAGON_GEM
-        ElementalTypes.DARK -> CobblemonItems.DARK_GEM
-        ElementalTypes.STEEL -> CobblemonItems.STEEL_GEM
-        ElementalTypes.FAIRY -> CobblemonItems.FAIRY_GEM
-        else -> CobblemonItems.NORMAL_GEM
-    }
-
-    val tooltip = lang("ui.pokedex.requirement.has_move_type.tooltip", moveTypeRequirement.type.displayName.green())
-
-    return CobblemonDexEvolutionRequirementDisplay(icon, tooltip)
-}
-
-fun buildOwnerHoldsItemRequirement(ownerHoldsItemRequirement: OwnerHoldsItemRequirement): DexEvolutionRequirementDisplay {
-    val item = ownerHoldsItemRequirement.itemCondition.items.get().first().value()
-    val tooltip = lang("ui.pokedex.requirement.owner_held_item.tooltip", item.description.plainCopy().green())
-
-    return CobblemonDexEvolutionRequirementDisplay(item, tooltip)
-}
-
-fun buildPartyMemberRequirement(partyMemberRequirement: PartyMemberRequirement): DexEvolutionRequirementDisplay? {
-    val description = describePokemonProperties(partyMemberRequirement.target) ?: return null
-    val icon = CobblemonItems.POKE_BALL
-    val tooltip = if (partyMemberRequirement.contains) {
-        lang("ui.pokedex.requirement.party_member.tooltip", description)
-    } else {
-        lang("ui.pokedex.requirement.party_member.anticondition.tooltip", description)
-    }
-
-    return CobblemonDexEvolutionRequirementDisplay(icon, tooltip)
-}
-
-fun buildPokemonPropertiesRequirement(pokemonPropertiesRequirement: PokemonPropertiesRequirement): DexEvolutionRequirementDisplay? {
-    val description = describePokemonProperties(pokemonPropertiesRequirement.target) ?: return null
-    val icon = Items.NAME_TAG
-    val tooltip = lang("ui.pokedex.requirement.pokemon_properties.tooltip", description)
-
-    return CobblemonDexEvolutionRequirementDisplay(icon, tooltip)
-}
-
-fun buildPropertyRangeRequirement(propertyRangeRequirement: PropertyRangeRequirement): DexEvolutionRequirementDisplay? {
-    val provider = SpeciesFeatures.getFeature(propertyRangeRequirement.feature) as? IntSpeciesFeatureProvider ?: return null
-    val displayName = provider.display?.name?.takeIf { it.isNotBlank() }?.asTranslated()?.green() ?: return null
-    val icon = provider.itemPoints.keys.firstOrNull()?.let { BuiltInRegistries.ITEM.get(it) } ?: Items.NAME_TAG
-
-    val range = propertyRangeRequirement.range
-    val tooltip = lang(
-        "ui.pokedex.requirement.property_range.tooltip",
-        displayName,
-        Component.literal(range.first.toString()).green(),
-        Component.literal(range.last.toString()).green()
-    )
-
-    return CobblemonDexEvolutionRequirementDisplay(icon, tooltip)
-}
-
-fun buildRecoilRequirement(recoilRequirement: RecoilRequirement): DexEvolutionRequirementDisplay {
-    val icon = CobblemonItems.LIFE_ORB
-    val recoilComponent = Component.literal(recoilRequirement.amount.toString()).green()
-    val tooltip = lang("ui.pokedex.requirement.recoil.tooltip", recoilComponent)
-
-    return CobblemonDexEvolutionRequirementDisplay(icon, tooltip)
-}
-
-fun buildStatCompareRequirement(statCompareRequirement: StatCompareRequirement): DexEvolutionRequirementDisplay {
-    val highStat = Stats.getStat(statCompareRequirement.highStat)
-    val lowStat = Stats.getStat(statCompareRequirement.lowStat)
-
-    val icon = when (highStat) {
-        Stats.HP, Stats.EVASION, Stats.ACCURACY -> CobblemonItems.HEALTH_MOCHI
-        Stats.ATTACK -> CobblemonItems.MUSCLE_MOCHI
-        Stats.DEFENCE -> CobblemonItems.RESIST_MOCHI
-        Stats.SPECIAL_ATTACK -> CobblemonItems.GENIUS_MOCHI
-        Stats.SPECIAL_DEFENCE -> CobblemonItems.CLEVER_MOCHI
-        Stats.SPEED -> CobblemonItems.SWIFT_MOCHI
-    }
-
-    val highStatComponent = highStat.displayName.plainCopy().green()
-    val lowStatComponent = lowStat.displayName.plainCopy().green()
-    val tooltip = lang("ui.pokedex.requirement.stat_compare.tooltip", highStatComponent, lowStatComponent)
-
-    return CobblemonDexEvolutionRequirementDisplay(icon, tooltip)
-}
-
-fun buildStatEqualRequirement(statEqualRequirement: StatEqualRequirement): DexEvolutionRequirementDisplay {
-    val statOne = Stats.getStat(statEqualRequirement.statOne)
-    val statTwo = Stats.getStat(statEqualRequirement.statTwo)
-
-    val statOneComponent = statOne.displayName.plainCopy().green()
-    val statTwoComponent = statTwo.displayName.plainCopy().green()
-
-    val icon = CobblemonItems.FRESH_START_MOCHI
-    val tooltip = lang("ui.pokedex.requirement.stat_equal.tooltip", statOneComponent, statTwoComponent)
-
-    return CobblemonDexEvolutionRequirementDisplay(icon, tooltip)
-}
-
-fun buildStructureRequirement(structureRequirement: StructureRequirement, negated: Boolean = false): DexEvolutionRequirementDisplay? {
-    if (negated && structureRequirement.structureCondition != null && structureRequirement.structureAnticondition != null) return null
-    val condition = if (negated) structureRequirement.structureAnticondition else structureRequirement.structureCondition
-    val anticondition = if (negated) structureRequirement.structureCondition else structureRequirement.structureAnticondition
-    if (condition == null && anticondition == null) {
-        return null
-    }
-
-    val icon = Items.FILLED_MAP
-    val displayName: (RegistryLikeCondition<Structure>) -> MutableComponent = {
-        when (it) {
-            is RegistryLikeTagCondition -> tagDisplayName("worldgen.structure", it.tag.location())
-            is RegistryLikeIdentifierCondition -> Component.literal(prettifyPath(it.identifier.path))
-            else -> Component.literal(it.toString())
-        }
-    }
-    val tooltip = if (condition != null && anticondition != null) {
-        lang("ui.pokedex.requirement.structure.both.tooltip", displayName(condition).green(), displayName(anticondition).green())
-    } else if (condition != null) {
-        lang("ui.pokedex.requirement.structure.tooltip", displayName(condition).green())
-    } else {
-        lang("ui.pokedex.requirement.structure.anticondition.tooltip", displayName(anticondition!!).green())
-    }
-
-    return CobblemonDexEvolutionRequirementDisplay(icon, tooltip)
-}
-
-fun buildTimeRangeRequirement(timeRangeRequirement: TimeRangeRequirement): DexEvolutionRequirementDisplay? {
-    val icon = Items.CLOCK
-    val timeRangeComponent = timeRangeRequirement.range.displayName() ?: return null
-    val tooltip = lang("ui.pokedex.requirement.time_range.tooltip", timeRangeComponent.green())
-
-    return CobblemonDexEvolutionRequirementDisplay(icon, tooltip)
-}
-
-fun buildUseMoveRequirement(useMoveRequirement: UseMoveRequirement): DexEvolutionRequirementDisplay {
-    val icon = CobblemonItems.CHOICE_BAND
-    val tooltip = lang("ui.pokedex.requirement.use_move.tooltip", useMoveRequirement.move.displayName.green())
-
-    return CobblemonDexEvolutionRequirementDisplay(icon, tooltip)
-}
-
-fun buildWeatherRequirement(weatherRequirement: WeatherRequirement): DexEvolutionRequirementDisplay {
-    val icon: Item
-    val tooltip: MutableComponent
-
-    if (weatherRequirement.isThundering == true) {
-        icon = Items.LIGHTNING_ROD
-        tooltip = lang("ui.pokedex.requirement.weather.tooltip.thundering")
-    } else {
-        icon = Items.WATER_BUCKET
-        tooltip = lang("ui.pokedex.requirement.weather.tooltip.raining")
-    }
-
-    return CobblemonDexEvolutionRequirementDisplay(icon, tooltip)
-}

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

@@ -26,6 +26,7 @@ import com.cobblemon.mod.common.api.moves.MoveTemplate
 import com.cobblemon.mod.common.api.moves.MovesetBuilder
 import com.cobblemon.mod.common.api.moves.adapters.MoveTemplateAdapter
 import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
+import com.cobblemon.mod.common.api.pokemon.PokemonSpecies.getByIdentifier
 import com.cobblemon.mod.common.api.pokemon.effect.ShoulderEffect
 import com.cobblemon.mod.common.api.pokemon.effect.adapter.ShoulderEffectAdapter
 import com.cobblemon.mod.common.api.pokemon.egg.EggGroup
@@ -43,6 +44,9 @@ import com.cobblemon.mod.common.api.riding.sound.RideSoundSettingsList
 import com.cobblemon.mod.common.api.spawning.TimeRange
 import com.cobblemon.mod.common.api.types.ElementalType
 import com.cobblemon.mod.common.api.types.adapters.ElementalTypeAdapter
+import com.cobblemon.mod.common.net.messages.client.data.FormEvolutionOverride
+import com.cobblemon.mod.common.net.messages.client.data.SpeciesEvolutionEntry
+import com.cobblemon.mod.common.net.messages.client.data.SpeciesEvolutionSyncPacket
 import com.cobblemon.mod.common.net.messages.client.data.SpeciesRegistrySyncPacket
 import com.cobblemon.mod.common.pokemon.FormData
 import com.cobblemon.mod.common.pokemon.Species
@@ -242,6 +246,18 @@ object PokemonSpecies : JsonDataRegistry<Species> {
 
     override fun sync(player: ServerPlayer) {
         SpeciesRegistrySyncPacket(species.toList()).sendToPlayer(player)
+        // Sent after the species themselves so every species is already registered by the time this is decoded.
+        val evolutionEntries = species.map { singleSpecies ->
+            val formOverrides = singleSpecies.forms.mapNotNull { form ->
+                if (form.ownEvolutions == null && form.ownPreEvolution == null) {
+                    null
+                } else {
+                    FormEvolutionOverride(form.name, form.ownEvolutions, form.ownPreEvolution)
+                }
+            }
+            SpeciesEvolutionEntry(singleSpecies.resourceIdentifier, singleSpecies.evolutions, singleSpecies.preEvolution, formOverrides)
+        }
+        SpeciesEvolutionSyncPacket(evolutionEntries).sendToPlayer(player)
     }
 
     /**

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

@@ -15,8 +15,6 @@ import com.cobblemon.mod.common.block.entity.PokeSnackBlockEntity
 import com.cobblemon.mod.common.client.entity.PokemonClientDelegate
 import com.cobblemon.mod.common.client.render.MatrixWrapper
 import com.cobblemon.mod.common.util.cobblemonResource
-import net.minecraft.client.Minecraft
-import net.minecraft.client.ParticleStatus
 import net.minecraft.core.particles.BlockParticleOption
 import net.minecraft.core.particles.ParticleOptions
 import net.minecraft.core.particles.ParticleTypes
@@ -42,25 +40,13 @@ sealed class ParticleData {
         val chance: Double,
         val amount: Int,
         val locatorResolver: (Map<String, MatrixWrapper>) -> List<String>
-    ): ParticleData() {
-        fun amount(): Int = when(Minecraft.getInstance().options.particles().get()) {
-            ParticleStatus.ALL -> amount
-            ParticleStatus.DECREASED -> amount / 2
-            ParticleStatus.MINIMAL -> amount / 4
-        }
-    }
+    ): ParticleData()
 
     data class MinecraftParticle(
         val particle: ParticleOptions,
         val chance: Double,
         val amount: Int
-    ): ParticleData() {
-        fun amount(): Int = when(Minecraft.getInstance().options.particles().get()) {
-            ParticleStatus.ALL -> amount
-            ParticleStatus.DECREASED -> amount / 2
-            ParticleStatus.MINIMAL -> amount / 4
-        }
-    }
+    ): ParticleData()
 }
 
 /**

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

@@ -25,6 +25,8 @@ interface PreEvolution {
 
     val form: FormData
 
+    fun resolveForm(extraAspects: Set<String> = emptySet()): FormData = form
+
     companion object {
 
         fun of(species: Species, form: FormData = species.standardForm): PreEvolution = StandardPreEvolution(species, form)

common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/influence/SpawnBaitInfluence.kt

@@ -22,7 +22,6 @@ import com.cobblemon.mod.common.api.spawning.position.SpawnablePosition
 import com.cobblemon.mod.common.api.types.ElementalTypes
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.entity.pokemon.ai.sensors.AlphaLevelMatchingSensor
-import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
 import net.minecraft.server.level.ServerPlayer
 import net.minecraft.world.entity.Entity
 
@@ -77,7 +76,7 @@ open class SpawnBaitInfluence(val effects: List<SpawnBait.Effect>, val onUsed: (
             ?: return super.affectWeight(detail, spawnablePosition, weight)
 
         val detailSpecies = pokemonDetail.pokemon.species
-            ?.let { PokemonSpecies.getByIdentifier(it.asIdentifierDefaultingNamespace()) }
+            ?.let { PokemonSpecies.getByName(it) }
             ?: return super.affectWeight(detail, spawnablePosition, weight)
 
         val formData = detailSpecies.getForm(pokemonDetail.pokemon.aspects)

common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/spawner/Spawner.kt

@@ -27,7 +27,6 @@ import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.util.isBoxLoaded
 import com.cobblemon.mod.common.util.removeIf
 import com.cobblemon.mod.common.util.squeezeWithinBounds
-import com.cobblemon.mod.common.util.toBlockPos
 import com.cobblemon.mod.common.util.toVec3f
 import com.cobblemon.mod.common.util.weightedSelection
 import kotlin.math.max
@@ -191,60 +190,73 @@ interface Spawner {
     }
 
     fun isValidStartPoint(world: Level, chunk: ChunkAccess, startPos: BlockPos.MutableBlockPos): Boolean {
-        val abovePos = startPos.above()
-        if (!world.isLoaded(startPos) || !world.isLoaded(abovePos)) {
+        val y = startPos.y
+        if (!world.isLoaded(startPos) || !world.isLoaded(startPos.setY(y + 1))) {
             return false
         }
-        val mid = chunk.getBlockState(startPos)
-        val above = chunk.getBlockState(abovePos)
 
-        return above.isPathfindable(PathComputationType.AIR) && mid.isAir
+        val mid = chunk.getBlockState(startPos.setY(y))
+        val above = chunk.getBlockState(startPos.setY(y + 1))
+
+        // Above must be non-solid
+        if (!above.isPathfindable(PathComputationType.AIR)) {
+            return false
+        }
+
+        // Position must be non-air
+        if (mid.isAir) {
+            return false
+        }
+
+        return true
     }
 
     fun constrainArea(area: SpawningZoneInput): SpawningZoneInput? {
-        val world = area.world
-        val centerPos = area.getCenter().toBlockPos()
+        val basePos = BlockPos.MutableBlockPos(area.baseX, area.baseY, area.baseZ)
+        val originalY = area.baseY
+
+        val (chunkX, chunkZ) = Pair(SectionPos.blockToSectionCoord(area.baseX), SectionPos.blockToSectionCoord(area.baseZ))
 
-        val (centerChunkX, centerChunkZ) = Pair(SectionPos.blockToSectionCoord(centerPos.x), SectionPos.blockToSectionCoord(centerPos.z))
         // if the chunk isn't loaded, we don't want to go further & we don't want the getChunk function below to load/create the chunk.
-        if (!world.areEntitiesLoaded(ChunkPos.asLong(centerChunkX, centerChunkZ))) return null
+        if (!area.world.areEntitiesLoaded(ChunkPos.asLong(chunkX, chunkZ))) return null
 
-        val chunk = world.getChunk(centerChunkX, centerChunkZ, ChunkStatus.FULL) ?: return null
+        val chunk = area.world.getChunk(chunkX, chunkZ, ChunkStatus.FULL) ?: return null
 
-        val probePos = centerPos.mutable()
-        var validY = if (isValidStartPoint(world, chunk, probePos)) centerPos.y else null
+        var valid = isValidStartPoint(area.world, chunk, basePos)
 
-        if (validY == null) {
-            for (offset in 1..Cobblemon.config.maxVerticalCorrectionBlocks) {
-                if (isValidStartPoint(world, chunk, probePos.set(centerPos.x, centerPos.y + offset, centerPos.z))) {
-                    validY = centerPos.y + offset
+        if (!valid) {
+            var offset = 1
+            do {
+                if (isValidStartPoint(area.world, chunk, basePos.setY(originalY + offset))) {
+                    valid = true
+                    basePos.y = originalY + offset
                     break
-                } else if (isValidStartPoint(world, chunk, probePos.set(centerPos.x, centerPos.y - offset, centerPos.z))) {
-                    validY = centerPos.y - offset
+                } else if (isValidStartPoint(area.world, chunk, basePos.setY(originalY - offset))) {
+                    valid = true
+                    basePos.y = originalY - offset
                     break
                 }
-            }
+                offset++
+            } while (offset <= Cobblemon.config.maxVerticalCorrectionBlocks)
         }
-        val targetY = validY ?: return null
-        val newBaseY = (targetY - (area.height / 2)).coerceIn(world.minBuildHeight, world.maxBuildHeight)
-        val minPos = world.squeezeWithinBounds(BlockPos(area.baseX, newBaseY, area.baseZ))
-        val maxPos = world.squeezeWithinBounds(BlockPos(area.baseX + area.length, newBaseY + area.height, area.baseZ + area.width))
 
-        val finalBox = AABB(
-            minPos.x.toDouble(), minPos.y.toDouble(), minPos.z.toDouble(),
-            maxPos.x.toDouble(), maxPos.y.toDouble(), maxPos.z.toDouble()
-        )
-        if (minPos.x < maxPos.x && minPos.y < maxPos.y && minPos.z < maxPos.z && world.isBoxLoaded(finalBox)) {
-            return SpawningZoneInput(
-                cause = area.cause,
-                world = world,
-                baseX = minPos.x,
-                baseY = minPos.y,
-                baseZ = minPos.z,
-                length = maxPos.x - minPos.x,
-                height = maxPos.y - minPos.y,
-                width = maxPos.z - minPos.z
-            )
+        if (valid) {
+            val min = area.world.squeezeWithinBounds(basePos)
+            val max = area.world.squeezeWithinBounds(basePos.move(area.length, area.height, area.width))
+            if (area.world.isLoaded(min) && area.world.isLoaded(max) &&
+                min.x < max.x && min.y < max.y && min.z < max.z
+            ) {
+                return SpawningZoneInput(
+                    cause = area.cause,
+                    world = area.world,
+                    baseX = min.x,
+                    baseY = min.y,
+                    baseZ = min.z,
+                    length = max.x - min.x,
+                    height = max.y - min.y,
+                    width = max.z - min.z
+                )
+            }
         }
 
         return null

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/battles/pokemon/BattlePokemon.kt

@@ -83,8 +83,7 @@ open class BattlePokemon(
             "max_health" to Function { DoubleValue(maxHealth.toDouble()) },
             "ivs" to Function { effectedPokemon.ivs.struct },
             "nature" to Function { StringValue(effectedPokemon.nature.name.toString()) },
-            "moveset" to Function { effectedPokemon.moveSet.toStruct() },
-            "has_faced_opponents" to Function { DoubleValue(facedOpponents.isNotEmpty()) }
+            "moveset" to Function { effectedPokemon.moveSet.toStruct() }
         ))
 
     val uuid: UUID

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/SaccharineLeafBlock.kt

@@ -34,9 +34,7 @@ import net.minecraft.world.item.alchemy.Potions
 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.BonemealableBlock
 import net.minecraft.world.level.block.DispenserBlock
 import net.minecraft.world.level.block.LeavesBlock
 import net.minecraft.world.level.block.state.BlockState
@@ -54,7 +52,7 @@ import net.minecraft.world.phys.shapes.EntityCollisionContext
 import net.minecraft.world.phys.shapes.Shapes
 import net.minecraft.world.phys.shapes.VoxelShape
 
-class SaccharineLeafBlock(settings: Properties) : LeavesBlock(settings), BonemealableBlock {
+class SaccharineLeafBlock(settings: Properties) : LeavesBlock(settings) {
     companion object {
         val AGE: IntegerProperty = BlockStateProperties.AGE_2
         val DISTANCE: IntegerProperty = BlockStateProperties.DISTANCE
@@ -183,15 +181,6 @@ class SaccharineLeafBlock(settings: Properties) : LeavesBlock(settings), Bonemea
         super.randomTick(state, world, pos, random)
     }
 
-    override fun isValidBonemealTarget(level: LevelReader, pos: BlockPos, state: BlockState): Boolean =
-        state.getValue(AGE) < MAX_AGE && !state.getValue(BlockStateProperties.WATERLOGGED)
-
-    override fun isBonemealSuccess(level: Level, random: RandomSource, pos: BlockPos, state: BlockState) = true
-
-    override fun performBonemeal(level: ServerLevel, random: RandomSource, pos: BlockPos, state: BlockState) {
-        level.setBlock(pos, changeAge(state, 1), UPDATE_CLIENTS)
-    }
-
     override fun placeLiquid(level: LevelAccessor, pos: BlockPos, state: BlockState, fluidState: FluidState): Boolean {
         if (!state.getValue(BlockStateProperties.WATERLOGGED) && fluidState.type === Fluids.WATER) {
             val hasHoney = state.getValue(AGE) > 0

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/TypeGemClusterBlock.kt

@@ -19,7 +19,6 @@ import net.minecraft.core.registries.BuiltInRegistries
 import net.minecraft.resources.ResourceLocation
 import net.minecraft.server.level.ServerLevel
 import net.minecraft.util.RandomSource
-import net.minecraft.util.StringRepresentable
 import net.minecraft.world.item.BlockItem
 import net.minecraft.world.item.ItemStack
 import net.minecraft.world.item.component.BlockItemStateProperties
@@ -34,8 +33,8 @@ import net.minecraft.world.level.block.Mirror
 import net.minecraft.world.level.block.Rotation
 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.DirectionProperty
-import net.minecraft.world.level.block.state.properties.EnumProperty
 import net.minecraft.world.level.block.state.properties.IntegerProperty
 import net.minecraft.world.level.material.PushReaction
 import net.minecraft.world.level.storage.loot.LootParams
@@ -62,27 +61,22 @@ class TypeGemClusterBlock(
         }
         val gemToClusterMap: MutableMap<Block, TypeGemClusterBlock> = mutableMapOf()
 
+        val SHOULD_GROW: BooleanProperty = BooleanProperty.create("should_grow")
         val FACING: DirectionProperty = DirectionalBlock.FACING
         val STAGE: IntegerProperty = IntegerProperty.create("stage", 0, 3)
-        val GROWTH_TYPE: EnumProperty<GrowthType> = EnumProperty.create("growth_type", GrowthType::class.java)
+        val STUNTED: BooleanProperty = BooleanProperty.create("stunted")
 
         fun clusterFromGemBlock(gemBlock: Block): TypeGemClusterBlock? {
             return gemToClusterMap[gemBlock]
         }
     }
 
-    enum class GrowthType(private val label: String, val chance: Float): StringRepresentable {
-        DECORATION("none", 0.25f),
-        FULL("full", 0.5f),
-        STUNTED("stunted", 0.25f);
-        override fun getSerializedName(): String = label
-    }
-
     init {
         registerDefaultState(stateDefinition.any()
             .setValue(FACING, Direction.UP)
+            .setValue(SHOULD_GROW, true)
             .setValue(STAGE, 0)
-            .setValue(GROWTH_TYPE, GrowthType.FULL)
+            .setValue(STUNTED, false)
         )
     }
 
@@ -95,19 +89,15 @@ class TypeGemClusterBlock(
 
         return defaultBlockState()
             .setValue(FACING, facing)
+            .setValue(SHOULD_GROW, shouldGrow)
             .setValue(STAGE, 0)
-            .setValue(GROWTH_TYPE, if(shouldGrow) GrowthType.FULL else GrowthType.DECORATION)
+            .setValue(STUNTED, false)
     }
 
-    public override fun isRandomlyTicking(state: BlockState): Boolean {
-        // if growth type is either stunted or full, we need to tick
-        return state.getValue(GROWTH_TYPE) != GrowthType.DECORATION
-    }
+    public override fun isRandomlyTicking(state: BlockState): Boolean = state.getValue(SHOULD_GROW)
 
     override fun randomTick(state: BlockState, level: ServerLevel, pos: BlockPos, random: RandomSource) {
-        /*
         advanceGrowth(state, level, pos, random)
-        */
     }
 
     fun advanceGrowth(state: BlockState, level: LevelAccessor, pos: BlockPos, random: RandomSource) {
@@ -121,8 +111,15 @@ class TypeGemClusterBlock(
             return
         }
 
+        // At STAGE_3
+        val isStunted = state.getValue(STUNTED)
         val facing = state.getValue(FACING)
 
+        if (isStunted) {
+            level.setBlock(pos, state.setValue(SHOULD_GROW, false), UPDATE_ALL)
+            return
+        }
+
         // Check neighboring gem blocks
         val hasConflict = Direction.entries
                 .filter { it != facing.opposite }
@@ -135,36 +132,61 @@ class TypeGemClusterBlock(
         if (hasConflict) {
             level.setBlock(
                 pos,
-                state.setValue(GROWTH_TYPE, GrowthType.STUNTED),
+                state.setValue(STUNTED, true).setValue(SHOULD_GROW, false),
                 UPDATE_ALL
             )
-        }
+        } else {
             var nextState = nextStage.defaultBlockState()
             if (nextState.hasProperty(FACING)) {
                 nextState = nextState.setValue(FACING, facing)
             }
             level.setBlock(pos, nextState, UPDATE_ALL)
-            if (isGem(nextState)) {
-                TypeGemCoreBlock.addClustersToBlock(state, pos, level, random)
-            }
+            attachDecorativeClusters(level, pos, random)
+        }
     }
 
     private fun isGem(state: BlockState): Boolean {
         return state.`is`(CobblemonBlockTags.TYPE_GEM_BLOCKS)
     }
 
+    private fun attachDecorativeClusters(level: LevelAccessor, gemPos: BlockPos, random: RandomSource) {
+        val openDirections = Direction.entries.filter { direction ->
+            level.getBlockState(gemPos.relative(direction)).isAir
+        }.toMutableList()
+
+        if (openDirections.isEmpty()) {
+            return
+        }
+
+        val minClusters = maxOf(1, (openDirections.size * 0.75f).toInt())
+        val clusterCount = random.nextInt(minClusters, openDirections.size + 1)
+
+        repeat(clusterCount) {
+            if (openDirections.isEmpty()) return@repeat
+
+            val index = random.nextInt(openDirections.size)
+            val direction = openDirections.removeAt(index)
+            val clusterPos = gemPos.relative(direction)
+            val stage = random.nextInt(0, 4)
+
+            val clusterState = defaultBlockState()
+                .setValue(FACING, direction)
+                .setValue(STAGE, stage)
+                .setValue(SHOULD_GROW, false) // so we can reduce lag... hopefully
+                .setValue(STUNTED, false)
+
+            level.setBlock(clusterPos, clusterState, UPDATE_ALL)
+        }
+    }
 
     fun gemClusterCanGrow(state: BlockState, level: LevelReader, pos: BlockPos): Boolean {
-        if (state.getValue(GROWTH_TYPE) == GrowthType.DECORATION) return false
-        if (state.getValue(GROWTH_TYPE) == GrowthType.STUNTED
-            && state.getValue(STAGE) == 3) return false
+        if (!state.getValue(SHOULD_GROW)) return false
 
         val supportPos = pos.relative(state.getValue(FACING).opposite)
         val supportBlock = level.getBlockState(supportPos).block
         return CobblemonBlocks.typeGemBlocks().containsValue(supportBlock) || (supportBlock == CobblemonBlocks.TYPE_GEM_CORE) // Cannot grow if not on any gem blocks
     }
 
-
     override fun getDrops(state: BlockState, params: LootParams.Builder): List<ItemStack> {
         val drops = super.getDrops(state, params)
 
@@ -178,7 +200,8 @@ class TypeGemClusterBlock(
                 DataComponents.BLOCK_STATE,
                 BlockItemStateProperties.EMPTY
                     .with(STAGE, state.getValue(STAGE))
-                    .with(GROWTH_TYPE, GrowthType.DECORATION)
+                    .with(SHOULD_GROW, false)
+                    .with(STUNTED, false)
             )
             stack.set(
                 DataComponents.CUSTOM_MODEL_DATA,
@@ -249,7 +272,7 @@ class TypeGemClusterBlock(
 
     override fun createBlockStateDefinition(builder: StateDefinition.Builder<Block, BlockState>) {
         super.createBlockStateDefinition(builder)
-        builder.add(FACING, STAGE, GROWTH_TYPE)
+        builder.add(FACING, SHOULD_GROW, STAGE, STUNTED)
     }
 
     override fun getCloneItemStack(level: LevelReader, pos: BlockPos, state: BlockState): ItemStack {
@@ -260,7 +283,8 @@ class TypeGemClusterBlock(
                 DataComponents.BLOCK_STATE,
                 BlockItemStateProperties.EMPTY
                     .with(STAGE, state.getValue(STAGE))
-                    .with(GROWTH_TYPE, GrowthType.DECORATION)
+                    .with(SHOULD_GROW, false)
+                    .with(STUNTED, false)
             )
             stack.set(
                 DataComponents.CUSTOM_MODEL_DATA,

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

@@ -11,10 +11,8 @@ package com.cobblemon.mod.common.block
 import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.CobblemonBlocks
 import com.cobblemon.mod.common.api.tags.CobblemonBlockTags
-import com.cobblemon.mod.common.block.TypeGemClusterBlock.Companion.FACING
-import com.cobblemon.mod.common.block.TypeGemClusterBlock.Companion.GROWTH_TYPE
-import com.cobblemon.mod.common.block.TypeGemClusterBlock.Companion.STAGE
-import com.cobblemon.mod.common.block.TypeGemClusterBlock.GrowthType
+import com.cobblemon.mod.common.block.TypeGemClusterBlock.Companion.SHOULD_GROW
+import com.cobblemon.mod.common.block.TypeGemClusterBlock.Companion.STUNTED
 import net.minecraft.core.BlockPos
 import net.minecraft.core.Direction
 import net.minecraft.core.registries.BuiltInRegistries
@@ -23,8 +21,8 @@ import net.minecraft.server.level.ServerLevel
 import net.minecraft.util.RandomSource
 import net.minecraft.world.level.BlockGetter
 import net.minecraft.world.level.LevelAccessor
+import net.minecraft.world.level.WorldGenLevel
 import net.minecraft.world.level.block.Block
-import net.minecraft.world.level.block.Blocks
 import net.minecraft.world.level.block.DirectionalBlock
 import net.minecraft.world.level.block.state.BlockState
 import java.util.*
@@ -32,6 +30,13 @@ import java.util.*
 class TypeGemCoreBlock(properties: Properties) : Block(properties) {
 
     companion object {
+        const val MAX_CONNECTED_GEMS = 7
+        const val MIN_DISTANCE_BETWEEN_GEMS = 1
+        const val CONTINUATION_CHANCE = 0.8f
+
+        // Upper safety check to prevent infinite loops
+        const val MAX_FORCE_GROW_ATTEMPTS = 64
+
         val BLOCK_TO_CLUSTER: Map<ResourceLocation, Block> by lazy {
             mapOf(
                 ResourceLocation.parse("cobblemon:normal_gem_block") to CobblemonBlocks.TYPE_GEM_CLUSTER_NORMAL,
@@ -55,6 +60,28 @@ class TypeGemCoreBlock(properties: Properties) : Block(properties) {
             )
         }
 
+        fun setStuntState(level: LevelAccessor, gemBlocks: List<Pair<BlockState, BlockPos>>, stunted: Boolean) {
+            for ((_, gemPos) in gemBlocks) {
+                for (dir in Direction.entries) {
+                    val neighborPos = gemPos.relative(dir)
+                    val neighborState = level.getBlockState(neighborPos)
+
+                    if (neighborState.block is TypeGemClusterBlock) {
+                        if (neighborState.hasProperty(STUNTED) && neighborState.getValue(STUNTED) != stunted) {
+
+                            var updatedState = neighborState.setValue(STUNTED, stunted)
+
+                            if (updatedState.hasProperty(SHOULD_GROW)) {
+                                updatedState = updatedState.setValue(SHOULD_GROW, !stunted)
+                            }
+
+                            level.setBlock(neighborPos, updatedState, 3)
+                        }
+                    }
+                }
+            }
+        }
+
         fun getConnectedGemBlocks(level: BlockGetter, pos: BlockPos): List<Pair<BlockState, BlockPos>> {
             val connectedGems = mutableListOf<Pair<BlockState, BlockPos>>()
             val visited = mutableSetOf<BlockPos>()
@@ -80,159 +107,119 @@ class TypeGemCoreBlock(properties: Properties) : Block(properties) {
             }
             return connectedGems
         }
-
-        fun addClustersToBlock(state: BlockState, pos: BlockPos, level: LevelAccessor, random: RandomSource) {
-            Direction.entries.forEach {
-                if (random.nextFloat() < Cobblemon.config.typeGemGrowthChance) {
-                    val faceState = level.getBlockState(pos.relative(it))
-                    val randomGrowthType = decideClusterGrowthType(level, pos)
-                    val newState = BLOCK_TO_CLUSTER[BuiltInRegistries.BLOCK.getKey(state.block)]?.defaultBlockState()
-                        ?.setValue(DirectionalBlock.FACING, it)
-                        ?.setValue(GROWTH_TYPE, randomGrowthType)
-                        ?: return
-
-                    if (faceState.`is`(Blocks.AIR)) {
-                        level.setBlock(pos.relative(it), newState, 3)
-                    }
-                }
-
-            }
-        }
-
-        private fun decideClusterGrowthType(level: LevelAccessor, pos: BlockPos, random: RandomSource = RandomSource.create()): GrowthType {
-            val growthTypes = if (getConnectedGemBlocks(level, pos).size > Cobblemon.config.typeGemMaxConnected) {
-                listOf(GrowthType.DECORATION, GrowthType.STUNTED)
-            } else {
-                GrowthType.entries
-            }
-            val totalChance = growthTypes.sumOf { it.chance.toDouble() }
-            var roll = random.nextDouble() * totalChance
-
-            for (type in growthTypes) {
-                roll -= type.chance.toDouble()
-                if (roll <= 0.0) {
-                    return type
-                }
-            }
-
-            return GrowthType.DECORATION
-        }
-    }
-
-    private fun getConnectedClusters(level: LevelAccessor, pos: BlockPos): List<Pair<BlockState, BlockPos>> {
-        val gemBlocks = getConnectedGemBlocks(level, pos)
-        val clusters = mutableListOf<Pair<BlockState, BlockPos>>()
-        val visited = mutableSetOf<BlockPos>()
-
-        for ((gemState, gemPos) in gemBlocks) {
-            val expectedCluster = BLOCK_TO_CLUSTER[BuiltInRegistries.BLOCK.getKey(gemState.block)] ?: continue
-
-            for (direction in Direction.entries) {
-                val clusterPos = gemPos.relative(direction)
-                if (!visited.add(clusterPos)) continue
-
-                val clusterState = level.getBlockState(clusterPos)
-                if (clusterState.block == expectedCluster) {
-                    clusters += clusterState to clusterPos
-                }
-            }
-        }
-        return clusters
     }
 
     override fun randomTick(state: BlockState, level: ServerLevel, pos: BlockPos, random: RandomSource) {
-        // should we tick at all?
-        if (random.nextFloat() >= Cobblemon.config.typeGemTickChance) {
-            return
-        }
-        val gemCount = getConnectedGemBlocks(level, pos).size
+        grow(level, pos, random)
+    }
 
-        // if growth has stopped fully but min growth hasn't been reached, randomly set a stopped bud to GROWTH_TYPE full
-        val clusters = getConnectedClusters(level, pos)
-        val fullClusterCount = clusters.count { (clusterState, _) ->
-            clusterState.getValue(GROWTH_TYPE) == GrowthType.FULL
+    fun forceGrow(level: WorldGenLevel, pos: BlockPos, random: RandomSource, percentage: Float) {
+        val desiredLength = MAX_CONNECTED_GEMS * percentage
+
+        repeat(MAX_FORCE_GROW_ATTEMPTS) {
+            val (grown, clusterSize) = grow(level, pos, random, true)
+            if (!grown || clusterSize >= desiredLength) return
         }
 
-        if (fullClusterCount == 0) {
-            if (gemCount < Cobblemon.config.typeGemMinGrowth && clusters.isNotEmpty()) {
-                println("Force set a cluster to FULL at size $gemCount")
-                val randomCluster = clusters.random()
-                level.setBlockAndUpdate(randomCluster.second, randomCluster.first.setValue(GROWTH_TYPE, GrowthType.FULL))
+        Cobblemon.LOGGER.warn(
+            "Forced type gem growth at {} stopped after {} attempts without reaching its target size; keeping the partial formation.",
+            pos,
+            MAX_FORCE_GROW_ATTEMPTS
+        )
+    }
+
+    private fun grow(
+        level: WorldGenLevel,
+        pos: BlockPos,
+        random: RandomSource,
+        forced: Boolean = false
+    ): Pair<Boolean, Int> {
+        val connectedGems = getConnectedGemBlocks(level, pos) // maybe we can store this and access it for better performance? check for changes in list rather than checking each time grow is called? idk
+        val gemCount = connectedGems.size
+        val overLimit = gemCount >= MAX_CONNECTED_GEMS
+
+        if (overLimit) {
+            // if there is no open air pockets to grow any new clusters then exit early
+            if (!hasBreathingRoom(level, connectedGems)) {
+                return Pair(false, gemCount)
+            }
+            // max type gem block count met, tell clusters to grow but not turn into blocks
+            setStuntState(level, connectedGems, true)
+            //return Pair(false, gemCount)
+        } else {
+            // make sure connected clusters know they can grow and turn into blocks
+            setStuntState(level, connectedGems, false)
+        }
+
+        val javaRandom = java.util.Random(random.nextLong())
+
+        for ((gemState, gemPos) in connectedGems.shuffled(javaRandom)) {
+            val registryKey = BuiltInRegistries.BLOCK.getKey(gemState.block)
+            val clusterBlock = BLOCK_TO_CLUSTER[registryKey] ?: continue // If there is no block to grow, skip the block
+
+            for (dir in Direction.entries.shuffled(javaRandom)) {
+                val targetPos = gemPos.relative(dir)
+                val targetState = level.getBlockState(targetPos)
+
+                if (!targetState.isAir) continue
+                if (!isPositionValidForGrowth(level, targetPos)) continue
+
+                // Place gem cluster
+                val placeState = clusterBlock.defaultBlockState()
+                    .setValue(DirectionalBlock.FACING, dir)
+                    .setValue(TypeGemClusterBlock.STAGE, 0)
+                    .setValue(SHOULD_GROW, true)
+
+                level.setBlock(targetPos, placeState, UPDATE_ALL)
+
+                // During world gen, the region silently discards writes into neighboring chunks that are already fully generated.
+                // Through ImposterProtoChunk with writes set to disabled. Checks if the block is still air after the write and skips if so as it can't be filled.
+                // Preventing infinite loops.
+                if (!level.getBlockState(targetPos).`is`(clusterBlock)) continue
+
+                if (forced) {
+                    forceAdvanceClusterGrowth(level, targetPos, random)
+                }
+
+                val updatedGemCount = if (forced) getConnectedGemBlocks(level, pos).size else connectedGems.size
+                return Pair(true, updatedGemCount)
             }
         }
 
-
-        expand(level, pos, random)
+        // println("[TypeGemCoreBlock] No valid spot found for gem placement.")
+        return Pair(false, connectedGems.size)
     }
 
-    fun expand(level: LevelAccessor, pos: BlockPos, random: RandomSource, forceGrow: Boolean = false) {
-        getConnectedGemBlocks(level, pos).forEach {
-            val state = it.first
-            val pos = it.second
-            addClustersToBlock(state, pos, level, random)
-            growClusters(pos, level, random, forceGrow)
+    private fun forceAdvanceClusterGrowth(level: WorldGenLevel, clusterPos: BlockPos, random: RandomSource) {
+        repeat(5) {
+            val clusterState = level.getBlockState(clusterPos)
+            val clusterBlock = clusterState.block as? TypeGemClusterBlock ?: return
+            clusterBlock.advanceGrowth(clusterState, level, clusterPos, random)
         }
     }
 
-    private fun growClusters(pos: BlockPos, level: LevelAccessor, random: RandomSource, forceGrow: Boolean) {
-        Direction.entries.forEach { direction ->
-            val relativePos = pos.relative(direction)
-            val relativeState = level.getBlockState(relativePos)
-            val clusterBlock = relativeState.block as? TypeGemClusterBlock ?: return@forEach
-
-            if ((relativeState.getValue(DirectionalBlock.FACING) == direction &&
-                random.nextFloat() < Cobblemon.config.typeGemGrowthChance) || forceGrow
-                ) {
-                clusterBlock.advanceGrowth(relativeState, level, relativePos, random)
+    private fun hasBreathingRoom(level: WorldGenLevel, gems: List<Pair<BlockState, BlockPos>>): Boolean {
+        for ((_, gemPos) in gems) {
+            for (dir in Direction.entries) {
+                if (level.getBlockState(gemPos.relative(dir)).isAir) {
+                    return true
+                }
             }
         }
+        return false
     }
 
-    private fun addInitialClusters(pos: BlockPos, level: ServerLevel, clusterType: TypeGemClusterBlock) {
-        Direction.entries.forEach {
-            val faceState = level.getBlockState(pos.relative(it))
-
-            if (faceState.`is`(Blocks.AIR)) {
-                level.setBlockAndUpdate(pos.relative(it), clusterType.defaultBlockState().setValue(
-                    DirectionalBlock.FACING, it)
-                    .setValue(GROWTH_TYPE, GrowthType.FULL)
-                )
-            }
+    private fun isPositionValidForGrowth(level: WorldGenLevel, pos: BlockPos): Boolean {
+        return Direction.entries.none { dir ->
+            val nearby = pos.relative(dir)
+            isGem(level.getBlockState(nearby)) &&
+                    pos.distManhattan(nearby) < MIN_DISTANCE_BETWEEN_GEMS
         }
     }
 
+    private fun isGem(state: BlockState): Boolean {
+        return state.`is`(CobblemonBlockTags.TYPE_GEM_BLOCKS)
+    }
+
     override fun isRandomlyTicking(state: BlockState): Boolean = true
-
-    private fun attachDecorativeClusters(level: LevelAccessor, gemPos: BlockPos, random: RandomSource) {
-        val openDirections = Direction.entries.filter { direction ->
-            level.getBlockState(gemPos.relative(direction)).isAir
-        }.toMutableList()
-
-        if (openDirections.isEmpty()) {
-            return
-        }
-
-        val gemState = level.getBlockState(gemPos)
-        val clusterBlock = BLOCK_TO_CLUSTER[BuiltInRegistries.BLOCK.getKey(gemState.block)] ?: return
-
-        val minClusters = maxOf(1, (openDirections.size * 0.75f).toInt())
-        val clusterCount = random.nextInt(minClusters, openDirections.size + 1)
-
-        repeat(clusterCount) {
-            if (openDirections.isEmpty()) return@repeat
-
-            val index = random.nextInt(openDirections.size)
-            val direction = openDirections.removeAt(index)
-            val clusterPos = gemPos.relative(direction)
-            val stage = random.nextInt(0, 4)
-
-            val clusterState = clusterBlock.defaultBlockState()
-                .setValue(FACING, direction)
-                .setValue(STAGE, stage)
-                .setValue(GROWTH_TYPE, GrowthType.DECORATION)
-
-            level.setBlock(clusterPos, clusterState, UPDATE_ALL)
-        }
-    }
-}
-
+}

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/PokeSnackBlockEntity.kt

@@ -171,7 +171,11 @@ open class PokeSnackBlockEntity(pos: BlockPos, state: BlockState) :
     fun attemptSpawn(player: Player) {
         val cause = SpawnCause(spawner = spawner, entity = player)
         val zoneInput = spawner.getZoneInput(cause)
-        val spawnAction = spawner.calculateSpawnActionsForArea(zoneInput, 1).firstOrNull() ?: return
+        val spawnAction = spawner.calculateSpawnActionsForArea(zoneInput, 1).firstOrNull()
+
+        if (spawnAction == null) {
+            return
+        }
 
         CobblemonEvents.POKE_SNACK_SPAWN_POKEMON_PRE.postThen(
             PokeSnackSpawnPokemonEvent.Pre(this, spawnAction),

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

@@ -334,6 +334,8 @@ class TMMachineBlockEntity(pos: BlockPos, state: BlockState) :
         level?.updateNeighborsAt(blockPos, currentState.block)
     }
 
+    override fun stillValid(player: Player): Boolean = tmMachineInventory.stillValid(player)
+
     override fun canPlaceItem(slot: Int, stack: ItemStack): Boolean = tmMachineInventory.canPlaceItem(slot, stack)
 
     override fun canTakeItem(target: Container, slot: Int, stack: ItemStack): Boolean =

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/entity/PokemonClientDelegate.kt

@@ -475,7 +475,7 @@ class PokemonClientDelegate : PosableState(), PokemonSideDelegate {
                         val locators = particleData.locatorResolver(locatorStates).filter(::isLocatorVisible)
                         if (particleData.chance > random.nextDouble()) {
                             locators.forEach { locator ->
-                                repeat(particleData.amount()) {
+                                repeat(particleData.amount) {
                                     runtime.resolve("q.particle('${particleData.particle}', '$locator')".asExpressionLike())
                                 }
                             }
@@ -485,7 +485,7 @@ class PokemonClientDelegate : PosableState(), PokemonSideDelegate {
                     is ParticleData.MinecraftParticle -> {
                         if (particleData.chance > random.nextDouble()) {
                             val box = currentEntity.boundingBox
-                            repeat(particleData.amount()) {
+                            repeat(particleData.amount) {
                                 val x = box.minX + (box.maxX - box.minX) * random.nextDouble()
                                 val y = box.minY + (box.maxY - box.minY) * random.nextDouble()
                                 val z = box.minZ + (box.maxZ - box.minZ) * random.nextDouble()

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

@@ -17,7 +17,6 @@ import com.cobblemon.mod.common.api.text.text
 import com.cobblemon.mod.common.client.gui.CobblemonRenderable
 import com.cobblemon.mod.common.pokemon.Species
 import com.cobblemon.mod.common.util.adapters.IntRangesAdapter
-import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
 import com.cobblemon.mod.common.util.lang
 import java.awt.Color
 import net.minecraft.client.Minecraft
@@ -329,7 +328,7 @@ class HabitatSpawnEditorGUI(
     private fun parseSpecies(value: String): Species? {
         val lowered = value.lowercase()
         pokemonSpeciesByTranslatedName[lowered]?.let { return it }
-        return runCatching { PokemonSpecies.getByIdentifier(lowered.asIdentifierDefaultingNamespace()) }.getOrNull()
+        return runCatching { PokemonSpecies.getByName(lowered) }.getOrNull()
     }
 
     private fun parsePhases(raw: String): IntRanges? {

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

@@ -56,8 +56,7 @@ class PCGUI(
     val party: ClientParty,
     val configuration: PCGUIConfiguration,
     val openOnBox: Int = CobblemonClient.lastPcBoxViewed,
-    val unseenWallpapers: MutableSet<ResourceLocation> = mutableSetOf(),
-    val silent: Boolean = false
+    val unseenWallpapers: MutableSet<ResourceLocation> = mutableSetOf()
 ) : Screen(Component.translatable("cobblemon.ui.pc.title")), CobblemonRenderable {
 
     companion object {
@@ -704,7 +703,7 @@ class PCGUI(
     }
 
     fun closeNormally(unlink: Boolean = true) {
-        if (!silent) playSound(CobblemonSounds.PC_OFF)
+        playSound(CobblemonSounds.PC_OFF)
         Minecraft.getInstance().setScreen(null)
         if (unlink) {
             UnlinkPlayerFromPCPacket().sendToServer()
@@ -749,7 +748,7 @@ class PCGUI(
 
         if (isInventoryKeyPressed(minecraft, keyCode, scanCode) && !boxNameFocused && !filterFocused) {
             saveMarkings(isPreviewInParty ?: false)
-            if (!silent) playSound(CobblemonSounds.PC_OFF)
+            playSound(CobblemonSounds.PC_OFF)
             UnlinkPlayerFromPCPacket().sendToServer()
             Minecraft.getInstance().setScreen(null)
             return true
@@ -760,7 +759,7 @@ class PCGUI(
         if (!filterFocused && !boxNameFocused) {
             when (keyCode) {
                 InputConstants.KEY_ESCAPE -> {
-                    if (!silent) playSound(CobblemonSounds.PC_OFF)
+                    playSound(CobblemonSounds.PC_OFF)
                     UnlinkPlayerFromPCPacket().sendToServer()
                     onClose()
                     return true
@@ -832,4 +831,4 @@ class PCGUI(
             markingsWidget.setActivePokemon(null)
         }
     }
-}
+}

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

@@ -38,6 +38,7 @@ import com.cobblemon.mod.common.client.gui.pokedex.PokedexGUIConstants.BASE_HEIG
 import com.cobblemon.mod.common.client.gui.pokedex.PokedexGUIConstants.BASE_WIDTH
 import com.cobblemon.mod.common.client.gui.pokedex.PokedexGUIConstants.HALF_OVERLAY_HEIGHT
 import com.cobblemon.mod.common.client.gui.pokedex.PokedexGUIConstants.HALF_OVERLAY_WIDTH
+import com.cobblemon.mod.common.client.gui.pokedex.PokedexGUIConstants.HALF_OVERLAY_WIDTH
 import com.cobblemon.mod.common.client.gui.pokedex.PokedexGUIConstants.HEADER_BAR_HEIGHT
 import com.cobblemon.mod.common.client.gui.pokedex.PokedexGUIConstants.ICONS_ARROW_PADDING_AROUND
 import com.cobblemon.mod.common.client.gui.pokedex.PokedexGUIConstants.ICONS_PADDING_AROUND
@@ -51,7 +52,8 @@ import com.cobblemon.mod.common.client.gui.pokedex.PokedexGUIConstants.TAB_MOVES
 import com.cobblemon.mod.common.client.gui.pokedex.PokedexGUIConstants.TAB_SIZE
 import com.cobblemon.mod.common.client.gui.pokedex.PokedexGUIConstants.TAB_STATS
 import com.cobblemon.mod.common.client.gui.pokedex.widgets.*
-import com.cobblemon.mod.common.client.gui.pokedex.widgets.EvolutionTreeWidget
+import com.cobblemon.mod.common.client.gui.pokedex.widgets.evolutiontree.EvolutionTreeWidget
+import com.cobblemon.mod.common.client.gui.pokedex.widgets.evolutiontree.debugEvolutionRequirementRendering
 import com.cobblemon.mod.common.client.pokedex.PokedexType
 import com.cobblemon.mod.common.client.render.drawScaledText
 import com.cobblemon.mod.common.net.messages.server.block.AdjustBlockEntityViewerCountPacket
@@ -192,7 +194,6 @@ class PokedexGUI private constructor(
     public override fun init() {
         super.init()
         clearWidgets()
-        evolutionTreeExpanded = false
 
         availableRegions = Dexes.dexEntryMap.keys.toList()
         selectedRegionIndex = 0
@@ -827,6 +828,10 @@ class PokedexGUI private constructor(
             }
         }
 
+        if (tabInfoIndex == TAB_EVOLUTION_TREE && keyCode == InputConstants.KEY_SEMICOLON) {
+            debugEvolutionRequirementRendering()
+        }
+
         return super.keyPressed(keyCode, scanCode, modifiers)
     }
 

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

@@ -16,17 +16,13 @@ import com.cobblemon.mod.common.util.cobblemonResource
 import com.mojang.blaze3d.vertex.PoseStack
 import net.minecraft.client.Minecraft
 import net.minecraft.client.gui.GuiGraphics
-import net.minecraft.network.chat.Component
 import net.minecraft.network.chat.MutableComponent
-import net.minecraft.network.chat.Style
 import net.minecraft.resources.ResourceLocation
-import java.util.Optional
 
 private val tooltipEdge = cobblemonResource("textures/gui/pokedex/tooltip_edge.png")
 private val tooltipBackground = cobblemonResource("textures/gui/pokedex/tooltip_background.png")
 
 private const val TOOLTIP_SLICE_SIZE = 11
-private const val TOOLTIP_MAX_TEXT_WIDTH = 160
 
 fun renderTooltip(
     context: GuiGraphics,
@@ -53,12 +49,7 @@ fun renderTooltip(
     posY: Int,
     delta: Float,
     offsetY: Int = 0,
-    maxTextWidth: Int = TOOLTIP_MAX_TEXT_WIDTH,
 ) {
-    val text = text.flatMap { wrapTooltipLine(it, maxTextWidth) }
-    // Only a tooltip that fits on a single line is centered; wrapped text is left-aligned
-    val centered = text.size == 1
-
     val poseStack = context.pose()
     val textWidth = text.maxOf { Minecraft.getInstance().font.width(it.font(CobblemonResources.DEFAULT_LARGE)) }
     val tooltipPadding = 6
@@ -87,6 +78,8 @@ fun renderTooltip(
     blitSlicedVertical(poseStack, tooltipBackground, posX - (tooltipWidth / 2), tooltipTop, tooltipWidth, totalHeight)
     blitSlicedVertical(poseStack, tooltipEdge, posX + (tooltipWidth / 2), tooltipTop, 1, totalHeight)
 
+    val centered = text.size == 1
+
     text.forEachIndexed { index, it ->
         drawScaledText(
             context = context,
@@ -102,20 +95,6 @@ fun renderTooltip(
     poseStack.popPose()
 }
 
-private fun wrapTooltipLine(line: MutableComponent, maxWidth: Int): List<MutableComponent> {
-    val styled = line.copy().font(CobblemonResources.DEFAULT_LARGE)
-    if (Minecraft.getInstance().font.width(styled) <= maxWidth) return listOf(line)
-
-    return Minecraft.getInstance().font.splitter.splitLines(styled, maxWidth, Style.EMPTY).map { wrapped ->
-        val component = Component.empty()
-        wrapped.visit({ style, string ->
-            component.append(Component.literal(string).withStyle(style))
-            Optional.empty<Unit>()
-        }, Style.EMPTY)
-        component
-    }
-}
-
 // Stretching the whole 11px image over an arbitrary height thickens the caps as more lines are added, so
 // instead the caps are drawn 1:1 and only the flat fill row is stretched to cover the remaining height
 private fun blitSlicedVertical(

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/pokedex/widgets/evolutiontree/EvolutionPokemonPropertiesRenderer.kt

@@ -6,7 +6,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-package com.cobblemon.mod.common.api.pokedex.entry
+package com.cobblemon.mod.common.client.gui.pokedex.widgets.evolutiontree
 
 import com.cobblemon.mod.common.api.pokemon.Natures
 import com.cobblemon.mod.common.api.pokemon.PokemonProperties
@@ -21,6 +21,7 @@ import com.cobblemon.mod.common.api.text.green
 import com.cobblemon.mod.common.api.types.ElementalTypes
 import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
 import com.cobblemon.mod.common.util.asTranslated
+import com.cobblemon.mod.common.util.cobblemonResource
 import com.cobblemon.mod.common.util.lang
 import net.minecraft.core.registries.BuiltInRegistries
 import net.minecraft.locale.Language
@@ -28,14 +29,14 @@ import net.minecraft.network.chat.Component
 import net.minecraft.network.chat.MutableComponent
 import net.minecraft.world.item.Items
 
-fun describePokemonProperties(properties: PokemonProperties): MutableComponent? {
+internal fun describePokemonProperties(properties: PokemonProperties): MutableComponent? {
     if (hasUndescribedProperty(properties)) {
         return null
     }
 
     val descriptors = mutableListOf<MutableComponent>()
 
-    properties.species?.let { PokemonSpecies.getByIdentifier(it.asIdentifierDefaultingNamespace()) }?.let {
+    properties.species?.let { PokemonSpecies.getByIdentifier(cobblemonResource(it)) }?.let {
         descriptors.add(it.translatedName.plainCopy().green())
     }
     properties.gender?.let {
@@ -135,7 +136,7 @@ private fun describeStringSpeciesFeature(property: StringSpeciesFeature): Mutabl
         return null
     }
 
-    val value = PokemonSpecies.getByIdentifier(property.value.asIdentifierDefaultingNamespace())?.translatedName?.plainCopy()
+    val value = PokemonSpecies.getByIdentifier(cobblemonResource(property.value))?.translatedName?.plainCopy()
         ?: Component.literal(property.value)
 
     return lang(key, value.green())

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/pokedex/widgets/evolutiontree/EvolutionRendererDebug.kt

@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.client.gui.pokedex.widgets.evolutiontree
+
+import com.cobblemon.mod.common.Cobblemon
+import com.cobblemon.mod.common.api.pokemon.PokemonSpecies
+import net.minecraft.client.Minecraft
+import net.minecraft.network.chat.Component
+
+fun debugEvolutionRequirementRendering() {
+    if (!Cobblemon.config.enableDebugKeys) {
+        return
+    }
+
+    val gaps = mutableListOf<Pair<String, String>>()
+
+    for (species in PokemonSpecies.implemented) {
+        val evolutions = species.evolutions + species.forms.flatMap { it.evolutions }
+        for (evolution in evolutions) {
+            if (renderEvolutionData(evolution) == null) {
+                gaps.add("Evolution: ${evolution::class.simpleName}" to species.showdownId())
+            }
+            for (requirement in evolution.requirements) {
+                if (resolveRequirementData(requirement) == null) {
+                    gaps.add("Requirement: ${requirement::class.simpleName}" to species.showdownId())
+                }
+            }
+        }
+    }
+
+    val player = Minecraft.getInstance().player
+    if (gaps.isEmpty()) {
+        player?.sendSystemMessage(Component.literal("Evolution render debug: no gaps found."))
+        return
+    }
+
+    val byType = gaps.groupBy({ it.first }, { it.second })
+    println("Evolution render debug found ${gaps.size} gap(s) across ${byType.size} type(s):")
+    byType.forEach { (type, species) -> println("  $type: ${species.distinct().joinToString(", ")}") }
+
+    player?.sendSystemMessage(Component.literal("Evolution render debug: ${gaps.size} gap(s) across ${byType.size} type(s), see log for details."))
+}

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/pokedex/widgets/evolutiontree/EvolutionTreeEvolutionRenderer.kt

@@ -0,0 +1,123 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.client.gui.pokedex.widgets.evolutiontree
+
+import com.cobblemon.mod.common.CobblemonItems
+import com.cobblemon.mod.common.api.pokemon.PokemonSpecies
+import com.cobblemon.mod.common.api.pokemon.evolution.Evolution
+import com.cobblemon.mod.common.api.pokemon.requirement.Requirement
+import com.cobblemon.mod.common.api.text.green
+import com.cobblemon.mod.common.pokemon.evolution.variants.BlockClickEvolution
+import com.cobblemon.mod.common.pokemon.evolution.variants.DummyEvolution
+import com.cobblemon.mod.common.pokemon.evolution.variants.ItemInteractionEvolution
+import com.cobblemon.mod.common.pokemon.evolution.variants.LevelUpEvolution
+import com.cobblemon.mod.common.pokemon.evolution.variants.TradeEvolution
+import com.cobblemon.mod.common.util.cobblemonResource
+import com.cobblemon.mod.common.util.itemRegistry
+import com.cobblemon.mod.common.util.lang
+import net.minecraft.client.Minecraft
+import net.minecraft.network.chat.Component
+import net.minecraft.network.chat.MutableComponent
+import net.minecraft.world.item.Item
+
+data class RenderEvolutionData(
+    val icons: List<Item>,
+    val tooltips: List<MutableComponent>,
+)
+
+internal fun resolveRequirementData(requirement: Requirement): RenderRequirementData? {
+    val icon = requirement.pokedexIcon?.let {
+        Minecraft.getInstance()?.player?.level()?.itemRegistry?.get(it)
+    }
+
+    val tooltip = requirement.pokedexTooltip?.let {
+        Component.translatable(it)
+    }
+
+    if (icon != null && tooltip != null) {
+        return RenderRequirementData(icon, tooltip)
+    }
+
+    return renderRequirementData(requirement)
+}
+
+fun renderEvolutionData(evolution: Evolution): RenderEvolutionData? {
+    when (evolution) {
+        is BlockClickEvolution -> return renderBlockClickEvolution(evolution)
+        is DummyEvolution -> return renderDummyEvolution(evolution)
+        is ItemInteractionEvolution -> return renderItemInteractionEvolution(evolution)
+        is LevelUpEvolution -> return renderLevelUpEvolution(evolution)
+        is TradeEvolution -> return renderTradeEvolution(evolution)
+    }
+
+    return null
+}
+
+fun renderBlockClickEvolution(blockClickEvolution: BlockClickEvolution): RenderEvolutionData? {
+    return null
+}
+
+// TODO: Use dummyEvolution?
+fun renderDummyEvolution(evolution: Evolution): RenderEvolutionData? {
+    return null
+}
+
+fun renderItemInteractionEvolution(itemInteractionEvolution: ItemInteractionEvolution): RenderEvolutionData? {
+    val item = itemInteractionEvolution.requiredContext.items.get().first().value()
+    val icons = mutableListOf(item)
+    val tooltips =
+        mutableListOf(lang("ui.pokedex.evolution.item_interact.tooltip", item.description.plainCopy().green()))
+
+    val requirementsDataList = itemInteractionEvolution.requirements.mapNotNull { requirement ->
+        resolveRequirementData(requirement)
+    }
+
+    requirementsDataList.forEach { requirement ->
+        icons.add(requirement.icon)
+        tooltips.add(requirement.tooltip)
+    }
+
+    return RenderEvolutionData(icons, tooltips)
+}
+
+fun renderLevelUpEvolution(levelUpEvolution: LevelUpEvolution): RenderEvolutionData? {
+    val requirementsDataList = levelUpEvolution.requirements.map { requirement ->
+        resolveRequirementData(requirement)
+    }
+
+    val icons = requirementsDataList.mapNotNull { requirementData -> requirementData?.icon }
+    val tooltips = requirementsDataList.mapNotNull { requirementData -> requirementData?.tooltip }
+
+    return RenderEvolutionData(icons, tooltips)
+}
+
+fun renderTradeEvolution(tradeEvolution: TradeEvolution): RenderEvolutionData? {
+    val icons = mutableListOf<Item>(CobblemonItems.LINK_CABLE)
+    val tooltips = mutableListOf<MutableComponent>()
+
+    val species = tradeEvolution.requiredContext.species
+    if (species == null) {
+        tooltips.add(lang("ui.pokedex.evolution.trade.tooltip.with_any_species"))
+    } else {
+        PokemonSpecies.getByIdentifier(cobblemonResource(species))?.let {
+            tooltips.add(lang("ui.pokedex.evolution.trade.tooltip.with_species", it.translatedName.green()))
+        }
+    }
+
+    val requirementsDataList = tradeEvolution.requirements.mapNotNull { requirement ->
+        resolveRequirementData(requirement)
+    }
+
+    requirementsDataList.forEach { requirement ->
+        icons.add(requirement.icon)
+        tooltips.add(requirement.tooltip)
+    }
+
+    return RenderEvolutionData(icons, tooltips)
+}

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/pokedex/widgets/evolutiontree/EvolutionTreeRequirementRenderer.kt

@@ -0,0 +1,379 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.client.gui.pokedex.widgets.evolutiontree
+
+import com.cobblemon.mod.common.CobblemonItems
+import com.cobblemon.mod.common.api.conditional.RegistryLikeCondition
+import com.cobblemon.mod.common.api.conditional.RegistryLikeIdentifierCondition
+import com.cobblemon.mod.common.api.conditional.RegistryLikeTagCondition
+import com.cobblemon.mod.common.api.pokemon.feature.IntSpeciesFeatureProvider
+import com.cobblemon.mod.common.api.pokemon.feature.SpeciesFeatures
+import com.cobblemon.mod.common.api.pokemon.requirement.Requirement
+import com.cobblemon.mod.common.api.pokemon.stats.Stats
+import com.cobblemon.mod.common.api.text.add
+import com.cobblemon.mod.common.api.text.green
+import com.cobblemon.mod.common.api.text.red
+import com.cobblemon.mod.common.api.types.ElementalTypes
+import com.cobblemon.mod.common.pokemon.requirements.*
+import com.cobblemon.mod.common.util.asTranslated
+import com.cobblemon.mod.common.util.lang
+import net.minecraft.client.Minecraft
+import net.minecraft.core.registries.BuiltInRegistries
+import net.minecraft.network.chat.Component
+import net.minecraft.network.chat.MutableComponent
+import net.minecraft.world.item.Item
+import net.minecraft.world.item.Items
+import net.minecraft.world.level.biome.Biome
+import net.minecraft.world.level.levelgen.structure.Structure
+
+data class RenderRequirementData(
+    val icon: Item,
+    val tooltip: MutableComponent,
+)
+
+fun renderRequirementData(requirement: Requirement): RenderRequirementData? {
+    when (requirement) {
+        is AdvancementRequirement -> return renderAdvancementRequirement(requirement)
+        is AnyRequirement -> return renderAnyRequirement(requirement)
+        is AreaRequirement -> return renderAreaRequirement(requirement)
+        is AttackDefenceRatioRequirement -> return renderAttackDefenceRatioRequirement(requirement)
+        is BattleCriticalHitsRequirement -> return renderBattleCriticalHitsRequirement(requirement)
+        is BiomeRequirement -> return renderBiomeRequirement(requirement)
+        is BlocksTraveledRequirement -> return renderBlocksTraveledRequirement(requirement)
+        is DamageTakenRequirement -> return renderDamageTakenRequirement(requirement)
+        is DefeatRequirement -> return renderDefeatRequirement(requirement)
+        is FriendshipRequirement -> return renderFriendshipRequirement(requirement)
+        is HeldItemRequirement -> return renderHeldItemRequirement(requirement)
+        is LevelRequirement -> return renderLevelRequirement(requirement)
+        is MoonPhaseRequirement -> return renderMoonPhaseRequirement(requirement)
+        is MoveSetRequirement -> return renderMoveSetRequirement(requirement)
+        is MoveTypeRequirement -> return renderMoveTypeRequirement(requirement)
+        is OwnerHoldsItemRequirement -> return renderOwnerHoldsItemRequirement(requirement)
+        is PartyMemberRequirement -> return renderPartyMemberRequirement(requirement)
+        is PokemonPropertiesRequirement -> return renderPokemonPropertiesRequirement(requirement)
+        is PropertyRangeRequirement -> return renderPropertyRangeRequirement(requirement)
+        is RecoilRequirement -> return renderRecoilRequirement(requirement)
+        is StatCompareRequirement -> return renderStatCompareRequirement(requirement)
+        is StatEqualRequirement -> return renderStatEqualRequirement(requirement)
+        is StructureRequirement -> return renderStructureRequirement(requirement)
+        is TimeRangeRequirement -> return renderTimeRangeRequirement(requirement)
+        is UseMoveRequirement -> return renderUseMoveRequirement(requirement)
+        is WeatherRequirement -> return renderWeatherRequirement(requirement)
+        is WorldRequirement -> return renderWorldRequirement(requirement)
+    }
+
+    return null
+}
+
+fun renderAdvancementRequirement(advancementRequirement: AdvancementRequirement): RenderRequirementData? {
+    val icon = Items.BOOK
+    val identifier = advancementRequirement.requiredAdvancement
+    val advancementLanguageKey = "${identifier.namespace}.${identifier.path.substringAfterLast('/')}"
+    val advancementComponent = Component.translatable("advancements.$advancementLanguageKey").green()
+    val tooltip = lang("ui.pokedex.requirement.advancement.tooltip", advancementComponent)
+
+    return RenderRequirementData(icon, tooltip)
+}
+
+fun renderAnyRequirement(anyRequirement: AnyRequirement): RenderRequirementData? {
+    return null
+}
+
+fun renderAreaRequirement(areaRequirement: AreaRequirement): RenderRequirementData? {
+    return null
+}
+
+fun renderAttackDefenceRatioRequirement(attackDefenceRatioRequirement: AttackDefenceRatioRequirement): RenderRequirementData? {
+    return null
+}
+
+fun renderBattleCriticalHitsRequirement(battleCriticalHitsRequirement: BattleCriticalHitsRequirement): RenderRequirementData? {
+    val icon = CobblemonItems.MEDICINAL_LEEK
+    val criticalsComponent = Component.literal(battleCriticalHitsRequirement.amount.toString()).green()
+    val tooltip = lang("ui.pokedex.requirement.battle_critical_hits.tooltip", criticalsComponent)
+
+    return RenderRequirementData(icon, tooltip)
+}
+
+fun renderBiomeRequirement(biomeRequirement: BiomeRequirement): RenderRequirementData? {
+    val condition = biomeRequirement.biomeCondition
+    val anticondition = biomeRequirement.biomeAnticondition
+    if (condition == null && anticondition == null) {
+        return null
+    }
+
+    val icon = Items.COMPASS
+    val displayName: (RegistryLikeCondition<Biome>) -> MutableComponent = {
+        when (it) {
+            is RegistryLikeTagCondition -> Component.literal(it.tag.location().path.substringAfterLast('/').split('_').joinToString(" ") { part -> part.replaceFirstChar(Char::titlecase) })
+            is RegistryLikeIdentifierCondition -> Component.translatable("biome.${it.identifier.namespace}.${it.identifier.path}")
+            else -> Component.literal(it.toString())
+        }
+    }
+    val tooltip = if (condition != null && anticondition != null) {
+        lang("ui.pokedex.requirement.biome.both.tooltip", displayName(condition).green(), displayName(anticondition).green())
+    } else if (condition != null) {
+        lang("ui.pokedex.requirement.biome.tooltip", displayName(condition).green())
+    } else {
+        lang("ui.pokedex.requirement.biome.anticondition.tooltip", displayName(anticondition!!).green())
+    }
+
+    val playerBiome = Minecraft.getInstance()?.player?.let { it.level().getBiome(it.blockPosition()) }
+    if (playerBiome != null) {
+        val isMet = (condition == null || condition.fits(playerBiome)) && (anticondition == null || !anticondition.fits(playerBiome))
+        tooltip.add(if (isMet) Component.literal(" ✔").green() else Component.literal(" ✘").red())
+    }
+
+    return RenderRequirementData(icon, tooltip)
+}
+
+fun renderBlocksTraveledRequirement(blocksTraveledRequirement: BlocksTraveledRequirement): RenderRequirementData? {
+    val icon = Items.LEATHER_BOOTS
+    val blocksComponent = Component.literal(blocksTraveledRequirement.amount.toString()).green()
+    val tooltip = lang("ui.pokedex.requirement.blocks_traveled.tooltip", blocksComponent)
+
+    return RenderRequirementData(icon, tooltip)
+}
+
+fun renderDamageTakenRequirement(damageTakenRequirement: DamageTakenRequirement): RenderRequirementData? {
+    val icon = CobblemonItems.PUNCHING_GLOVE
+    val blocksComponent = Component.literal(damageTakenRequirement.amount.toString()).green()
+    val tooltip = lang("ui.pokedex.requirement.damage_taken.tooltip", blocksComponent)
+
+    return RenderRequirementData(icon, tooltip)
+}
+
+fun renderDefeatRequirement(defeatRequirement: DefeatRequirement): RenderRequirementData? {
+    val description = describePokemonProperties(defeatRequirement.target) ?: return null
+    val icon = CobblemonItems.PUNCHING_GLOVE
+    val defeatedAmount = defeatRequirement.amount
+
+    val descriptionComponent = Component.literal(defeatedAmount.toString()).green().add(" ").add(description)
+    val tooltip = lang("ui.pokedex.requirement.defeat.tooltip", descriptionComponent)
+
+    return RenderRequirementData(icon, tooltip)
+}
+
+fun renderFriendshipRequirement(friendshipRequirement: FriendshipRequirement): RenderRequirementData? {
+    val icon = CobblemonItems.SOOTHE_BELL
+    val friendshipAmountComponent = Component.literal(friendshipRequirement.amount.toString()).green()
+    val tooltip = lang("ui.pokedex.requirement.friendship.tooltip", friendshipAmountComponent)
+
+    return RenderRequirementData(icon, tooltip)
+}
+
+fun renderHeldItemRequirement(heldItemRequirement: HeldItemRequirement): RenderRequirementData? {
+    val item = heldItemRequirement.itemCondition.items.get().first().value()
+    val tooltip = lang("ui.pokedex.requirement.held_item.tooltip", item.description.plainCopy().green())
+
+    return RenderRequirementData(item, tooltip)
+}
+
+fun renderLevelRequirement(levelRequirement: LevelRequirement): RenderRequirementData? {
+    val minLevel = levelRequirement.minLevel
+    val maxLevel = levelRequirement.maxLevel
+
+    val icon = CobblemonItems.RARE_CANDY
+    val tooltip =
+        if (minLevel == maxLevel || maxLevel == Int.MAX_VALUE)
+            lang("ui.pokedex.requirement.level.tooltip.min", Component.literal(minLevel.toString()).green())
+        else
+            lang("ui.pokedex.requirement.level.tooltip.between", Component.literal(minLevel.toString()).green(), Component.literal(maxLevel.toString()).green())
+
+    return RenderRequirementData(icon, tooltip)
+}
+
+fun renderMoonPhaseRequirement(moonPhaseRequirement: MoonPhaseRequirement): RenderRequirementData? {
+    val icon = Items.CLOCK
+    val moonPhaseComponent = moonPhaseRequirement.moonPhase.displayName().green()
+    val tooltip = lang("ui.pokedex.requirement.moon_phase.tooltip", moonPhaseComponent)
+
+    return RenderRequirementData(icon, tooltip)
+}
+
+fun renderMoveSetRequirement(moveSetRequirement: MoveSetRequirement): RenderRequirementData? {
+    val icon = CobblemonItems.TECHNICAL_MACHINE
+    val tooltip = lang("ui.pokedex.requirement.has_move.tooltip", moveSetRequirement.move.displayName.green())
+
+    return RenderRequirementData(icon, tooltip)
+}
+
+fun renderMoveTypeRequirement(moveTypeRequirement: MoveTypeRequirement): RenderRequirementData? {
+    val type = ElementalTypes.get(moveTypeRequirement.type.name)
+    val icon = when (type) {
+        ElementalTypes.NORMAL -> CobblemonItems.NORMAL_GEM
+        ElementalTypes.FIRE -> CobblemonItems.FIRE_GEM
+        ElementalTypes.WATER -> CobblemonItems.WATER_GEM
+        ElementalTypes.GRASS -> CobblemonItems.GRASS_GEM
+        ElementalTypes.ELECTRIC -> CobblemonItems.ELECTRIC_GEM
+        ElementalTypes.ICE -> CobblemonItems.ICE_GEM
+        ElementalTypes.FIGHTING -> CobblemonItems.FIGHTING_GEM
+        ElementalTypes.POISON -> CobblemonItems.POISON_GEM
+        ElementalTypes.GROUND -> CobblemonItems.GROUND_GEM
+        ElementalTypes.FLYING -> CobblemonItems.FLYING_GEM
+        ElementalTypes.PSYCHIC -> CobblemonItems.PSYCHIC_GEM
+        ElementalTypes.BUG -> CobblemonItems.BUG_GEM
+        ElementalTypes.ROCK -> CobblemonItems.ROCK_GEM
+        ElementalTypes.GHOST -> CobblemonItems.GHOST_GEM
+        ElementalTypes.DRAGON -> CobblemonItems.DRAGON_GEM
+        ElementalTypes.DARK -> CobblemonItems.DARK_GEM
+        ElementalTypes.STEEL -> CobblemonItems.STEEL_GEM
+        ElementalTypes.FAIRY -> CobblemonItems.FAIRY_GEM
+        else -> CobblemonItems.NORMAL_GEM
+    }
+
+    val tooltip = lang("ui.pokedex.requirement.has_move_type.tooltip", moveTypeRequirement.type.displayName.green())
+
+    return RenderRequirementData(icon, tooltip)
+}
+
+fun renderOwnerHoldsItemRequirement(ownerHoldsItemRequirement: OwnerHoldsItemRequirement): RenderRequirementData? {
+    val item = ownerHoldsItemRequirement.itemCondition.items.get().first().value()
+    val tooltip = lang("ui.pokedex.requirement.owner_held_item.tooltip", item.description.plainCopy().green())
+
+    return RenderRequirementData(item, tooltip)
+}
+
+fun renderPartyMemberRequirement(partyMemberRequirement: PartyMemberRequirement): RenderRequirementData? {
+    val description = describePokemonProperties(partyMemberRequirement.target) ?: return null
+    val icon = CobblemonItems.POKE_BALL
+    val tooltip = if (partyMemberRequirement.contains) {
+        lang("ui.pokedex.requirement.party_member.tooltip", description)
+    } else {
+        lang("ui.pokedex.requirement.party_member.anticondition.tooltip", description)
+    }
+
+    return RenderRequirementData(icon, tooltip)
+}
+
+fun renderPokemonPropertiesRequirement(pokemonPropertiesRequirement: PokemonPropertiesRequirement): RenderRequirementData? {
+    val description = describePokemonProperties(pokemonPropertiesRequirement.target) ?: return null
+    val icon = Items.NAME_TAG
+    val tooltip = lang("ui.pokedex.requirement.pokemon_properties.tooltip", description)
+
+    return RenderRequirementData(icon, tooltip)
+}
+
+fun renderPropertyRangeRequirement(propertyRangeRequirement: PropertyRangeRequirement): RenderRequirementData? {
+    val provider = SpeciesFeatures.getFeature(propertyRangeRequirement.feature) as? IntSpeciesFeatureProvider ?: return null
+    val displayName = provider.display?.name?.takeIf { it.isNotBlank() }?.asTranslated()?.green() ?: return null
+    val icon = provider.itemPoints.keys.firstOrNull()?.let { BuiltInRegistries.ITEM.get(it) } ?: Items.NAME_TAG
+
+    val range = propertyRangeRequirement.range
+    val tooltip = lang(
+        "ui.pokedex.requirement.property_range.tooltip",
+        displayName,
+        Component.literal(range.first.toString()).green(),
+        Component.literal(range.last.toString()).green()
+    )
+
+    return RenderRequirementData(icon, tooltip)
+}
+
+fun renderRecoilRequirement(recoilRequirement: RecoilRequirement): RenderRequirementData? {
+    val icon = CobblemonItems.LIFE_ORB
+    val recoilComponent = Component.literal(recoilRequirement.amount.toString()).green()
+    val tooltip = lang("ui.pokedex.requirement.recoil.tooltip", recoilComponent)
+
+    return RenderRequirementData(icon, tooltip)
+}
+
+fun renderStatCompareRequirement(statCompareRequirement: StatCompareRequirement): RenderRequirementData? {
+    val highStat = Stats.getStat(statCompareRequirement.highStat)
+    val lowStat = Stats.getStat(statCompareRequirement.lowStat)
+
+    val icon = when (highStat) {
+        Stats.HP, Stats.EVASION, Stats.ACCURACY -> CobblemonItems.HEALTH_MOCHI
+        Stats.ATTACK -> CobblemonItems.MUSCLE_MOCHI
+        Stats.DEFENCE -> CobblemonItems.RESIST_MOCHI
+        Stats.SPECIAL_ATTACK -> CobblemonItems.GENIUS_MOCHI
+        Stats.SPECIAL_DEFENCE -> CobblemonItems.CLEVER_MOCHI
+        Stats.SPEED -> CobblemonItems.SWIFT_MOCHI
+    }
+
+    val highStatComponent = highStat.displayName.plainCopy().green()
+    val lowStatComponent = lowStat.displayName.plainCopy().green()
+    val tooltip = lang("ui.pokedex.requirement.stat_compare.tooltip", highStatComponent, lowStatComponent)
+
+    return RenderRequirementData(icon, tooltip)
+}
+
+fun renderStatEqualRequirement(statEqualRequirement: StatEqualRequirement): RenderRequirementData? {
+    val statOne = Stats.getStat(statEqualRequirement.statOne)
+    val statTwo = Stats.getStat(statEqualRequirement.statTwo)
+
+    val statOneComponent = statOne.displayName.plainCopy().green()
+    val statTwoComponent = statTwo.displayName.plainCopy().green()
+
+    val icon = CobblemonItems.FRESH_START_MOCHI
+    val tooltip = lang("ui.pokedex.requirement.stat_equal.tooltip", statOneComponent, statTwoComponent)
+
+    return RenderRequirementData(icon, tooltip)
+}
+
+fun renderStructureRequirement(structureRequirement: StructureRequirement): RenderRequirementData? {
+    val condition = structureRequirement.structureCondition
+    val anticondition = structureRequirement.structureAnticondition
+    if (condition == null && anticondition == null) {
+        return null
+    }
+
+    val icon = Items.STRUCTURE_BLOCK
+    val displayName: (RegistryLikeCondition<Structure>) -> MutableComponent = {
+        val path = when (it) {
+            is RegistryLikeTagCondition -> it.tag.location().path
+            is RegistryLikeIdentifierCondition -> it.identifier.path
+            else -> it.toString()
+        }
+        Component.literal(path.substringAfterLast('/').split('_').joinToString(" ") { part -> part.replaceFirstChar(Char::titlecase) })
+    }
+    val tooltip = if (condition != null && anticondition != null) {
+        lang("ui.pokedex.requirement.structure.both.tooltip", displayName(condition).green(), displayName(anticondition).green())
+    } else if (condition != null) {
+        lang("ui.pokedex.requirement.structure.tooltip", displayName(condition).green())
+    } else {
+        lang("ui.pokedex.requirement.structure.anticondition.tooltip", displayName(anticondition!!).green())
+    }
+
+    return RenderRequirementData(icon, tooltip)
+}
+
+fun renderTimeRangeRequirement(timeRangeRequirement: TimeRangeRequirement): RenderRequirementData? {
+    val icon = Items.CLOCK
+    val timeRangeComponent = timeRangeRequirement.range.displayName() ?: return null
+    val tooltip = lang("ui.pokedex.requirement.time_range.tooltip", timeRangeComponent.green())
+
+    return RenderRequirementData(icon, tooltip)
+}
+
+fun renderUseMoveRequirement(useMoveRequirement: UseMoveRequirement): RenderRequirementData? {
+    val icon = CobblemonItems.CHOICE_BAND
+    val tooltip = lang("ui.pokedex.requirement.use_move.tooltip", useMoveRequirement.move.displayName.green())
+
+    return RenderRequirementData(icon, tooltip)
+}
+
+fun renderWeatherRequirement(weatherRequirement: WeatherRequirement): RenderRequirementData? {
+    val icon: Item
+    val tooltip: MutableComponent
+
+    if (weatherRequirement.isThundering == true) {
+        icon = Items.LIGHTNING_ROD
+        tooltip = lang("ui.pokedex.requirement.weather.tooltip.thundering")
+    } else {
+        icon = Items.WATER_BUCKET
+        tooltip = lang("ui.pokedex.requirement.weather.tooltip.raining")
+    }
+
+    return RenderRequirementData(icon, tooltip)
+}
+
+fun renderWorldRequirement(worldRequirement: WorldRequirement): RenderRequirementData? {
+    return null
+}

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/pokedex/widgets/evolutiontree/EvolutionTreeWidget.kt

@@ -6,17 +6,13 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-package com.cobblemon.mod.common.client.gui.pokedex.widgets
+package com.cobblemon.mod.common.client.gui.pokedex.widgets.evolutiontree
 
 import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.CobblemonItems
 import com.cobblemon.mod.common.api.gui.*
 import com.cobblemon.mod.common.api.pokedex.Dexes
 import com.cobblemon.mod.common.api.pokedex.PokedexEntryProgress
-import com.cobblemon.mod.common.api.pokedex.entry.CobblemonBiomeDexEvolutionRequirementDisplay
-import com.cobblemon.mod.common.api.pokedex.entry.DexEntries
-import com.cobblemon.mod.common.api.pokedex.entry.DexEvolutionDisplay
-import com.cobblemon.mod.common.api.pokedex.entry.DexEvolutionRequirementDisplay
 import com.cobblemon.mod.common.api.pokedex.entry.PokedexEntry
 import com.cobblemon.mod.common.api.pokedex.entry.PokedexForm
 import com.cobblemon.mod.common.api.pokemon.PokemonProperties
@@ -24,8 +20,6 @@ import com.cobblemon.mod.common.api.pokemon.PokemonSpecies
 import com.cobblemon.mod.common.api.pokemon.evolution.Evolution
 import com.cobblemon.mod.common.api.text.add
 import com.cobblemon.mod.common.api.text.bold
-import com.cobblemon.mod.common.api.text.green
-import com.cobblemon.mod.common.api.text.red
 import com.cobblemon.mod.common.client.CobblemonClient
 import com.cobblemon.mod.common.client.CobblemonResources
 import com.cobblemon.mod.common.client.gui.pokedex.PokedexGUI
@@ -35,22 +29,18 @@ import com.cobblemon.mod.common.client.gui.pokedex.PokedexGUIConstants.POKEMON_D
 import com.cobblemon.mod.common.client.gui.pokedex.PokedexGUIConstants.SCROLL_SLOT_SIZE
 import com.cobblemon.mod.common.client.gui.pokedex.ScaledButton
 import com.cobblemon.mod.common.client.gui.pokedex.renderTooltip
+import com.cobblemon.mod.common.client.gui.pokedex.widgets.PokemonSlotWidget
 import com.cobblemon.mod.common.client.gui.summary.widgets.SoundlessWidget
 import com.cobblemon.mod.common.client.render.drawScaledText
 import com.cobblemon.mod.common.client.render.renderScaledGuiItemIcon
-import com.cobblemon.mod.common.pokemon.FormData
 import com.cobblemon.mod.common.pokemon.Gender
 import com.cobblemon.mod.common.pokemon.RenderablePokemon
 import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
 import com.cobblemon.mod.common.util.cobblemonResource
 import com.cobblemon.mod.common.util.lang
-import net.minecraft.client.Minecraft
 import net.minecraft.client.gui.GuiGraphics
-import net.minecraft.core.registries.Registries
-import net.minecraft.locale.Language
 import net.minecraft.network.chat.Component
 import net.minecraft.network.chat.MutableComponent
-import net.minecraft.tags.TagKey
 
 class EvolutionTreeWidget(
     val parent: PokedexGUI,
@@ -102,8 +92,6 @@ class EvolutionTreeWidget(
 
     private var hoveredTooltips: List<MutableComponent>? = null
 
-    private var viewedForm: FormData? = null
-
     private val expandButton: ScaledButton = ScaledButton(
         0f,
         0f,
@@ -112,14 +100,11 @@ class EvolutionTreeWidget(
         resource = expandResource,
         clickAction = {
             parent.evolutionTreeExpanded = !parent.evolutionTreeExpanded
+            expandButton.resource = if (parent.evolutionTreeExpanded) minimizeResource else expandResource
             updatePositioning()
         }
     ).apply { addWidget(this) }
 
-    init {
-        updatePositioning()
-    }
-
     override fun renderWidget(
         guiGraphics: GuiGraphics,
         mouseX: Int,
@@ -161,28 +146,9 @@ class EvolutionTreeWidget(
         if (pokedexEntry == null || pokedexForm == null) return
 
         updatePositioning()
-        var rootSpecies = pokedexEntry
-        var rootForm = pokedexForm
-        var preEvolution = findPreEvolution(rootSpecies, rootForm)
-        while (preEvolution != null) {
-            rootSpecies = Dexes.findDexEntryBySpeciesId(preEvolution.fromSpecies)!!
-            rootForm = rootSpecies.forms.first { it.displayForm.equals(preEvolution.fromForm, ignoreCase = true) }
-            preEvolution = findPreEvolution(rootSpecies, rootForm)
-        }
 
-        val entry = Dexes.findDexEntryBySpeciesId(rootSpecies.speciesId)
-            ?: throw RuntimeException("Root dex entry not found")
-
-        val viewedFormEquivalents = Dexes.getFormEquivalents(pokedexForm.displayForm)
-        viewedForm = PokemonSpecies.getByIdentifier(pokedexEntry.speciesId)
-            ?.forms?.firstOrNull { viewedFormEquivalents.contains(it.name.lowercase()) }
-
-        val formEquivalents = Dexes.getFormEquivalents(rootForm.displayForm)
-        val form =
-            entry.forms.firstOrNull { formEquivalents.contains(it.displayForm.lowercase()) } ?:
-            entry.forms.first { it.displayForm.equals("Normal", ignoreCase = true) }
-
-        val rootEvolutionNode = buildEvolutionTree(entry, form)
+        val (rootPokedexEntry, rootPokedexForm) = Dexes.findRootDexEntryBySpeciesId(pokedexEntry.speciesId, pokedexForm.displayForm)
+        val rootEvolutionNode = buildEvolutionTree(rootPokedexEntry, rootPokedexForm, null)
 
 //        val isSameEntry = previousRootPokedexEntry != null && pokedexEntry?.id == previousRootPokedexEntry?.id
 //        val isSameForm =
@@ -206,13 +172,6 @@ class EvolutionTreeWidget(
         panningY = 0.0
     }
 
-    /** The evolution leading to [form]; the standard form falls back to any form of the species (no evolution leads to regular Vivillon). */
-    private fun findPreEvolution(entry: PokedexEntry, form: PokedexForm): DexEvolutionDisplay? {
-        return DexEntries.evolutionDisplays.firstOrNull { it.toSpecies == entry.speciesId && it.toForm == form.displayForm }
-            ?: DexEntries.evolutionDisplays.takeIf { form.displayForm.equals("Normal", ignoreCase = true) }
-                ?.firstOrNull { it.toSpecies == entry.speciesId }
-    }
-
     fun updatePositioning() {
         x = pX + X_MARGIN
         y = pY + if (parent.evolutionTreeExpanded) Y_MARGIN_EXPANDED else Y_MARGIN_MINIMIZED
@@ -221,7 +180,6 @@ class EvolutionTreeWidget(
         panningX = 0.0
         panningY = 0.0
 
-        expandButton.resource = if (parent.evolutionTreeExpanded) minimizeResource else expandResource
         expandButton.buttonX = x + EXPAND_BUTTON_X_MARGIN
         expandButton.buttonY = y + EXPAND_BUTTON_Y_MARGIN
     }
@@ -229,50 +187,61 @@ class EvolutionTreeWidget(
     private fun buildEvolutionTree(
         pokedexEntry: PokedexEntry,
         pokedexForm: PokedexForm,
-        aspects: Set<String> = emptySet(),
+        evolution: Evolution? = null,
+        resultProperties: PokemonProperties? = evolution?.result,
+        renderData: RenderEvolutionData? = evolution?.let { renderEvolutionData(it) }
     ): EvolutionNode {
-        val discoveryLevel = CobblemonClient.clientPokedexData.getHighestKnowledgeFor(pokedexEntry, pokedexForm, aspects.toMutableSet())
+        val species = PokemonSpecies.getByIdentifier(pokedexEntry.speciesId)!!
 
         val formEquivalents = Dexes.getFormEquivalents(pokedexForm.displayForm)
-        val evolutions = DexEntries.evolutionDisplays.filter { it.fromSpecies == pokedexEntry.speciesId && formEquivalents.contains(it.fromForm.lowercase()) }
+        val form = species.forms.firstOrNull { formEquivalents.contains(it.name.lowercase()) }
+        val parentSpecies = Dexes.findDexEntryBySpeciesId(species.resourceIdentifier)!!
+        val parentPokedexForm = parentSpecies.forms.first { formEquivalents.contains(it.displayForm.lowercase()) }
 
-        val children = evolutions.mapNotNull {
-            val childPokedexEntry = Dexes.findDexEntryBySpeciesId(it.toSpecies)
-            if (childPokedexEntry == null) {
-                Cobblemon.LOGGER.warn("Dex entry not found for species: ${it.toSpecies}")
-                return@mapNotNull null
+        val aspects = resultProperties?.aspects?.toMutableSet() ?: mutableSetOf()
+        form?.aspects?.let { aspects.addAll(it) }
+
+        val discoveryLevel = CobblemonClient.clientPokedexData.getHighestKnowledgeFor(pokedexEntry, pokedexForm, aspects)
+
+        val evolutions = form?.evolutions ?: species.evolutions
+
+        // Avoid evolution.result.create() here: it builds a full battle-ready Pokemon (initializeMovesetFromDefault
+        // etc.) which relies on server-only data like CobblemonMovesetBuilders and crashes on the client
+        val children = evolutions.flatMap { evolution ->
+            val baseRenderData = renderEvolutionData(evolution)
+
+            listOfNotNull(evolution.result, evolution.shedder).mapNotNull { resultProperties ->
+                val resultSpecies = resultProperties.species
+                    ?.let { PokemonSpecies.getByIdentifier(it.asIdentifierDefaultingNamespace()) }
+                    ?: return@mapNotNull null
+                
+                val resultForm = resultSpecies.getForm(aspects + resultProperties.aspects)
+
+                val speciesId = resultSpecies.resourceIdentifier
+                val childPokedexEntry = Dexes.findDexEntryBySpeciesId(speciesId)
+
+                if (childPokedexEntry == null) {
+                    Cobblemon.LOGGER.warn("Dex entry not found for species: $speciesId")
+                    return@mapNotNull null
+                }
+
+                val formEquivalents = Dexes.getFormEquivalents(resultForm.name.lowercase())
+                val childPokedexForm = childPokedexEntry.forms.first { formEquivalents.contains(it.displayForm.lowercase()) }
+
+                val childRenderData = if (resultProperties === evolution.shedder) {
+                    RenderEvolutionData(
+                        icons = (baseRenderData?.icons ?: emptyList()) + CobblemonItems.POKE_BALL,
+                        tooltips = (baseRenderData?.tooltips ?: emptyList()) + lang("ui.pokedex.evolution.shedder.tooltip"),
+                    )
+                } else {
+                    baseRenderData
+                }
+
+                return@mapNotNull buildEvolutionTree(childPokedexEntry, childPokedexForm, evolution, resultProperties, childRenderData)
             }
-            val formEquivalents = Dexes.getFormEquivalents(it.toForm.lowercase())
-            val childPokedexForm = childPokedexEntry.forms.first { formEquivalents.contains(it.displayForm.lowercase()) }
-            buildEvolutionTree(childPokedexEntry, childPokedexForm, it.toAspects)
         }
 
-        return EvolutionNode(
-            pokedexEntry = pokedexEntry,
-            pokedexForm = pokedexForm,
-            aspects = aspects,
-            pokedexEntryProgress = discoveryLevel,
-            children = mergeEquivalentChildren(children),
-            renderDataAlternatives = evolutions,
-        )
-    }
-
-    private fun mergeEquivalentChildren(children: List<EvolutionNode>): List<EvolutionNode> {
-        return children
-            .groupBy { Triple(it.pokedexEntry.speciesId, it.pokedexForm.displayForm.lowercase(), it.aspects) }
-            .values
-            .map { group ->
-                if (group.size == 1) return@map group.first()
-                val first = group.first()
-                EvolutionNode(
-                    first.pokedexEntry,
-                    first.pokedexForm,
-                    first.aspects,
-                    first.pokedexEntryProgress,
-                    first.children,
-                    group.flatMap { it.renderDataAlternatives }
-                )
-            }
+        return EvolutionNode(pokedexEntry, parentPokedexForm, aspects, discoveryLevel, children, renderData)
     }
 
     private fun renderTreeDrawingNode(
@@ -289,19 +258,15 @@ class EvolutionTreeWidget(
             val (childX, _) = getDrawingCoordinates(child)
 
             val lineStartX = treeX + SCROLL_SLOT_SIZE
+            val lineEndX = childX
             val lineY = treeY + SCROLL_SLOT_SIZE / 2
 
-            val formEquivalents = Dexes.getFormEquivalents(child.value.pokedexForm.displayForm)
-            val alternatives = treeDrawingNode.value.renderDataAlternatives.filter {
-                it.toSpecies == child.value.pokedexEntry.speciesId && formEquivalents.contains(it.toForm.lowercase()) && it.toAspects == child.value.aspects
-            }
-
-            alternatives.takeIf { it.isNotEmpty() }?.let {
+            child.value.renderData?.let { renderData ->
                 drawEvolutionInfo(
                     guiGraphics,
-                    it,
+                    renderData,
                     lineStartX,
-                    childX,
+                    lineEndX,
                     lineY,
                     mouseX,
                     mouseY,
@@ -333,19 +298,16 @@ class EvolutionTreeWidget(
             treeDrawingNode.children.forEach { child ->
                 val (childX, childY) = getDrawingCoordinates(child)
 
+                val lineStartX = treeForkEnd
+                val lineEndX = childX
                 val lineY = childY + SCROLL_SLOT_SIZE / 2
 
-                val formEquivalents = Dexes.getFormEquivalents(child.value.pokedexForm.displayForm)
-                val alternatives = treeDrawingNode.value.renderDataAlternatives.filter {
-                    it.toSpecies == child.value.pokedexEntry.speciesId && formEquivalents.contains(it.toForm.lowercase()) && it.toAspects == child.value.aspects
-                }
-
-                alternatives.takeIf { it.isNotEmpty() }?.let {
+                child.value.renderData?.let { renderData ->
                     drawEvolutionInfo(
                         guiGraphics,
-                        it,
-                        treeForkEnd,
-                        childX,
+                        renderData,
+                        lineStartX,
+                        lineEndX,
                         lineY,
                         mouseX,
                         mouseY,
@@ -384,7 +346,7 @@ class EvolutionTreeWidget(
                         if (formName == "normal") null
                         else lang("ui.pokedex.info.form.${species}-${formName.replace("-", "")}")
 
-                    formComponent?.let { speciesComponent.copy().add(" (").add(it).add(")") } ?: speciesComponent
+                    formComponent?.add(" ")?.add(speciesComponent) ?: speciesComponent
                 }
 
             guiGraphics.disableScissor()
@@ -446,7 +408,7 @@ class EvolutionTreeWidget(
 
     private fun drawEvolutionInfo(
         guiGraphics: GuiGraphics,
-        renderDataAlternatives: List<DexEvolutionDisplay>,
+        renderData: RenderEvolutionData,
         lineStartX: Int,
         lineEndX: Int,
         lineY: Int,
@@ -454,26 +416,6 @@ class EvolutionTreeWidget(
         mouseY: Int,
         delta: Float,
     ) {
-        val icons = renderDataAlternatives.flatMap { it.requirements.filter(::isDisplayable).map { req -> req.icon } }.distinct()
-        val playerBiome = Minecraft.getInstance().player?.let { it.level().getBiome(it.blockPosition()) }
-        val alternativeTooltips = renderDataAlternatives.map { alternative ->
-            alternative.requirements.filter(::isDisplayable).map { req ->
-                if (req is CobblemonBiomeDexEvolutionRequirementDisplay) {
-                    val tooltip = req.tooltip.copy()
-                    if (playerBiome != null) {
-                        val conditionFits = req.condition?.let { if (it.tag) playerBiome.`is`(TagKey.create(Registries.BIOME, it.id)) else playerBiome.`is`(it.id) } ?: true
-                        val antiConditionFits = req.antiCondition?.let { if (it.tag) playerBiome.`is`(TagKey.create(Registries.BIOME, it.id)) else playerBiome.`is`(it.id) } ?: false
-                        val isMet = conditionFits && !antiConditionFits
-                        tooltip.add(if (isMet) Component.literal(" ✔").green() else Component.literal(" ✘").red())
-                    }
-                    tooltip
-                } else {
-                    req.tooltip
-                }
-            }
-        }
-        val tooltips = combineAlternativeTooltips(alternativeTooltips)
-
         val lineXMiddle = (lineStartX + lineEndX) / 2
         val iconX = (lineXMiddle + ICON_X_PADDING - ICON_SLOT_HALF_PADDING).toInt()
         val iconY = (lineY + ICON_Y_PADDING - ICON_SLOT_HALF_PADDING).toInt()
@@ -489,7 +431,7 @@ class EvolutionTreeWidget(
             return
         }
 
-        if (icons.isEmpty()) {
+        if (renderData.icons.isEmpty()) {
             guiGraphics.hLine(
                 lineStartX,
                 lineEndX,
@@ -520,8 +462,8 @@ class EvolutionTreeWidget(
                 height = iconSize,
             )
 
-            val index = (System.currentTimeMillis() / MILLIS_BETWEEN_ICONS_CYCLE) % icons.size
-            val item = icons[index.toInt()]
+            val index = (System.currentTimeMillis() / MILLIS_BETWEEN_ICONS_CYCLE) % renderData.icons.size
+            val item = renderData.icons[index.toInt()]
 
             renderScaledGuiItemIcon(
                 itemStack = item.defaultInstance,
@@ -536,49 +478,17 @@ class EvolutionTreeWidget(
         val isIconHovered = isElementHovered(
             mouseX,
             mouseY,
-            iconX,
-            iconX + iconSize,
-            iconY,
-            iconY + iconSize,
+            iconX.toInt(),
+            iconX.toInt() + iconSize,
+            iconY.toInt(),
+            iconY.toInt() + iconSize,
         )
 
-        if (tooltips.isNotEmpty() &&
+        if (renderData.tooltips.isNotEmpty() &&
             (isLineHovered || isIconHovered) &&
             this.isHovered(mouseX.toDouble(), mouseY.toDouble())
         ) {
-            hoveredTooltips = tooltips.map { it.copy() }
-        }
-    }
-
-    /** Hides biome requirements naming untranslated biomes, e.g. from mods that aren't installed (aether:skyroot_forest) */
-    private fun isDisplayable(requirement: DexEvolutionRequirementDisplay): Boolean {
-        if (requirement !is CobblemonBiomeDexEvolutionRequirementDisplay) return true
-        return listOfNotNull(requirement.condition, requirement.antiCondition).all {
-            it.tag || Language.getInstance().has("biome.${it.id.namespace}.${it.id.path}")
-        }
-    }
-
-    private fun combineAlternativeTooltips(alternatives: List<List<Component>>): List<Component> {
-        val groups = alternatives.filter { it.isNotEmpty() }
-        if (groups.size <= 1) return groups.firstOrNull() ?: emptyList()
-
-        val sharedStrings = groups.map { group -> group.map { it.string }.toSet() }.reduce { acc, strings -> acc intersect strings }
-        val shared = groups.first().filter { it.string in sharedStrings }.distinctBy { it.string }
-        val remainders = groups
-            .map { group -> group.filter { it.string !in sharedStrings } }
-            .distinctBy { group -> group.map { it.string } }
-
-        // An alternative needing nothing beyond the shared lines makes the others irrelevant
-        if (remainders.any { it.isEmpty() }) return shared
-        if (remainders.size == 1) return shared + remainders.first()
-
-        return if (remainders.size >= 3 && remainders.all { it.size == 1 }) {
-            shared + lang("ui.pokedex.evolution.one_of").bold() + remainders.map { it.first() }
-        } else {
-            // Show each alternative in full, otherwise it's unclear where the first one starts
-            groups.distinctBy { group -> group.map { it.string } }.flatMapIndexed { index, group ->
-                if (index == 0) group else listOf(lang("ui.pokedex.evolution.or").bold()) + group
-            }
+            hoveredTooltips = renderData.tooltips
         }
     }
 
@@ -656,6 +566,6 @@ class EvolutionTreeWidget(
         val aspects: Set<String>,
         val pokedexEntryProgress: PokedexEntryProgress,
         override val children: List<EvolutionNode>,
-        val renderDataAlternatives: List<DexEvolutionDisplay>,
+        val renderData: RenderEvolutionData?,
     ) : TreeNode<EvolutionNode>
 }

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

@@ -1041,10 +1041,7 @@ class TMMachineScreen(containerMenu: TMMachineMenu, val inventory: Inventory, ti
                     // Scroll to move if moves list contains held TM move
                     if (tmList.get().contains(heldStackTm)) {
                         val moveListIndex = tmList.get().indexOf(heldStackTm)
-                        movesScrollingList.scrollAmount = movesScrollingList.maxScroll * when (moveListIndex) {
-                            tmList.get().lastIndex -> 1.0
-                            else -> (moveListIndex / tmList.get().size.toDouble())
-                        }
+                        movesScrollingList.scrollAmount = (if (moveListIndex == tmList.get().lastIndex) 1.0 else (moveListIndex / tmList.get().size.toDouble()))* movesScrollingList.maxScroll
                     }
                 }
             }

common/src/main/kotlin/com/cobblemon/mod/common/client/net/storage/pc/OpenPCHandler.kt

@@ -24,9 +24,8 @@ object OpenPCHandler : ClientNetworkPacketHandler<OpenPCPacket> {
                 party = CobblemonClient.storage.party,
                 configuration = PCGUIConfiguration(),
                 openOnBox = packet.box ?: CobblemonClient.lastPcBoxViewed,
-                unseenWallpapers = packet.unseenWallpapers.toMutableSet(),
-                silent = packet.silent
+                unseenWallpapers = packet.unseenWallpapers.toMutableSet()
             )
         )
     }
-}
+}

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/render/models/blockbench/pokemon/gen1/CaterpieModel.kt

@@ -0,0 +1,98 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen1
+
+import com.cobblemon.mod.common.client.render.models.blockbench.PosableState
+import com.cobblemon.mod.common.client.render.models.blockbench.createTransformation
+import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
+import com.cobblemon.mod.common.client.render.models.blockbench.pose.CobblemonPose
+import com.cobblemon.mod.common.client.render.models.blockbench.pose.ModelPartTransformation
+import com.cobblemon.mod.common.client.render.models.blockbench.pose.Pose
+import com.cobblemon.mod.common.entity.PoseType
+import com.cobblemon.mod.common.entity.PoseType.Companion.MOVING_POSES
+import com.cobblemon.mod.common.entity.PoseType.Companion.STATIONARY_POSES
+import com.cobblemon.mod.common.entity.PoseType.Companion.UI_POSES
+import net.minecraft.client.model.geom.ModelPart
+import net.minecraft.world.phys.Vec3
+
+class CaterpieModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame {
+    override val rootPart = root.registerChildWithAllChildren("caterpie")
+    override val head = getPart("head")
+
+    override var portraitScale = 2.1F
+    override var portraitTranslation = Vec3(-0.55, -1.55, 0.0)
+    override var profileScale = 0.8F
+    override var profileTranslation = Vec3(0.0, 0.55, 0.0)
+
+    lateinit var sleep: Pose
+    lateinit var standing: Pose
+    lateinit var walk: Pose
+    lateinit var shoulderLeft: CobblemonPose
+    lateinit var shoulderRight: CobblemonPose
+
+    val shoulderOffset = 3
+
+
+    override val cryAnimation = CryProvider { bedrockStateful("caterpie", "cry") }
+
+    override fun registerPoses() {
+        val blink = quirk { bedrockStateful("caterpie", "blink")}
+        sleep = registerPose(
+            poseType = PoseType.SLEEP,
+            transformTicks = 10,
+            animations = arrayOf(bedrock("caterpie", "sleep"))
+        )
+
+        standing = registerPose(
+            poseName = "standing",
+            poseTypes = STATIONARY_POSES + UI_POSES,
+            quirks = arrayOf(blink),
+            animations = arrayOf(
+                singleBoneLook(),
+                bedrock("caterpie", "ground_idle")
+            )
+        )
+
+        walk = registerPose(
+            poseName = "walking",
+            poseTypes = MOVING_POSES,
+            quirks = arrayOf(blink),
+            animations = arrayOf(
+                singleBoneLook(),
+                bedrock("caterpie", "ground_walk")
+            )
+        )
+
+        shoulderLeft = registerPose(
+                poseType = PoseType.SHOULDER_LEFT,
+                quirks = arrayOf(blink),
+                animations = arrayOf(
+                        bedrock("caterpie", "ground_idle")
+                ),
+                transformedParts = arrayOf(
+                        rootPart.createTransformation().addPosition(ModelPartTransformation.X_AXIS, shoulderOffset)
+                )
+        )
+
+        shoulderRight = registerPose(
+                poseType = PoseType.SHOULDER_RIGHT,
+                quirks = arrayOf(blink),
+                animations = arrayOf(
+                        bedrock("caterpie", "ground_idle")
+                ),
+                transformedParts = arrayOf(
+                        rootPart.createTransformation().addPosition(ModelPartTransformation.X_AXIS, -shoulderOffset)
+                )
+        )
+    }
+
+    override fun getFaintAnimation(state: PosableState) = bedrockStateful("caterpie", "faint")
+}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/WeedleModel.kt

@@ -0,0 +1,98 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen1
+
+import com.cobblemon.mod.common.client.render.models.blockbench.PosableState
+import com.cobblemon.mod.common.client.render.models.blockbench.createTransformation
+import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
+import com.cobblemon.mod.common.client.render.models.blockbench.pose.ModelPartTransformation
+import com.cobblemon.mod.common.client.render.models.blockbench.pose.Pose
+import com.cobblemon.mod.common.entity.PoseType
+import com.cobblemon.mod.common.entity.PoseType.Companion.MOVING_POSES
+import com.cobblemon.mod.common.entity.PoseType.Companion.STATIONARY_POSES
+import com.cobblemon.mod.common.entity.PoseType.Companion.UI_POSES
+import net.minecraft.client.model.geom.ModelPart
+import net.minecraft.world.phys.Vec3
+
+class WeedleModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame {
+    override val rootPart = root.registerChildWithAllChildren("weedle")
+    override val head = getPart("head")
+
+    override var portraitScale = 2.2F
+    override var portraitTranslation = Vec3(-0.31, -1.83, 0.0)
+    override var profileScale = 0.8F
+    override var profileTranslation = Vec3(0.1, 0.6, 0.0)
+
+    lateinit var sleep: Pose
+    lateinit var standing: Pose
+    lateinit var walk: Pose
+    lateinit var shoulderLeft: Pose
+    lateinit var shoulderRight: Pose
+
+    val shoulderOffset = 3.8
+    val shoulderZOffset = -3
+
+    override val cryAnimation = CryProvider { bedrockStateful("weedle", "cry") }
+
+    override fun registerPoses() {
+        val blink = quirk { bedrockStateful("weedle", "blink")}
+        sleep = registerPose(
+            poseType = PoseType.SLEEP,
+            animations = arrayOf(bedrock("weedle", "sleep"))
+        )
+
+        standing = registerPose(
+            poseName = "standing",
+            poseTypes = STATIONARY_POSES + UI_POSES,
+            quirks = arrayOf(blink),
+            animations = arrayOf(
+                singleBoneLook(),
+                bedrock("weedle", "ground_idle2")
+            )
+        )
+
+        walk = registerPose(
+            poseName = "walk",
+            poseTypes = MOVING_POSES,
+            quirks = arrayOf(blink),
+            animations = arrayOf(
+                singleBoneLook(),
+                bedrock("weedle", "ground_walk")
+            )
+        )
+
+        shoulderLeft = registerPose(
+                poseType = PoseType.SHOULDER_LEFT,
+                quirks = arrayOf(blink),
+                animations = arrayOf(
+                        bedrock("weedle", "ground_idle")
+                ),
+                transformedParts = arrayOf(
+                        rootPart.createTransformation().addPosition(ModelPartTransformation.X_AXIS, shoulderOffset),
+                        rootPart.createTransformation().addPosition(ModelPartTransformation.Z_AXIS, shoulderZOffset)
+                )
+        )
+
+        shoulderRight = registerPose(
+                poseType = PoseType.SHOULDER_RIGHT,
+                quirks = arrayOf(blink),
+                animations = arrayOf(
+                        bedrock("weedle", "ground_idle")
+                ),
+                transformedParts = arrayOf(
+                        rootPart.createTransformation().addPosition(ModelPartTransformation.X_AXIS, -shoulderOffset),
+                        rootPart.createTransformation().addPosition(ModelPartTransformation.Z_AXIS, shoulderZOffset)
+                )
+        )
+    }
+
+    override fun getFaintAnimation(state: PosableState) = bedrockStateful("weedle", "faint")
+}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/LuxioModel.kt

@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen4
+
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
+import com.cobblemon.mod.common.client.render.models.blockbench.animation.QuadrupedWalkAnimation
+import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.frame.QuadrupedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.pose.Pose
+import com.cobblemon.mod.common.entity.PoseType
+import net.minecraft.client.model.geom.ModelPart
+import net.minecraft.world.phys.Vec3
+
+class LuxioModel (root: ModelPart) : PokemonPosableModel(root), HeadedFrame, QuadrupedFrame {
+    override val rootPart = root.registerChildWithAllChildren("luxio")
+    override val head = getPart("head")
+
+    override val foreLeftLeg = getPart("front_leg_left")
+    override val foreRightLeg = getPart("front_leg_right")
+    override val hindLeftLeg = getPart("back_leg_left")
+    override val hindRightLeg = getPart("back_leg_right")
+
+    override var portraitScale = 1.8F
+    override var portraitTranslation = Vec3(-0.6, -0.25, 0.0)
+
+    override var profileScale = 0.7F
+    override var profileTranslation = Vec3(0.0, 0.7, 0.0)
+
+    lateinit var standing: Pose
+    lateinit var walk: Pose
+    lateinit var sleep: Pose
+
+    override fun registerPoses() {
+//        val blink = quirk { bedrockStateful("luxio", "blink") }
+        sleep = registerPose(
+            poseType = PoseType.SLEEP,
+            animations = arrayOf(bedrock("luxio", "sleep"))
+        )
+
+        standing = registerPose(
+            poseName = "standing",
+            poseTypes = PoseType.UI_POSES + PoseType.STATIONARY_POSES,
+//            quirks = arrayOf(blink),
+            animations = arrayOf(
+                singleBoneLook(),
+                bedrock("luxio", "idle")
+            )
+        )
+
+        walk = registerPose(
+            poseName = "walk",
+            poseTypes = PoseType.MOVING_POSES,
+//            quirks = arrayOf(blink),
+            animations = arrayOf(
+                QuadrupedWalkAnimation(this, periodMultiplier = 1.1F),
+                singleBoneLook(),
+                bedrock("luxio", "idle")
+            )
+        )
+    }
+
+//    override fun getFaintAnimation(
+//        pokemonEntity: PokemonEntity,
+//        state: PosableState<PokemonEntity>
+//    ) = if (state.isPosedIn(standing, walk)) bedrockStateful("luxio", "faint") else null
+}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/LuxrayModel.kt

@@ -0,0 +1,67 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen4
+
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
+import com.cobblemon.mod.common.client.render.models.blockbench.animation.QuadrupedWalkAnimation
+import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.frame.QuadrupedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.pose.Pose
+import com.cobblemon.mod.common.entity.PoseType
+import net.minecraft.client.model.geom.ModelPart
+import net.minecraft.world.phys.Vec3
+
+class LuxrayModel (root: ModelPart) : PokemonPosableModel(root), HeadedFrame, QuadrupedFrame {
+    override val rootPart = root.registerChildWithAllChildren("luxray")
+    override val head = getPart("head")
+
+    override val foreLeftLeg = getPart("front_leg_left")
+    override val foreRightLeg = getPart("front_leg_right")
+    override val hindLeftLeg = getPart("back_leg_left")
+    override val hindRightLeg = getPart("back_leg_right")
+
+    override var portraitScale = 1.8F
+    override var portraitTranslation = Vec3(-0.9, 0.6, 0.0)
+
+    override var profileScale = 0.66F
+    override var profileTranslation = Vec3(0.0, 0.7, 0.0)
+
+    lateinit var standing: Pose
+    lateinit var walk: Pose
+
+    override fun registerPoses() {
+//        val blink = quirk { bedrockStateful("luxray", "blink") }
+        standing = registerPose(
+            poseName = "standing",
+            poseTypes = PoseType.UI_POSES + PoseType.STATIONARY_POSES,
+//            quirks = arrayOf(blink),
+            animations = arrayOf(
+                singleBoneLook(),
+                bedrock("luxray", "ground_idle")
+            )
+        )
+
+        walk = registerPose(
+            poseName = "walk",
+            poseTypes = PoseType.MOVING_POSES,
+//            quirks = arrayOf(blink),
+            animations = arrayOf(
+                QuadrupedWalkAnimation(this, periodMultiplier = 1.1F),
+                bedrock("luxray", "ground_idle"),
+                singleBoneLook()
+//                bedrock("luxray", "idle")
+            )
+        )
+    }
+
+//    override fun getFaintAnimation(
+//        pokemonEntity: PokemonEntity,
+//        state: PosableState<PokemonEntity>
+//    ) = if (state.isPosedIn(standing, walk)) bedrockStateful("luxray", "faint") else null
+}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/ShinxModel.kt

@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen4
+
+import com.cobblemon.mod.common.client.render.models.blockbench.animation.QuadrupedWalkAnimation
+import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.frame.QuadrupedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
+import com.cobblemon.mod.common.client.render.models.blockbench.pose.Pose
+import com.cobblemon.mod.common.entity.PoseType
+import net.minecraft.client.model.geom.ModelPart
+import net.minecraft.world.phys.Vec3
+
+class ShinxModel (root: ModelPart) : PokemonPosableModel(root), HeadedFrame, QuadrupedFrame {
+    override val rootPart = root.registerChildWithAllChildren("shinx")
+    override val head = getPart("head")
+
+    override val foreLeftLeg = getPart("leg_left")
+    override val foreRightLeg = getPart("leg_right")
+    override val hindLeftLeg = getPart("back_leg_left")
+    override val hindRightLeg = getPart("back_leg_right")
+
+    override var portraitScale = 1.8F
+    override var portraitTranslation = Vec3(-0.6, -0.25, 0.0)
+
+    override var profileScale = 0.66F
+    override var profileTranslation = Vec3(0.0, 0.7, 0.0)
+
+    lateinit var standing: Pose
+    lateinit var walk: Pose
+
+    override fun registerPoses() {
+//        val blink = quirk { bedrockStateful("shinx", "blink") }
+        standing = registerPose(
+            poseName = "standing",
+            poseTypes = PoseType.UI_POSES + PoseType.STATIONARY_POSES,
+//            quirks = arrayOf(blink),
+            animations = arrayOf(
+                singleBoneLook(),
+                bedrock("shinx", "ground_idle")
+            )
+        )
+
+        walk = registerPose(
+            poseName = "walk",
+            poseTypes = PoseType.MOVING_POSES,
+//            quirks = arrayOf(blink),
+            animations = arrayOf(
+                QuadrupedWalkAnimation(this, periodMultiplier = 1.1F),
+                singleBoneLook(),
+                bedrock("shinx", "ground_idle")
+            )
+        )
+    }
+
+//    override fun getFaintAnimation(
+//        pokemonEntity: PokemonEntity,
+//        state: PosableState<PokemonEntity>
+//    ) = if (state.isPosedIn(standing, walk)) bedrockStateful("shinx", "faint") else null
+}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/JellicentModel.kt

@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen5
+
+import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
+import com.cobblemon.mod.common.client.render.models.blockbench.pose.CobblemonPose
+import com.cobblemon.mod.common.entity.PoseType
+import net.minecraft.client.model.geom.ModelPart
+import net.minecraft.world.phys.Vec3
+
+class JellicentModel (root: ModelPart) : PokemonPosableModel(root), HeadedFrame {
+    override val rootPart = root.registerChildWithAllChildren("jellicent")
+    override val head = getPart("head")
+
+    override var portraitScale = 1.13F
+    override var portraitTranslation = Vec3(-0.56, 1.64, 0.0)
+
+    override var profileScale = 0.51F
+    override var profileTranslation = Vec3(0.0, 1.05, 0.0)
+
+    lateinit var standing: CobblemonPose
+    lateinit var walk: CobblemonPose
+
+    override fun registerPoses() {
+        val blink = quirk { bedrockStateful("jellicent", "blink") }
+
+        standing = registerPose(
+            poseName = "standing",
+            poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES,
+            quirks = arrayOf(blink),
+            animations = arrayOf(
+                singleBoneLook(),
+                bedrock("jellicent", "render")
+            )
+        )
+
+        walk = registerPose(
+            poseName = "walk",
+            poseTypes = PoseType.MOVING_POSES,
+            quirks = arrayOf(blink),
+            animations = arrayOf(
+                singleBoneLook(),
+                bedrock("jellicent", "render")
+            )
+        )
+    }
+
+//    override fun getFaintAnimation(
+//        pokemonEntity: PokemonEntity,
+//        state: PosableState<PokemonEntity>
+//    ) = if (state.isPosedIn(standing, walk)) bedrockStateful("jellicent", "faint") else null
+}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/ChesnaughtModel.kt

@@ -0,0 +1,70 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen6
+
+import com.cobblemon.mod.common.client.render.models.blockbench.animation.BimanualSwingAnimation
+import com.cobblemon.mod.common.client.render.models.blockbench.animation.BipedWalkAnimation
+import com.cobblemon.mod.common.client.render.models.blockbench.frame.BimanualFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.frame.BipedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
+import com.cobblemon.mod.common.client.render.models.blockbench.pose.Pose
+import com.cobblemon.mod.common.entity.PoseType.Companion.MOVING_POSES
+import com.cobblemon.mod.common.entity.PoseType.Companion.STATIONARY_POSES
+import com.cobblemon.mod.common.entity.PoseType.Companion.UI_POSES
+import net.minecraft.client.model.geom.ModelPart
+import net.minecraft.world.phys.Vec3
+
+class ChesnaughtModel (root: ModelPart) : PokemonPosableModel(root), HeadedFrame, BipedFrame, BimanualFrame {
+    override val rootPart = root.registerChildWithAllChildren("chesnaught")
+    override val head = getPart("head")
+    override val rightArm = getPart("arm_right")
+    override val leftArm = getPart("arm_left")
+    override val leftLeg = getPart("leg_left")
+    override val rightLeg = getPart("leg_right")
+
+    override var portraitScale = 2.2F
+    override var portraitTranslation = Vec3(-1.0, 1.65, 0.0)
+
+    override var profileScale = 0.6F
+    override var profileTranslation = Vec3(0.0, 0.85, 0.0)
+
+
+    lateinit var standing: Pose
+    lateinit var walk: Pose
+
+    override val cryAnimation = CryProvider { bedrockStateful("chesnaught", "cry") }
+
+    override fun registerPoses() {
+        val blink = quirk { bedrockStateful("chesnaught", "blink")}
+
+        standing = registerPose(
+            poseName = "standing",
+            poseTypes = STATIONARY_POSES + UI_POSES,
+            quirks = arrayOf(blink),
+            animations = arrayOf(
+                singleBoneLook(),
+                bedrock("chesnaught", "ground_idle")
+            )
+        )
+
+        walk = registerPose(
+            poseName = "walk",
+            poseTypes = MOVING_POSES,
+            quirks = arrayOf(blink),
+            animations = arrayOf(
+                singleBoneLook(),
+                BimanualSwingAnimation(this),
+                BipedWalkAnimation(this),
+                bedrock("chesnaught", "ground_idle")
+            )
+        )
+    }
+}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/ChespinModel.kt

@@ -0,0 +1,70 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen6
+
+import com.cobblemon.mod.common.client.render.models.blockbench.frame.BimanualFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.frame.BipedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
+import com.cobblemon.mod.common.client.render.models.blockbench.pose.Pose
+import com.cobblemon.mod.common.entity.PoseType
+import net.minecraft.client.model.geom.ModelPart
+import net.minecraft.world.phys.Vec3
+
+class ChespinModel (root: ModelPart) : PokemonPosableModel(root), HeadedFrame, BipedFrame, BimanualFrame {
+    override val rootPart = root.registerChildWithAllChildren("chespin")
+    override val head = getPart("head")
+    override val rightArm = getPart("arm_right")
+    override val leftArm = getPart("arm_left")
+    override val leftLeg = getPart("leg_left")
+    override val rightLeg = getPart("leg_right")
+
+    override var portraitScale = 2.03F
+    override var portraitTranslation = Vec3(-0.12, -0.44, 0.0)
+
+    override var profileScale = 0.77F
+    override var profileTranslation = Vec3(0.0, 0.6, 0.0)
+
+    lateinit var standing: Pose
+    lateinit var walk: Pose
+    lateinit var sleep: Pose
+
+    override val cryAnimation = CryProvider { bedrockStateful("chespin", "cry") }
+
+    override fun registerPoses() {
+        val blink = quirk { bedrockStateful("chespin", "blink")}
+
+        standing = registerPose(
+            poseName = "standing",
+            poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES,
+            quirks = arrayOf(blink),
+            animations = arrayOf(
+                singleBoneLook(),
+                bedrock("chespin", "ground_idle")
+            )
+        )
+
+        walk = registerPose(
+            poseName = "walk",
+            poseTypes = PoseType.MOVING_POSES,
+            quirks = arrayOf(blink),
+            animations = arrayOf(
+                singleBoneLook(),
+                bedrock("chespin", "ground_walk")
+            )
+        )
+
+        sleep = registerPose(
+            poseType = PoseType.SLEEP,
+            transformTicks = 10,
+            animations = arrayOf(bedrock("chespin", "sleep"))
+        )
+    }
+}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/FroakieModel.kt

@@ -0,0 +1,118 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen6
+
+import com.cobblemon.mod.common.client.render.models.blockbench.PosableState
+import com.cobblemon.mod.common.client.render.models.blockbench.frame.BimanualFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.frame.BipedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
+import com.cobblemon.mod.common.client.render.models.blockbench.pose.Pose
+import com.cobblemon.mod.common.entity.PoseType
+import com.cobblemon.mod.common.util.isBattling
+import net.minecraft.client.model.geom.ModelPart
+import net.minecraft.world.phys.Vec3
+
+class FroakieModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame, BipedFrame, BimanualFrame {
+    override val rootPart = root.registerChildWithAllChildren("froakie")
+    override val head = getPart("head")
+    override val rightArm = getPart("arm_right")
+    override val leftArm = getPart("arm_left")
+    override val rightLeg = getPart("leg_right")
+    override val leftLeg = getPart("leg_left")
+
+    override var portraitScale = 1.86F
+    override var portraitTranslation = Vec3(-0.25, -0.51, 0.0)
+
+    override var profileScale = 0.75F
+    override var profileTranslation = Vec3(0.0, 0.56, 0.0)
+
+    lateinit var sleep: Pose
+    lateinit var standing: Pose
+    lateinit var float: Pose
+    lateinit var swim: Pose
+    lateinit var walk: Pose
+    lateinit var battleidle: Pose
+
+    override val cryAnimation = CryProvider { bedrockStateful("froakie", "cry") }
+
+    override fun registerPoses() {
+        val blink = quirk { bedrockStateful("froakie", "blink")}
+        sleep = registerPose(
+                poseType = PoseType.SLEEP,
+                transformTicks = 10,
+                quirks = arrayOf(blink),
+                animations = arrayOf(bedrock("froakie", "sleep"))
+        )
+
+        standing = registerPose(
+                poseName = "standing",
+                poseTypes = PoseType.UI_POSES + PoseType.STATIONARY_POSES - PoseType.FLOAT,
+                transformTicks = 10,
+                quirks = arrayOf(blink),
+                condition = { !it.isBattling },
+                animations = arrayOf(
+                        singleBoneLook(),
+                        bedrock("froakie", "ground_idle")
+                )
+        )
+
+        walk = registerPose(
+                poseName = "walk",
+                poseType = PoseType.WALK,
+                transformTicks = 10,
+                quirks = arrayOf(blink),
+                condition = { !it.isBattling },
+                animations = arrayOf(
+                        singleBoneLook(),
+                        bedrock("froakie", "ground_walk")
+                )
+        )
+
+        float = registerPose(
+                poseName = "swim_idle",
+                poseTypes = setOf(PoseType.FLOAT, PoseType.HOVER),
+                transformTicks = 10,
+                quirks = arrayOf(blink),
+                condition = { !it.isBattling },
+                animations = arrayOf(
+                        singleBoneLook(),
+                        bedrock("froakie", "water_idle")
+                )
+        )
+
+        swim = registerPose(
+                poseName = "swim",
+                poseTypes = setOf(PoseType.SWIM, PoseType.FLY),
+                transformTicks = 10,
+                quirks = arrayOf(blink),
+                condition = { !it.isBattling },
+                animations = arrayOf(
+                        singleBoneLook(),
+                        bedrock("froakie", "water_swim")
+                )
+        )
+
+        battleidle = registerPose(
+                poseName = "battle_idle",
+                poseTypes = PoseType.STATIONARY_POSES,
+                transformTicks = 10,
+                quirks = arrayOf(blink),
+                condition = { it.isBattling },
+                animations = arrayOf(
+                        singleBoneLook(),
+                        bedrock("froakie", "battle_idle")
+                )
+
+        )
+    }
+
+    override fun getFaintAnimation(state: PosableState) = if (state.isPosedIn(standing, walk, battleidle, swim, float, sleep)) bedrockStateful("froakie", "faint") else null
+}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/FrogadierModel.kt

@@ -0,0 +1,118 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen6
+
+import com.cobblemon.mod.common.client.render.models.blockbench.PosableState
+import com.cobblemon.mod.common.client.render.models.blockbench.frame.BimanualFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.frame.BipedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
+import com.cobblemon.mod.common.client.render.models.blockbench.pose.Pose
+import com.cobblemon.mod.common.entity.PoseType
+import com.cobblemon.mod.common.util.isBattling
+import net.minecraft.client.model.geom.ModelPart
+import net.minecraft.world.phys.Vec3
+
+class FrogadierModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame, BipedFrame, BimanualFrame {
+    override val rootPart = root.registerChildWithAllChildren("frogadier")
+    override val head = getPart("head")
+    override val rightArm = getPart("arm_right")
+    override val leftArm = getPart("arm_left")
+    override val rightLeg = getPart("leg_right")
+    override val leftLeg = getPart("leg_left")
+
+    override var portraitScale = 1.9F
+    override var portraitTranslation = Vec3(-0.1, 1.4, 0.0)
+
+    override var profileScale = 0.7F
+    override var profileTranslation = Vec3(0.0, 0.7, 0.0)
+
+    lateinit var sleep: Pose
+    lateinit var standing: Pose
+    lateinit var float: Pose
+    lateinit var swim: Pose
+    lateinit var walk: Pose
+    lateinit var battleidle: Pose
+
+    override val cryAnimation = CryProvider { bedrockStateful("frogadier", "cry") }
+
+    override fun registerPoses() {
+        val blink = quirk { bedrockStateful("frogadier", "blink")}
+        sleep = registerPose(
+                poseType = PoseType.SLEEP,
+                transformTicks = 10,
+                quirks = arrayOf(blink),
+                animations = arrayOf(bedrock("frogadier", "sleep"))
+        )
+
+        standing = registerPose(
+                poseName = "standing",
+                poseTypes = PoseType.UI_POSES + PoseType.STATIONARY_POSES - PoseType.FLOAT,
+                transformTicks = 10,
+                quirks = arrayOf(blink),
+                condition = { !it.isBattling },
+                animations = arrayOf(
+                        singleBoneLook(),
+                        bedrock("frogadier", "ground_idle")
+                )
+        )
+
+        walk = registerPose(
+                poseName = "walk",
+                poseType = PoseType.WALK,
+                transformTicks = 10,
+                quirks = arrayOf(blink),
+                condition = { !it.isBattling },
+                animations = arrayOf(
+                        singleBoneLook(),
+                        bedrock("frogadier", "ground_walk")
+                )
+        )
+
+        float = registerPose(
+                poseName = "swim_idle",
+                poseTypes = setOf(PoseType.FLOAT, PoseType.HOVER),
+                transformTicks = 10,
+                quirks = arrayOf(blink),
+                condition = { !it.isBattling },
+                animations = arrayOf(
+                        singleBoneLook(),
+                        bedrock("frogadier", "water_idle")
+                )
+        )
+
+        swim = registerPose(
+                poseName = "swim",
+                poseTypes = setOf(PoseType.SWIM, PoseType.FLY),
+                transformTicks = 10,
+                quirks = arrayOf(blink),
+                condition = { !it.isBattling },
+                animations = arrayOf(
+                        singleBoneLook(),
+                        bedrock("frogadier", "water_swim")
+                )
+        )
+
+        battleidle = registerPose(
+                poseName = "battle_idle",
+                poseTypes = PoseType.STATIONARY_POSES,
+                transformTicks = 10,
+                quirks = arrayOf(blink),
+                condition = { it.isBattling },
+                animations = arrayOf(
+                        singleBoneLook(),
+                        bedrock("frogadier", "battle_idle")
+                )
+
+        )
+    }
+
+    override fun getFaintAnimation(state: PosableState) = if (state.isPosedIn(standing, walk, battleidle, swim, float, sleep)) bedrockStateful("frogadier", "faint") else null
+}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/GreninjaModel.kt

@@ -0,0 +1,142 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen6
+
+import com.cobblemon.mod.common.client.render.models.blockbench.PosableState
+import com.cobblemon.mod.common.client.render.models.blockbench.createTransformation
+import com.cobblemon.mod.common.client.render.models.blockbench.frame.BimanualFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.frame.BipedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
+import com.cobblemon.mod.common.client.render.models.blockbench.pose.Pose
+import com.cobblemon.mod.common.entity.PoseType
+import com.cobblemon.mod.common.util.isBattling
+import net.minecraft.client.model.geom.ModelPart
+import net.minecraft.world.phys.Vec3
+
+class GreninjaModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame, BipedFrame, BimanualFrame {
+    override val rootPart = root.registerChildWithAllChildren("greninja")
+    override val head = getPart("head")
+    override val rightArm = getPart("arm_right")
+    override val leftArm = getPart("arm_left")
+    override val rightLeg = getPart("leg_right")
+    override val leftLeg = getPart("leg_left")
+    val shurikenright = getPart("hand_shuriken_right")
+    val shurikenleft = getPart("hand_shuriken_left")
+
+    override var portraitScale = 2.2F
+    override var portraitTranslation = Vec3(-0.1, 1.34, 0.0)
+
+    override var profileScale = 0.7F
+    override var profileTranslation = Vec3(0.0, 0.7, 0.0)
+
+    lateinit var sleep: Pose
+    lateinit var standing: Pose
+    lateinit var float: Pose
+    lateinit var swim: Pose
+    lateinit var walk: Pose
+    lateinit var battleidle: Pose
+
+    override val cryAnimation = CryProvider { bedrockStateful("greninja", "cry") }
+
+    override fun registerPoses() {
+        val blink = quirk { bedrockStateful("greninja", "blink")}
+        sleep = registerPose(
+            poseType = PoseType.SLEEP,
+            transformTicks = 10,
+            transformedParts = arrayOf(
+                shurikenleft.createTransformation().withVisibility(visibility = false),
+                shurikenright.createTransformation().withVisibility(visibility = false)
+            ),
+            animations = arrayOf(bedrock("greninja", "sleep"))
+        )
+
+        standing = registerPose(
+            poseName = "standing",
+            poseTypes = PoseType.UI_POSES + PoseType.STATIONARY_POSES - PoseType.FLOAT,
+            transformTicks = 10,
+            quirks = arrayOf(blink),
+            condition = { !it.isBattling },
+            transformedParts = arrayOf(
+                shurikenleft.createTransformation().withVisibility(visibility = false),
+                shurikenright.createTransformation().withVisibility(visibility = false)
+            ),
+            animations = arrayOf(
+                singleBoneLook(),
+                bedrock("greninja", "ground_idle")
+            )
+        )
+
+        walk = registerPose(
+            poseName = "walk",
+            poseType = PoseType.WALK,
+            transformTicks = 10,
+            quirks = arrayOf(blink),
+            transformedParts = arrayOf(
+                shurikenleft.createTransformation().withVisibility(visibility = false),
+                shurikenright.createTransformation().withVisibility(visibility = false)
+            ),
+            animations = arrayOf(
+                singleBoneLook(),
+                bedrock("greninja", "ground_walk")
+            )
+        )
+
+        float = registerPose(
+            poseName = "swim_idle",
+            poseTypes = setOf(PoseType.FLOAT, PoseType.HOVER),
+            transformTicks = 10,
+            quirks = arrayOf(blink),
+            condition = { !it.isBattling },
+            transformedParts = arrayOf(
+                shurikenleft.createTransformation().withVisibility(visibility = false),
+                shurikenright.createTransformation().withVisibility(visibility = false)
+            ),
+            animations = arrayOf(
+                singleBoneLook(),
+                bedrock("greninja", "water_idle")
+            )
+        )
+
+        swim = registerPose(
+            poseName = "swim",
+            poseTypes = setOf(PoseType.SWIM, PoseType.FLY),
+            transformTicks = 10,
+            quirks = arrayOf(blink),
+            condition = { !it.isBattling },
+            transformedParts = arrayOf(
+                shurikenleft.createTransformation().withVisibility(visibility = false),
+                shurikenright.createTransformation().withVisibility(visibility = false)
+            ),
+            animations = arrayOf(
+                singleBoneLook(),
+                bedrock("greninja", "water_swim")
+            )
+        )
+
+        battleidle = registerPose(
+            poseName = "battle_idle",
+            poseTypes = PoseType.STATIONARY_POSES,
+            transformTicks = 10,
+            quirks = arrayOf(blink),
+            condition = { it.isBattling },
+            transformedParts = arrayOf(
+                shurikenleft.createTransformation().withVisibility(visibility = false),
+                shurikenright.createTransformation().withVisibility(visibility = false)
+            ),
+            animations = arrayOf(
+                singleBoneLook(),
+                bedrock("greninja", "battle_idle")
+            )
+        )
+    }
+
+    override fun getFaintAnimation(state: PosableState) = if (state.isPosedIn(standing, walk, battleidle, swim, float, sleep)) bedrockStateful("greninja", "faint") else null
+}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/QuilladinModel.kt

@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen6
+
+import com.cobblemon.mod.common.client.render.models.blockbench.frame.BimanualFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.frame.BipedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
+import com.cobblemon.mod.common.client.render.models.blockbench.pose.Pose
+import com.cobblemon.mod.common.entity.PoseType
+import com.cobblemon.mod.common.entity.PoseType.Companion.MOVING_POSES
+import com.cobblemon.mod.common.entity.PoseType.Companion.STATIONARY_POSES
+import com.cobblemon.mod.common.entity.PoseType.Companion.UI_POSES
+import net.minecraft.client.model.geom.ModelPart
+import net.minecraft.world.phys.Vec3
+
+class QuilladinModel (root: ModelPart) : PokemonPosableModel(root), HeadedFrame, BipedFrame, BimanualFrame {
+    override val rootPart = root.registerChildWithAllChildren("quilladin")
+    override val head = getPart("torso")
+    override val rightArm = getPart("arm_right")
+    override val leftArm = getPart("arm_left")
+    override val leftLeg = getPart("leg_left")
+    override val rightLeg = getPart("leg_right")
+
+    override var portraitScale = 2F
+    override var portraitTranslation = Vec3(-0.3, 0.1, 0.0)
+
+    override var profileScale = 0.7F
+    override var profileTranslation = Vec3(0.0, 0.7, 0.0)
+
+    lateinit var standing: Pose
+    lateinit var walk: Pose
+    lateinit var sleep: Pose
+
+    override val cryAnimation = CryProvider { bedrockStateful("quilladin", "cry") }
+
+    override fun registerPoses() {
+        val blink = quirk { bedrockStateful("quilladin", "blink")}
+
+        standing = registerPose(
+            poseName = "standing",
+            poseTypes = STATIONARY_POSES + UI_POSES,
+            quirks = arrayOf(blink),
+            animations = arrayOf(
+                singleBoneLook(),
+                bedrock("quilladin", "ground_idle")
+            )
+        )
+
+        walk = registerPose(
+            poseName = "walk",
+            poseTypes = MOVING_POSES,
+            quirks = arrayOf(blink),
+            animations = arrayOf(
+                singleBoneLook(),
+                bedrock("quilladin", "ground_walk")
+            )
+        )
+
+        sleep = registerPose(
+            poseType = PoseType.SLEEP,
+            transformTicks = 10,
+            animations = arrayOf(bedrock("quilladin", "sleep"))
+        )
+    }
+}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/VivillonModel.kt

@@ -29,7 +29,7 @@ class VivillonModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame, B
     override var portraitTranslation = Vec3(-0.3, 0.2, 0.0)
 
     override var profileScale = 0.7F
-    override var profileTranslation = Vec3(0.0, 0.8, 0.0)
+    override var profileTranslation = Vec3(0.1, 0.8, 0.0)
 
     lateinit var standing: Pose
     lateinit var walk: Pose

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/CrabominableModel.kt

@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen7
+
+import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
+import com.cobblemon.mod.common.client.render.models.blockbench.pose.Pose
+import com.cobblemon.mod.common.entity.PoseType
+import com.cobblemon.mod.common.entity.PoseType.Companion.UI_POSES
+import net.minecraft.client.model.geom.ModelPart
+import net.minecraft.world.phys.Vec3
+
+class CrabominableModel (root: ModelPart) : PokemonPosableModel(root), HeadedFrame {
+    override val rootPart = root.registerChildWithAllChildren("crabominable")
+    override val head = getPart("head")
+
+    override var portraitScale = 1.0F
+    override var portraitTranslation = Vec3(-0.55, 1.65, 0.0)
+
+    override var profileScale = 0.3F
+    override var profileTranslation = Vec3(0.0, 1.2, 0.0)
+
+    lateinit var standing: Pose
+    lateinit var walk: Pose
+
+    override fun registerPoses() {
+        standing = registerPose(
+            poseName = "standing",
+            poseTypes = PoseType.STATIONARY_POSES + UI_POSES,
+            animations = arrayOf(
+                singleBoneLook(),
+                bedrock("crabominable", "ground_idle")
+            )
+        )
+
+        walk = registerPose(
+            poseName = "walk",
+            poseTypes = PoseType.MOVING_POSES,
+            animations = arrayOf(
+                singleBoneLook(),
+                bedrock("crabominable", "ground_idle"),
+                bedrock("crabominable", "ground_walk")
+            )
+        )
+    }
+
+//    override fun getFaintAnimation(
+//        pokemonEntity: PokemonEntity,
+//        state: PosableState<PokemonEntity>
+//    ) = if (state.isPosedIn(standing, walk)) bedrockStateful("crabominable", "faint") else null
+}

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

@@ -220,8 +220,10 @@ object VaryingModelRepository {
 
         inbuilt("squirtle", ::SquirtleModel)
         inbuilt("wartortle", ::WartortleModel)
+        inbuilt("caterpie", ::CaterpieModel)
         inbuilt("metapod", ::MetapodModel)
         inbuilt("butterfree", ::ButterfreeModel)
+        inbuilt("weedle", ::WeedleModel)
         inbuilt("beedrill", ::BeedrillModel)
         inbuilt("raticate", ::RaticateModel)
         inbuilt("raticate_alolan", ::RaticateAlolanModel)
@@ -309,6 +311,9 @@ object VaryingModelRepository {
         inbuilt("morelull", :: MorelullModel)
         inbuilt("shiinotic", :: ShiinoticModel)
         inbuilt("spiritomb", :: SpiritombModel)
+        inbuilt("chespin", :: ChespinModel)
+        inbuilt("quilladin", :: QuilladinModel)
+        inbuilt("chesnaught", :: ChesnaughtModel)
         inbuilt("pineco", :: PinecoModel)
         inbuilt("lotad", :: LotadModel)
         inbuilt("lombre", :: LombreModel)
@@ -336,6 +341,9 @@ object VaryingModelRepository {
         inbuilt("walkingwake", ::WalkingwakeModel)
         inbuilt("ironleaves", ::IronleavesModel)
         inbuilt("miltank", ::MiltankModel)
+        inbuilt("froakie", ::FroakieModel)
+        inbuilt("frogadier", ::FrogadierModel)
+        inbuilt("greninja", ::GreninjaModel)
         inbuilt("grookey", ::GrookeyModel)
         inbuilt("thwackey", ::ThwackeyModel)
         inbuilt("rillaboom", ::RillaboomModel)
@@ -388,6 +396,9 @@ object VaryingModelRepository {
         inbuilt("hoothoot", ::HoothootModel)
         inbuilt("wingull", ::WingullModel)
         inbuilt("pelipper", ::PelipperModel)
+        inbuilt("shinx", ::ShinxModel)
+        inbuilt("luxio", ::LuxioModel)
+        inbuilt("luxray", ::LuxrayModel)
         inbuilt("numel", ::NumelModel)
         inbuilt("roggenrola", ::RoggenrolaModel)
         inbuilt("boldore", ::BoldoreModel)
@@ -444,6 +455,7 @@ object VaryingModelRepository {
         inbuilt("bayleef", ::BayleefModel)
         inbuilt("meganium", ::MeganiumModel)
         inbuilt("crabrawler", ::CrabrawlerModel)
+        inbuilt("crabominable", ::CrabominableModel)
         inbuilt("wimpod", ::WimpodModel)
         inbuilt("golisopod", ::GolisopodModel)
         inbuilt("ralts", ::RaltsModel)
@@ -499,6 +511,7 @@ object VaryingModelRepository {
         inbuilt("woobat", ::WoobatModel)
         inbuilt("swoobat", ::SwoobatModel)
         inbuilt("frillish", ::FrillishModel)
+        inbuilt("jellicent", ::JellicentModel)
         inbuilt("cubchoo", ::CubchooModel)
         inbuilt("beartic", ::BearticModel)
         inbuilt("dreepy", ::DreepyModel)

common/src/main/kotlin/com/cobblemon/mod/common/client/render/pokemon/PokemonRenderer.kt

@@ -319,37 +319,32 @@ class PokemonRenderer(
         val clientDelegate = entity.delegate as PokemonClientDelegate
         val pokemonPosition = entity.position().add(0.0, entity.bbHeight / 2.0 * clientDelegate.activeSendoutScale.toDouble(), 0.0)
         val recallBallOrigin = (beamTarget as? Player)?.let { RecallArmAnimationTracker.get(it.uuid)?.beamOrigin }
-
-        val beamSourcePosition = when {
-            // cover the recall ball origin presence
-            recallBallOrigin != null -> recallBallOrigin
-            // cover the pokeball catching a specimen
-            beamTarget is EmptyPokeBallEntity -> (beamTarget.delegate as PokeBallPosableState)
-                .locatorStates["beam"]
-                ?.transformPosition(Vec3(0.0, 0.2, 0.45)) ?: beamTarget.position()
-            // player recall
-            beamTarget.uuid == Minecraft.getInstance().player?.uuid -> {
+        var beamSourcePosition = if (recallBallOrigin != null) {
+            recallBallOrigin
+        } else if (beamTarget is EmptyPokeBallEntity) {
+            (beamTarget.delegate as PokeBallPosableState).locatorStates["beam"]?.transformPosition(Vec3(0.0, 0.2, 0.45)) ?: beamTarget.position()
+        } else {
+            if (beamTarget.uuid == Minecraft.getInstance().player?.uuid) {
                 val lookVec = beamTarget.lookAngle.yRot((PI / 2).toFloat()).multiply(1.0, 0.0, 1.0).normalize()
                 beamTarget.getEyePosition(partialTicks).subtract(0.0, 0.4, 0.0).subtract(lookVec.scale(0.3))
-            }
-            // npc recall
-            beamTarget is NPCEntity -> {
+            } else if (beamTarget is NPCEntity) {
                 val npcDelegate = beamTarget.delegate as NPCClientDelegate
                 val baseScale = beamTarget.renderScale * beamTarget.hitboxScale
 
                 (npcDelegate.locatorStates["beam"]?.getOrigin()?.scale(baseScale.toDouble()))
                     ?: beamTarget.position().add(0.0, (beamTarget.bbHeight / 2.0) * baseScale, 0.0)
-            }
-            clientDelegate.sendOutPosition != null -> clientDelegate.sendOutPosition!!
-            // ???
-            else -> {
+            } else {
                 val lookVec = beamTarget.lookAngle.yRot((PI / 2 - (beamTarget.visualRotationYInDegrees - beamTarget.xRot).toRadians()).toFloat()).multiply(1.0, 0.0, 1.0).normalize()
                 beamTarget.getEyePosition(partialTicks).subtract(0.0, 0.7, 0.0).subtract(lookVec.scale(0.4))
             }
         }
+        if (clientDelegate.sendOutPosition != null) {
+            beamSourcePosition = clientDelegate.sendOutPosition!!
+        }
 
-        if (beamSourcePosition.distanceTo(pokemonPosition) > 20) return
-
+        if (beamSourcePosition.distanceTo(pokemonPosition) > 20) {
+            return
+        }
         var newOffset = offset.scale(2.0)
         // the further away the source position is, the smaller the newOffset should be. Max distance is 20 blocks
         val distance = beamSourcePosition.distanceTo(entity.position())

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

@@ -8,6 +8,7 @@
 
 package com.cobblemon.mod.common.command
 
+import com.cobblemon.mod.common.CobblemonSounds
 import com.cobblemon.mod.common.api.permission.CobblemonPermissions
 import com.cobblemon.mod.common.api.storage.pc.link.PCLinkManager
 import com.cobblemon.mod.common.api.storage.pc.link.PermissiblePcLink
@@ -53,8 +54,8 @@ object PcCommand {
             throw SimpleCommandExceptionType(lang("command.pc.invalid-box", box, pc.boxes.size).red()).create()
         }
         PCLinkManager.addLink(PermissiblePcLink(pc, player, CobblemonPermissions.PC))
-        OpenPCPacket(pc, box = if (box != null) (box - 1) else null, silent = true).sendToPlayer(player)
+        OpenPCPacket(pc, box = if (box != null) (box - 1) else null).sendToPlayer(player)
         return Command.SINGLE_SUCCESS
     }
 
-}
+}

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

@@ -11,7 +11,6 @@ package com.cobblemon.mod.common.command.argument
 import com.cobblemon.mod.common.api.pokemon.PokemonSpecies
 import com.cobblemon.mod.common.pokemon.FormData
 import com.cobblemon.mod.common.pokemon.Species
-import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
 import com.google.common.base.Splitter
 import com.mojang.brigadier.StringReader
 import com.mojang.brigadier.arguments.ArgumentType
@@ -39,7 +38,7 @@ class FormArgumentType : ArgumentType<FormData> {
         }
         speciesBeginning++
         val speciesToken = reader.string.substring(speciesBeginning, formTokenBeginning)
-        val species = PokemonSpecies.getByIdentifier(speciesToken.asIdentifierDefaultingNamespace()) ?: PokemonSpecies.species.first()
+        val species = PokemonSpecies.getByName(speciesToken) ?: PokemonSpecies.species.first()
         val result = species.forms.union(listOf(species.standardForm)).first { it.formOnlyShowdownId().lowercase() == formToken }
         return result
     }
@@ -58,7 +57,7 @@ class FormArgumentType : ArgumentType<FormData> {
             curIdx++
             val speciesToken = builder.input.substring(curIdx, builder.start - 1)
 
-            val species = PokemonSpecies.getByIdentifier(speciesToken.asIdentifierDefaultingNamespace()) ?: PokemonSpecies.species.first()
+            val species = PokemonSpecies.getByName(speciesToken) ?: PokemonSpecies.species.first()
             val forms = species.forms.union(listOf(species.standardForm)).filter { it.formOnlyShowdownId().lowercase().startsWith(formToken) }
             forms.forEach { str ->
                 builder.suggest(str.formOnlyShowdownId())

common/src/main/kotlin/com/cobblemon/mod/common/config/CobblemonConfig.kt

@@ -222,16 +222,16 @@ class CobblemonConfig {
     @CobblemonConfigField(Category.Spawning, lang = "shiny_rate", SERVER)
     var shinyRate = 8192F
 
-    @CobblemonConfigField(Category.Spawning, lang = "fossil_machine_alpha_chance", SERVER)
+    @CobblemonConfigField(Category.Pokemon, lang = "fossil_machine_alpha_chance", SERVER)
     var fossilMachineAlphaChance = 20
 
-    @CobblemonConfigField(Category.Spawning, lang = "fossil_machine_shiny_chance", SERVER)
+    @CobblemonConfigField(Category.Pokemon, lang = "fossil_machine_shiny_chance", SERVER)
     var fossilMachineShinyChance = 100
 
-    @CobblemonConfigField(Category.Spawning, lang = "honey_slather_alpha_chance", SERVER)
+    @CobblemonConfigField(Category.Pokemon, lang = "honey_slather_alpha_chance", SERVER)
     var honeySlatherAlphaChance = 100
 
-    @CobblemonConfigField(Category.Spawning, lang = "honey_slather_shiny_chance", SERVER)
+    @CobblemonConfigField(Category.Pokemon, lang = "honey_slather_shiny_chance", SERVER)
     var honeySlatherShinyChance = 4000
 
     @CobblemonConfigField(Category.Pokemon, lang = "shiny_notice_particles_distance", CLIENT)
@@ -392,21 +392,6 @@ class CobblemonConfig {
     @CobblemonConfigField(Category.Spawning, lang = "data_monitor_shiny_rate", SERVER)
     var monitorShinyRate = 200
 
-    @CobblemonConfigField(Category.World, lang = "type_gem_max_connected", SERVER)
-    var typeGemMaxConnected = 16
-
-    @CobblemonConfigField(Category.World, lang = "type_gem_min_growth", SERVER)
-    var typeGemMinGrowth = 8
-
-    @CobblemonConfigField(Category.World, lang = "type_gem_growth_chance", SERVER)
-    var typeGemGrowthChance = 0.1f
-
-    @CobblemonConfigField(Category.World, lang = "type_gem_initial_expansion_cycles", SERVER)
-    var typeGemInitialExpansionCycles = 100
-
-    @CobblemonConfigField(Category.World, lang = "type_gem_tick_chance", SERVER)
-    var typeGemTickChance = 1.0f
-
     fun clone(): CobblemonConfig {
         val newConfig = CobblemonConfig()
         CobblemonConfig::class.memberProperties.forEach { property ->

common/src/main/kotlin/com/cobblemon/mod/common/datafixer/CobblemonSchemas.kt

@@ -30,7 +30,7 @@ object CobblemonSchemas {
     private val SAME: (Int, Schema) -> Schema = ::Schema
     private val RESULT: DataFixerBuilder.Result = this.create()
 
-    const val DATA_VERSION = 3
+    const val DATA_VERSION = 2
 
     /**
      * The Cobblemon [DataFixer].
@@ -85,8 +85,6 @@ object CobblemonSchemas {
         builder.addFixer(RaisedPPStagesFix(schema1))
         val schema2 = builder.addSchema(2, SAME)
         builder.addFixer(HypertrainIVFix(schema2))
-        val schema3 = builder.addSchema(3, SAME)
-        builder.addFixer(TypeGemGrowthTypeFix(schema3))
     }
 
     private class CobblemonDataFixerCodec<R>(private val baseCodec: Codec<R>, private val typeReference: TypeReference) : Codec<R> {

common/src/main/kotlin/com/cobblemon/mod/common/datafixer/fix/TypeGemGrowthTypeFix.kt

@@ -1,101 +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.datafixer.fix
-
-import com.mojang.datafixers.DSL
-import com.mojang.datafixers.DataFix
-import com.mojang.datafixers.TypeRewriteRule
-import com.mojang.datafixers.schemas.Schema
-import com.mojang.serialization.Dynamic
-import net.minecraft.util.datafix.fixes.References
-
-/**
- * Merges the old `should_grow` and `stunted` type gem cluster properties into `growth_type`.
- */
-class TypeGemGrowthTypeFix(outputSchema: Schema) : DataFix(outputSchema, false) {
-
-    override fun makeRule(): TypeRewriteRule {
-        return fixTypeEverywhereTyped("TypeGemGrowthTypeFix", inputSchema.getType(References.CHUNK)) { chunk ->
-            chunk.update(DSL.remainderFinder(), ::fixChunk)
-        }
-    }
-
-    private fun fixChunk(chunk: Dynamic<*>): Dynamic<*> {
-        return chunk.update("sections") { sections ->
-            sections.createList(sections.asStream().map(::fixSection))
-        }
-    }
-
-    private fun fixSection(section: Dynamic<*>): Dynamic<*> {
-        return section.update("block_states") { blockStates ->
-            blockStates.update("palette") { palette ->
-                palette.createList(palette.asStream().map(::fixPaletteEntry))
-            }
-        }
-    }
-
-    private fun fixPaletteEntry(entry: Dynamic<*>): Dynamic<*> {
-        if (entry.get("Name").asString("") !in CLUSTER_IDS) return entry
-
-        return entry.update("Properties") { properties ->
-            if (properties.get(GROWTH_TYPE).result().isPresent) return@update properties
-
-            val shouldGrow = properties.get(SHOULD_GROW).asString(OLD_SHOULD_GROW_DEFAULT) == "true"
-            val stunted = properties.get(STUNTED).asString(OLD_STUNTED_DEFAULT) == "true"
-
-            properties
-                .remove(SHOULD_GROW)
-                .remove(STUNTED)
-                .set(GROWTH_TYPE, properties.createString(growthTypeFor(shouldGrow, stunted)))
-        }
-    }
-
-    private fun growthTypeFor(shouldGrow: Boolean, stunted: Boolean): String {
-        return when {
-            stunted -> GROWTH_TYPE_STUNTED
-            shouldGrow -> GROWTH_TYPE_FULL
-            else -> GROWTH_TYPE_NONE
-        }
-    }
-
-    companion object {
-        private const val SHOULD_GROW = "should_grow"
-        private const val STUNTED = "stunted"
-        private const val GROWTH_TYPE = "growth_type"
-
-        private const val OLD_SHOULD_GROW_DEFAULT = "true"
-        private const val OLD_STUNTED_DEFAULT = "false"
-
-        private const val GROWTH_TYPE_FULL = "full"
-        private const val GROWTH_TYPE_STUNTED = "stunted"
-        private const val GROWTH_TYPE_NONE = "none"
-
-        // ID's as they were when this fix was made.
-        private val CLUSTER_IDS = setOf(
-            "cobblemon:normal_gem_cluster",
-            "cobblemon:fire_gem_cluster",
-            "cobblemon:water_gem_cluster",
-            "cobblemon:electric_gem_cluster",
-            "cobblemon:grass_gem_cluster",
-            "cobblemon:ice_gem_cluster",
-            "cobblemon:fighting_gem_cluster",
-            "cobblemon:poison_gem_cluster",
-            "cobblemon:ground_gem_cluster",
-            "cobblemon:flying_gem_cluster",
-            "cobblemon:psychic_gem_cluster",
-            "cobblemon:bug_gem_cluster",
-            "cobblemon:rock_gem_cluster",
-            "cobblemon:ghost_gem_cluster",
-            "cobblemon:dragon_gem_cluster",
-            "cobblemon:dark_gem_cluster",
-            "cobblemon:steel_gem_cluster",
-            "cobblemon:fairy_gem_cluster"
-        )
-    }
-}

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

@@ -1192,7 +1192,7 @@ open class PokemonEntity(
                 itemStack.hurtAndBreak(1, player, EquipmentSlot.MAINHAND)
                 return InteractionResult.SUCCESS
             } else if (itemStack.`is`(Items.BOWL)) {
-                if (pokemon.aspects.any { it.contains("mooshtank") && !it.contains("mooshtank-false") }) {
+                if (pokemon.aspects.any { it.contains("mooshtank") }) {
                     player.playSound(SoundEvents.MOOSHROOM_MILK, 1.0f, 1.0f)
                     // if the Mooshtank ate a Flower beforehand
                     if (pokemon.lastFlowerFed != ItemStack.EMPTY && pokemon.aspects.any { it.contains("mooshtank-brown") }) {
@@ -1234,8 +1234,7 @@ open class PokemonEntity(
             ) {
                 if (pokemon.aspects.any { it.contains("mooshtank-brown") }) {
                     player.playSound(SoundEvents.MOOSHROOM_EAT, 1.0f, 1.0f)
-                    pokemon.lastFlowerFed = itemStack.copyWithCount(1)
-                    if (!player.isCreative && !level().isClientSide) itemStack.shrink(1)
+                    pokemon.lastFlowerFed = itemStack
                     return InteractionResult.sidedSuccess(level().isClientSide)
                 }
             } else if (!player.isShiftKeyDown && StashHandler.interactMob(player, pokemon, itemStack)) {
@@ -2742,4 +2741,4 @@ open class PokemonEntity(
     }
 
     fun hasRider() = this.passengers.any { it is LivingEntity }
-}
+}

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

@@ -26,7 +26,6 @@ object CallbackHandler {
         CobblemonEvents.POKEMON_CAPTURED.subscribe { CobblemonCallbacks.run(cobblemonResource("pokemon_captured"), it.context) }
         CobblemonEvents.POKEMON_ENTITY_SPAWN.subscribe { entity -> CobblemonCallbacks.run(cobblemonResource("pokemon_entity_spawn"), mutableMapOf<String, MoValue>("pokemon_entity" to entity.entity.asMoLangValue()), functions = moLangFunctionMap("pokemon" to { entity.entity.pokemon.struct })) }
         CobblemonEvents.BATTLE_VICTORY.subscribe { CobblemonCallbacks.run(cobblemonResource("battle_victory"), it.context) }
-        CobblemonEvents.BATTLE_ENDED.subscribe { CobblemonCallbacks.run(cobblemonResource("battle_ended"), it.context) }
         CobblemonEvents.POKEDEX_DATA_CHANGED_PRE.subscribe { CobblemonCallbacks.run(cobblemonResource("pokedex_data_changed_pre"), it.getContext(), it.functions) }
         CobblemonEvents.POKEDEX_DATA_CHANGED_POST.subscribe { CobblemonCallbacks.run(cobblemonResource("pokedex_data_changed_post"), it.getContext()) }
         CobblemonEvents.FORME_CHANGE.subscribe { CobblemonCallbacks.run(cobblemonResource("forme_change"), it.context) }

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/MedicinalLeekItem.kt

@@ -35,10 +35,14 @@ class MedicinalLeekItem(block: MedicinalLeekBlock, settings: Properties) : ItemN
         val blockHitResult2 = blockHitResult.withPosition(blockHitResult.blockPos.above())
         val placeResult = this.place(BlockPlaceContext(UseOnContext(user, hand, blockHitResult2)))
         val stack = user.getItemInHand(hand)
-        // If the leek couldn't be planted, fall back to the default item behaviour so its food component lets it be eaten
-        if (!placeResult.consumesAction()) {
-            return super.use(world, user, hand)
+        // This will always be true but just in case we change it down the line.
+        /*
+        if (!placeResult.isAccepted && this.isFood && user.canConsume(this.foodComponent?.isAlwaysEdible == true)) {
+            user.setCurrentHand(hand)
+            return TypedInteractionResult.consume(stack)
         }
+
+         */
         return InteractionResultHolder(placeResult, stack)
     }
 

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/WearableHatItem.kt

@@ -19,13 +19,14 @@ import net.minecraft.world.level.Level
 
 class WearableHatItem(override val name: String): CobblemonItem(Properties()), WearableItem {
     override fun use(level: Level, player: Player, usedHand: InteractionHand): InteractionResultHolder<ItemStack> {
+        val itemStack = player.getItemInHand(usedHand)
         val hitPokemon = player.traceFirstEntityCollision(
             entityClass = PokemonEntity::class.java,
             maxDistance = player.entityInteractionRange().toFloat()
         )
         // If the player is looking at a Pokémon within range, block the ability to swap the item onto their head
-        if (player.isCrouching && hitPokemon != null && hitPokemon.isOwnedBy(player)) return InteractionResultHolder.fail(player.getItemInHand(usedHand))
-
-        return this.swapStackWithEquipmentSlot(level, player, usedHand)
+        return if (player.isCrouching && hitPokemon != null && hitPokemon.isOwnedBy(player)) {
+            InteractionResultHolder.fail(itemStack)
+        } else this.swapWithEquipmentSlot(this, level, player, usedHand)
     }
-}
+}

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

@@ -10,18 +10,10 @@ package com.cobblemon.mod.common.item
 
 import com.cobblemon.mod.common.util.cobblemonResource
 import net.minecraft.resources.ResourceLocation
-import net.minecraft.stats.Stats
-import net.minecraft.world.InteractionHand
-import net.minecraft.world.InteractionResultHolder
 import net.minecraft.world.entity.EquipmentSlot
-import net.minecraft.world.entity.player.Player
 import net.minecraft.world.item.Equipable
-import net.minecraft.world.item.ItemStack
-import net.minecraft.world.item.enchantment.EnchantmentEffectComponents.PREVENT_ARMOR_CHANGE
-import net.minecraft.world.item.enchantment.EnchantmentHelper
-import net.minecraft.world.level.Level
 
-interface WearableItem : Equipable {
+interface WearableItem: Equipable {
     val name: String
 
     companion object {
@@ -31,43 +23,5 @@ interface WearableItem : Equipable {
     fun getModel3d(): ResourceLocation = cobblemonResource("${MODEL_PATH}/${this.name}")
     fun getModel2d(): ResourceLocation = cobblemonResource(this.name)
 
-    override fun getEquipmentSlot(): EquipmentSlot {
-        return EquipmentSlot.HEAD
-    }
-
-    /**
-     * Swap stack with equipment slot
-     * Copied from vanilla, modified to account for stackable items
-     * @see Equipable.swapWithEquipmentSlot
-     *
-     * @param item
-     * @param level
-     * @param player
-     * @param hand
-     * @return the interaction result holder
-     */
-    fun swapStackWithEquipmentSlot(
-        level: Level,
-        player: Player,
-        hand: InteractionHand
-    ): InteractionResultHolder<ItemStack> {
-        var itemStack = player.getItemInHand(hand)
-        val equipmentSlot = player.getEquipmentSlotForItem(itemStack)
-
-        if (!player.canUseSlot(equipmentSlot)) return InteractionResultHolder.pass(itemStack)
-
-        val slotStack = player.getItemBySlot(equipmentSlot)
-
-        if (!(!EnchantmentHelper.has(slotStack, PREVENT_ARMOR_CHANGE) || player.isCreative) || ItemStack.matches(itemStack, slotStack)) return InteractionResultHolder.fail(itemStack)
-        if (!level.isClientSide()) player.awardStat(Stats.ITEM_USED.get(itemStack.item))
-
-        val equipStack = itemStack.split(1)
-        when {
-            itemStack.isEmpty -> itemStack = slotStack.copyAndClear()
-            else -> player.addItem(slotStack.copyAndClear())
-        }
-
-        player.setItemSlot(equipmentSlot, equipStack)
-        return InteractionResultHolder.sidedSuccess(itemStack, level.isClientSide())
-    }
-}
+    override fun getEquipmentSlot(): EquipmentSlot { return EquipmentSlot.HEAD }
+}

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)
@@ -379,7 +295,8 @@ object CobblemonItemGroups {
                 DataComponents.BLOCK_STATE,
                 BlockItemStateProperties.EMPTY
                     .with(TypeGemClusterBlock.STAGE, i)
-                    .with(TypeGemClusterBlock.GROWTH_TYPE, TypeGemClusterBlock.GrowthType.DECORATION)
+                    .with(TypeGemClusterBlock.SHOULD_GROW, false)
+                    .with(TypeGemClusterBlock.STUNTED, false)
             )
             stack.set(
                 DataComponents.CUSTOM_MODEL_DATA,
@@ -714,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)
@@ -730,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
                 )
-            )
+            ))
         }
     }
 
@@ -931,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)
@@ -948,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)
@@ -1067,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/data/DexEvolutionDisplaySyncPacket.kt

@@ -1,107 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.net.messages.client.data
-
-import com.cobblemon.mod.common.api.pokedex.entry.CobblemonBiomeDexEvolutionRequirementDisplay
-import com.cobblemon.mod.common.api.pokedex.entry.CobblemonDexEvolutionRequirementDisplay
-import com.cobblemon.mod.common.api.pokedex.entry.DexEntries
-import com.cobblemon.mod.common.api.pokedex.entry.DexEvolutionDisplay
-import com.cobblemon.mod.common.api.pokedex.entry.DexEvolutionRequirementDisplay
-import com.cobblemon.mod.common.util.cobblemonResource
-import com.cobblemon.mod.common.util.readIdentifier
-import com.cobblemon.mod.common.util.readNullable
-import com.cobblemon.mod.common.util.readString
-import com.cobblemon.mod.common.util.readText
-import com.cobblemon.mod.common.util.writeIdentifier
-import com.cobblemon.mod.common.util.writeNullable
-import com.cobblemon.mod.common.util.writeString
-import com.cobblemon.mod.common.util.writeText
-import com.google.common.collect.Lists
-import com.google.common.collect.Sets
-import net.minecraft.core.registries.BuiltInRegistries
-import net.minecraft.network.RegistryFriendlyByteBuf
-import net.minecraft.util.ExtraCodecs
-
-class DexEvolutionDisplaySyncPacket(entries: MutableList<DexEvolutionDisplay>)
-    : DataRegistrySyncPacket<DexEvolutionDisplay, DexEvolutionDisplaySyncPacket>(entries) {
-
-    override val id = ID
-
-    override fun encodeEntry(buffer: RegistryFriendlyByteBuf, entry: DexEvolutionDisplay) {
-        buffer.writeIdentifier(entry.fromSpecies)
-        buffer.writeString(entry.fromForm)
-        buffer.writeCollection(entry.fromAspects) { _, aspect -> buffer.writeString(aspect) }
-        buffer.writeIdentifier(entry.toSpecies)
-        buffer.writeString(entry.toForm)
-        buffer.writeCollection(entry.toAspects) { _, aspect -> buffer.writeString(aspect) }
-        buffer.writeCollection(entry.requirements) { _, req ->
-            when (req) {
-                is CobblemonBiomeDexEvolutionRequirementDisplay -> {
-                    buffer.writeByte(1)
-                    buffer.writeIdentifier(BuiltInRegistries.ITEM.getKey(req.icon))
-                    buffer.writeText(req.tooltip)
-                    buffer.writeNullable(req.condition) { b, cond ->
-                        b.writeIdentifier(cond.id)
-                        b.writeBoolean(cond.tag)
-                    }
-                    buffer.writeNullable(req.antiCondition) { b, cond ->
-                        b.writeIdentifier(cond.id)
-                        b.writeBoolean(cond.tag)
-                    }
-                }
-                else -> {
-                    buffer.writeByte(0)
-                    buffer.writeIdentifier(BuiltInRegistries.ITEM.getKey(req.icon))
-                    buffer.writeText(req.tooltip)
-                }
-            }
-        }
-    }
-
-    override fun decodeEntry(buffer: RegistryFriendlyByteBuf): DexEvolutionDisplay? {
-        val fromSpecies = buffer.readIdentifier()
-        val fromForm = buffer.readString()
-        val fromAspects = buffer.readCollection(Sets::newHashSetWithExpectedSize) { buffer.readString() }
-        val toSpecies = buffer.readIdentifier()
-        val toForm = buffer.readString()
-        val toAspects = buffer.readCollection(Sets::newHashSetWithExpectedSize) { buffer.readString() }
-        val requirements = buffer.readCollection(Lists::newArrayListWithExpectedSize) {
-            val type = buffer.readByte().toInt()
-            val icon = BuiltInRegistries.ITEM.get(buffer.readIdentifier())
-            val tooltip = buffer.readText().copy()
-            if (type == 1) {
-                val condition = buffer.readNullable { b ->
-                    val id = b.readIdentifier()
-                    val tag = b.readBoolean()
-                    ExtraCodecs.TagOrElementLocation(id, tag)
-                }
-                val antiCondition = buffer.readNullable { b ->
-                    val id = b.readIdentifier()
-                    val tag = b.readBoolean()
-                    ExtraCodecs.TagOrElementLocation(id, tag)
-                }
-                CobblemonBiomeDexEvolutionRequirementDisplay(icon, tooltip, condition, antiCondition)
-            } else {
-                CobblemonDexEvolutionRequirementDisplay(icon, tooltip)
-            }
-        }.toList()
-        return DexEvolutionDisplay(fromSpecies, fromForm, fromAspects, toSpecies, toForm, toAspects, requirements)
-    }
-
-    override fun synchronizeDecoded(entries: Collection<DexEvolutionDisplay>) {
-        DexEntries.evolutionDisplays.clear()
-        DexEntries.evolutionDisplays.addAll(entries)
-    }
-
-    companion object {
-        val ID = cobblemonResource("dex_evolution_display_sync")
-        fun decode(buffer: RegistryFriendlyByteBuf): DexEvolutionDisplaySyncPacket =
-            DexEvolutionDisplaySyncPacket(mutableListOf()).apply { decodeBuffer(buffer) }
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/data/SpeciesEvolutionSyncPacket.kt

@@ -0,0 +1,100 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.net.messages.client.data
+
+import com.cobblemon.mod.common.Cobblemon
+import com.cobblemon.mod.common.api.pokemon.PokemonSpecies
+import com.cobblemon.mod.common.api.pokemon.evolution.Evolution
+import com.cobblemon.mod.common.api.pokemon.evolution.PreEvolution
+import com.cobblemon.mod.common.pokemon.FormData
+import com.cobblemon.mod.common.pokemon.Species
+import com.cobblemon.mod.common.util.cobblemonResource
+import com.cobblemon.mod.common.util.readIdentifier
+import com.cobblemon.mod.common.util.readString
+import com.cobblemon.mod.common.util.writeIdentifier
+import com.cobblemon.mod.common.util.writeString
+import com.google.gson.reflect.TypeToken
+import net.minecraft.network.RegistryFriendlyByteBuf
+import net.minecraft.resources.ResourceLocation
+
+/**
+ * Carries the evolutions/preEvolution of every [Species] (and any [FormData] overrides), sent right after
+ * [SpeciesRegistrySyncPacket] so that every species is already registered by the time this is decoded. This avoids
+ * the cross-species lookup ordering hazards that come with resolving evolutions during the species sync itself.
+ */
+class SpeciesEvolutionSyncPacket(entries: Collection<SpeciesEvolutionEntry>) : DataRegistrySyncPacket<SpeciesEvolutionEntry, SpeciesEvolutionSyncPacket>(entries) {
+
+    override val id = ID
+
+    override fun encodeEntry(buffer: RegistryFriendlyByteBuf, entry: SpeciesEvolutionEntry) {
+        try {
+            buffer.writeIdentifier(entry.speciesIdentifier)
+            buffer.writeString(PokemonSpecies.gson.toJson(entry.evolutions, EVOLUTION_SET_TYPE))
+            buffer.writeNullable(entry.preEvolution) { _, preEvolution -> buffer.writeString(PokemonSpecies.gson.toJson(preEvolution, PreEvolution::class.java)) }
+            buffer.writeCollection(entry.formOverrides) { _, override ->
+                buffer.writeString(override.formName)
+                buffer.writeNullable(override.evolutions) { _, evolutions -> buffer.writeString(PokemonSpecies.gson.toJson(evolutions, EVOLUTION_SET_TYPE)) }
+                buffer.writeNullable(override.preEvolution) { _, preEvolution -> buffer.writeString(PokemonSpecies.gson.toJson(preEvolution, PreEvolution::class.java)) }
+            }
+        } catch (e: Exception) {
+            Cobblemon.LOGGER.error("Caught exception encoding evolution data for species {}", entry.speciesIdentifier, e)
+        }
+    }
+
+    override fun decodeEntry(buffer: RegistryFriendlyByteBuf): SpeciesEvolutionEntry? {
+        val identifier = buffer.readIdentifier()
+        return try {
+            val evolutions: MutableSet<Evolution> = PokemonSpecies.gson.fromJson(buffer.readString(), EVOLUTION_SET_TYPE)
+            val preEvolution = buffer.readNullable { _ -> PokemonSpecies.gson.fromJson(buffer.readString(), PreEvolution::class.java) }
+            val formOverrides = buffer.readList { _ ->
+                val formName = buffer.readString()
+                val formEvolutions = buffer.readNullable { _ -> PokemonSpecies.gson.fromJson<MutableSet<Evolution>>(buffer.readString(), EVOLUTION_SET_TYPE) }
+                val formPreEvolution = buffer.readNullable { _ -> PokemonSpecies.gson.fromJson(buffer.readString(), PreEvolution::class.java) }
+                FormEvolutionOverride(formName, formEvolutions, formPreEvolution)
+            }
+            SpeciesEvolutionEntry(identifier, evolutions, preEvolution, formOverrides)
+        } catch (e: Exception) {
+            Cobblemon.LOGGER.error("Caught exception decoding evolution data for species {}", identifier, e)
+            null
+        }
+    }
+
+    override fun synchronizeDecoded(entries: Collection<SpeciesEvolutionEntry>) {
+        entries.forEach { entry ->
+            val species = PokemonSpecies.getByIdentifier(entry.speciesIdentifier)
+            if (species == null) {
+                Cobblemon.LOGGER.error("Received evolution data for unknown species {}", entry.speciesIdentifier)
+                return@forEach
+            }
+            species.applyEvolutionData(entry.evolutions, entry.preEvolution)
+            entry.formOverrides.forEach { override ->
+                species.getFormByName(override.formName).applyEvolutionData(override.evolutions, override.preEvolution)
+            }
+        }
+    }
+
+    companion object {
+        val ID = cobblemonResource("species_evolution_sync")
+        private val EVOLUTION_SET_TYPE = TypeToken.getParameterized(MutableSet::class.java, Evolution::class.java).type
+        fun decode(buffer: RegistryFriendlyByteBuf): SpeciesEvolutionSyncPacket = SpeciesEvolutionSyncPacket(emptyList()).apply { decodeBuffer(buffer) }
+    }
+}
+
+class SpeciesEvolutionEntry(
+    val speciesIdentifier: ResourceLocation,
+    val evolutions: MutableSet<Evolution>,
+    val preEvolution: PreEvolution?,
+    val formOverrides: List<FormEvolutionOverride>
+)
+
+class FormEvolutionOverride(
+    val formName: String,
+    val evolutions: MutableSet<Evolution>?,
+    val preEvolution: PreEvolution?
+)

common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/storage/pc/OpenPCPacket.kt

@@ -34,19 +34,17 @@ class OpenPCPacket : NetworkPacket<OpenPCPacket> {
     val storeID: UUID
     val box: Int?
     val unseenWallpapers: Set<ResourceLocation>
-    val silent: Boolean
 
     @JvmOverloads
     @Deprecated("Use the constructor with the PCStore object instead, this will become private in a future title update", level = DeprecationLevel.WARNING)
-    constructor(storeID: UUID, box: Int? = null, unseenWallpapers: Set<ResourceLocation> = emptySet(), silent: Boolean? = false) {
+    constructor(storeID: UUID, box: Int? = null, unseenWallpapers: Set<ResourceLocation> = emptySet()) {
         this.storeID = storeID
         this.box = box
         this.unseenWallpapers = unseenWallpapers
-        this.silent = silent ?: false
     }
 
     @JvmOverloads
-    constructor(pc: PCStore, box: Int? = null, silent: Boolean? = false): this(pc.uuid, box, pc.unseenWallpapers, silent ?: false)
+    constructor(pc: PCStore, box: Int? = null): this(pc.uuid, box, pc.unseenWallpapers)
 
     override val id = ID
 
@@ -54,7 +52,6 @@ class OpenPCPacket : NetworkPacket<OpenPCPacket> {
         buffer.writeUUID(storeID)
         buffer.writeNullable(box) { buf, value -> buf.writeInt(value)}
         buffer.writeCollection(unseenWallpapers) { _, it -> buffer.writeResourceLocation(it) }
-        buffer.writeBoolean(silent)
     }
 
     companion object {
@@ -62,8 +59,7 @@ class OpenPCPacket : NetworkPacket<OpenPCPacket> {
         fun decode(buffer: RegistryFriendlyByteBuf) = OpenPCPacket(
             buffer.readUUID(),
             buffer.readNullable { it.readInt() },
-            buffer.readList { buffer.readResourceLocation() }.toSet(),
-            buffer.readBoolean()
+            buffer.readList { buffer.readResourceLocation() }.toSet()
         )
     }
-}
+}

common/src/main/kotlin/com/cobblemon/mod/common/net/serverhandling/block/TMMachineTeachMoveHandler.kt

@@ -43,8 +43,6 @@ object TMMachineTeachMoveHandler : ServerNetworkPacketHandler<TMMachineTeachMove
             !pokemon.moveSet.getMoveTemplates().contains(moveTemplate) &&
             !pokemon.allAccessibleMoves.contains(moveTemplate)
         ) {
-            menu.incrementStateId()
-
             if (!player.isCreative && !Cobblemon.config.infiniteTmUses) menu.carried.shrink(1)
 
             if (pokemon.moveSet.hasSpace()) {
@@ -60,4 +58,4 @@ object TMMachineTeachMoveHandler : ServerNetworkPacketHandler<TMMachineTeachMove
             player.playNotifySound(CobblemonSounds.MOVE_LEARN, SoundSource.MASTER, 1.0F, 1.0F)
         }
     }
-}
+}

common/src/main/kotlin/com/cobblemon/mod/common/pokemon/FormData.kt

@@ -76,7 +76,7 @@ class FormData(
     @SerializedName("moves")
     private var _moves: Learnset? = null,
     @SerializedName("evolutions")
-    private val _evolutions: MutableSet<Evolution>? = null,
+    private var _evolutions: MutableSet<Evolution>? = null,
     @SerializedName("abilities")
     private var _abilities: AbilityPool? = null,
     @SerializedName("drops")
@@ -84,7 +84,7 @@ class FormData(
     @SerializedName("pokedex")
     private var _pokedex: MutableList<String>? = null,
     @SerializedName("preEvolution")
-    private val _preEvolution: PreEvolution? = null,
+    private var _preEvolution: PreEvolution? = null,
     private var standingEyeHeight: Float? = null,
     private var swimmingEyeHeight: Float? = null,
     private var flyingEyeHeight: Float? = null,
@@ -269,15 +269,24 @@ class FormData(
         this.species = species
         this.behaviour.parent = species.behaviour
         Cobblemon.statProvider.provide(this)
-        // These properties are lazy, these need all species to be reloaded but SpeciesAdditions is what will eventually trigger this after all species have been loaded
-        this.preEvolution?.species
-        this.preEvolution?.form
-        this.evolutions.size
         this._lightingData?.let { this._lightingData = it.copy(lightLevel = it.lightLevel.coerceIn(0, 15)) }
         behaviour.herd.initialize()
         return this
     }
 
+    /**
+     * Applies decoded evolution data onto this form, received separately via [com.cobblemon.mod.common.net.messages.client.data.SpeciesEvolutionSyncPacket]
+     * after every species has already been registered.
+     */
+    internal fun applyEvolutionData(evolutions: MutableSet<Evolution>?, preEvolution: PreEvolution?) {
+        this._evolutions = evolutions
+        this._preEvolution = preEvolution
+        // These properties are lazy, force resolution now that every species is guaranteed to be registered
+        this.preEvolution?.species
+        this.preEvolution?.form
+        this.evolutions.size
+    }
+
     internal fun resolveEvolutionMoves() {
         this.evolutions.forEach { evolution ->
             if (evolution.learnableMoves.isNotEmpty() && evolution.result.species != null) {

common/src/main/kotlin/com/cobblemon/mod/common/pokemon/Pokemon.kt

@@ -105,7 +105,6 @@ import com.cobblemon.mod.common.pokemon.properties.UncatchableProperty
 import com.cobblemon.mod.common.pokemon.requirements.BlocksTraveledRequirement
 import com.cobblemon.mod.common.pokemon.status.PersistentStatus
 import com.cobblemon.mod.common.pokemon.status.PersistentStatusContainer
-import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
 import com.cobblemon.mod.common.util.cobblemonResource
 import com.cobblemon.mod.common.util.codec.internal.ClientPokemonP1
 import com.cobblemon.mod.common.util.codec.internal.ClientPokemonP2
@@ -212,9 +211,8 @@ open class Pokemon : ShowdownIdentifiable {
             // Species updates already update HP but just a form change may require it
             // Moved to before the field was set else it won't actually do the hp calc proper <3
             val quotient = clamp(currentHealth / maxHealth.toFloat(), 0F, 1F)
-            val oldForm = field
             field = value
-            this.updateMovesOnFormChange(oldForm)
+            this.updateMovesOnFormChange(value)
             // Evo proxy is already cleared on species update but the form may be changed by itself, this is fine and no unnecessary packets will be sent out
             this.evolutionProxy.current().clear()
             checkGender()
@@ -471,7 +469,7 @@ open class Pokemon : ShowdownIdentifiable {
      */
     var gmaxFactor = false
         set(value) {
-            val evolutions = species.standardForm.evolutions.mapNotNull { it.result.species }.mapNotNull { PokemonSpecies.getByIdentifier(it.asIdentifierDefaultingNamespace()) }
+            val evolutions = species.standardForm.evolutions.mapNotNull { it.result.species }.mapNotNull { PokemonSpecies.getByName(it) }
             if (species.canGmax() || evolutions.find { it.canGmax() } != null) {
                 field = value
                 onChange(GmaxFactorUpdatePacket({ this }, value))
@@ -2303,16 +2301,15 @@ open class Pokemon : ShowdownIdentifiable {
      *
      * E.g, Removing Overheat from Rotom when it is no longer Rotom-Heat and the target form is not compatible with Overheat.
      */
-    private fun updateMovesOnFormChange(oldForm: FormData) {
+    private fun updateMovesOnFormChange(newForm: FormData) {
         if (this.isClient) return
 
-        val newForm = this.form
-        val oldFormChangeMoves = oldForm.moves.formChangeMoves.toSet()
+        val oldFormChangeMoves = this.form.moves.formChangeMoves.toSet()
 
         // Only remove moves that were provided by the old form's form-change moves AND are not learnable by the new form
         for (i in 0 until MoveSet.MOVE_COUNT) {
             val move = this.moveSet[i]
-            if (move != null && move.template in oldFormChangeMoves && !LearnsetQuery.ANY.canLearn(move.template, newForm.moves)) {
+            if (move != null && move.template in oldFormChangeMoves) {
                 this.moveSet.setMove(i, null)
             }
         }
@@ -2325,8 +2322,16 @@ open class Pokemon : ShowdownIdentifiable {
             }
         }
 
-        // Add the new form's form-change moves (skipping any the Pokémon isn't high enough level for yet).
-        grantEligibleFormChangeMoves()
+        // Add new form's form-change moves
+        newForm.moves.formChangeMoves.forEach { move ->
+            if (this.moveSet.filterNotNull().none { it.template == move }) {
+                if (this.moveSet.hasSpace()) {
+                    this.moveSet.add(move.create())
+                } else {
+                    this.benchedMoves.add(BenchedMove(move, 0))
+                }
+            }
+        }
 
         // If moveset is empty try to find one valid move to fill it
         if (this.moveSet.filterNotNull().isEmpty()) {
@@ -2338,30 +2343,6 @@ open class Pokemon : ShowdownIdentifiable {
         }
     }
 
-    /**
-     * Grants any of the current form's `form_change` moves that this Pokémon doesn't already know and is high
-     * enough level for (form-change moves that are also level-up moves, e.g. Glaciate on Kyurem, shouldn't be
-     * granted until that level is reached).
-     */
-    private fun grantEligibleFormChangeMoves() {
-        if (this.isClient) return
-
-        this.form.moves.formChangeMoves.forEach { move ->
-            if (this.moveSet.filterNotNull().none { it.template == move } && this.benchedMoves.none { it.moveTemplate == move }) {
-                val requiredLevel = this.form.moves.levelUpMoves.entries.firstOrNull { move in it.value }?.key
-                if (requiredLevel != null && this.level < requiredLevel) {
-                    return@forEach
-                }
-
-                if (this.moveSet.hasSpace()) {
-                    this.moveSet.add(move.create())
-                } else {
-                    this.benchedMoves.add(BenchedMove(move, 0))
-                }
-            }
-        }
-    }
-
     companion object {
         /**
          * The [FriendshipMutationCalculator] used when a Pokémon levels up.

common/src/main/kotlin/com/cobblemon/mod/common/pokemon/Species.kt

@@ -181,11 +181,20 @@ class Species : ShowdownIdentifiable {
             this.forms.add(0, this.standardForm)
         }
         this.lightingData?.let { this.lightingData = it.copy(lightLevel = it.lightLevel.coerceIn(0, 15)) }
-        // These properties are lazy, these need all species to be reloaded but SpeciesAdditions is what will eventually trigger this after all species have been loaded
+        behaviour.herd.initialize()
+    }
+
+    /**
+     * Applies decoded evolution data onto this species, received separately via [com.cobblemon.mod.common.net.messages.client.data.SpeciesEvolutionSyncPacket]
+     * after every species has already been registered.
+     */
+    internal fun applyEvolutionData(evolutions: MutableSet<Evolution>, preEvolution: PreEvolution?) {
+        // Mutate in place rather than reassign: standardForm may have already captured this.evolutions by reference.
+        this.evolutions.clear()
+        this.evolutions.addAll(evolutions)
+        this.preEvolution = preEvolution
         this.preEvolution?.species
         this.preEvolution?.form
-        this.evolutions.size
-        behaviour.herd.initialize()
     }
 
     // Ran after initialize due to us creating a Pokémon here which requires all the properties in #initialize to be present for both this and the results, this is the easiest way to quickly resolve species + form

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

@@ -25,12 +25,20 @@ internal class CobblemonLazyPreEvolution(private val rawData: String) : PreEvolu
         this.properties.species?.asIdentifierDefaultingNamespace()?.let { PokemonSpecies.getByIdentifier(it) } ?: throw IllegalArgumentException("A PreEvolution needs a valid species")
     }
 
-    private val lazyForm: FormData by lazy {
-        this.properties.form?.let { formId -> this.species.forms.firstOrNull { it.formOnlyShowdownId().equals(formId, true) } } ?: this.species.standardForm
+    private fun computeForm(extraAspects: Set<String>): FormData {
+        val properties = this.properties
+        return properties.form?.let { formId -> this.species.forms.firstOrNull { it.formOnlyShowdownId().equals(formId, true) } }
+            ?: this.species.getForm(properties.aspects + this.rawData.split(" ").map { it.lowercase() }.toSet() + extraAspects)
     }
 
+    private val lazyForm: FormData by lazy { computeForm(emptySet()) }
+
     override val species: Species
         get() = this.lazySpecies
     override val form: FormData
         get() = this.lazyForm
+
+    override fun resolveForm(extraAspects: Set<String>): FormData {
+        return if (extraAspects.isEmpty()) this.form else computeForm(extraAspects)
+    }
 }

common/src/main/kotlin/com/cobblemon/mod/common/util/adapters/BoxAdapter.kt

@@ -12,10 +12,12 @@ import com.google.gson.JsonDeserializationContext
 import com.google.gson.JsonDeserializer
 import com.google.gson.JsonElement
 import com.google.gson.JsonObject
+import com.google.gson.JsonSerializationContext
+import com.google.gson.JsonSerializer
 import java.lang.reflect.Type
 import net.minecraft.world.phys.AABB
 
-object BoxAdapter : JsonDeserializer<AABB> {
+object BoxAdapter : JsonDeserializer<AABB>, JsonSerializer<AABB> {
     override fun deserialize(json: JsonElement, type: Type, ctx: JsonDeserializationContext): AABB {
         json as JsonObject
         return AABB(
@@ -27,4 +29,15 @@ object BoxAdapter : JsonDeserializer<AABB> {
             json.get("maxZ")?.asDouble ?: 9999999.0
         )
     }
+
+    override fun serialize(src: AABB, typeOfSrc: Type, ctx: JsonSerializationContext): JsonElement {
+        val json = JsonObject()
+        json.addProperty("minX", src.minX)
+        json.addProperty("minY", src.minY)
+        json.addProperty("minZ", src.minZ)
+        json.addProperty("maxX", src.maxX)
+        json.addProperty("maxY", src.maxY)
+        json.addProperty("maxZ", src.maxZ)
+        return json
+    }
 }

common/src/main/kotlin/com/cobblemon/mod/common/util/adapters/DropEntryAdapter.kt

@@ -13,6 +13,8 @@ import com.google.gson.JsonDeserializationContext
 import com.google.gson.JsonDeserializer
 import com.google.gson.JsonElement
 import com.google.gson.JsonObject
+import com.google.gson.JsonSerializationContext
+import com.google.gson.JsonSerializer
 import java.lang.reflect.Type
 
 /**
@@ -22,7 +24,7 @@ import java.lang.reflect.Type
  * @author Hiroku
  * @since July 24th, 2022
  */
-object DropEntryAdapter : JsonDeserializer<DropEntry> {
+object DropEntryAdapter : JsonDeserializer<DropEntry>, JsonSerializer<DropEntry> {
     override fun deserialize(json: JsonElement, type: Type, ctx: JsonDeserializationContext): DropEntry {
         json as JsonObject
         val entryClass = json.get("type")?.asString
@@ -30,4 +32,12 @@ object DropEntryAdapter : JsonDeserializer<DropEntry> {
             ?: DropEntry.defaultType
         return ctx.deserialize(json, entryClass)
     }
+
+    override fun serialize(src: DropEntry, typeOfSrc: Type, ctx: JsonSerializationContext): JsonElement {
+        val json = ctx.serialize(src, src::class.java).asJsonObject
+        val name = DropEntry.entryTypes.entries.find { it.value == src::class.java }?.key
+            ?: throw IllegalArgumentException("Cannot resolve drop entry type for ${src::class.qualifiedName}")
+        json.addProperty("type", name)
+        return json
+    }
 }

common/src/main/kotlin/com/cobblemon/mod/common/util/adapters/ExpressionAdapter.kt

@@ -10,13 +10,21 @@ package com.cobblemon.mod.common.util.adapters
 
 import com.bedrockk.molang.Expression
 import com.bedrockk.molang.MoLang
+import com.cobblemon.mod.common.util.getString
 import com.google.gson.JsonDeserializationContext
 import com.google.gson.JsonDeserializer
 import com.google.gson.JsonElement
+import com.google.gson.JsonPrimitive
+import com.google.gson.JsonSerializationContext
+import com.google.gson.JsonSerializer
 import java.lang.reflect.Type
 
-object ExpressionAdapter : JsonDeserializer<Expression> {
+object ExpressionAdapter : JsonDeserializer<Expression>, JsonSerializer<Expression> {
     override fun deserialize(json: JsonElement, typeOfT: Type, ctx: JsonDeserializationContext): Expression {
         return MoLang.createParser(json.asString).parseExpression()
     }
+
+    override fun serialize(src: Expression, typeOfSrc: Type, ctx: JsonSerializationContext): JsonElement {
+        return JsonPrimitive(src.getString())
+    }
 }