26.1.2 backport of dataregistry

Signed-off-by: Polymeta <4726322-polymeta@users.noreply.gitlab.com>

.gitlab-ci.yml

@@ -71,8 +71,8 @@ setup_packsquash:
     - echo "Installing wget & unzip"
     - yum install -y wget unzip
     - echo "Downloading PackSquash"
-    - wget https://github.com/ComunidadAylas/PackSquash/releases/download/v0.4.0/PackSquash.CLI.executable.x86_64-unknown-linux-musl.zip
-    - unzip PackSquash.CLI.executable.x86_64-unknown-linux-musl.zip -d ./packsquash_bin
+    - wget https://github.com/ComunidadAylas/PackSquash/releases/download/v0.4.1/packsquash-x86_64-unknown-linux-musl.zip
+    - unzip packsquash-x86_64-unknown-linux-musl.zip -d ./packsquash_bin
     - echo "Creating PackSquash options.toml"
     - |
       cat <<EOF > ./options.toml

CHANGELOG.md

@@ -1,6 +1,4 @@
 # Changelog
-## [1.7.4 (MONTH Nth, 2026)](#1-7-4)
-## [1.7.4 (MONTH Xth, 2026)](#1-7-4)
 ## [1.8.0 (MONTH Xth, 2026)](#1-8-0)
 
 ### Additions
@@ -54,40 +52,70 @@
 - The lush shipwreck cove structure itself has been slightly cleaned up to be less noisy with the blocks it is built out of.
 - All shipwreck coves' spawners have been adjusted to give compatible mobs enchanted iron or diamond armour and weapons while in its ominous state. The armour given to the mobs will also use the automaton trim. We upped the difficulty because it was too easy now that your Pokémon can fight for you.
 - One TM of the elemental hyper beams has been added as guaranteed loot to the main treasure chest in every shipwreck cove. (Magma cove gets blast burn, lush cove gets frenzy plant, and submerged cove gets hydro cannon)
+- Added 7 new advancements
+- Pressing the inventory key now closes the Pokémon interact wheel GUI
+- Pokémon cries now play when clicking Pokémon in the summary screen.
+- Pressing the Summary key while either the starter selection or summary screen are open now closes those screens
 
 ### New rideable Pokémon
 - Drampa
 - Archeops
+- Skarmory
+- Crobat
+- Goodra
+- Hisuian Goodra
+- Milotic
 
 ### Pokémon Added
-- Pancham (+ Cosmetic with Black Glasses)
-- Pangoro (+ Cosmetic with Black Glasses)
-- Skitty
-- Delcatty
 - Wurmple
 - Silcoon
 - Beautifly
 - Cascoon
 - Dustox
+- Skitty
+- Delcatty
+
+- Seviper
+- Zangoose
+- Cherubi
+- Cherrim
+- Stunky
+- Skuntank
+
 - Audino
+- Pawniard
+- Bisharp
+- Kingambit
+
+- Pancham (+ Cosmetic with Black Glasses)
+- Pangoro (+ Cosmetic with Black Glasses)
+
 - Rockruff
 - Lycanroc
+
+- Rolycoly
+- Carkol
+- Coalossal
+
 - Snom
 - Frosmoth
+
+- Duraludon
+- Archaludon
+
 - Applin
 - Flapple
 - Appletun
 - Dipplin
 - Hydrapple
+
+- Nymble
+- Lokix
+
+#### Regional Forms
 - Sandshrew (Alolan)
 - Sandslash (Alolan)
-- Seviper
-- Zangoose
-- Stunky
-- Skuntank
-- Pawniard
-- Bisharp
-- Kingambit
+- Avalugg (Hisuian)
 
 ### Model updates for the following Pokémon
 - Goomy
@@ -99,35 +127,77 @@
 - Zubat
 - Golbat
 - Crobat
-- Pidgey
-- Pidgeotto
-- Pidgeot
+
+### Model updates for the following Pokémon
+
+- Sandshrew
 - Sandslash
 - Nidoking
+- Zubat
+- Golbat
+- Crobat
+- Porygon
+- Porygon2
+- Porygon-Z
+
+- Skarmory
+- Jynx
+- Popplio
+- Brionne
+- Primarina
+- Fletchling
+- Fletchinder
+- Talonflame
+
 - Sableye
 - Mawile
+
+- Goomy
+- Sliggoo
+- Goodra
+
 - Nacli
-- Naclestack
+- Naclstack
 - Garganacl
-- Skarmory
+
+#### Model changes to the regional bias resource pack:
+
+- Added Mime Jr. (Galar Bias)
+- Added Bergmite (Hisui Bias)
+- Changed models for every existing regional bias
 
 ### Animation updates for the following Pokémon
-- Drampa
-- Archeops
 - Skarmory
+- Skitty
+- Flygon
+- Shellos
 - Riolu
 - Lucario
-- Shellos
-- Skitty
-- Joltik
 - Purrloin
 - Liepard
-- Flygon
+- Joltik
+- Galvantula
+- Nidoking
+- Fletchling
+- Fletchinder
+- Talonflame
+- Archeops
+- Drampa
+- Sewaddle
+- Swadloon
+- Leavanny
+- Goomy
+- Sliggoo
+- Goodra
+- Shedinja
+- Skwovet
+- Greedent
 
 #### Added sounds to the following moves
 - Absorb
 - Aurora Beam
 - Double Team
+- Draco Meteor
 - Fire Punch
 - Fire Spin
 - Flame Charge
@@ -147,6 +217,7 @@
 - Tail Whip
 
 ### Changes
+- Stat increase and decrease particles have been changed, with the addition of alpha boost particles. 
 - Dragonite's mailbag cosmetic can now also be obtained with a chest in the cosmetic slot
 
 ### Fixes
@@ -154,6 +225,22 @@
 - Fixed Blitzle's base scale being `1` rather than the intended `0.8`
 - Fixed Magnezone's emissive layer for the shiny having the wrong name, thus displaying wrongly
 - Fixed Litleo not blinking
+- Fixed Garchomp T-posing when sleeping while out of battle.
+- Sharp Beak can now be crafted
+- Metal Alloy can now be crafted
+- Ability Capsules can now be brewed
+- Using an Ability Capsule will now return an Empty Bottle
+- The following items can now be obtained by brushing the following Pokémon:
+  - Pink Wool - Wigglytuff
+  - White Wool - Swablu, Altaria
+  - Shed Shell - Ekans, Arbok, Dratini, Dragonair, Dunsparce, Treecko, Grovyle, Sceptile, Seviper, Scraggy, Scrafty, Helioptile, Heliolisk, Salandit, Salazzle, Sobble, Drizzile, Inteleon, Silicoblra, Sandaconda, Toxel, Toxtricity, Orthworm, Dudunsparce
+  - Phantom Membrane - Dreepy, Drakloak, Dragapult
+- The following items can now be obtained by evolving the following Pokémon into any of their evolutions:
+  - Turtle Scute - Squirtle, Wartortle, Turtwig, Grotle, Tirtouga, Chewtle
+  - Shed Shell - Metapod, Kakuna, Ekans, Paras, Venonat, Krabby, Scyther, Kabuto, Dratini, Dragonair, Ledyba, Spinarak, Yanma, Pineco, Dunsparce, GLigar, Pupitar, Treecko, Grovyle, Silcoon, Cascoon, Surskit, Nincada, Trapinch, Vibrava, Corphish, Anorith, Bagon, Shelgon, Kricketot, Burmy, Combee, Skorupi, Swadloon, Whirlipede, Dwebble, Scraggy, Karrablast, Joltik, Larvesta, Spewpa, Clauncher, Helioptile, Charjabug, Crabrawler, Cutiefly, Dewpider, Salandit, Wimpod, Poipole, Sobble, Drizzile, Dottler, Silicobra, Toxel, Sizzlipede, Snom, Tarountula, Nymble, Rellor
+- Saccharine Leaves now drop Tart, Sweet, or Syrupy Apples, depending on their honey coating stage, instead of vanilla Apples
+- Fixed the height of the Tumblestone Bud items when held in hand, placed on head, viewed in a GUI, and placed in an Item Frame
+- Refactored all advancements, removing several deemed unnecessary. Due to this refactor, all previously obtained advancements will be reset besides the root (for picking a starter Pokémon). We are sorry for the inconvience, but it makes the tab cleaner and simplifies future advancements.
 - Restructured Botany Pots integration folder structure
 - Decrease the default pastured mon wander radius to 32.
 - Factor in the weight of Pokémon when calculating pushing forces between hitboxes.
@@ -166,14 +253,53 @@
 - Cleaned up seat data. Removed all now unused fields from seats in all species files. Also made locator seat names explicit in the species files (however, this doesn't break the legacy format)
 - Marks can now provide aspects.
 - Added new shiny and Alpha chance configs
+- Apricorns now make a new sound when harvested
+- Lowered the volume of harvesting berries
+- Added alternate versions of the basic PC Wallpapers based on the original design of Cobblemon's PC, before public release
+- Improved compatibility with various mods
+    - Farmer's Delight's cutting board can now be used to strip Apricorn and Saccharine's logs, or salvage their planks from various blocks. It can also separate their boats from chests
+    - Farmer's Delight's cutting board can be used to get two white dye from Pep-Up Flowers and two magenta dye from Medicinal Leeks
+    - Farmer's Delight's cutting board can separate Tumblestone Blocks back into Tumblestones
+    - Farmer's Delight's cutting board can salvage Type Gems from their Gem Blocks
+    - Farmer's Delight's Onions, Tomatoes, and Cabbages can be used to cook Open-Faced Sandwiches. Nature's Spirit's Olives also can be used
+    - Farmer's Delight's cutting board can be used on Hearty Grains to obtain rice and straw, similarly to Farmer's Delight's Rice Panicles
+    - Farmer's Delight's Apple Pies and Apple Ciders can now be made using Applin Apples, alongside the Vanilla counterpart
+    - Amendments allows for cooking Leek and Potato Stew in a Cauldron
+    - Any mods that utilise Moonlight's Soft Fluid system can store Leek and Potato Stew, Medicinal Brew, Antidote, Awakening, Burn Heal, Ice Heal, Paralyze Heal, Full Heal, Potion, Super Potion, Hyper Potion, Max Potion, Full Restore, Ability Capsules, Moomoo Milk, and Berry Juice in liquid form (such as Suplementaries' Jar or Goblet, or Cauldrons while using Amendments)
+    - Supplementaries' Hourglass can now use Bright Powder, Quick Powder, Metal Powder, Heal Powder, Silver Powder, and Remedy
+    - Berry Trees are now compatible with the Planter properly
+    - Saccharine Way Signs (added by Supplementaries automagically) now use a premade texture to prevent odd visual issues
+    - Supplementaries' Jar can now store various Cobblemon cookies, candies, and similar items
+    - Some of Supplementaries' items have been added to the `#cobblemon:held/container_held_items` item tag, including sacks, safes, and lunch baskets
+    - Experience Nuggets can be used in place of Sculk for making the EXP Candies if using Create
+    - Rage Candy Bar has a Create Mixing recipe
+    - All Cobblemon ores can now be crushed in Create's Crushing Wheels
+    - All Gem and Tumblestone Clusters can be crushed for automatic, low return, gems
+    - Hearty Grains can be milled like Farmer's Delight Rice Panicles if both Farmer's Delight and Create are installed
+    - Big Roots and Revival Herbs can be milled to their respective powders
+    - Pep-Up Flowers, Medicinal Leeks, and all 70 berries can be milled in Create's Millstone for additional dye drops
+    - Auspicious Armor and Upgrades can be Haunted using Create's crafting systems
+    - Applin Apples can be used to make Honeyed Apples in Create
+- Golden Apples can now be crafted using the Applin Apples
+- Prismarine Crystals and Amethyst Shards can now be used to craft Pokedexes
+- Updated Pokedex Screens item tag to support tagged variants of Redstone and Glowstone Dust
+- Sounds for interacting with various Cobblemon blocks now play from the center of the block, rather than the corner
+- The `/pc` command no longer plays PC activation sounds
+- Lowered the volume of Blitzle and Zebstrika's cry
+- Fixed Raichu (male) and Alolan Raichu (both genders) not displaying the correct Partner Cap when Pewter Crunchies are in the cosmetic slot.
+- Regional Foods will now prioritize being eaten instead of used for healing Pokémon, shift clicking will use it as healing
 
 ### Fixes
+- Fixed Croagunk's walkspeed
+- Fixed Blitzle's base scale being `1` rather than the intended `0.8`
+- Fixed Magnezone's emissive layer for the shiny having the wrong name, thus displaying wrongly
+- Fixed Litleo not blinking
 - Fixed Pokédex layout for genderless variations
 - Fixed odd stacking behaviour with the poke_bait item.
-- Fixed an occasional crash on retrieving revived fossils
 - Fixed a compatibility issue with World Game Rules which caused some log spam in specific cases.
 - Fixed improper validation of Pokémon when performing a trade.
 - Fixed an issue where particle like beam can disappear when you don't see the beginning of the beam, or you look away
+- Fixed Bedrock particle materials (alpha/opaque/blend/add) sharing one render batch, which caused incorrect culling on mixed batches; each material now batches and draws with its own blend and cull state, and the alpha material renders as a true cutout
 - Fixed an occasional crash on retrieving revived fossils
 - Fixed brushing not working on Neoforge
 - Fixed braking not working for submarines (whoops).
@@ -199,6 +325,16 @@
 - Resolved the niche issue where Structures would spawn in an incorrect location, creating very funky world gen.
 - Fixed Galarian Ponyta missing its cry.
 - Fixed various log warnings caused by redundant files and sound events.
+- Traded Pokémon will now retain the original friendship level when traded back to its OT
+- Clusters now display correctly on maps
+- Fixed removing mulch from berry trees with a shovel not working.
+- Fixed collecting honey from Saccharine Leaf blocks deleting Honey Bottles when the inventory was full
+- Fixed Stripped Saccharine Wood recipe being missing
+- Fixed CancelableSoundInstance causing lag by attempting to create sounds every tick when out of range of hearing
+- Fixed Stat Reducing Aprijuice not being possible to apply on a max out Pokémon, and the possibility of going into negatives
+- Fixed Exploit where you could take out the bait or drop your Pokérod with bait to avoid consuming bait, now the bobber will just disappear if you do so
+- Fixed Apricorn and Saccharine boats incorrectly using chest boat models
+- Fixed wild and trainer battle AI refusing to select moves with the `adjacentAlly` target type, even when it's their only option
 
 ### Developer
 - Added `PokeSnackSpawnerFactory` which allows influence registration on PokeSnack encounters
@@ -207,6 +343,8 @@
 - Tweaked the spawning selector interface to take a bucket function rather than a bucket directly.
 - Added a new `cobblemon:height_range` processor type to allow developers to restrict structure-spawning ranges.
 - Separated all the functions of MoLangFunctions.kt into their own files.
+- Spawn buckets and their base weights are now provided by the spawner, with different base weights for world, fishing, snack, and habitat spawn buckets.
+- Removed "SpawnBucket" class in favour of just storing maps of bucket names to weights.
 
 ### Molang & Datapacks
 - Added `moveset_builders` datapack folder for different styles of movesets.
@@ -226,6 +364,19 @@
 - Added `q.world.spawn_loot_table_items(loot_table_id, x, y, z)` which spawns the items from the loot table at the position. (Use type: "minecraft:chest" for the loot table.)
 - Added `q.pokemon.entity` to access the entity of Pokémon.
 - Flamethrower and Seismic Toss had their action effect JSON cleaned up
+- Ride sounds can now be set as exclusive to passengers
+- Ride sounds no longer play when submerged unless specified with a new setting
+- NPC Trainers can now call a `command` animation when issuing a command in battle.
+- Added a q.failed function to move action effects.
+- Herd spawned Pokémon have their levels controlled differently. The `levelRange` property now acts as a clamp instead of a filter, with a new `herdLevelRange` property to do the filter behaviour. 
+
+### Particles
 
 ### Localization
 - Updated translations for:
+  - Japanese
+  - German
+  - Ecuadorian Spanish
+  - Simplified Chinese
+  - Traditional Chinese
+  - Korean

common/build.gradle.kts

@@ -72,6 +72,10 @@ tasks.withType<Test> {
     }
 }
 
+tasks.processResources {
+    exclude("data/**/README.md")
+}
+
 sourceSets {
     main {
         blossom {

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

@@ -8,7 +8,7 @@
 
 package com.cobblemon.mod.common.mixin;
 
-import com.cobblemon.mod.common.block.entity.TMShelfBlockEntity;
+import com.cobblemon.mod.common.block.entity.DiscShelfBlockEntity;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Holder;
 import net.minecraft.sounds.SoundEvent;
@@ -29,7 +29,7 @@ public abstract class NoteBlockMixin {
     private void cobblemon$triggerTMShelfSequencer(BlockState state, Level level, BlockPos pos, int type, int data, CallbackInfoReturnable<Boolean> cir) {
         final BlockPos shelfPos = pos.below();
         final BlockEntity blockEntity = level.getBlockEntity(shelfPos);
-        if (!(blockEntity instanceof TMShelfBlockEntity tmShelfBlockEntity)) {
+        if (!(blockEntity instanceof DiscShelfBlockEntity discShelfBlockEntity)) {
             return;
         }
 
@@ -43,7 +43,7 @@ public abstract class NoteBlockMixin {
                 final Holder<SoundEvent> holder = instrument.getSoundEvent();
                 soundEvent = holder.value();
             }
-            tmShelfBlockEntity.onNoteBlockPulse(level, pos, soundEvent);
+            discShelfBlockEntity.onNoteBlockPulse(level, pos, soundEvent);
         }
 
         // Suppress vanilla note-block playback while it is on top of a TM Shelf.

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

@@ -139,23 +139,4 @@ public abstract class ServerEntityMixin {
             CobblemonNetwork.INSTANCE.sendPacketToPlayer(player, packet);
         }
     }
-
-    @Inject(method = "sendPairingData", at = @At("TAIL"))
-    private void cobblemon$sendPairingSeatAssignments(
-            ServerPlayer player,
-            Consumer<Packet<ClientGamePacketListener>> consumer,
-            CallbackInfo ci
-    ) {
-        if (!(entity instanceof PokemonEntity pokemon)) return;
-        if (pokemon.getOccupiedSeats().isEmpty()) return;
-
-        pokemon.getOccupiedSeats().forEach((seat, passenger) -> {
-            if (seat.getLocator() == null) return;
-            CobblemonNetwork.INSTANCE.sendPacketToPlayer(
-                    player,
-                    new ClientboundSeatAssignmentPacket(passenger.getId(), pokemon.getId(), seat.getLocator())
-            );
-        });
-    }
-
 }

common/src/main/java/com/cobblemon/mod/common/mixin/client/ChannelMixin.java

@@ -6,7 +6,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-package com.cobblemon.mod.common.mixin;
+package com.cobblemon.mod.common.mixin.client;
 
 import com.cobblemon.mod.common.duck.ChannelDuck;
 import com.mojang.blaze3d.audio.Channel;

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

@@ -33,7 +33,7 @@ object CobblemonBlockEntities : PlatformRegistry<Registry<BlockEntityType<*>>, R
     val LECTERN: BlockEntityType<LecternBlockEntity> = this.create("lectern", BlockEntityType.Builder.of(::LecternBlockEntity, CobblemonBlocks.LECTERN).build(null))
 
     @JvmField
-    val TM_SHELF: BlockEntityType<TMShelfBlockEntity> = this.create("tm_shelf", BlockEntityType.Builder.of(::TMShelfBlockEntity, CobblemonBlocks.TM_SHELF).build(null))
+    val DISC_SHELF: BlockEntityType<DiscShelfBlockEntity> = this.create("disc_shelf", BlockEntityType.Builder.of(::DiscShelfBlockEntity, CobblemonBlocks.DISC_SHELF).build(null))
 
     @JvmField
     val BERRY = this.create("berry", BlockEntityType.Builder.of(::BerryBlockEntity, *CobblemonBlocks.berries().values.toTypedArray()).build(null))

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

@@ -255,31 +255,31 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<
     val POKE_SNACK = this.create("poke_snack", PokeSnackBlock(BlockBehaviour.Properties.of().forceSolidOn().strength(0.5F).sound(SoundType.WOOL).pushReaction(PushReaction.DESTROY).lightLevel { if (it.getValue(BlockStateProperties.LIT)) 3 else 0 }, true))
 
     @JvmField
-    val TUMBLESTONE_CLUSTER = tumblestoneBlock("tumblestone_cluster", TumblestoneBlock.STAGE_3, 7, 3, null)
+    val TUMBLESTONE_CLUSTER = tumblestoneBlock("tumblestone_cluster", TumblestoneBlock.STAGE_3, 7, 3, null, MapColor.TERRACOTTA_ORANGE)
     @JvmField
-    val LARGE_BUDDING_TUMBLESTONE = tumblestoneBlock("large_budding_tumblestone", TumblestoneBlock.STAGE_2, 5, 3, TUMBLESTONE_CLUSTER)
+    val LARGE_BUDDING_TUMBLESTONE = tumblestoneBlock("large_budding_tumblestone", TumblestoneBlock.STAGE_2, 5, 3, TUMBLESTONE_CLUSTER, MapColor.TERRACOTTA_ORANGE)
     @JvmField
-    val MEDIUM_BUDDING_TUMBLESTONE = tumblestoneBlock("medium_budding_tumblestone", TumblestoneBlock.STAGE_1, 4, 3, LARGE_BUDDING_TUMBLESTONE)
+    val MEDIUM_BUDDING_TUMBLESTONE = tumblestoneBlock("medium_budding_tumblestone", TumblestoneBlock.STAGE_1, 4, 3, LARGE_BUDDING_TUMBLESTONE, MapColor.TERRACOTTA_ORANGE)
     @JvmField
-    val SMALL_BUDDING_TUMBLESTONE = tumblestoneBlock("small_budding_tumblestone", TumblestoneBlock.STAGE_0, 3, 4, MEDIUM_BUDDING_TUMBLESTONE)
+    val SMALL_BUDDING_TUMBLESTONE = tumblestoneBlock("small_budding_tumblestone", TumblestoneBlock.STAGE_0, 3, 4, MEDIUM_BUDDING_TUMBLESTONE, MapColor.TERRACOTTA_ORANGE)
 
     @JvmField
-    val SKY_TUMBLESTONE_CLUSTER = tumblestoneBlock("sky_tumblestone_cluster", TumblestoneBlock.STAGE_3, 7, 3, null)
+    val SKY_TUMBLESTONE_CLUSTER = tumblestoneBlock("sky_tumblestone_cluster", TumblestoneBlock.STAGE_3, 7, 3, null, MapColor.COLOR_LIGHT_BLUE)
     @JvmField
-    val LARGE_BUDDING_SKY_TUMBLESTONE = tumblestoneBlock("large_budding_sky_tumblestone", TumblestoneBlock.STAGE_2, 5, 3, SKY_TUMBLESTONE_CLUSTER)
+    val LARGE_BUDDING_SKY_TUMBLESTONE = tumblestoneBlock("large_budding_sky_tumblestone", TumblestoneBlock.STAGE_2, 5, 3, SKY_TUMBLESTONE_CLUSTER, MapColor.COLOR_LIGHT_BLUE)
     @JvmField
-    val MEDIUM_BUDDING_SKY_TUMBLESTONE = tumblestoneBlock("medium_budding_sky_tumblestone", TumblestoneBlock.STAGE_1, 4, 3, LARGE_BUDDING_SKY_TUMBLESTONE)
+    val MEDIUM_BUDDING_SKY_TUMBLESTONE = tumblestoneBlock("medium_budding_sky_tumblestone", TumblestoneBlock.STAGE_1, 4, 3, LARGE_BUDDING_SKY_TUMBLESTONE, MapColor.COLOR_LIGHT_BLUE)
     @JvmField
-    val SMALL_BUDDING_SKY_TUMBLESTONE = tumblestoneBlock("small_budding_sky_tumblestone", TumblestoneBlock.STAGE_0, 3, 4, MEDIUM_BUDDING_SKY_TUMBLESTONE)
+    val SMALL_BUDDING_SKY_TUMBLESTONE = tumblestoneBlock("small_budding_sky_tumblestone", TumblestoneBlock.STAGE_0, 3, 4, MEDIUM_BUDDING_SKY_TUMBLESTONE, MapColor.COLOR_LIGHT_BLUE)
 
     @JvmField
-    val BLACK_TUMBLESTONE_CLUSTER = tumblestoneBlock("black_tumblestone_cluster", TumblestoneBlock.STAGE_3, 7, 3, null)
+    val BLACK_TUMBLESTONE_CLUSTER = tumblestoneBlock("black_tumblestone_cluster", TumblestoneBlock.STAGE_3, 7, 3, null, MapColor.TERRACOTTA_BLACK)
     @JvmField
-    val LARGE_BUDDING_BLACK_TUMBLESTONE = tumblestoneBlock("large_budding_black_tumblestone", TumblestoneBlock.STAGE_2, 5, 3, BLACK_TUMBLESTONE_CLUSTER)
+    val LARGE_BUDDING_BLACK_TUMBLESTONE = tumblestoneBlock("large_budding_black_tumblestone", TumblestoneBlock.STAGE_2, 5, 3, BLACK_TUMBLESTONE_CLUSTER, MapColor.TERRACOTTA_BLACK)
     @JvmField
-    val MEDIUM_BUDDING_BLACK_TUMBLESTONE = tumblestoneBlock("medium_budding_black_tumblestone", TumblestoneBlock.STAGE_1, 4, 3, LARGE_BUDDING_BLACK_TUMBLESTONE)
+    val MEDIUM_BUDDING_BLACK_TUMBLESTONE = tumblestoneBlock("medium_budding_black_tumblestone", TumblestoneBlock.STAGE_1, 4, 3, LARGE_BUDDING_BLACK_TUMBLESTONE, MapColor.TERRACOTTA_BLACK)
     @JvmField
-    val SMALL_BUDDING_BLACK_TUMBLESTONE = tumblestoneBlock("small_budding_black_tumblestone", TumblestoneBlock.STAGE_0, 3, 4, MEDIUM_BUDDING_BLACK_TUMBLESTONE)
+    val SMALL_BUDDING_BLACK_TUMBLESTONE = tumblestoneBlock("small_budding_black_tumblestone", TumblestoneBlock.STAGE_0, 3, 4, MEDIUM_BUDDING_BLACK_TUMBLESTONE, MapColor.TERRACOTTA_BLACK)
 
     @JvmField
     val TUMBLESTONE_BLOCK = this.create("tumblestone_block", Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_ORANGE).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
@@ -289,85 +289,85 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<
     val BLACK_TUMBLESTONE_BLOCK = this.create("black_tumblestone_block", Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BLACK).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
 
     @JvmField
-    val TYPE_GEM_CORE = this.create("deepslate_crystal_core", TypeGemCoreBlock(BlockBehaviour.Properties.of().strength(4.0F, 10.0F).requiresCorrectToolForDrops()))
+    val TYPE_GEM_CORE = this.create("deepslate_crystal_core", TypeGemCoreBlock(BlockBehaviour.Properties.of().strength(4.0F, 10.0F).requiresCorrectToolForDrops().mapColor(MapColor.DEEPSLATE)))
 
     private val typeGemBlocks = mutableMapOf<ResourceLocation, Block>()
 
     @JvmField
-    val TYPE_GEM_BLOCK_NORMAL = typeGemBlock("normal_gem_block")
+    val TYPE_GEM_BLOCK_NORMAL = typeGemBlock("normal_gem_block", MapColor.QUARTZ)
     @JvmField
-    val TYPE_GEM_BLOCK_FIRE = typeGemBlock("fire_gem_block")
+    val TYPE_GEM_BLOCK_FIRE = typeGemBlock("fire_gem_block", MapColor.FIRE)
     @JvmField
-    val TYPE_GEM_BLOCK_WATER = typeGemBlock("water_gem_block")
+    val TYPE_GEM_BLOCK_WATER = typeGemBlock("water_gem_block", MapColor.WATER)
     @JvmField
-    val TYPE_GEM_BLOCK_ELECTRIC = typeGemBlock("electric_gem_block")
+    val TYPE_GEM_BLOCK_GRASS = typeGemBlock("grass_gem_block", MapColor.COLOR_LIGHT_GREEN)
     @JvmField
-    val TYPE_GEM_BLOCK_GRASS = typeGemBlock("grass_gem_block")
+    val TYPE_GEM_BLOCK_ELECTRIC = typeGemBlock("electric_gem_block", MapColor.GOLD)
     @JvmField
-    val TYPE_GEM_BLOCK_ICE = typeGemBlock("ice_gem_block")
+    val TYPE_GEM_BLOCK_ICE = typeGemBlock("ice_gem_block", MapColor.ICE)
     @JvmField
-    val TYPE_GEM_BLOCK_FIGHTING = typeGemBlock("fighting_gem_block")
+    val TYPE_GEM_BLOCK_FIGHTING = typeGemBlock("fighting_gem_block", MapColor.COLOR_RED)
     @JvmField
-    val TYPE_GEM_BLOCK_POISON = typeGemBlock("poison_gem_block")
+    val TYPE_GEM_BLOCK_POISON = typeGemBlock("poison_gem_block", MapColor.COLOR_PURPLE)
     @JvmField
-    val TYPE_GEM_BLOCK_GROUND = typeGemBlock("ground_gem_block")
+    val TYPE_GEM_BLOCK_GROUND = typeGemBlock("ground_gem_block", MapColor.PODZOL)
     @JvmField
-    val TYPE_GEM_BLOCK_FLYING = typeGemBlock("flying_gem_block")
+    val TYPE_GEM_BLOCK_FLYING = typeGemBlock("flying_gem_block", MapColor.COLOR_LIGHT_BLUE)
     @JvmField
-    val TYPE_GEM_BLOCK_PSYCHIC = typeGemBlock("psychic_gem_block")
+    val TYPE_GEM_BLOCK_PSYCHIC = typeGemBlock("psychic_gem_block", MapColor.COLOR_MAGENTA)
     @JvmField
-    val TYPE_GEM_BLOCK_BUG = typeGemBlock("bug_gem_block")
+    val TYPE_GEM_BLOCK_BUG = typeGemBlock("bug_gem_block", MapColor.TERRACOTTA_LIGHT_GREEN)
     @JvmField
-    val TYPE_GEM_BLOCK_ROCK = typeGemBlock("rock_gem_block")
+    val TYPE_GEM_BLOCK_ROCK = typeGemBlock("rock_gem_block", MapColor.TERRACOTTA_LIGHT_GRAY)
     @JvmField
-    val TYPE_GEM_BLOCK_GHOST = typeGemBlock("ghost_gem_block")
+    val TYPE_GEM_BLOCK_GHOST = typeGemBlock("ghost_gem_block", MapColor.TERRACOTTA_MAGENTA)
     @JvmField
-    val TYPE_GEM_BLOCK_DRAGON = typeGemBlock("dragon_gem_block")
+    val TYPE_GEM_BLOCK_DRAGON = typeGemBlock("dragon_gem_block", MapColor.COLOR_BLUE)
     @JvmField
-    val TYPE_GEM_BLOCK_DARK = typeGemBlock("dark_gem_block")
+    val TYPE_GEM_BLOCK_DARK = typeGemBlock("dark_gem_block", MapColor.TERRACOTTA_BLACK)
     @JvmField
-    val TYPE_GEM_BLOCK_STEEL = typeGemBlock("steel_gem_block")
+    val TYPE_GEM_BLOCK_STEEL = typeGemBlock("steel_gem_block", MapColor.METAL)
     @JvmField
-    val TYPE_GEM_BLOCK_FAIRY = typeGemBlock("fairy_gem_block")
+    val TYPE_GEM_BLOCK_FAIRY = typeGemBlock("fairy_gem_block", MapColor.COLOR_PINK)
 
     private val typeGemClusters = mutableMapOf<ResourceLocation, TypeGemClusterBlock>()
 
     @JvmField
-    val TYPE_GEM_CLUSTER_NORMAL = typeGemCluster("normal_gem_cluster", TYPE_GEM_BLOCK_NORMAL, cobblemonResource("normal_gem"))
+    val TYPE_GEM_CLUSTER_NORMAL = typeGemCluster("normal_gem_cluster", TYPE_GEM_BLOCK_NORMAL, cobblemonResource("normal_gem"), MapColor.QUARTZ)
     @JvmField
-    val TYPE_GEM_CLUSTER_FIRE = typeGemCluster("fire_gem_cluster", TYPE_GEM_BLOCK_FIRE, cobblemonResource("fire_gem"))
+    val TYPE_GEM_CLUSTER_FIRE = typeGemCluster("fire_gem_cluster", TYPE_GEM_BLOCK_FIRE, cobblemonResource("fire_gem"), MapColor.FIRE)
     @JvmField
-    val TYPE_GEM_CLUSTER_WATER = typeGemCluster("water_gem_cluster", TYPE_GEM_BLOCK_WATER, cobblemonResource("water_gem"))
+    val TYPE_GEM_CLUSTER_WATER = typeGemCluster("water_gem_cluster", TYPE_GEM_BLOCK_WATER, cobblemonResource("water_gem"), MapColor.WATER)
     @JvmField
-    val TYPE_GEM_CLUSTER_ELECTRIC = typeGemCluster("electric_gem_cluster", TYPE_GEM_BLOCK_ELECTRIC, cobblemonResource("electric_gem"))
+    val TYPE_GEM_CLUSTER_GRASS = typeGemCluster("grass_gem_cluster", TYPE_GEM_BLOCK_GRASS, cobblemonResource("grass_gem"), MapColor.COLOR_LIGHT_GREEN)
     @JvmField
-    val TYPE_GEM_CLUSTER_GRASS = typeGemCluster("grass_gem_cluster", TYPE_GEM_BLOCK_GRASS, cobblemonResource("grass_gem"))
+    val TYPE_GEM_CLUSTER_ELECTRIC = typeGemCluster("electric_gem_cluster", TYPE_GEM_BLOCK_ELECTRIC, cobblemonResource("electric_gem"), MapColor.GOLD)
     @JvmField
-    val TYPE_GEM_CLUSTER_ICE = typeGemCluster("ice_gem_cluster", TYPE_GEM_BLOCK_ICE, cobblemonResource("ice_gem"))
+    val TYPE_GEM_CLUSTER_ICE = typeGemCluster("ice_gem_cluster", TYPE_GEM_BLOCK_ICE, cobblemonResource("ice_gem"), MapColor.ICE)
     @JvmField
-    val TYPE_GEM_CLUSTER_FIGHTING = typeGemCluster("fighting_gem_cluster", TYPE_GEM_BLOCK_FIGHTING, cobblemonResource("fighting_gem"))
+    val TYPE_GEM_CLUSTER_FIGHTING = typeGemCluster("fighting_gem_cluster", TYPE_GEM_BLOCK_FIGHTING, cobblemonResource("fighting_gem"), MapColor.COLOR_RED)
     @JvmField
-    val TYPE_GEM_CLUSTER_POISON = typeGemCluster("poison_gem_cluster", TYPE_GEM_BLOCK_POISON, cobblemonResource("poison_gem"))
+    val TYPE_GEM_CLUSTER_POISON = typeGemCluster("poison_gem_cluster", TYPE_GEM_BLOCK_POISON, cobblemonResource("poison_gem"), MapColor.COLOR_PURPLE)
     @JvmField
-    val TYPE_GEM_CLUSTER_GROUND = typeGemCluster("ground_gem_cluster", TYPE_GEM_BLOCK_GROUND, cobblemonResource("ground_gem"))
+    val TYPE_GEM_CLUSTER_GROUND = typeGemCluster("ground_gem_cluster", TYPE_GEM_BLOCK_GROUND, cobblemonResource("ground_gem"), MapColor.PODZOL)
     @JvmField
-    val TYPE_GEM_CLUSTER_FLYING = typeGemCluster("flying_gem_cluster", TYPE_GEM_BLOCK_FLYING, cobblemonResource("flying_gem"))
+    val TYPE_GEM_CLUSTER_FLYING = typeGemCluster("flying_gem_cluster", TYPE_GEM_BLOCK_FLYING, cobblemonResource("flying_gem"), MapColor.COLOR_LIGHT_BLUE)
     @JvmField
-    val TYPE_GEM_CLUSTER_PSYCHIC = typeGemCluster("psychic_gem_cluster", TYPE_GEM_BLOCK_PSYCHIC, cobblemonResource("psychic_gem"))
+    val TYPE_GEM_CLUSTER_PSYCHIC = typeGemCluster("psychic_gem_cluster", TYPE_GEM_BLOCK_PSYCHIC, cobblemonResource("psychic_gem"), MapColor.COLOR_MAGENTA)
     @JvmField
-    val TYPE_GEM_CLUSTER_BUG = typeGemCluster("bug_gem_cluster", TYPE_GEM_BLOCK_BUG, cobblemonResource("bug_gem"))
+    val TYPE_GEM_CLUSTER_BUG = typeGemCluster("bug_gem_cluster", TYPE_GEM_BLOCK_BUG, cobblemonResource("bug_gem"), MapColor.TERRACOTTA_LIGHT_GREEN)
     @JvmField
-    val TYPE_GEM_CLUSTER_ROCK = typeGemCluster("rock_gem_cluster", TYPE_GEM_BLOCK_ROCK, cobblemonResource("rock_gem"))
+    val TYPE_GEM_CLUSTER_ROCK = typeGemCluster("rock_gem_cluster", TYPE_GEM_BLOCK_ROCK, cobblemonResource("rock_gem"), MapColor.TERRACOTTA_LIGHT_GRAY)
     @JvmField
-    val TYPE_GEM_CLUSTER_GHOST = typeGemCluster("ghost_gem_cluster", TYPE_GEM_BLOCK_GHOST, cobblemonResource("ghost_gem"))
+    val TYPE_GEM_CLUSTER_GHOST = typeGemCluster("ghost_gem_cluster", TYPE_GEM_BLOCK_GHOST, cobblemonResource("ghost_gem"), MapColor.TERRACOTTA_MAGENTA)
     @JvmField
-    val TYPE_GEM_CLUSTER_DRAGON = typeGemCluster("dragon_gem_cluster", TYPE_GEM_BLOCK_DRAGON, cobblemonResource("dragon_gem"))
+    val TYPE_GEM_CLUSTER_DRAGON = typeGemCluster("dragon_gem_cluster", TYPE_GEM_BLOCK_DRAGON, cobblemonResource("dragon_gem"), MapColor.COLOR_BLUE)
     @JvmField
-    val TYPE_GEM_CLUSTER_DARK = typeGemCluster("dark_gem_cluster", TYPE_GEM_BLOCK_DARK, cobblemonResource("dark_gem"))
+    val TYPE_GEM_CLUSTER_DARK = typeGemCluster("dark_gem_cluster", TYPE_GEM_BLOCK_DARK, cobblemonResource("dark_gem"), MapColor.TERRACOTTA_BLACK)
     @JvmField
-    val TYPE_GEM_CLUSTER_STEEL = typeGemCluster("steel_gem_cluster", TYPE_GEM_BLOCK_STEEL, cobblemonResource("steel_gem"))
+    val TYPE_GEM_CLUSTER_STEEL = typeGemCluster("steel_gem_cluster", TYPE_GEM_BLOCK_STEEL, cobblemonResource("steel_gem"), MapColor.METAL)
     @JvmField
-    val TYPE_GEM_CLUSTER_FAIRY = typeGemCluster("fairy_gem_cluster", TYPE_GEM_BLOCK_FAIRY, cobblemonResource("fairy_gem"))
+    val TYPE_GEM_CLUSTER_FAIRY = typeGemCluster("fairy_gem_cluster", TYPE_GEM_BLOCK_FAIRY, cobblemonResource("fairy_gem"), MapColor.COLOR_PINK)
 
     @JvmField
     val POLISHED_TUMBLESTONE = this.create("polished_tumblestone", Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_ORANGE).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
@@ -558,7 +558,7 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<
     @JvmField
     val RELIC_COIN_POUCH = create("relic_coin_pouch", CoinPouchBlock(BlockBehaviour.Properties.of().sound(CobblemonSounds.RELIC_COIN_POUCH_SOUNDS).pushReaction(PushReaction.DESTROY).noOcclusion(), true))
     @JvmField
-    val RELIC_COIN_SACK = create("relic_coin_sack", CoinPouchBlock(BlockBehaviour.Properties.of().sound(CobblemonSounds.RELIC_COIN_SACK_SOUNDS).pushReaction(PushReaction.DESTROY).strength(0.4F), false))
+    val RELIC_COIN_SACK = create("relic_coin_sack", CoinPouchBlock(BlockBehaviour.Properties.of().sound(CobblemonSounds.RELIC_COIN_SACK_SOUNDS).pushReaction(PushReaction.DESTROY).strength(0.4F).mapColor(MapColor.GOLD), false))
 
     @JvmField
     val GILDED_CHEST = create("gilded_chest", GildedChestBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.CHEST).noOcclusion().sound(CobblemonSounds.GILDED_CHEST_SOUNDS), GildedChestBlock.Type.RED))
@@ -702,7 +702,7 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<
     val LECTERN = create("lectern", LecternBlock(BlockBehaviour.Properties.of().mapColor(MapColor.WOOD).instrument(NoteBlockInstrument.BASS).sound(SoundType.WOOD).strength(2.5F).ignitedByLava().lightLevel { if (it.getValue(LecternBlock.EMIT_LIGHT) as Boolean) 13 else 0 }))
 
     @JvmField
-    val TM_SHELF = create("tm_shelf", TMShelfBlock(BlockBehaviour.Properties.of().mapColor(MapColor.WOOD).instrument(NoteBlockInstrument.BASS).sound(SoundType.METAL).strength(2.5F)))
+    val DISC_SHELF = create("disc_shelf", DiscShelfBlock(BlockBehaviour.Properties.of().mapColor(MapColor.WOOD).instrument(NoteBlockInstrument.BASS).sound(SoundType.METAL).strength(2.5F)))
 
     @JvmField
     val DISPLAY_CASE = create("display_case", DisplayCaseBlock(BlockBehaviour.Properties.of().sound(CobblemonSounds.DISPLAY_CASE_SOUNDS).noOcclusion().pushReaction(PushReaction.BLOCK).mapColor(MapColor.STONE).strength(0.3F).requiresCorrectToolForDrops()))
@@ -777,8 +777,9 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<
 
     private fun apricornBlock(name: String, apricorn: Apricorn): ApricornBlock = this.create(name, ApricornBlock(BlockBehaviour.Properties.of().mapColor(apricorn.mapColor()).randomTicks().strength(Blocks.OAK_LOG.defaultDestroyTime(), Blocks.OAK_LOG.explosionResistance).sound(SoundType.WOOD).noOcclusion(), apricorn))
 
-    private fun tumblestoneBlock(name: String, stage: Int, height: Int, xzOffset: Int, nextStage: Block?) : Block {
+    private fun tumblestoneBlock(name: String, stage: Int, height: Int, xzOffset: Int, nextStage: Block?, mapColor: MapColor) : Block {
         return this.create(name, TumblestoneBlock(BlockBehaviour.Properties.of()
+            .mapColor(mapColor)
             .pushReaction(PushReaction.DESTROY)
             .noOcclusion()
             .strength(1.5F)
@@ -1008,8 +1009,8 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<
         return this.create(name, block)
     }
 
-    private fun typeGemBlock(name: String): Block {
-        val typeGemBlock = this.create(name, Block(BlockBehaviour.Properties.of().strength(3.0F, 6.0F).sound(CobblemonSounds.TYPE_GEM_BLOCK_SOUNDS)))
+    private fun typeGemBlock(name: String, mapColor: MapColor): Block {
+        val typeGemBlock = this.create(name, Block(BlockBehaviour.Properties.of().mapColor(mapColor).strength(3.0F, 6.0F).sound(CobblemonSounds.TYPE_GEM_BLOCK_SOUNDS)))
 
         val identifier = cobblemonResource(name)
         typeGemBlocks[identifier] = typeGemBlock
@@ -1019,8 +1020,8 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<
 
     fun typeGemBlocks() = typeGemBlocks.toMap()
 
-    private fun typeGemCluster(name: String, gemBlock: Block, dropItemId: ResourceLocation): Block {
-        val gemClusterBlock = this.create(name, TypeGemClusterBlock(BlockBehaviour.Properties.of().strength(2.0F, 3.0F).sound(CobblemonSounds.TYPE_GEM_CLUSTER_SOUNDS).pushReaction(PushReaction.DESTROY), gemBlock, dropItemId))
+    private fun typeGemCluster(name: String, gemBlock: Block, dropItemId: ResourceLocation, mapColor: MapColor): Block {
+        val gemClusterBlock = this.create(name, TypeGemClusterBlock(BlockBehaviour.Properties.of().mapColor(mapColor).strength(2.0F, 3.0F).sound(CobblemonSounds.TYPE_GEM_CLUSTER_SOUNDS).pushReaction(PushReaction.DESTROY), gemBlock, dropItemId))
 
         TypeGemClusterBlock.gemToClusterMap[gemBlock] = gemClusterBlock
 
@@ -1031,4 +1032,4 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<
     }
 
     fun typeGemClusters() = typeGemClusters.toMap()
-}
+}

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

@@ -12,6 +12,7 @@ import com.cobblemon.mod.common.api.net.NetworkPacket
 import com.mojang.brigadier.arguments.ArgumentType
 import kotlin.reflect.KClass
 import net.minecraft.commands.synchronization.ArgumentTypeInfo
+import net.minecraft.core.HolderLookup
 import net.minecraft.resources.ResourceKey
 import net.minecraft.resources.ResourceLocation
 import net.minecraft.server.MinecraftServer
@@ -168,12 +169,16 @@ interface CobblemonImplementation {
      * TODO
      *
      * @param identifier
-     * @param reloader
+     * @param reloaderFactory
      * @param type
      * @param dependencies
      */
-    fun registerResourceReloader(identifier: ResourceLocation, reloader: PreparableReloadListener, type: PackType, dependencies: Collection<ResourceLocation>)
-
+    fun registerResourceReloader(
+        identifier: ResourceLocation,
+        type: PackType,
+        dependencies: Collection<ResourceLocation>,
+        reloaderFactory: (HolderLookup.Provider) -> PreparableReloadListener
+    )
     /**
      * TODO
      *

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

@@ -460,7 +460,7 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
     @JvmField
     val TM_MACHINE = blockItem("tm_machine", CobblemonBlocks.TM_MACHINE)
     @JvmField
-    val TM_SHELF = blockItem("tm_shelf", CobblemonBlocks.TM_SHELF)
+    val DISC_SHELF = blockItem("disc_shelf", CobblemonBlocks.DISC_SHELF)
     @JvmField
     val PASTURE = blockItem("pasture", CobblemonBlocks.PASTURE)
     @JvmField
@@ -1524,41 +1524,41 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
 
     // Type Gems
     @JvmField
-    val NORMAL_GEM = this.create("normal_gem", itemNameBlockItem("normal_gem", CobblemonBlocks.TYPE_GEM_CLUSTER_NORMAL))
+    val NORMAL_GEM = this.create("normal_gem", GemItem(Item.Properties(), CobblemonBlocks.TYPE_GEM_CLUSTER_NORMAL))
     @JvmField
-    val FIRE_GEM = this.create("fire_gem", itemNameBlockItem("fire_gem", CobblemonBlocks.TYPE_GEM_CLUSTER_FIRE))
+    val FIRE_GEM = this.create("fire_gem", GemItem(Item.Properties(), CobblemonBlocks.TYPE_GEM_CLUSTER_FIRE))
     @JvmField
-    val WATER_GEM = this.create("water_gem", itemNameBlockItem("water_gem", CobblemonBlocks.TYPE_GEM_CLUSTER_WATER))
+    val WATER_GEM = this.create("water_gem", GemItem(Item.Properties(), CobblemonBlocks.TYPE_GEM_CLUSTER_WATER))
     @JvmField
-    val GRASS_GEM = this.create("grass_gem", itemNameBlockItem("grass_gem", CobblemonBlocks.TYPE_GEM_CLUSTER_GRASS))
+    val GRASS_GEM = this.create("grass_gem", GemItem(Item.Properties(), CobblemonBlocks.TYPE_GEM_CLUSTER_GRASS))
     @JvmField
-    val ELECTRIC_GEM = this.create("electric_gem", itemNameBlockItem("electric_gem", CobblemonBlocks.TYPE_GEM_CLUSTER_ELECTRIC))
+    val ELECTRIC_GEM = this.create("electric_gem", GemItem(Item.Properties(), CobblemonBlocks.TYPE_GEM_CLUSTER_ELECTRIC))
     @JvmField
-    val ICE_GEM = this.create("ice_gem", itemNameBlockItem("ice_gem", CobblemonBlocks.TYPE_GEM_CLUSTER_ICE))
+    val ICE_GEM = this.create("ice_gem", GemItem(Item.Properties(), CobblemonBlocks.TYPE_GEM_CLUSTER_ICE))
     @JvmField
-    val FIGHTING_GEM = this.create("fighting_gem", itemNameBlockItem("fighting_gem", CobblemonBlocks.TYPE_GEM_CLUSTER_FIGHTING))
+    val FIGHTING_GEM = this.create("fighting_gem", GemItem(Item.Properties(), CobblemonBlocks.TYPE_GEM_CLUSTER_FIGHTING))
     @JvmField
-    val POISON_GEM = this.create("poison_gem", itemNameBlockItem("poison_gem", CobblemonBlocks.TYPE_GEM_CLUSTER_POISON))
+    val POISON_GEM = this.create("poison_gem", GemItem(Item.Properties(), CobblemonBlocks.TYPE_GEM_CLUSTER_POISON))
     @JvmField
-    val GROUND_GEM = this.create("ground_gem", itemNameBlockItem("ground_gem", CobblemonBlocks.TYPE_GEM_CLUSTER_GROUND))
+    val GROUND_GEM = this.create("ground_gem", GemItem(Item.Properties(), CobblemonBlocks.TYPE_GEM_CLUSTER_GROUND))
     @JvmField
-    val FLYING_GEM = this.create("flying_gem", itemNameBlockItem("flying_gem", CobblemonBlocks.TYPE_GEM_CLUSTER_FLYING))
+    val FLYING_GEM = this.create("flying_gem", GemItem(Item.Properties(), CobblemonBlocks.TYPE_GEM_CLUSTER_FLYING))
     @JvmField
-    val PSYCHIC_GEM = this.create("psychic_gem", itemNameBlockItem("psychic_gem", CobblemonBlocks.TYPE_GEM_CLUSTER_PSYCHIC))
+    val PSYCHIC_GEM = this.create("psychic_gem", GemItem(Item.Properties(), CobblemonBlocks.TYPE_GEM_CLUSTER_PSYCHIC))
     @JvmField
-    val BUG_GEM = this.create("bug_gem", itemNameBlockItem("bug_gem", CobblemonBlocks.TYPE_GEM_CLUSTER_BUG))
+    val BUG_GEM = this.create("bug_gem", GemItem(Item.Properties(), CobblemonBlocks.TYPE_GEM_CLUSTER_BUG))
     @JvmField
-    val ROCK_GEM = this.create("rock_gem", itemNameBlockItem("rock_gem", CobblemonBlocks.TYPE_GEM_CLUSTER_ROCK))
+    val ROCK_GEM = this.create("rock_gem", GemItem(Item.Properties(), CobblemonBlocks.TYPE_GEM_CLUSTER_ROCK))
     @JvmField
-    val GHOST_GEM = this.create("ghost_gem", itemNameBlockItem("ghost_gem", CobblemonBlocks.TYPE_GEM_CLUSTER_GHOST))
+    val GHOST_GEM = this.create("ghost_gem", GemItem(Item.Properties(), CobblemonBlocks.TYPE_GEM_CLUSTER_GHOST))
     @JvmField
-    val DRAGON_GEM = this.create("dragon_gem", itemNameBlockItem("dragon_gem", CobblemonBlocks.TYPE_GEM_CLUSTER_DRAGON))
+    val DRAGON_GEM = this.create("dragon_gem", GemItem(Item.Properties(), CobblemonBlocks.TYPE_GEM_CLUSTER_DRAGON))
     @JvmField
-    val DARK_GEM = this.create("dark_gem", itemNameBlockItem("dark_gem", CobblemonBlocks.TYPE_GEM_CLUSTER_DARK))
+    val DARK_GEM = this.create("dark_gem", GemItem(Item.Properties(), CobblemonBlocks.TYPE_GEM_CLUSTER_DARK))
     @JvmField
-    val STEEL_GEM = this.create("steel_gem", itemNameBlockItem("steel_gem", CobblemonBlocks.TYPE_GEM_CLUSTER_STEEL))
+    val STEEL_GEM = this.create("steel_gem", GemItem(Item.Properties(), CobblemonBlocks.TYPE_GEM_CLUSTER_STEEL))
     @JvmField
-    val FAIRY_GEM = this.create("fairy_gem", itemNameBlockItem("fairy_gem", CobblemonBlocks.TYPE_GEM_CLUSTER_FAIRY))
+    val FAIRY_GEM = this.create("fairy_gem", GemItem(Item.Properties(), CobblemonBlocks.TYPE_GEM_CLUSTER_FAIRY))
 
     //@JvmField
     //val BINDING_SOIL = blockItem("binding_soil", CobblemonBlocks.BINDING_SOIL)

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

@@ -108,6 +108,9 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, ResourceKey<Regi
     @JvmField
     val LEVELUP = this.create("gui.levelup")
 
+    @JvmField
+    val MOVE_LEARN = this.create("gui.move_learn")
+
     @JvmField
     val PVN_BATTLE = this.create("battle.pvn.default")
     @JvmField
@@ -142,6 +145,8 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, ResourceKey<Regi
     val MONITOR_INSERT = this.create("block.monitor.insert")
     @JvmField
     val MONITOR_LOADING = this.create("block.monitor.loading")
+    @JvmField
+    val MONITOR_GLITCHING = this.create("block.monitor.glitching")
 
     @JvmField
     val FOSSIL_MACHINE_ACTIVATE = this.create("block.fossil_machine.activate")
@@ -210,17 +215,23 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, ResourceKey<Regi
     @JvmField
     val TM_USE = this.create("item.tm.use")
     @JvmField
+    val TM_MACHINE_BURN_LOOP = this.create("block.tm_machine.burn_loop")
+    @JvmField
     val TM_MACHINE_CRAFT = this.create("block.tm_machine.craft")
     @JvmField
-    val TM_MACHINE_OFF = this.create("block.tm_machine.off")
-    @JvmField
-    val TM_MACHINE_ON = this.create("block.tm_machine.on")
+    val TM_MACHINE_START = this.create("block.tm_machine.start")
     @JvmField
     val TM_MACHINE_OPEN = this.create("block.tm_machine.open")
     @JvmField
     val TM_MACHINE_CLOSE = this.create("block.tm_machine.close")
     @JvmField
-    val TM_MACHINE_PLACE_DISC = this.create("block.tm_machine.place_disc")
+    val TM_MACHINE_TM_INSERT = this.create("block.tm_machine.tm_insert")
+    @JvmField
+    val TM_MACHINE_TM_RETRIEVE = this.create("block.tm_machine.tm_retrieve")
+    @JvmField
+    val TM_MACHINE_ITEM_INSERT = this.create("block.tm_machine.item_insert")
+    @JvmField
+    val TM_MACHINE_ITEM_RETRIEVE = this.create("block.tm_machine.item_retrieve")
 
 
     @JvmField
@@ -261,6 +272,9 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, ResourceKey<Regi
     @JvmField
     val BERRY_EAT_FULL = this.create("item.berry.eat.full")
 
+    @JvmField
+    val APRICORN_HARVEST = this.create("block.apricorn.harvest")
+
     @JvmField
     val BIG_ROOT_BREAK = this.create("block.big_root.break")
     @JvmField
@@ -408,9 +422,9 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, ResourceKey<Regi
     )
 
     @JvmField
-    val TYPE_GEM_BLOCK_BREAK = this.create("block.type_gem_cluster.break")
+    val TYPE_GEM_BLOCK_BREAK = this.create("block.type_gem_block.break")
     @JvmField
-    val TYPE_GEM_CLUSTER_BREAK = this.create("block.type_gem_block.break")
+    val TYPE_GEM_CLUSTER_BREAK = this.create("block.type_gem_cluster.break")
     @JvmField
     val TYPE_GEM_BLOCK_HIT = this.create("block.type_gem_block.hit")
     @JvmField
@@ -419,7 +433,7 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, ResourceKey<Regi
     val TYPE_GEM_BLOCK_STEP = this.create("block.type_gem_block.step")
 
     @JvmField
-    val TYPE_GEM_CLUSTER_SOUNDS = SoundType(1f, 1.2f,
+    val TYPE_GEM_CLUSTER_SOUNDS = SoundType(1f, 1.1f,
         TYPE_GEM_CLUSTER_BREAK,
         TYPE_GEM_BLOCK_STEP,
         TYPE_GEM_BLOCK_PLACE,

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

@@ -81,6 +81,9 @@ object CobblemonCriteria : PlatformRegistry<Registry<CriterionTrigger<*>>, Resou
     @JvmField
     val PLANT_TUMBLESTONE = this.create("plant_tumblestone", SimpleCriterionTrigger(PlantTumblestoneCriterion.CODEC))
 
+    @JvmField
+    val PLANT_TYPE_GEM = this.create("plant_type_gem", SimpleCriterionTrigger(PlantTypeGemCriterion.CODEC))
+
     val RIDING_STAT_BOOST = this.create("riding_stat_boost", SimpleCriterionTrigger(RidingStatBoostCriterion.CODEC))
 
     @JvmField

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

@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.advancement.criterion
+
+import com.cobblemon.mod.common.block.TypeGemClusterBlock
+import com.cobblemon.mod.common.block.TypeGemCoreBlock
+import com.mojang.serialization.Codec
+import com.mojang.serialization.codecs.RecordCodecBuilder
+import net.minecraft.advancements.critereon.ContextAwarePredicate
+import net.minecraft.core.BlockPos
+import net.minecraft.server.level.ServerPlayer
+import java.util.*
+
+class PlantTypeGemContext(val pos: BlockPos, val block: TypeGemClusterBlock)
+
+class PlantTypeGemCriterion(
+    playerCtx: Optional<ContextAwarePredicate>
+): SimpleCriterionCondition<PlantTypeGemContext>(playerCtx) {
+
+    companion object {
+        val CODEC: Codec<PlantTypeGemCriterion> = RecordCodecBuilder.create { it.group(
+            ContextAwarePredicate.CODEC.optionalFieldOf("player").forGetter(PlantTypeGemCriterion::playerCtx)
+        ).apply(it, ::PlantTypeGemCriterion) }
+    }
+
+    override fun matches(player: ServerPlayer, context: PlantTypeGemContext): Boolean {
+        return player.level().getBlockState(context.pos).block is TypeGemCoreBlock
+    }
+}

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

@@ -48,7 +48,7 @@ class RidingStatBoostCriterion(
                     val max = context.pokemon.pokemon.getMaxRideBoost(rideStat).toDouble()
                     val min = context.pokemon.pokemon.getBaseRideStat(rideStat).toDouble()
                     val value = context.pokemon.getRideStat(rideStat, ridingStyle, min, max)
-                    val isSufficient = (value >= this.statValue && this.statValue > 0.0) || !context.pokemon.pokemon.canAddRideBoost(rideStat)
+                    val isSufficient = (value >= this.statValue && this.statValue > 0.0) || !context.pokemon.pokemon.canApplyRideBoost(rideStat)
                     if (isSufficient && this.rideStat == "any") {
                         return true
                     } else if (!isSufficient && this.rideStat == "all") {

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

@@ -152,6 +152,11 @@ abstract class BattleActor(
     open fun sendMessage(component: Component) {
         sendUpdate(BattleMessagePacket(component))
     }
+    /**
+     * Called when this actor's Pokemon uses a move. Default implementation does nothing.
+     * Subclasses (NPC-backed actors, players, etc) may override to trigger animations or UI.
+     */
+    open fun onUseMove(user: BattlePokemon, target: BattlePokemon?) {}
     open fun awardExperience(battlePokemon: BattlePokemon, experience: Int) {}
     open fun sendUpdate(packet: NetworkPacket<*>) {}
 

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

@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.data
-
-import com.cobblemon.mod.common.api.net.Decodable
-import com.cobblemon.mod.common.api.net.Encodable
-
-// TODO this is implemented in multiple places but unused. Can we scratch this?
-/**
- * Represents an object that will possibly be synchronized to the client during datapack synchronization.
- *
- * @param T The type of the object being synchronized.
- *
- * @author Licious
- * @since October 14th, 2022
- */
-interface ClientDataSynchronizer<T> : Decodable, Encodable {
-
-    /**
-     * Compares an object of type [T] with this instance to see if synchronization is necessary.
-     *
-     * @param other The other instance of type [T].
-     * @return If synchronization is necessary.
-     */
-    fun shouldSynchronize(other: T): Boolean
-
-}

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

@@ -0,0 +1,93 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.data
+
+import com.cobblemon.mod.common.util.endsWith
+import com.google.gson.Gson
+import com.google.gson.reflect.TypeToken
+import net.minecraft.core.HolderLookup
+import java.io.BufferedReader
+import java.io.File
+import java.util.concurrent.ExecutionException
+import net.minecraft.resources.ResourceLocation
+import net.minecraft.server.packs.PackType
+import net.minecraft.server.packs.resources.ResourceManager
+
+/**
+ * A [DataRegistry] that consumes JSON files.
+ * Every deserialized instance is attached to an [Identifier].
+ * For example a file under data/mymod/[resourcePath]/entry.json would be backed by the identifier modid:entry.
+ *
+ * @param T The type of the data consumed by this registry.
+ *
+ * @author Licious
+ * @since August 5th, 2022
+ */
+interface ServerJsonDataRegistry<T> : DataRegistry {
+
+    /**
+     * The [TypeToken] of type [T].
+     */
+    val typeToken: TypeToken<T>
+
+    /**
+     * The folder location for the data this registry will consume.
+     */
+    val resourcePath: String
+
+    override val type: PackType
+        get() = PackType.SERVER_DATA
+
+    override fun reload(manager: ResourceManager) {
+        //NO-OP, handled by reload(manager, registry)
+    }
+
+    fun reload(manager: ResourceManager, registry: HolderLookup.Provider) {
+        val gson = setupParser(registry)
+        val data = hashMapOf<ResourceLocation, T>()
+        manager.listResources(resourcePath) { path -> path.endsWith(JSON_EXTENSION) }.forEach { (identifier, resource) ->
+            if (identifier.namespace == "pixelmon") {
+                return@forEach
+            }
+
+            resource.open().use { stream ->
+                stream.bufferedReader().use { reader ->
+                    val resolvedIdentifier = ResourceLocation.fromNamespaceAndPath(identifier.namespace, File(identifier.path).nameWithoutExtension)
+                    data[resolvedIdentifier] = parse(reader, resolvedIdentifier, gson)
+                }
+            }
+        }
+
+        reload(data, registry)
+    }
+
+    fun parse(reader: BufferedReader, identifier: ResourceLocation, gson: Gson): T {
+        return try {
+            gson.fromJson(reader, typeToken.type)
+        } catch (exception: Exception) {
+            throw ExecutionException("Error loading JSON for data: $identifier", exception)
+        }
+    }
+
+    /**
+     * Allows the creation of [Gson] instances which have adapters that are registry-aware, e.g. [com.cobblemon.mod.common.pokemon.evolution.adapters.LegacyItemConditionWrapperAdapter]
+     */
+    fun setupParser(registry: HolderLookup.Provider): Gson
+
+    /**
+     * Reloads this registry from the deserialized data.
+     *
+     * @param data A map of the data associating an instance to the respective identifier from the [ResourceManager].
+     */
+    fun reload(data: Map<ResourceLocation, T>, registry: HolderLookup.Provider)
+
+    companion object {
+        const val JSON_EXTENSION = ".json"
+    }
+}

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

@@ -8,7 +8,6 @@
 
 package com.cobblemon.mod.common.api.events.entity
 
-import com.cobblemon.mod.common.api.spawning.SpawnBucket
 import com.cobblemon.mod.common.api.spawning.SpawnCause
 import com.cobblemon.mod.common.api.spawning.spawner.Spawner
 
@@ -21,7 +20,7 @@ class SpawnBucketChosenEvent(
     /** The cause of the spawn. */
     val spawnCause: SpawnCause,
     /** The bucket that was chosen. You can alter this. */
-    var bucket: SpawnBucket,
+    var bucket: String,
     /** The final weights that were used to make the choice. */
-    val bucketWeights: Map<SpawnBucket, Float>
+    val bucketWeights: Map<String, Float>
 )

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

@@ -9,7 +9,6 @@
 package com.cobblemon.mod.common.api.events.fishing
 
 import com.cobblemon.mod.common.api.events.Cancelable
-import com.cobblemon.mod.common.api.spawning.SpawnBucket
 import com.cobblemon.mod.common.entity.fishing.PokeRodFishingBobberEntity
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import net.minecraft.world.item.ItemStack
@@ -27,7 +26,7 @@ interface BaitSpawnPokemonEvent {
      */
     data class Pre(
         val bobber: PokeRodFishingBobberEntity, // todo replace this with the bait entity
-        val chosenBucket: SpawnBucket,
+        val chosenBucket: String,
         val rod: ItemStack
     ) : Cancelable(), BobberSpawnPokemonEvent
 
@@ -38,7 +37,7 @@ interface BaitSpawnPokemonEvent {
      * @param pokemon The Pokemon that is modified.
      */
     data class Modify(
-        val chosenBucket: SpawnBucket,
+        val chosenBucket: String,
         val rod: ItemStack,
         val pokemon: PokemonEntity
     ) : BobberSpawnPokemonEvent
@@ -52,7 +51,7 @@ interface BaitSpawnPokemonEvent {
      */
     data class Post(
         val bobber: PokeRodFishingBobberEntity,
-        val chosenBucket: SpawnBucket,
+        val chosenBucket: String,
         val bait: ItemStack,
         val pokemon: PokemonEntity
     ) : BobberSpawnPokemonEvent

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

@@ -8,12 +8,10 @@
 
 package com.cobblemon.mod.common.api.events.fishing
 
-import com.cobblemon.mod.common.api.spawning.SpawnBucket
-
 /**
  * Event that is fired when a bucket is chosen by the bobber.
  * @param chosenBucket The bucket that is chosen.
  * @param buckets The list of buckets that the bobber can choose from.
  * @param luckOfTheSeaLevel The level of the Luck of the Sea enchantment on the rod.
  */
-class BobberBucketChosenEvent(var chosenBucket: SpawnBucket, val buckets: MutableList<SpawnBucket>, val luckOfTheSeaLevel: Int)
+class BobberBucketChosenEvent(var chosenBucket: String, val buckets: MutableList<String>, val luckOfTheSeaLevel: Int)

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

@@ -12,10 +12,7 @@ import com.bedrockk.molang.runtime.value.MoValue
 import com.bedrockk.molang.runtime.value.StringValue
 import com.cobblemon.mod.common.api.events.Cancelable
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMoLangValue
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.moLangFunctionMap
-import com.cobblemon.mod.common.api.molang.ObjectValue
-import com.cobblemon.mod.common.api.spawning.SpawnBucket
 import com.cobblemon.mod.common.api.spawning.detail.SpawnAction
 import com.cobblemon.mod.common.entity.fishing.PokeRodFishingBobberEntity
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
@@ -73,8 +70,8 @@ interface BobberSpawnPokemonEvent {
         val bait: ItemStack,
         val pokemon: PokemonEntity
     ) : BobberSpawnPokemonEvent {
-        val context = mutableMapOf<String, MoValue>(
-            "chosen_bucket" to ObjectValue(spawnAction.bucket, { it.name }),
+        val context = mutableMapOf(
+            "chosen_bucket" to StringValue(spawnAction.bucket),
             "bait" to pokemon.level().itemRegistry.wrapAsHolder(bait.item).asMoLangValue(Registries.ITEM),
             "pokemon_entity" to pokemon.asMoLangValue()
         )

common/src/main/kotlin/com/cobblemon/mod/common/api/fishing/SpawnBait.kt

@@ -75,6 +75,7 @@ class SpawnBait(
         val POKEMON_CHANCE = cobblemonResource("pokemon_chance")
         val FRIENDSHIP = cobblemonResource("friendship")
         val RARITY_BUCKET = cobblemonResource("rarity_bucket")
+        val SIZE = cobblemonResource("size")
 
         fun registerEffect(type: ResourceLocation, effect: (PokemonEntity, Effect) -> Unit) {
             EFFECT_FUNCTIONS[type] = effect
@@ -95,6 +96,7 @@ class SpawnBait(
             registerEffect(HIDDEN_ABILITY_CHANCE) { entity, _ -> FishingSpawnCause.alterHAAttempt(entity) }
             registerEffect(ALPHA_CHANCE) { entity, effect -> FishingSpawnCause.alterAlphaAttempt(entity) }
             registerEffect(FRIENDSHIP) { entity, effect -> FishingSpawnCause.alterFriendshipAttempt(entity, effect) }
+            registerEffect(SIZE) { entity, effect -> FishingSpawnCause.alterSize(entity, effect) }
             CobblemonEvents.BAIT_EFFECT_REGISTRATION.post(BaitEffectFunctionRegistryEvent()) { event ->
                 event.functions.forEach { (type, function) -> registerEffect(type, function) }
             }

common/src/main/kotlin/com/cobblemon/mod/common/api/habitats/ActivatedHabitatPool.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.api.habitats
-
-import com.cobblemon.mod.common.api.spawning.SpawnBucket
-import net.minecraft.network.RegistryFriendlyByteBuf
-import net.minecraft.resources.ResourceLocation
-
-/**
- * A [HabitatPool] of [ActivatedHabitatSpawn]s. Mainly just to help with deserialization and ensuring
- * a single type for everything that's applied to a habitat block.
- *
- * @author Hiroku
- * @since February 13th, 2026
- */
-class ActivatedHabitatPool : HabitatPool<ActivatedHabitatSpawn>() {
-    override val type: ResourceLocation = ActivatedHabitatSpawn.TYPE
-    override var spawns: List<ActivatedHabitatSpawn> = listOf()
-
-    companion object {
-        fun default() = ActivatedHabitatPool().apply {
-            id = ResourceLocation("cobblemon", "custom__default_activated_pool")
-            name = "Custom"
-        }
-    }
-
-    override fun decode(buffer: RegistryFriendlyByteBuf, buckets: List<SpawnBucket>) {
-        super.decode(buffer, buckets)
-        spawns = buffer.readList { ActivatedHabitatSpawn().apply { decode(buffer, buckets) } }
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/api/habitats/ActivatedHabitatSpawn.kt

@@ -1,23 +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.habitats
-
-import com.cobblemon.mod.common.util.cobblemonResource
-
-/**
- * A basic [HabitatSpawn] that will be triggered via activated spawning in a habitat. Nothing to it, really.
- *
- * @author Hiroku
- * @since February 13th, 2026
- */
-class ActivatedHabitatSpawn : HabitatSpawn() {
-    companion object {
-        val TYPE = cobblemonResource("activated")
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/api/habitats/HabitatPool.kt

@@ -8,39 +8,81 @@
 
 package com.cobblemon.mod.common.api.habitats
 
-import com.cobblemon.mod.common.api.spawning.SpawnBucket
+import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.api.spawning.detail.PokemonSpawnDetail
 import com.cobblemon.mod.common.api.spawning.position.SpawnablePosition
 import com.cobblemon.mod.common.block.habitat.HabitatBlockEntity
+import com.cobblemon.mod.common.util.DataKeys
+import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
+import net.minecraft.nbt.CompoundTag
+import net.minecraft.nbt.ListTag
+import net.minecraft.nbt.Tag
 import net.minecraft.network.RegistryFriendlyByteBuf
 import net.minecraft.resources.ResourceLocation
 
 /**
- * A pool of [HabitatSpawn]s. This is either filled with [NaturalHabitatSpawn]s or [ActivatedHabitatSpawn]s depending
- * on whether the pool is a [NaturalHabitatPool] or an [ActivatedHabitatPool]. The pool is responsible for converting
+ * A pool of [HabitatSpawn]s. This is filled with [HabitatSpawn]s. The pool is responsible for converting
  * its spawns into [PokemonSpawnDetail]s.
  *
  * @author Hiroku
  * @since February 13th, 2026
  */
-abstract class HabitatPool<T : HabitatSpawn> {
+class HabitatPool {
     companion object {
-        val types = mutableMapOf(
-            ActivatedHabitatSpawn.TYPE to ActivatedHabitatPool::class.java,
-            NaturalHabitatSpawn.TYPE to NaturalHabitatPool::class.java
-        )
+        fun default() = HabitatPool().apply {
+            id = ResourceLocation("cobblemon", "custom__default_pool")
+            name = "Custom"
+        }
+
+        fun writePoolToNBT(pool: HabitatPool, nbt: CompoundTag) {
+            nbt.putString(DataKeys.HABITAT_POOL_ID, pool.id.toString())
+            if (pool.id.path.startsWith("custom__")) {
+                nbt.putString(DataKeys.HABITAT_POOL_NAME, pool.name)
+                val spawnsListNBT = ListTag()
+                for (spawn in pool.spawns) {
+                    val spawnTag = CompoundTag()
+                    spawn.writeToNBT(spawnTag)
+                    spawnsListNBT.add(spawnTag)
+                }
+                nbt.put(DataKeys.HABITAT_POOL_SPAWNS, spawnsListNBT)
+            }
+        }
+
+        fun readPoolFromNBT(nbt: CompoundTag): HabitatPool {
+            val poolId = nbt.getString(DataKeys.HABITAT_POOL_ID).asIdentifierDefaultingNamespace()
+            if (nbt.contains(DataKeys.HABITAT_POOL_NAME)) {
+                // It's one that was stored on the block
+                val pool = HabitatPool()
+                pool.id = poolId
+                pool.name = nbt.getString(DataKeys.HABITAT_POOL_NAME)
+                val spawnsListNBT = nbt.getList(DataKeys.HABITAT_POOL_SPAWNS, Tag.TAG_COMPOUND.toInt())
+                val spawns = mutableListOf<HabitatSpawn>()
+                spawnsListNBT.forEach { spawnTag ->
+                    try {
+                        val spawn = HabitatSpawn().apply { readFromNBT(spawnTag as CompoundTag) }
+                        spawns.add(spawn)
+                    } catch (_: Exception) {
+                        // If there's an error reading a spawn, skip it and log the error.
+                        Cobblemon.LOGGER.error("Error reading activated habitat spawn from NBT for habitat block, skipping.")
+                    }
+                }
+                pool.spawns = spawns
+                return pool
+            } else {
+                return HabitatPools.habitatPoolsById[poolId] ?: HabitatPool.default()
+            }
+        }
     }
 
     lateinit var id: ResourceLocation
     var name: String = ""
-    abstract val type: ResourceLocation
-    abstract var spawns: List<T>
+    var spawns: List<HabitatSpawn> = listOf()
 
     /** Whether a pool is editable is just down to whether it's not from a datapack. */
     @Transient
     var editable: Boolean = false
 
-    open fun validate() {
+    fun validate() {
         for (spawn in spawns) {
             if (SpawnablePosition.getByName(spawn.spawnablePositionType) == null) {
                 throw IllegalArgumentException("$id mentions non-existent spawnable position type ${spawn.spawnablePositionType} on spawn for ${spawn.species}")
@@ -58,8 +100,9 @@ abstract class HabitatPool<T : HabitatSpawn> {
         buffer.writeCollection(spawns) { _, it -> it.encode(buffer) }
     }
 
-    open fun decode(buffer: RegistryFriendlyByteBuf, buckets: List<SpawnBucket>) {
+    fun decode(buffer: RegistryFriendlyByteBuf) {
         id = buffer.readResourceLocation()
         name = buffer.readUtf()
+        spawns = buffer.readList { HabitatSpawn().apply { decode(buffer) } }
     }
 }

common/src/main/kotlin/com/cobblemon/mod/common/api/habitats/HabitatPools.kt

@@ -12,16 +12,13 @@ import com.cobblemon.mod.common.api.data.JsonDataRegistry
 import com.cobblemon.mod.common.api.pokemon.PokemonProperties
 import com.cobblemon.mod.common.api.reactive.SimpleObservable
 import com.cobblemon.mod.common.api.spawning.IntRanges
-import com.cobblemon.mod.common.api.spawning.SpawnBucket
 import com.cobblemon.mod.common.api.spawning.TimeRange
 import com.cobblemon.mod.common.api.spawning.position.SpawnablePositionType
 import com.cobblemon.mod.common.pokemon.Species
-import com.cobblemon.mod.common.util.adapters.HabitatPoolAdapter
 import com.cobblemon.mod.common.util.adapters.IdentifierAdapter
 import com.cobblemon.mod.common.util.adapters.IntRangeAdapter
 import com.cobblemon.mod.common.util.adapters.IntRangesAdapter
 import com.cobblemon.mod.common.util.adapters.RegisteredSpawnablePositionAdapter
-import com.cobblemon.mod.common.util.adapters.SpawnBucketAdapter
 import com.cobblemon.mod.common.util.adapters.SpeciesAdapter
 import com.cobblemon.mod.common.util.adapters.pokemonPropertiesShortAdapter
 import com.cobblemon.mod.common.util.cobblemonResource
@@ -36,18 +33,16 @@ import net.minecraft.server.level.ServerPlayer
 import net.minecraft.server.packs.PackType
 import net.minecraft.world.level.storage.LevelResource
 
-object HabitatPools : JsonDataRegistry<HabitatPool<*>> {
+object HabitatPools : JsonDataRegistry<HabitatPool> {
     override val id = cobblemonResource("habitat_pools")
     override val type = PackType.SERVER_DATA
     override val observable = SimpleObservable<HabitatPools>()
-    override val typeToken: TypeToken<HabitatPool<*>> = TypeToken.get(HabitatPool::class.java)
+    override val typeToken: TypeToken<HabitatPool> = TypeToken.get(HabitatPool::class.java)
     override val resourcePath = "habitat_pools"
 
     override val gson: Gson = GsonBuilder()
         .registerTypeAdapter(ResourceLocation::class.java, IdentifierAdapter)
-        .registerTypeAdapter(HabitatPool::class.java, HabitatPoolAdapter)
         .registerTypeAdapter(SpawnablePositionType::class.java, RegisteredSpawnablePositionAdapter)
-        .registerTypeAdapter(SpawnBucket::class.java, SpawnBucketAdapter)
         .registerTypeAdapter(Species::class.java, SpeciesAdapter)
         .registerTypeAdapter(IntRange::class.java, IntRangeAdapter)
         .registerTypeAdapter(TimeRange::class.java, TimeRange.adapter)
@@ -56,10 +51,10 @@ object HabitatPools : JsonDataRegistry<HabitatPool<*>> {
         .setPrettyPrinting()
         .create()
 
-    private val datapacked = mutableMapOf<ResourceLocation, HabitatPool<*>>()
-    private val worldSaved = mutableMapOf<ResourceLocation, HabitatPool<*>>()
+    private val datapacked = mutableMapOf<ResourceLocation, HabitatPool>()
+    private val worldSaved = mutableMapOf<ResourceLocation, HabitatPool>()
 
-    val habitatPoolsById = mutableMapOf<ResourceLocation, HabitatPool<*>>()
+    val habitatPoolsById = mutableMapOf<ResourceLocation, HabitatPool>()
 
     private lateinit var worldSavedPoolsFolder: File
 
@@ -73,7 +68,7 @@ object HabitatPools : JsonDataRegistry<HabitatPool<*>> {
 
         worldSavedPoolsFolder.listFiles { it.endsWith(".json") }.forEach {
             val identifier = ResourceLocation.parse(it.nameWithoutExtension)
-            val habitat = gson.fromJson<HabitatPool<*>>(it.reader())
+            val habitat = gson.fromJson<HabitatPool>(it.reader())
             habitat.id = identifier
             habitat.validate()
             habitat.editable = true
@@ -82,7 +77,7 @@ object HabitatPools : JsonDataRegistry<HabitatPool<*>> {
         setupHabitatPoolsById()
     }
 
-    override fun reload(data: Map<ResourceLocation, HabitatPool<*>>) {
+    override fun reload(data: Map<ResourceLocation, HabitatPool>) {
         datapacked.clear()
         datapacked.putAll(data)
         data.entries.forEach { (identifier, habitat) ->

common/src/main/kotlin/com/cobblemon/mod/common/api/habitats/HabitatSpawn.kt

@@ -10,9 +10,7 @@ package com.cobblemon.mod.common.api.habitats
 
 import com.cobblemon.mod.common.api.pokemon.PokemonProperties
 import com.cobblemon.mod.common.api.pokemon.PokemonSpecies
-import com.cobblemon.mod.common.api.spawning.BestSpawner
 import com.cobblemon.mod.common.api.spawning.IntRanges
-import com.cobblemon.mod.common.api.spawning.SpawnBucket
 import com.cobblemon.mod.common.api.spawning.TimeRange
 import com.cobblemon.mod.common.api.spawning.condition.AppendageCondition
 import com.cobblemon.mod.common.api.spawning.condition.SpawningCondition
@@ -30,9 +28,7 @@ import net.minecraft.nbt.CompoundTag
 import net.minecraft.network.RegistryFriendlyByteBuf
 
 /**
- * A kind of simplified spawn definition for the purposes of spawning from [HabitatBlockEntity] instances. This is a
- * very shallow class tree, with [ActivatedHabitatSpawn] being a trivial subclass but the other subclass being
- * [NaturalHabitatSpawn] which introduces the need to supply a spawn bucket.
+ * A kind of simplified spawn definition for the purposes of spawning from [HabitatBlockEntity] instances.
  *
  * These have only a small subset of the properties that a regular [PokemonSpawnDetail] would have to align with the
  * fact that these are configured from a simple GUI. There are limits to how many properties and conditions could be
@@ -46,11 +42,13 @@ import net.minecraft.network.RegistryFriendlyByteBuf
  * @author Hiroku
  * @since February 13th, 2026
  */
-sealed class HabitatSpawn {
+class HabitatSpawn {
     /** The species that will be spawned. */
     lateinit var species: Species
     /** The kind of position the Pokémon will spawn in. Things like "grounded", "seafloor", "fishing". */
     lateinit var spawnablePositionType: String
+    /** The bucket to spawn from. */
+    var bucket: String = "common"
 
     /** Selection weight. */
     var weight: Float = 1F
@@ -77,6 +75,7 @@ sealed class HabitatSpawn {
         timeRange?.let { nbt.putString(DataKeys.HABITAT_POOL_SPAWN_TIMES, TimeRange.adapter.serialize(it)) }
         minLight?.let { nbt.putInt(DataKeys.HABITAT_POOL_SPAWN_MIN_LIGHT, it) }
         maxLight?.let { nbt.putInt(DataKeys.HABITAT_POOL_SPAWN_MAX_LIGHT, it) }
+        nbt.putString(DataKeys.HABITAT_POOL_SPAWN_BUCKET, bucket)
     }
 
     open fun readFromNBT(nbt: CompoundTag) {
@@ -89,6 +88,7 @@ sealed class HabitatSpawn {
         timeRange = if (nbt.contains(DataKeys.HABITAT_POOL_SPAWN_TIMES)) TimeRange.adapter.deserialize(nbt.getString(DataKeys.HABITAT_POOL_SPAWN_TIMES)) else null
         minLight = if (nbt.contains(DataKeys.HABITAT_POOL_SPAWN_MIN_LIGHT)) nbt.getInt(DataKeys.HABITAT_POOL_SPAWN_MIN_LIGHT) else null
         maxLight = if (nbt.contains(DataKeys.HABITAT_POOL_SPAWN_MAX_LIGHT)) nbt.getInt(DataKeys.HABITAT_POOL_SPAWN_MAX_LIGHT) else null
+        bucket = if (nbt.contains(DataKeys.HABITAT_POOL_SPAWN_BUCKET)) nbt.getString(DataKeys.HABITAT_POOL_SPAWN_BUCKET) else "common"
     }
 
     open fun encode(buffer: RegistryFriendlyByteBuf) {
@@ -101,12 +101,10 @@ sealed class HabitatSpawn {
         buffer.writeNullable(timeRange) { _, value -> buffer.writeUtf(TimeRange.adapter.serialize(value)) }
         buffer.writeNullable(minLight) { _, value -> buffer.writeInt(value) }
         buffer.writeNullable(maxLight) { _, value -> buffer.writeInt(value) }
+        buffer.writeUtf(bucket)
     }
 
-    open fun decode(
-        buffer: RegistryFriendlyByteBuf,
-        buckets: List<SpawnBucket>
-    ) {
+    open fun decode(buffer: RegistryFriendlyByteBuf) {
         species = PokemonSpecies.getByIdentifier(buffer.readResourceLocation())!!
         spawnablePositionType = buffer.readUtf()
         weight = buffer.readFloat()
@@ -116,6 +114,7 @@ sealed class HabitatSpawn {
         timeRange = buffer.readNullable { _ -> TimeRange.adapter.deserialize(buffer.readUtf()) }
         minLight = buffer.readNullable { _ -> buffer.readInt() }
         maxLight = buffer.readNullable { _ -> buffer.readInt() }
+        bucket = buffer.readUtf()
     }
 
     /** Creates the [PokemonSpawnDetail] that will be used in the spawner. This is done per habitat block. */
@@ -138,7 +137,7 @@ sealed class HabitatSpawn {
         spawnDetail.apply {
             this.id = "habitat_${species.resourceIdentifier}"
             this.pokemon = properties
-            this.bucket = BestSpawner.config.buckets.first { it.weight > 0 }
+            this.bucket = this@HabitatSpawn.bucket
             this.weight = this@HabitatSpawn.weight
             this.levelRange = levelRange
             this.conditions = mutableListOf(condition)

common/src/main/kotlin/com/cobblemon/mod/common/api/habitats/NaturalHabitatPool.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.api.habitats
-
-import com.cobblemon.mod.common.api.spawning.SpawnBucket
-import net.minecraft.network.RegistryFriendlyByteBuf
-import net.minecraft.resources.ResourceLocation
-
-/**
- * A [HabitatPool] of [NaturalHabitatSpawn]s. Mainly just to help with deserialization and ensuring
- * a single type for everything that's applied to a habitat block.
- *
- * @author Hiroku
- * @since February 13th, 2026
- */
-class NaturalHabitatPool : HabitatPool<NaturalHabitatSpawn>() {
-    override val type: ResourceLocation = NaturalHabitatSpawn.TYPE
-    override var spawns: List<NaturalHabitatSpawn> = listOf()
-
-    companion object {
-        fun default() = NaturalHabitatPool().apply {
-            id = ResourceLocation("cobblemon", "custom__default_natural_pool")
-            name = "Custom"
-        }
-    }
-
-    override fun decode(buffer: RegistryFriendlyByteBuf, buckets: List<SpawnBucket>) {
-        super.decode(buffer, buckets)
-        spawns = buffer.readList { NaturalHabitatSpawn().apply { decode(buffer, buckets) } }
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/api/habitats/NaturalHabitatSpawn.kt

@@ -1,63 +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.habitats
-
-import com.cobblemon.mod.common.Cobblemon
-import com.cobblemon.mod.common.api.spawning.SpawnBucket
-import com.cobblemon.mod.common.api.spawning.detail.PokemonSpawnDetail
-import com.cobblemon.mod.common.block.habitat.HabitatBlockEntity
-import com.cobblemon.mod.common.util.DataKeys
-import com.cobblemon.mod.common.util.cobblemonResource
-import net.minecraft.nbt.CompoundTag
-import net.minecraft.network.RegistryFriendlyByteBuf
-
-/**
- * A type of [HabitatSpawn] that spawns Pokémon as part of natural world spawning, and therefore
- * needs to indicate the [SpawnBucket] it will be part of.
- *
- * @author Hiroku
- * @since February 13th, 2026
- */
-class NaturalHabitatSpawn : HabitatSpawn() {
-    companion object {
-        val TYPE = cobblemonResource("natural")
-    }
-
-    lateinit var bucket: SpawnBucket
-
-    override fun createSpawnDetail(habitatBlockEntity: HabitatBlockEntity): PokemonSpawnDetail? {
-        val spawnDetail = super.createSpawnDetail(habitatBlockEntity)
-        spawnDetail?.bucket = bucket
-        return spawnDetail
-    }
-
-    override fun writeToNBT(nbt: CompoundTag) {
-        super.writeToNBT(nbt)
-        nbt.putString(DataKeys.HABITAT_POOL_SPAWN_BUCKET, bucket.name)
-    }
-
-    override fun readFromNBT(nbt: CompoundTag) {
-        super.readFromNBT(nbt)
-        bucket = Cobblemon.bestSpawner.config.buckets.first { it.name == nbt.getString(DataKeys.HABITAT_POOL_SPAWN_BUCKET) }
-    }
-
-    override fun encode(buffer: RegistryFriendlyByteBuf) {
-        super.encode(buffer)
-        buffer.writeUtf(bucket.name)
-    }
-
-    override fun decode(
-        buffer: RegistryFriendlyByteBuf,
-        buckets: List<SpawnBucket>
-    ) {
-        super.decode(buffer, buckets)
-        val bucketName = buffer.readUtf()
-        bucket = buckets.first { it.name == bucketName }
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/api/habitats/dto/ActivatedHabitatSettingsDTO.kt

@@ -8,9 +8,7 @@
 
 package com.cobblemon.mod.common.api.habitats.dto
 
-import com.cobblemon.mod.common.api.habitats.ActivatedHabitatPool
 import com.cobblemon.mod.common.api.habitats.spawningstyle.ActivatedHabitatSpawning
-import com.cobblemon.mod.common.api.spawning.SpawnBucket
 import net.minecraft.network.RegistryFriendlyByteBuf
 
 class ActivatedHabitatSettingsDTO() {
@@ -20,7 +18,6 @@ class ActivatedHabitatSettingsDTO() {
     var spawnRange = 16
     var maxSpawns = -1
     var maxSpawnsPerActivation = 1
-    var habitatPool: HabitatPoolSettingsDTO = HabitatPoolSettingsDTO(ActivatedHabitatPool.default())
 
     constructor(activatedHabitatSpawning: ActivatedHabitatSpawning): this() {
         this.chance = activatedHabitatSpawning.chance
@@ -29,7 +26,6 @@ class ActivatedHabitatSettingsDTO() {
         this.spawnRange = activatedHabitatSpawning.spawnRange
         this.maxSpawns = activatedHabitatSpawning.maxSpawns
         this.maxSpawnsPerActivation = activatedHabitatSpawning.maxSpawnsPerActivation
-        this.habitatPool = HabitatPoolSettingsDTO(activatedHabitatSpawning.pool)
     }
 
     fun encode(buffer: RegistryFriendlyByteBuf) {
@@ -39,20 +35,14 @@ class ActivatedHabitatSettingsDTO() {
         buffer.writeInt(spawnRange)
         buffer.writeInt(maxSpawns)
         buffer.writeInt(maxSpawnsPerActivation)
-        habitatPool.encode(buffer)
     }
 
-    fun decode(
-        buffer: RegistryFriendlyByteBuf,
-        buckets: List<SpawnBucket>
-    ) {
+    fun decode(buffer: RegistryFriendlyByteBuf) {
         this.chance = buffer.readFloat()
         this.trigger = buffer.readEnum(ActivatedHabitatSpawning.Trigger::class.java)
         this.cancelledNaturalSpawningRange = buffer.readInt()
         this.spawnRange = buffer.readInt()
         this.maxSpawns = buffer.readInt()
         this.maxSpawnsPerActivation = buffer.readInt()
-        this.habitatPool = HabitatPoolSettingsDTO()
-        habitatPool.decode(buffer, buckets)
     }
 }

common/src/main/kotlin/com/cobblemon/mod/common/api/habitats/dto/HabitatPoolSettingsDTO.kt

@@ -9,30 +9,23 @@
 package com.cobblemon.mod.common.api.habitats.dto
 
 import com.cobblemon.mod.common.Cobblemon
-import com.cobblemon.mod.common.api.habitats.ActivatedHabitatPool
-import com.cobblemon.mod.common.api.habitats.ActivatedHabitatSpawn
 import com.cobblemon.mod.common.api.habitats.HabitatPool
 import com.cobblemon.mod.common.api.habitats.HabitatPools
 import com.cobblemon.mod.common.api.habitats.HabitatSpawn
-import com.cobblemon.mod.common.api.habitats.NaturalHabitatPool
-import com.cobblemon.mod.common.api.habitats.NaturalHabitatSpawn
-import com.cobblemon.mod.common.api.spawning.SpawnBucket
 import net.minecraft.network.RegistryFriendlyByteBuf
 import net.minecraft.resources.ResourceLocation
 
 class HabitatPoolSettingsDTO() {
     lateinit var id: ResourceLocation
     var isReference = false
-    var isActivated = false
 
     // Below properties are only there when it's not a reference, otherwise the handler will have to look them up from the id
     var name: String? = null
     var spawns: MutableList<HabitatSpawn>? = null
 
-    constructor(habitatPool: HabitatPool<*>): this() {
+    constructor(habitatPool: HabitatPool): this() {
         this.id = habitatPool.id
         this.isReference = !id.path.startsWith("custom__")
-        this.isActivated = habitatPool is ActivatedHabitatPool
         if (!this.isReference) {
             this.name = habitatPool.name
             this.spawns = habitatPool.spawns.toMutableList()
@@ -42,7 +35,6 @@ class HabitatPoolSettingsDTO() {
     fun encode(buffer: RegistryFriendlyByteBuf) {
         buffer.writeResourceLocation(id)
         buffer.writeBoolean(isReference)
-        buffer.writeBoolean(isActivated)
         if (!isReference) {
             buffer.writeUtf(name!!)
             buffer.writeCollection(spawns!!) { _, spawn ->
@@ -52,50 +44,32 @@ class HabitatPoolSettingsDTO() {
     }
 
     fun decode(
-        buffer: RegistryFriendlyByteBuf,
-        buckets: List<SpawnBucket>
+        buffer: RegistryFriendlyByteBuf
     ) {
         this.id = buffer.readResourceLocation()
         this.isReference = buffer.readBoolean()
-        this.isActivated = buffer.readBoolean()
         if (!isReference) {
             this.name = buffer.readUtf()
             this.spawns = buffer.readList {
-                val spawn = if (isActivated) {
-                    ActivatedHabitatSpawn()
-                } else {
-                    NaturalHabitatSpawn()
-                }
-                spawn.decode(buffer, buckets)
+                val spawn = HabitatSpawn()
+                spawn.decode(buffer)
                 spawn
             }.toMutableList()
         }
     }
 
-    fun toHabitatPool(): HabitatPool<*>? {
+    fun toHabitatPool(): HabitatPool? {
         if (isReference) {
             val pool = HabitatPools.habitatPoolsById[id]
             if (pool == null) {
                 Cobblemon.LOGGER.error("Could not find habitat pool with id $id")
-            } else if (pool is ActivatedHabitatPool && !isActivated) {
-                Cobblemon.LOGGER.error("Pool with id $id is an activated habitat pool but was deserialized as a natural pool")
-            } else if (pool !is ActivatedHabitatPool && isActivated) {
-                Cobblemon.LOGGER.error("Pool with id $id is a natural habitat pool but was deserialized as an activated pool")
             }
             return pool
         }
-        return if (isActivated) {
-            val pool = ActivatedHabitatPool()
-            pool.id = id
-            pool.name = name!!
-            pool.spawns = spawns!!.map { it as ActivatedHabitatSpawn }
-            pool
-        } else {
-            val pool = NaturalHabitatPool()
-            pool.id = id
-            pool.name = name!!
-            pool.spawns = spawns!!.map { it as NaturalHabitatSpawn }
-            pool
-        }
+        val pool = HabitatPool()
+        pool.id = id
+        pool.name = name!!
+        pool.spawns = spawns!!
+        return pool
     }
 }

common/src/main/kotlin/com/cobblemon/mod/common/api/habitats/dto/HabitatSettingsDTO.kt

@@ -9,9 +9,9 @@
 package com.cobblemon.mod.common.api.habitats.dto
 
 import com.cobblemon.mod.common.api.habitats.HabitatPhaseOrder
+import com.cobblemon.mod.common.api.habitats.HabitatPool
 import com.cobblemon.mod.common.api.habitats.spawningstyle.ActivatedHabitatSpawning
 import com.cobblemon.mod.common.api.habitats.spawningstyle.NaturalHabitatSpawning
-import com.cobblemon.mod.common.api.spawning.SpawnBucket
 import com.cobblemon.mod.common.block.habitat.HabitatBlockEntity
 import net.minecraft.network.RegistryFriendlyByteBuf
 import net.minecraft.resources.ResourceLocation
@@ -23,6 +23,7 @@ class HabitatSettingsDTO() {
     var modifiers: String = ""
     lateinit var mimicId: ResourceLocation
     var isActivatedSpawning = false
+    var pool: HabitatPoolSettingsDTO = HabitatPoolSettingsDTO(HabitatPool.default())
     var activatedSettings: ActivatedHabitatSettingsDTO? = null
     var naturalSettings: NaturalHabitatSettingsDTO? = null
 
@@ -32,6 +33,7 @@ class HabitatSettingsDTO() {
         this.levelRange = habitatBlockEntity.levelRange
         this.modifiers = habitatBlockEntity.modifiers.asString()
         this.mimicId = habitatBlockEntity.mimicId
+        this.pool = HabitatPoolSettingsDTO(habitatBlockEntity.pool)
         val style = habitatBlockEntity.spawningStyle
         if (style is ActivatedHabitatSpawning) {
             this.isActivatedSpawning = true
@@ -48,6 +50,7 @@ class HabitatSettingsDTO() {
         buffer.writeInt(levelRange.last)
         buffer.writeUtf(modifiers)
         buffer.writeResourceLocation(mimicId)
+        pool.encode(buffer)
         buffer.writeBoolean(isActivatedSpawning)
         if (isActivatedSpawning) {
             activatedSettings?.encode(buffer)
@@ -56,10 +59,7 @@ class HabitatSettingsDTO() {
         }
     }
 
-    fun decode(
-        buffer: RegistryFriendlyByteBuf,
-        buckets: List<SpawnBucket>
-    ) {
+    fun decode(buffer: RegistryFriendlyByteBuf) {
         this.numberOfPhases = buffer.readInt()
         this.phaseOrder = buffer.readEnum(HabitatPhaseOrder::class.java)
         val levelRangeStart = buffer.readInt()
@@ -67,16 +67,18 @@ class HabitatSettingsDTO() {
         this.levelRange = levelRangeStart..levelRangeEnd
         this.modifiers = buffer.readUtf()
         this.mimicId = buffer.readResourceLocation()
+        this.pool = HabitatPoolSettingsDTO()
+        this.pool.decode(buffer)
         if (buffer.readBoolean()) {
             this.isActivatedSpawning = true
             this.naturalSettings = null
             val activatedSettings = ActivatedHabitatSettingsDTO()
-            activatedSettings.decode(buffer, buckets)
+            activatedSettings.decode(buffer)
             this.activatedSettings = activatedSettings
         } else {
             this.activatedSettings = null
             val naturalSettings = NaturalHabitatSettingsDTO()
-            naturalSettings.decode(buffer, buckets)
+            naturalSettings.decode(buffer)
             this.naturalSettings = naturalSettings
         }
     }

common/src/main/kotlin/com/cobblemon/mod/common/api/habitats/dto/NaturalHabitatSettingsDTO.kt

@@ -8,35 +8,25 @@
 
 package com.cobblemon.mod.common.api.habitats.dto
 
-import com.cobblemon.mod.common.api.habitats.NaturalHabitatPool
 import com.cobblemon.mod.common.api.habitats.spawningstyle.NaturalHabitatSpawning
-import com.cobblemon.mod.common.api.spawning.SpawnBucket
 import net.minecraft.network.RegistryFriendlyByteBuf
 
 class NaturalHabitatSettingsDTO() {
     var replaceSpawns = false
     var rangeOfInfluence = 16
-    var habitatPool: HabitatPoolSettingsDTO = HabitatPoolSettingsDTO(NaturalHabitatPool.default())
 
     constructor(naturalHabitatSpawning: NaturalHabitatSpawning): this() {
         this.replaceSpawns = naturalHabitatSpawning.replaceSpawns
         this.rangeOfInfluence = naturalHabitatSpawning.rangeOfInfluence
-        this.habitatPool = HabitatPoolSettingsDTO(naturalHabitatSpawning.pool)
     }
 
     fun encode(buffer: RegistryFriendlyByteBuf) {
         buffer.writeBoolean(replaceSpawns)
         buffer.writeInt(rangeOfInfluence)
-        habitatPool.encode(buffer)
     }
 
-    fun decode(
-        buffer: RegistryFriendlyByteBuf,
-        buckets: List<SpawnBucket>
-    ) {
+    fun decode(buffer: RegistryFriendlyByteBuf, ) {
         this.replaceSpawns = buffer.readBoolean()
         this.rangeOfInfluence = buffer.readInt()
-        this.habitatPool = HabitatPoolSettingsDTO()
-        habitatPool.decode(buffer, buckets)
     }
 }

common/src/main/kotlin/com/cobblemon/mod/common/api/habitats/spawningstyle/ActivatedHabitatSpawning.kt

@@ -8,17 +8,16 @@
 
 package com.cobblemon.mod.common.api.habitats.spawningstyle
 
+import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.api.events.CobblemonEvents
 import com.cobblemon.mod.common.api.events.habitats.HabitatSpawnActivatedEvent
-import com.cobblemon.mod.common.api.habitats.ActivatedHabitatPool
-import com.cobblemon.mod.common.api.habitats.ActivatedHabitatSpawn
 import com.cobblemon.mod.common.api.habitats.ActivatedHabitatSpawningInfluence
 import com.cobblemon.mod.common.api.spawning.SpawnCause
-import com.cobblemon.mod.common.api.spawning.detail.SpawnDetail
 import com.cobblemon.mod.common.api.spawning.detail.SpawnPool
 import com.cobblemon.mod.common.api.spawning.spawner.FixedAreaSpawner
 import com.cobblemon.mod.common.block.habitat.HabitatBlockEntity
 import com.cobblemon.mod.common.util.DataKeys
+import com.cobblemon.mod.common.util.cobblemonResource
 import net.minecraft.core.BlockPos
 import net.minecraft.nbt.CompoundTag
 import net.minecraft.server.level.ServerLevel
@@ -27,7 +26,7 @@ import net.minecraft.server.level.ServerLevel
  * A habitat spawning style defined by being triggered by something. The activation trigger, [trigger], is either
  * a redstone pulse, every tick, or every random tick.
  *
- * The spawn details are generated from the [pool] every time there is some change to the habitat block's settings,
+ * The spawn details are generated from the pool every time there is some change to the habitat block's settings,
  * then those spawn details are used for spawning Pokémon when the habitat block is triggered.
  *
  * The [chance] property is applied after the trigger logic so that not every activation necessarily results in a spawn
@@ -37,6 +36,10 @@ import net.minecraft.server.level.ServerLevel
  * @since February 14th, 2026
  */
 class ActivatedHabitatSpawning(val habitatBlockEntity: HabitatBlockEntity) : HabitatSpawningStyle {
+    companion object {
+        val TYPE = cobblemonResource("activated")
+    }
+
     enum class Trigger {
         /** Requires a redstone pulse. */
         REDSTONE,
@@ -46,7 +49,8 @@ class ActivatedHabitatSpawning(val habitatBlockEntity: HabitatBlockEntity) : Hab
         RANDOM_TICK
     }
 
-    override val type = ActivatedHabitatSpawn.TYPE
+    @Transient
+    override val type = TYPE
 
     /** The chance that an activation by the [trigger] will result in a spawn attempt. The spawn attempt may still fail. */
     var chance = 1F
@@ -60,11 +64,7 @@ class ActivatedHabitatSpawning(val habitatBlockEntity: HabitatBlockEntity) : Hab
     var maxSpawns = -1
     /** The maximum number of Pokémon that can spawn in a single activation. This will still be capped by [maxSpawns]. */
     var maxSpawnsPerActivation = 1
-    /** The pool of spawns to choose from. */
-    var pool: ActivatedHabitatPool = ActivatedHabitatPool.default()
 
-    // This is cached here so that it doesn't have to be regenerated every time the block is triggered, updated when settings change.
-    var spawnDetails: List<SpawnDetail> = listOf()
     lateinit var spawner: FixedAreaSpawner
 
     override fun writeToNBT(nbt: CompoundTag) {
@@ -75,10 +75,6 @@ class ActivatedHabitatSpawning(val habitatBlockEntity: HabitatBlockEntity) : Hab
         nbt.putInt(DataKeys.HABITAT_ACTIVATED_SPAWN_RANGE, spawnRange)
         nbt.putInt(DataKeys.HABITAT_ACTIVATED_MAX_SPAWNS, maxSpawns)
         nbt.putInt(DataKeys.HABITAT_ACTIVATED_MAX_SPAWNS_PER_ACTIVATION, maxSpawnsPerActivation)
-
-        val poolNBT = CompoundTag()
-        writePoolToNBT(pool, poolNBT)
-        nbt.put(DataKeys.HABITAT_POOL, poolNBT)
     }
 
     override fun readFromNBT(nbt: CompoundTag) {
@@ -88,25 +84,18 @@ class ActivatedHabitatSpawning(val habitatBlockEntity: HabitatBlockEntity) : Hab
         spawnRange = nbt.getInt(DataKeys.HABITAT_ACTIVATED_SPAWN_RANGE)
         maxSpawns = nbt.getInt(DataKeys.HABITAT_ACTIVATED_MAX_SPAWNS)
         maxSpawnsPerActivation = nbt.getInt(DataKeys.HABITAT_ACTIVATED_MAX_SPAWNS_PER_ACTIVATION)
-
-        pool = HabitatSpawningStyle.readPoolFromNBT(
-            nbt = nbt.getCompound(DataKeys.HABITAT_POOL),
-            poolInitializer = ::ActivatedHabitatPool,
-            spawnInitializer = ::ActivatedHabitatSpawn,
-            defaultPool = ActivatedHabitatPool::default
-        )
     }
 
     fun generateSpawnDetails(world: ServerLevel, pos: BlockPos) {
-        spawnDetails = pool.createSpawnDetails(habitatBlockEntity)
         spawner = FixedAreaSpawner(
             name = "habitat_spawner_$pos",
             world = world,
             position = pos,
             spawnPool = SpawnPool("habitat_block").also {
-                it.details.addAll(spawnDetails)
+                it.details.addAll(habitatBlockEntity.spawnDetails)
                 it.precalculate()
             },
+            buckets = Cobblemon.bestSpawner.config.activatedHabitatBuckets,
             maxPokemonPerChunk = 16F,
             verticalRadius = spawnRange,
             horizontalRadius = spawnRange
@@ -118,7 +107,7 @@ class ActivatedHabitatSpawning(val habitatBlockEntity: HabitatBlockEntity) : Hab
         // Check if the spawn attempt should even happen based on chance.
         if (chance < 1F && world.random.nextFloat() >= chance) {
             return
-        } else if (spawnDetails.isEmpty()) {
+        } else if (habitatBlockEntity.spawnDetails.isEmpty()) {
             // If there are no spawn details, then there's no point in trying to spawn anything.
             return
         }

common/src/main/kotlin/com/cobblemon/mod/common/api/habitats/spawningstyle/HabitatSpawningStyle.kt

@@ -8,15 +8,7 @@
 
 package com.cobblemon.mod.common.api.habitats.spawningstyle
 
-import com.cobblemon.mod.common.Cobblemon
-import com.cobblemon.mod.common.api.habitats.HabitatPool
-import com.cobblemon.mod.common.api.habitats.HabitatPools
-import com.cobblemon.mod.common.api.habitats.HabitatSpawn
-import com.cobblemon.mod.common.util.DataKeys
-import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
 import net.minecraft.nbt.CompoundTag
-import net.minecraft.nbt.ListTag
-import net.minecraft.nbt.Tag
 import net.minecraft.resources.ResourceLocation
 
 /**
@@ -33,47 +25,4 @@ sealed interface HabitatSpawningStyle {
 
     fun writeToNBT(nbt: CompoundTag)
     fun readFromNBT(nbt: CompoundTag)
-
-    fun writePoolToNBT(pool: HabitatPool<*>, nbt: CompoundTag) {
-        nbt.putString(DataKeys.HABITAT_POOL_ID, pool.id.toString())
-        if (pool.id.path.startsWith("custom__")) {
-            nbt.putString(DataKeys.HABITAT_POOL_NAME, pool.name)
-            val spawnsListNBT = ListTag()
-            for (spawn in pool.spawns) {
-                val spawnTag = CompoundTag()
-                spawn.writeToNBT(spawnTag)
-                spawnsListNBT.add(spawnTag)
-            }
-            nbt.put(DataKeys.HABITAT_POOL_SPAWNS, spawnsListNBT)
-        }
-    }
-    
-    companion object {
-        fun <T : HabitatSpawn, P : HabitatPool<T>> readPoolFromNBT(nbt: CompoundTag, poolInitializer: () -> P, spawnInitializer: () -> T, defaultPool: () -> P): P {
-            var pool: P
-            val poolId = nbt.getString(DataKeys.HABITAT_POOL_ID).asIdentifierDefaultingNamespace()
-            if (nbt.contains(DataKeys.HABITAT_POOL_NAME)) {
-                // It's one that was stored on the block
-                pool = poolInitializer()
-                pool.id = poolId
-                pool.name = nbt.getString(DataKeys.HABITAT_POOL_NAME)
-                val spawnsListNBT = nbt.getList(DataKeys.HABITAT_POOL_SPAWNS, Tag.TAG_COMPOUND.toInt())
-                val spawns = mutableListOf<T>()
-                spawnsListNBT.forEach { spawnTag ->
-                    try {
-                        val spawn = spawnInitializer().apply { readFromNBT(spawnTag as CompoundTag) }
-                        spawns.add(spawn)
-                    } catch (_: Exception) {
-                        // If there's an error reading a spawn, skip it and log the error.
-                        Cobblemon.LOGGER.error("Error reading activated habitat spawn from NBT for habitat block, skipping.")
-                    }
-                }
-                pool.spawns = spawns
-            } else {
-                pool = HabitatPools.habitatPoolsById[poolId] as? P ?: defaultPool()
-            }
-            
-            return pool
-        }
-    }
 }

common/src/main/kotlin/com/cobblemon/mod/common/api/habitats/spawningstyle/NaturalHabitatSpawning.kt

@@ -8,21 +8,18 @@
 
 package com.cobblemon.mod.common.api.habitats.spawningstyle
 
-import com.cobblemon.mod.common.api.habitats.NaturalHabitatPool
-import com.cobblemon.mod.common.api.habitats.NaturalHabitatSpawn
-import com.cobblemon.mod.common.api.habitats.spawningstyle.HabitatSpawningStyle.Companion.readPoolFromNBT
-import com.cobblemon.mod.common.api.spawning.detail.SpawnDetail
 import com.cobblemon.mod.common.block.habitat.HabitatBlockEntity
 import com.cobblemon.mod.common.util.DataKeys
+import com.cobblemon.mod.common.util.cobblemonResource
 import net.minecraft.nbt.CompoundTag
 import net.minecraft.resources.ResourceLocation
 
 /**
  * A habitat spawning style defined by tapping into regular spawning methods. This works by adding to the spawn list
  * for spawning that's occurring nearby. When [replaceSpawns] is set to true, the original spawns will be
- * removed completely in favour of the spawns provided in this habitat's [pool].
+ * removed completely in favour of the spawns provided in this habitat's pool.
  *
- * The spawn details are generated from the [pool] every time there is some change to the habitat block's settings,
+ * The spawn details are generated from the pool every time there is some change to the habitat block's settings,
  * then those spawn details are used for spawning Pokémon when world spawning is occurring nearby.
  *
  * Whether or not this interactions with overworld or fishing spawns is determined by whether the habitat pool has
@@ -32,10 +29,13 @@ import net.minecraft.resources.ResourceLocation
  * @since February 22nd, 2026
  */
 class NaturalHabitatSpawning(val habitatBlockEntity: HabitatBlockEntity) : HabitatSpawningStyle {
+    companion object {
+        val TYPE = cobblemonResource("natural")
+    }
+
     @Transient
-    override val type: ResourceLocation = NaturalHabitatSpawn.TYPE
+    override val type: ResourceLocation = TYPE
 
-    var pool: NaturalHabitatPool = NaturalHabitatPool.default()
     var replaceSpawns = false
     var rangeOfInfluence = 16
 
@@ -43,33 +43,19 @@ class NaturalHabitatSpawning(val habitatBlockEntity: HabitatBlockEntity) : Habit
     var affectsFishing = false
     @Transient
     var affectsOverworld = false
-    @Transient
-    var spawnDetails: List<SpawnDetail> = listOf()
 
     fun generateSpawnDetails() {
-        spawnDetails = pool.createSpawnDetails(habitatBlockEntity = habitatBlockEntity)
-        affectsFishing = spawnDetails.any { it.spawnablePositionType.name == "fishing" }
-        affectsOverworld = spawnDetails.any { it.spawnablePositionType.name != "fishing" }
+        affectsFishing = habitatBlockEntity.spawnDetails.any { it.spawnablePositionType.name == "fishing" }
+        affectsOverworld = habitatBlockEntity.spawnDetails.any { it.spawnablePositionType.name != "fishing" }
     }
 
     override fun writeToNBT(nbt: CompoundTag) {
         nbt.putBoolean(DataKeys.HABITAT_NATURAL_REPLACE_SPAWNS, replaceSpawns)
         nbt.putInt(DataKeys.HABITAT_NATURAL_RANGE_OF_INFLUENCE, rangeOfInfluence)
-
-        val poolNBT = CompoundTag()
-        writePoolToNBT(pool, poolNBT)
-        nbt.put(DataKeys.HABITAT_POOL, poolNBT)
     }
 
     override fun readFromNBT(nbt: CompoundTag) {
         replaceSpawns = nbt.getBoolean(DataKeys.HABITAT_NATURAL_REPLACE_SPAWNS)
         rangeOfInfluence = nbt.getInt(DataKeys.HABITAT_NATURAL_RANGE_OF_INFLUENCE)
-
-        pool = readPoolFromNBT(
-            nbt = nbt.getCompound(DataKeys.HABITAT_POOL),
-            poolInitializer = ::NaturalHabitatPool,
-            spawnInitializer = ::NaturalHabitatSpawn,
-            defaultPool = NaturalHabitatPool::default
-        )
     }
 }

common/src/main/kotlin/com/cobblemon/mod/common/api/interaction/PokemonInteractions.kt

@@ -10,7 +10,7 @@ package com.cobblemon.mod.common.api.interaction
 
 import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.api.conditional.RegistryLikeCondition
-import com.cobblemon.mod.common.api.data.JsonDataRegistry
+import com.cobblemon.mod.common.api.data.ServerJsonDataRegistry
 import com.cobblemon.mod.common.api.molang.ExpressionLike
 import com.cobblemon.mod.common.api.pokemon.PokemonProperties
 import com.cobblemon.mod.common.api.pokemon.requirement.Requirement
@@ -26,6 +26,7 @@ import com.google.gson.Gson
 import com.google.gson.GsonBuilder
 import com.google.gson.reflect.TypeToken
 import net.minecraft.advancements.critereon.ItemPredicate
+import net.minecraft.core.HolderLookup
 import net.minecraft.resources.ResourceLocation
 import net.minecraft.server.level.ServerPlayer
 import net.minecraft.server.packs.PackType
@@ -36,28 +37,31 @@ import net.minecraft.world.level.block.Block
 import net.minecraft.world.level.levelgen.structure.Structure
 import net.minecraft.world.level.material.Fluid
 
-object PokemonInteractions : JsonDataRegistry<PokemonInteractionSet> {
+object PokemonInteractions : ServerJsonDataRegistry<PokemonInteractionSet> {
     override val id = cobblemonResource("pokemon_interactions")
     override val type = PackType.SERVER_DATA
+    override fun setupParser(registry: HolderLookup.Provider): Gson {
+        return GsonBuilder()
+            .registerTypeAdapter(ResourceLocation::class.java, IdentifierAdapter)
+            .registerTypeAdapter(PokemonProperties::class.java, pokemonPropertiesShortAdapter)
+            .registerTypeAdapter(ItemPredicate::class.java, LegacyItemConditionWrapperAdapter(registry))
+            .registerTypeAdapter(Requirement::class.java, CobblemonRequirementAdapter)
+            .registerTypeAdapter(InteractionEffect::class.java, InteractionEffectAdapter)
+            .registerTypeAdapter(ExpressionLike::class.java, ExpressionLikeAdapter)
+            .registerTypeAdapter(TypeToken.getParameterized(RegistryLikeCondition::class.java, Biome::class.java).type, BiomeLikeConditionAdapter)
+            .registerTypeAdapter(TypeToken.getParameterized(RegistryLikeCondition::class.java, Block::class.java).type, BlockLikeConditionAdapter)
+            .registerTypeAdapter(TypeToken.getParameterized(RegistryLikeCondition::class.java, Item::class.java).type, ItemLikeConditionAdapter)
+            .registerTypeAdapter(TypeToken.getParameterized(RegistryLikeCondition::class.java, Structure::class.java).type, StructureLikeConditionAdapter)
+            .registerTypeAdapter(TypeToken.getParameterized(RegistryLikeCondition::class.java, Fluid::class.java).type, FluidLikeConditionAdapter)
+            .registerTypeAdapter(IntRange::class.java, IntRangeAdapter)
+            .registerTypeAdapterFactory(LowerCaseEnumTypeAdapterFactory())
+            .setPrettyPrinting()
+            .create()
+    }
+
     override val observable = SimpleObservable<PokemonInteractions>()
     override val typeToken: TypeToken<PokemonInteractionSet> = TypeToken.get(PokemonInteractionSet::class.java)
     override val resourcePath = "pokemon_interactions"
-    override val gson: Gson = GsonBuilder()
-        .registerTypeAdapter(ResourceLocation::class.java, IdentifierAdapter)
-        .registerTypeAdapter(PokemonProperties::class.java, pokemonPropertiesShortAdapter)
-        .registerTypeAdapter(ItemPredicate::class.java, LegacyItemConditionWrapperAdapter)
-        .registerTypeAdapter(Requirement::class.java, CobblemonRequirementAdapter)
-        .registerTypeAdapter(InteractionEffect::class.java, InteractionEffectAdapter)
-        .registerTypeAdapter(ExpressionLike::class.java, ExpressionLikeAdapter)
-        .registerTypeAdapter(TypeToken.getParameterized(RegistryLikeCondition::class.java, Biome::class.java).type, BiomeLikeConditionAdapter)
-        .registerTypeAdapter(TypeToken.getParameterized(RegistryLikeCondition::class.java, Block::class.java).type, BlockLikeConditionAdapter)
-        .registerTypeAdapter(TypeToken.getParameterized(RegistryLikeCondition::class.java, Item::class.java).type, ItemLikeConditionAdapter)
-        .registerTypeAdapter(TypeToken.getParameterized(RegistryLikeCondition::class.java, Structure::class.java).type, StructureLikeConditionAdapter)
-        .registerTypeAdapter(TypeToken.getParameterized(RegistryLikeCondition::class.java, Fluid::class.java).type, FluidLikeConditionAdapter)
-        .registerTypeAdapter(IntRange::class.java, IntRangeAdapter)
-        .registerTypeAdapterFactory(LowerCaseEnumTypeAdapterFactory())
-        .setPrettyPrinting()
-        .create()
 
     val interactions = mutableListOf<PokemonInteractionSet>()
 
@@ -65,7 +69,7 @@ object PokemonInteractions : JsonDataRegistry<PokemonInteractionSet> {
         PokemonInteractionsSyncPacket(interactions).sendToPlayer(player)
     }
 
-    override fun reload(data: Map<ResourceLocation, PokemonInteractionSet>) {
+    override fun reload(data: Map<ResourceLocation, PokemonInteractionSet>, registry: HolderLookup.Provider) {
         interactions.clear()
         val split = data.entries
             .partition {
@@ -87,4 +91,4 @@ object PokemonInteractions : JsonDataRegistry<PokemonInteractionSet> {
             .flatMap { it.interactions }
             .firstOrNull(interactionCheck)
     }
-}
+}

common/src/main/kotlin/com/cobblemon/mod/common/api/interaction/PokemonInteration.kt

@@ -51,11 +51,15 @@ data class PokemonInteractionSet(
 }
 
 data class PokemonInteraction(
-    val grouping: ResourceLocation,
     val requirements: List<Requirement> = listOf(),
     val effects: List<InteractionEffect> = listOf(),
     val cooldown: ExpressionLike = "0".asExpressionLike()
 ) {
+    // Not put as a necessary constructor parameter because then there isn't a default constructor
+    // and that means Gson just gives null for everything in the constructor and falls back to the JSON
+    // properties - completely ignoring the default values above.
+    lateinit var grouping: ResourceLocation
+
     fun encode(buffer: FriendlyByteBuf) {
         buffer.writeResourceLocation(grouping)
         buffer.writeCollection(requirements) { it, requirement ->
@@ -76,11 +80,12 @@ data class PokemonInteraction(
             val cooldown = buffer.readExpressionLike()
 
             return PokemonInteraction(
-                grouping,
                 requirements,
                 effects,
                 cooldown,
-            )
+            ).also {
+                it.grouping = grouping
+            }
         }
     }
 }

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

@@ -38,7 +38,7 @@ import net.minecraft.world.phys.AABB
  * @since July 29th, 2023
  */
 interface PokemonSelectingItem {
-    fun use(player: ServerPlayer, stack: ItemStack): InteractionResultHolder<ItemStack> {
+    fun use(player: ServerPlayer, stack: ItemStack, ignoreShift: Boolean = false): InteractionResultHolder<ItemStack> {
         val range = player.entityInteractionRange()
         val entity = player.level()
             .getEntities(player, AABB.ofSize(player.position(), range, range, range))
@@ -60,7 +60,7 @@ interface PokemonSelectingItem {
                 return interactWithSpecificBattle(player, stack, battlePokemon)
             }
         } ?: run {
-            if (!player.isShiftKeyDown) {
+            if (ignoreShift || !player.isShiftKeyDown) {
                 return if (entity != null) {
                     val pokemon = entity.pokemon
                     if (entity.ownerUUID == player.uuid) {

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

@@ -49,7 +49,12 @@ class FormDexRecord {
                     it.genders.addAll(genders.map(Gender::valueOf))
                     it.seenShinyStates.addAll(seenShinyStates)
                     it.highestLevel = highestLevel
-                    it.knowledge = PokedexEntryProgress.valueOf(knowledge)
+                    it.knowledge = when (knowledge) { // The string checks are due to legacy enum names which got changes in 1.8
+                        "NONE" -> PokedexEntryProgress.UNREGISTERED
+                        "ENCOUNTERED" -> PokedexEntryProgress.SEEN
+                        "CAUGHT" -> PokedexEntryProgress.OWNED
+                        else -> PokedexEntryProgress.valueOf(knowledge)
+                    }
                 }
             }
         }

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

@@ -25,11 +25,4 @@ enum class PokedexEntryProgress : StringRepresentable, Comparable<PokedexEntryPr
     OWNED;
 
     override fun getSerializedName() = this.name
-    companion object {
-        val CODEC: Codec<PokedexEntryProgress> = RecordCodecBuilder.create { instance ->
-            instance.map ({
-                PokedexEntryProgress.valueOf(it)
-            }, PrimitiveCodec.STRING.fieldOf("name").forGetter { it.name })
-        }
-    }
 }

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

@@ -56,10 +56,8 @@ class AggregatePokedexDef(
             return speciesToEntry.values.toList()
         }
     }
-
-    override fun shouldSynchronize(other: PokedexDef) = true
-
-    override fun decode(buffer: RegistryFriendlyByteBuf) {
+	
+    fun decode(buffer: RegistryFriendlyByteBuf) {
         sortOrder = buffer.readSizedInt(IntSize.U_BYTE)
         val size = buffer.readInt()
         for (i in 0 until size) {
@@ -67,7 +65,7 @@ class AggregatePokedexDef(
         }
     }
 
-    override fun encode(buffer: RegistryFriendlyByteBuf) {
+    fun encode(buffer: RegistryFriendlyByteBuf) {
         buffer.writeSizedInt(IntSize.U_BYTE, sortOrder)
         buffer.writeInt(subDexIds.size)
         subDexIds.forEach {

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

@@ -8,8 +8,6 @@
 
 package com.cobblemon.mod.common.api.pokedex.def
 
-import com.cobblemon.mod.common.api.data.ClientDataSynchronizer
-import com.cobblemon.mod.common.api.pokedex.entry.DexEntries
 import com.cobblemon.mod.common.api.pokedex.entry.PokedexEntry
 import com.mojang.serialization.Codec
 import com.mojang.serialization.MapCodec
@@ -23,7 +21,7 @@ import net.minecraft.resources.ResourceLocation
  * @since August 24, 2024
  * @author Apion
  */
-abstract class PokedexDef: ClientDataSynchronizer<PokedexDef> {
+abstract class PokedexDef {
     //The ID used to find the codecs for this "type" of PokedexDef
     abstract val typeId: ResourceLocation
     //The ID of this dex in the Dexes registry

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

@@ -45,9 +45,7 @@ class SimplePokedexDef(
 
     override fun getEntries() = entries.mapNotNull { DexEntries.entries[it] }
 
-    override fun shouldSynchronize(other: PokedexDef) = true
-
-    override fun decode(buffer: RegistryFriendlyByteBuf) {
+    fun decode(buffer: RegistryFriendlyByteBuf) {
         sortOrder = buffer.readSizedInt(IntSize.U_BYTE)
         val size = buffer.readInt()
         for (i in 0 until size) {
@@ -55,7 +53,7 @@ class SimplePokedexDef(
         }
     }
 
-    override fun encode(buffer: RegistryFriendlyByteBuf) {
+    fun encode(buffer: RegistryFriendlyByteBuf) {
         buffer.writeSizedInt(IntSize.U_BYTE, sortOrder)
         buffer.writeInt(entries.size)
         entries.forEach {

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

@@ -41,16 +41,18 @@ class PokedexCategoryFilter(
             PokedexCategoryFilterType.UNDISCOVERED_TM_MOVE -> hasUndiscoveredLevelUpTM(entry)
             PokedexCategoryFilterType.RIDEABLE -> {
                 val species = PokemonSpecies.getByIdentifier(entry.speciesId)
-                species?.forms?.any { form -> !form.riding.behaviours.isNullOrEmpty() } == true
-                    && pokedexManager.getHighestKnowledgeFor(entry) >= PokedexEntryProgress.OWNED
+                // we were silly as standard forms also can be rideable and we were ingoring those
+                (species?.forms.orEmpty() + listOfNotNull(species?.standardForm)).any { form -> !form.riding.behaviours.isNullOrEmpty() }
+                    && (pokedexManager.getHighestKnowledgeFor(entry) >= PokedexEntryProgress.OWNED ||
+                        pokedexManager.getHighestKnowledgeFor(entry) >= PokedexEntryProgress.SEEN)
             }
         }
     }
 
     private fun hasUndiscoveredLevelUpTM(entry: PokedexEntry): Boolean {
-        if (pokedexManager.getHighestKnowledgeFor(entry) != PokedexEntryProgress.OWNED) return false
+        if (pokedexManager.getHighestKnowledgeFor(entry) == PokedexEntryProgress.UNREGISTERED) return false
         val species = PokemonSpecies.getByIdentifier(entry.speciesId) ?: return false
-        val forms = pokedexManager.getCaughtForms(entry)
+        val forms = pokedexManager.getEncounteredForms(entry)
         val formData = if (forms.isEmpty()) {
             listOf(species.standardForm)
         } else {

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

@@ -72,7 +72,7 @@ class SearchFilter(val pokedexManager: AbstractPokedexManager, val searchString:
                 }
             }
             SearchByType.DROPS -> {
-                if (pokedexManager.getHighestKnowledgeFor(entry) !== PokedexEntryProgress.OWNED) return false
+                if (pokedexManager.getHighestKnowledgeFor(entry) == PokedexEntryProgress.UNREGISTERED) return false
                 val dropsList = mutableListOf<String>()
                 val formsList = if (species.forms.isEmpty()) mutableListOf(species.standardForm) else species.forms
                 formsList.forEach {
@@ -131,9 +131,7 @@ class SearchFilter(val pokedexManager: AbstractPokedexManager, val searchString:
             form.moves.tutorMoves,
             form.moves.eggMoves,
             form.moves.evolutionMoves,
-            form.moves.formChangeMoves,
-            form.moves.specialMoves,
-            form.moves.legacyMoves
+            form.moves.formChangeMoves
         )
 
         for (moves in alwaysDiscovered) {

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

@@ -674,9 +674,6 @@ open class PokemonProperties {
     @JvmOverloads
     fun createEntity(world: Level, player: ServerPlayer? = null): PokemonEntity {
         val pokemon = create(player)
-        if (pokemon.isAlpha) {
-            pokemon.initializeMovesetWithRandomTm()
-        }
         return PokemonEntity(world, pokemon).also { applyCustomProperties(it) }
     }
 

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

@@ -8,7 +8,6 @@
 
 package com.cobblemon.mod.common.api.pokemon.moves
 
-import com.cobblemon.mod.common.api.data.ClientDataSynchronizer
 import com.cobblemon.mod.common.api.moves.MoveTemplate
 import com.cobblemon.mod.common.api.moves.Moves
 import com.cobblemon.mod.common.net.IntSize
@@ -18,7 +17,7 @@ import com.cobblemon.mod.common.util.writeSizedInt
 import com.google.gson.JsonElement
 import net.minecraft.network.RegistryFriendlyByteBuf
 
-open class Learnset : ClientDataSynchronizer<Learnset> {
+open class Learnset {
     class Interpreter(val loadMove: (JsonElement, Learnset) -> Boolean) {
         companion object {
             fun parseFromPrefixIntoList(prefix: String, list: (Learnset) -> MutableList<MoveTemplate>): Interpreter {
@@ -111,9 +110,9 @@ open class Learnset : ClientDataSynchronizer<Learnset> {
     }
 
     // We only sync level up moves atm
-    override fun shouldSynchronize(other: Learnset) = other.levelUpMoves != this.levelUpMoves
+    fun shouldSynchronize(other: Learnset) = other.levelUpMoves != this.levelUpMoves
 
-    override fun decode(buffer: RegistryFriendlyByteBuf) {
+    fun decode(buffer: RegistryFriendlyByteBuf) {
         this.levelUpMoves.clear()
         repeat(times = buffer.readSizedInt(IntSize.U_BYTE)) {
             val level = buffer.readSizedInt(IntSize.U_SHORT)
@@ -125,7 +124,7 @@ open class Learnset : ClientDataSynchronizer<Learnset> {
         }
     }
 
-    override fun encode(buffer: RegistryFriendlyByteBuf) {
+    fun encode(buffer: RegistryFriendlyByteBuf) {
         buffer.writeSizedInt(IntSize.U_BYTE, levelUpMoves.size)
         for ((level, moves) in levelUpMoves) {
             buffer.writeSizedInt(IntSize.U_SHORT, level)

common/src/main/kotlin/com/cobblemon/mod/common/api/riding/Seat.kt

@@ -22,8 +22,8 @@ import net.minecraft.network.RegistryFriendlyByteBuf
  */
 data class Seat(
     val locator: String = "",
-    val condition: Expression?,
-    val poseAnimations: MutableList<SeatPoseAnimations>?,
+    val condition: Expression? = null,
+    val poseAnimations: MutableList<SeatPoseAnimations>? = null,
     val handsBusy: Boolean = false,
 ) : Encodable {
 

common/src/main/kotlin/com/cobblemon/mod/common/api/snowstorm/ParticleMaterials.kt

@@ -8,7 +8,6 @@
 
 package com.cobblemon.mod.common.api.snowstorm
 
-import com.cobblemon.mod.common.client.render.shader.CobblemonShaders
 import com.mojang.blaze3d.platform.GlStateManager
 import com.mojang.blaze3d.systems.RenderSystem
 import com.mojang.blaze3d.vertex.BufferBuilder
@@ -16,6 +15,7 @@ import com.mojang.blaze3d.vertex.DefaultVertexFormat
 import com.mojang.blaze3d.vertex.Tesselator
 import com.mojang.blaze3d.vertex.VertexFormat
 import net.minecraft.client.particle.ParticleRenderType
+import net.minecraft.client.renderer.GameRenderer
 import net.minecraft.client.renderer.texture.TextureAtlas
 import net.minecraft.client.renderer.texture.TextureManager
 
@@ -23,8 +23,9 @@ object ParticleMaterials {
     val ALPHA = object : ParticleRenderType {
         override fun begin(tessellator: Tesselator, textureManager: TextureManager): BufferBuilder {
             RenderSystem.enableBlend()
+            RenderSystem.enableCull()
             RenderSystem.depthMask(true)
-            RenderSystem.setShader { CobblemonShaders.PARTICLE_CUTOUT }
+            RenderSystem.setShader { GameRenderer.getParticleShader() }
             RenderSystem.setShaderTexture(0, TextureAtlas.LOCATION_PARTICLES)
             RenderSystem.blendFunc(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA)
             return tessellator.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.PARTICLE)
@@ -36,10 +37,11 @@ object ParticleMaterials {
     val ADD = object : ParticleRenderType {
         override fun begin(tessellator: Tesselator, textureManager: TextureManager): BufferBuilder {
             RenderSystem.enableBlend()
+            RenderSystem.disableCull()
             RenderSystem.depthMask(true)
-            RenderSystem.setShader { CobblemonShaders.PARTICLE_BLEND }
+            RenderSystem.setShader { GameRenderer.getParticleShader() }
             RenderSystem.setShaderTexture(0, TextureAtlas.LOCATION_PARTICLES)
-            RenderSystem.blendFunc(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA)
+            RenderSystem.blendFunc(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE)
             return tessellator.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.PARTICLE)
         }
 
@@ -49,10 +51,11 @@ object ParticleMaterials {
     val BLEND = object : ParticleRenderType {
         override fun begin(tessellator: Tesselator, textureManager: TextureManager): BufferBuilder {
             RenderSystem.enableBlend()
+            RenderSystem.disableCull()
             RenderSystem.depthMask(true)
-            RenderSystem.setShader { CobblemonShaders.PARTICLE_BLEND }
+            RenderSystem.setShader { GameRenderer.getParticleShader() }
             RenderSystem.setShaderTexture(0, TextureAtlas.LOCATION_PARTICLES)
-            RenderSystem.blendFunc(GlStateManager.SourceFactor.DST_COLOR, GlStateManager.DestFactor.ZERO)
+            RenderSystem.blendFunc(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA)
             return tessellator.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.PARTICLE)
         }
 
@@ -62,10 +65,11 @@ object ParticleMaterials {
     val OPAQUE = object : ParticleRenderType {
         override fun begin(tessellator: Tesselator, textureManager: TextureManager): BufferBuilder {
             RenderSystem.enableBlend()
+            RenderSystem.enableCull()
             RenderSystem.depthMask(true)
-            RenderSystem.setShader { CobblemonShaders.PARTICLE_BLEND }
+            RenderSystem.setShader { GameRenderer.getParticleShader() }
             RenderSystem.setShaderTexture(0, TextureAtlas.LOCATION_PARTICLES)
-            RenderSystem.blendFunc(GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ONE)
+            RenderSystem.blendFunc(GlStateManager.SourceFactor.SRC_COLOR, GlStateManager.DestFactor.ZERO)
             return tessellator.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.PARTICLE)
         }
 

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

@@ -18,12 +18,12 @@ import com.cobblemon.mod.common.api.spawning.condition.SeafloorSpawningCondition
 import com.cobblemon.mod.common.api.spawning.condition.SpawningCondition
 import com.cobblemon.mod.common.api.spawning.condition.SubmergedSpawningCondition
 import com.cobblemon.mod.common.api.spawning.condition.SurfaceSpawningCondition
+import com.cobblemon.mod.common.api.spawning.detail.EmptySpawnDetail
 import com.cobblemon.mod.common.api.spawning.detail.NPCSpawnDetail
 import com.cobblemon.mod.common.api.spawning.detail.PokemonHerdSpawnDetail
 import com.cobblemon.mod.common.api.spawning.detail.PokemonSpawnDetail
 import com.cobblemon.mod.common.api.spawning.detail.SpawnAction
 import com.cobblemon.mod.common.api.spawning.detail.SpawnDetail
-import com.cobblemon.mod.common.api.spawning.influence.BucketMultiplyingInfluence
 import com.cobblemon.mod.common.api.spawning.influence.SpawningInfluence
 import com.cobblemon.mod.common.api.spawning.position.AreaSpawnablePositionResolver
 import com.cobblemon.mod.common.api.spawning.position.FishingSpawnablePosition
@@ -121,6 +121,7 @@ object BestSpawner {
         SpawnDetail.registerSpawnType(name = PokemonSpawnDetail.TYPE, PokemonSpawnDetail::class.java)
         SpawnDetail.registerSpawnType(name = NPCSpawnDetail.TYPE, NPCSpawnDetail::class.java)
         SpawnDetail.registerSpawnType(name = PokemonHerdSpawnDetail.TYPE, PokemonHerdSpawnDetail::class.java)
+        SpawnDetail.registerSpawnType(name = EmptySpawnDetail.TYPE, EmptySpawnDetail::class.java)
         LOGGER.info("Loaded ${SpawnDetail.spawnDetailTypes.size} spawn detail types.")
 
         loadConfig()

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

@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.spawning
-
-/**
- * A spawn bucket is a simple referenceable object by spawn files. The bucket is used at the beginning of
- * the selection process to decide which set of spawns will be used for spawning on that attempt. Weights are used to
- * make entire buckets more or less likely, and then weighted selections will occur within whichever bucket
- * was chosen.
- *
- * Spawn buckets are configured in the main config.
- *
- * @author Hiroku
- * @since June 20th, 2022
- */
-class SpawnBucket() {
-    lateinit var name: String
-    var weight = 0F
-
-    constructor(name: String, weight: Float): this() {
-        this.name = name
-        this.weight = weight
-    }
-
-    override fun hashCode() = name.hashCode()
-    override fun equals(other: Any?) = other is SpawnBucket && other.name == name
-}

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

@@ -49,7 +49,6 @@ object SpawnDetailPresets : JsonDataRegistry<SpawnDetailPreset> {
         .setPrettyPrinting()
         .setLenient()
         .disableHtmlEscaping()
-        .registerTypeAdapter(SpawnBucket::class.java, SpawnBucketAdapter)
         .registerTypeAdapter(SpawnablePositionType::class.java, RegisteredSpawnablePositionAdapter)
         .registerTypeAdapter(TypeToken.getParameterized(RegistryLikeCondition::class.java, Biome::class.java).type, BiomeLikeConditionAdapter)
         .registerTypeAdapter(TypeToken.getParameterized(RegistryLikeCondition::class.java, Block::class.java).type, BlockLikeConditionAdapter)

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

@@ -67,7 +67,6 @@ object SpawnLoader {
         .registerTypeAdapter(MoonPhaseRange::class.java, IntRangesAdapter(MoonPhaseRange.moonPhaseRanges) { MoonPhaseRange(*it) })
         .registerTypeAdapter(ItemDropMethod::class.java, ItemDropMethod.adapter)
         .registerTypeAdapter(PokemonProperties::class.java, pokemonPropertiesShortAdapter)
-        .registerTypeAdapter(SpawnBucket::class.java, SpawnBucketAdapter)
         .registerTypeAdapter(CompoundTag::class.java, NbtCompoundAdapter)
         .registerTypeAdapter(IntRange::class.java, IntRangeAdapter)
         .registerTypeAdapter(PossibleHeldItem::class.java, PossibleHeldItemAdapter)

common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/condition/SpawningPrecalculation.kt

@@ -8,10 +8,9 @@
 
 package com.cobblemon.mod.common.api.spawning.condition
 
-import com.cobblemon.mod.common.api.spawning.SpawnBucket
-import com.cobblemon.mod.common.api.spawning.position.SpawnablePosition
 import com.cobblemon.mod.common.api.spawning.detail.SpawnDetail
-import com.cobblemon.mod.common.api.spawning.spawner.Spawner
+import com.cobblemon.mod.common.api.spawning.detail.SpawnPool
+import com.cobblemon.mod.common.api.spawning.position.SpawnablePosition
 import net.minecraft.resources.ResourceLocation
 
 /**
@@ -22,8 +21,8 @@ import net.minecraft.resources.ResourceLocation
  * time as sharing that value. The requirement of implementations is only to get that
  * key from both a [SpawnDetail] and a [SpawnablePosition].
  *
- * When a precalculation has been registered with a [Spawner] by adding to [Spawner.precalculators],
- * the precalculation result will need to be updated by running [Spawner.precalculate]. That
+ * When a precalculation has been registered with a [SpawnPool] by adding to [SpawnPool.precalculators],
+ * the precalculation result will need to be updated by running [SpawnPool.precalculate]. That
  * might take it a hot minute, but the result will be that there is an extra layer of
  * shortcutting to the matching algorithm.
  *
@@ -34,7 +33,7 @@ interface SpawningPrecalculation<T : Any> {
     /** Retrieves the precalculation keys for the given spawn detail. */
     fun select(detail: SpawnDetail): Collection<T>
     /** Retrieves the precalculation key for the given spawnable position, if that key exists for this position. */
-    fun select(bucket: SpawnBucket, spawnablePosition: SpawnablePosition): T?
+    fun select(bucket: String, spawnablePosition: SpawnablePosition): T?
 
     /**
      * Generates a precalculation result for the list of [SpawnDetail]s and the subsequent precalculations.
@@ -74,7 +73,7 @@ interface SpawningPrecalculation<T : Any> {
 object RootPrecalculation : SpawningPrecalculation<Any> {
     val list = listOf(Unit)
     override fun select(detail: SpawnDetail): List<Any> = list
-    override fun select(bucket: SpawnBucket, spawnablePosition: SpawnablePosition): Any = Unit
+    override fun select(bucket: String, spawnablePosition: SpawnablePosition): Any = Unit
 }
 
 /**
@@ -85,12 +84,12 @@ object RootPrecalculation : SpawningPrecalculation<Any> {
  */
 object SpawnablePositionTypePrecalculation : SpawningPrecalculation<Class<out SpawnablePosition>> {
     override fun select(detail: SpawnDetail) = listOf(detail.spawnablePositionType.clazz)
-    override fun select(bucket: SpawnBucket, spawnablePosition: SpawnablePosition) = spawnablePosition::class.java
+    override fun select(bucket: String, spawnablePosition: SpawnablePosition) = spawnablePosition::class.java
 }
 
-object BucketPrecalculation : SpawningPrecalculation<SpawnBucket> {
+object BucketPrecalculation : SpawningPrecalculation<String> {
     override fun select(detail: SpawnDetail) = listOf(detail.bucket)
-    override fun select(bucket: SpawnBucket, spawnablePosition: SpawnablePosition) = bucket
+    override fun select(bucket: String, spawnablePosition: SpawnablePosition) = bucket
 }
 
 /**
@@ -99,7 +98,7 @@ object BucketPrecalculation : SpawningPrecalculation<SpawnBucket> {
  */
 object BiomePrecalculation : SpawningPrecalculation<ResourceLocation> {
     override fun select(detail: SpawnDetail) = detail.validBiomes
-    override fun select(bucket: SpawnBucket, spawnablePosition: SpawnablePosition) = spawnablePosition.biomeHolder.unwrapKey().map { it.location() }.orElse(null)
+    override fun select(bucket: String, spawnablePosition: SpawnablePosition) = spawnablePosition.biomeHolder.unwrapKey().map { it.location() }.orElse(null)
 }
 
 /**
@@ -114,7 +113,7 @@ sealed class PrecalculationResult<T : Any>(
     val calculation: SpawningPrecalculation<*>
 ) {
     /** Gets the list of spawn details that fit this spawnable position. */
-    abstract fun retrieve(bucket: SpawnBucket, spawnablePosition: SpawnablePosition): List<SpawnDetail>
+    abstract fun retrieve(bucket: String, spawnablePosition: SpawnablePosition): List<SpawnDetail>
 }
 
 /**
@@ -127,7 +126,7 @@ class NestedPrecalculationResult<T : Any>(
     calculation: SpawningPrecalculation<T>,
     val mapping: Map<T, PrecalculationResult<*>> = mutableMapOf()
 ) : PrecalculationResult<T>(calculation) {
-    override fun retrieve(bucket: SpawnBucket, spawnablePosition: SpawnablePosition) = mapping[calculation.select(bucket, spawnablePosition)]?.retrieve(bucket, spawnablePosition) ?: emptyList()
+    override fun retrieve(bucket: String, spawnablePosition: SpawnablePosition) = mapping[calculation.select(bucket, spawnablePosition)]?.retrieve(bucket, spawnablePosition) ?: emptyList()
 }
 
 /**
@@ -141,5 +140,5 @@ class FinalPrecalculationResult<T : Any>(
     calculation: SpawningPrecalculation<*>,
     val mapping: Map<T, List<SpawnDetail>>
 ) : PrecalculationResult<T>(calculation) {
-    override fun retrieve(bucket: SpawnBucket, spawnablePosition: SpawnablePosition) = mapping[calculation.select(bucket, spawnablePosition)] ?: emptyList()
+    override fun retrieve(bucket: String, spawnablePosition: SpawnablePosition) = mapping[calculation.select(bucket, spawnablePosition)] ?: emptyList()
 }

common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/detail/EmptySpawnAction.kt

@@ -0,0 +1,25 @@
+/*
+ * 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.spawning.detail
+
+import com.cobblemon.mod.common.api.spawning.position.SpawnablePosition
+
+/**
+ * Does a whole lot of nothing. Spawns nothing.
+ *
+ * @author Hiroku
+ * @since May 16th, 2026
+ */
+class EmptySpawnAction(
+    spawnablePosition: SpawnablePosition,
+    bucket: String,
+    detail: EmptySpawnDetail
+) : SpawnAction<Unit>(spawnablePosition, bucket, detail) {
+    override fun run() {}
+}

common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/detail/EmptySpawnDetail.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.api.spawning.detail
+
+import com.cobblemon.mod.common.api.spawning.position.SpawnablePosition
+import com.cobblemon.mod.common.api.spawning.selection.SpawnSelectionData
+
+/**
+ * A spawn detail for nothing. It is used to take a slot, like to weigh down a spawn attempt,
+ * with something that ultimately doesn't spawn anything.
+ *
+ * The use case for this is very niche. With 1.8, the buckets that can be selected by a spawner
+ * during a spawn attempt will be narrowed down to the buckets that are used by the spawn
+ * pool. That means that if a bucket is never used by the pool, it will never be selected. That
+ * way, a bucket won't be selected when it never had any chance of being selected. This is what
+ * you would want in almost every case.
+ *
+ * However, in some cases you may want spawning to not spawn anything or you may want to preserve
+ * the relative rarity of the other buckets, and in that case you'd put something like this in a
+ * bucket so that it technically exists in the spawn pool without actually resulting in a spawned
+ * entity.
+ *
+ * @author Hiroku
+ * @since May 16th, 2026
+ */
+class EmptySpawnDetail : SpawnDetail() {
+    companion object {
+        val TYPE = "empty"
+    }
+
+    override val type: String = TYPE
+
+    override fun createSpawnAction(
+        spawnablePosition: SpawnablePosition,
+        bucket: String,
+        selectionData: SpawnSelectionData
+    ) = EmptySpawnAction(
+        spawnablePosition = spawnablePosition,
+        bucket = bucket,
+        detail = this
+    )
+}

common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/detail/NPCSpawnAction.kt

@@ -9,7 +9,6 @@
 package com.cobblemon.mod.common.api.spawning.detail
 
 import com.cobblemon.mod.common.Cobblemon
-import com.cobblemon.mod.common.api.spawning.SpawnBucket
 import com.cobblemon.mod.common.api.spawning.position.SpawnablePosition
 import com.cobblemon.mod.common.entity.npc.NPCEntity
 import com.cobblemon.mod.common.util.resolveInt
@@ -20,7 +19,7 @@ import com.cobblemon.mod.common.util.resolveInt
  * @author Hiroku
  * @since October 8th, 2023
  */
-class NPCSpawnAction(spawnablePosition: SpawnablePosition, bucket: SpawnBucket, override val detail: NPCSpawnDetail) : SingleEntitySpawnAction<NPCEntity>(spawnablePosition, bucket, detail) {
+class NPCSpawnAction(spawnablePosition: SpawnablePosition, bucket: String, override val detail: NPCSpawnDetail) : SingleEntitySpawnAction<NPCEntity>(spawnablePosition, bucket, detail) {
     override fun createEntity(): NPCEntity {
         val npc = NPCEntity(spawnablePosition.world)
         npc.npc = detail.npcClass

common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/detail/NPCSpawnDetail.kt

@@ -11,13 +11,11 @@ package com.cobblemon.mod.common.api.spawning.detail
 import com.bedrockk.molang.Expression
 import com.bedrockk.molang.runtime.value.StringValue
 import com.cobblemon.mod.common.api.npc.NPCClass
-import com.cobblemon.mod.common.api.spawning.SpawnBucket
 import com.cobblemon.mod.common.api.spawning.position.SpawnablePosition
 import com.cobblemon.mod.common.api.spawning.selection.SpawnSelectionData
 import com.cobblemon.mod.common.entity.npc.NPCEntity
 import com.cobblemon.mod.common.util.asExpression
 import com.google.gson.annotations.SerializedName
-import kotlin.math.ceil
 
 /**
  * A [SpawnDetail] describing an [NPCEntity] spawn.
@@ -51,7 +49,7 @@ class NPCSpawnDetail : SpawnDetail() {
 
     override fun createSpawnAction(
         spawnablePosition: SpawnablePosition,
-        bucket: SpawnBucket,
+        bucket: String,
         selectionData: SpawnSelectionData
     ) = NPCSpawnAction(spawnablePosition, bucket, this)
 }

common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/detail/PokemonHerdSpawnDetail.kt

@@ -11,7 +11,6 @@ package com.cobblemon.mod.common.api.spawning.detail
 import com.cobblemon.mod.common.Cobblemon.LOGGER
 import com.cobblemon.mod.common.api.drop.DropTable
 import com.cobblemon.mod.common.api.pokemon.PokemonProperties
-import com.cobblemon.mod.common.api.spawning.SpawnBucket
 import com.cobblemon.mod.common.api.spawning.position.SpawnablePosition
 import com.cobblemon.mod.common.api.spawning.selection.SpawnSelectionData
 import com.cobblemon.mod.common.util.weightedSelection
@@ -54,8 +53,10 @@ class PokemonHerdSpawnDetail : SpawnDetail() {
         var pokemon: PokemonProperties = PokemonProperties()
         val levelRange: IntRange? = null
         var levelRangeOffset: IntRange? = null
+        val herdLevelRange: IntRange? = null
         var dropTable: DropTable? = null
-        var isLeader: Boolean? = null
+        var isLeader: Boolean = false
+        var isFollower: Boolean = true
         var weight: Float = 1F
         var maxTimes = 10
         var heldItem: ResourceLocation? = null
@@ -83,7 +84,7 @@ class PokemonHerdSpawnDetail : SpawnDetail() {
         val herdable = getValidHerdMembers(selectionData)
         val herdCounts = getHerdMemberCounts(selectionData)
 
-        val leaderIsPossible = herdable.any { it.levelRange?.contains(level) != false && it.isLeader == true }
+        val leaderIsPossible = herdable.any { it.herdLevelRange?.contains(level) != false && it.isLeader }
         val leaderIsSelected = herdCounts.any { it.key?.isLeader == true && it.value > 0 }
         return leaderIsPossible && !leaderIsSelected
     }
@@ -98,14 +99,16 @@ class PokemonHerdSpawnDetail : SpawnDetail() {
 
     override fun createSpawnAction(
         spawnablePosition: SpawnablePosition,
-        bucket: SpawnBucket,
+        bucket: String,
         selectionData: SpawnSelectionData
     ): PokemonSpawnAction {
         val validHerdMembers = getValidHerdMembers(selectionData)
+        var searchedForLeader = false
         val herdable = if (lacksPossibleLeader(selectionData)) {
-            validHerdMembers.filter { it.isLeader == true }
+            searchedForLeader = true
+            validHerdMembers.filter { it.isLeader }
         } else {
-            validHerdMembers
+            validHerdMembers.filter { it.isFollower }
         }.weightedSelection { it.weight } ?: herdablePokemon[0]
 
         val level = selectionData.context[herdLevelKey] as? Int ?: 1
@@ -134,7 +137,7 @@ class PokemonHerdSpawnDetail : SpawnDetail() {
             heldItem = heldItem,
             levelRange = levelRange
         ).also {
-            if (herdable.isLeader == true) {
+            if (herdable.isLeader && searchedForLeader) {
                 it.labels += HERD_LEADER
             }
         }
@@ -153,7 +156,7 @@ class PokemonHerdSpawnDetail : SpawnDetail() {
             val count = counts[herdable] ?: 0
             return@filter when {
                 count >= herdable.maxTimes -> false
-                herdable.levelRange != null && level !in herdable.levelRange -> false
+                herdable.herdLevelRange != null && level !in herdable.herdLevelRange -> false
                 else -> true
             }
         }

common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/detail/PokemonSpawnAction.kt

@@ -11,7 +11,6 @@ package com.cobblemon.mod.common.api.spawning.detail
 import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.api.drop.DropTable
 import com.cobblemon.mod.common.api.pokemon.PokemonProperties
-import com.cobblemon.mod.common.api.spawning.SpawnBucket
 import com.cobblemon.mod.common.api.spawning.position.SpawnablePosition
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.pokemon.feature.SeasonFeatureHandler
@@ -26,7 +25,7 @@ import net.minecraft.world.item.ItemStack
  */
 class PokemonSpawnAction(
     spawnablePosition: SpawnablePosition,
-    bucket: SpawnBucket,
+    bucket: String,
     override val detail: SpawnDetail,
     /**
      * The [PokemonProperties] that are about to be used. When using it, a copy will be taken.

common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/detail/PokemonSpawnDetail.kt

@@ -14,7 +14,6 @@ import com.cobblemon.mod.common.api.drop.DropTable
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMoLangValue
 import com.cobblemon.mod.common.api.pokemon.PokemonProperties
 import com.cobblemon.mod.common.api.pokemon.PokemonSpecies
-import com.cobblemon.mod.common.api.spawning.SpawnBucket
 import com.cobblemon.mod.common.api.spawning.position.SpawnablePosition
 import com.cobblemon.mod.common.api.spawning.selection.SpawnSelectionData
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
@@ -104,7 +103,8 @@ class PokemonSpawnDetail : SpawnDetail() {
     }
 
     override fun createSpawnAction(
-        spawnablePosition: SpawnablePosition, bucket: SpawnBucket,
+        spawnablePosition: SpawnablePosition,
+        bucket: String,
         selectionData: SpawnSelectionData
     ): SingleEntitySpawnAction<PokemonEntity> {
         val levelRange = pokemon.deriveLevelRange(levelRange)

common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/detail/SingleEntitySpawnAction.kt

@@ -11,7 +11,6 @@ package com.cobblemon.mod.common.api.spawning.detail
 import com.cobblemon.mod.common.api.events.CobblemonEvents
 import com.cobblemon.mod.common.api.events.entity.SpawnEvent
 import com.cobblemon.mod.common.api.reactive.SimpleObservable
-import com.cobblemon.mod.common.api.spawning.SpawnBucket
 import com.cobblemon.mod.common.api.spawning.position.SpawnablePosition
 import com.cobblemon.mod.common.util.toVec3d
 import net.minecraft.world.entity.Entity
@@ -26,7 +25,7 @@ import net.minecraft.world.entity.MobSpawnType
  */
 abstract class SingleEntitySpawnAction<T : Entity>(
     spawnablePosition: SpawnablePosition,
-    bucket: SpawnBucket,
+    bucket: String,
     detail: SpawnDetail
 ) : SpawnAction<EntitySpawnResult>(spawnablePosition, bucket, detail) {
     abstract fun createEntity(): T?

common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/detail/SpawnAction.kt

@@ -8,7 +8,6 @@
 
 package com.cobblemon.mod.common.api.spawning.detail
 
-import com.cobblemon.mod.common.api.spawning.SpawnBucket
 import com.cobblemon.mod.common.api.spawning.position.SpawnablePosition
 import java.util.concurrent.CompletableFuture
 
@@ -21,7 +20,7 @@ import java.util.concurrent.CompletableFuture
  */
 abstract class SpawnAction<R>(
     val spawnablePosition: SpawnablePosition,
-    val bucket: SpawnBucket,
+    val bucket: String,
     open val detail: SpawnDetail
 ) {
     val labels = mutableListOf<String>()

common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/detail/SpawnDetail.kt

@@ -15,7 +15,6 @@ import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.Cobblemon.LOGGER
 import com.cobblemon.mod.common.api.ModDependant
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.queryStructOf
-import com.cobblemon.mod.common.api.spawning.SpawnBucket
 import com.cobblemon.mod.common.api.spawning.condition.CompositeSpawningCondition
 import com.cobblemon.mod.common.api.spawning.condition.SpawningCondition
 import com.cobblemon.mod.common.api.spawning.multiplier.WeightMultiplier
@@ -54,7 +53,7 @@ abstract class SpawnDetail : ModDependant {
     var displayName: String? = null
     @SerializedName("spawnablePositionType", alternate = ["context"])
     lateinit var spawnablePositionType: SpawnablePositionType<*>
-    var bucket = SpawnBucket("", 0F)
+    var bucket = ""
     var conditions = mutableListOf<SpawningCondition<*>>()
     var anticonditions = mutableListOf<SpawningCondition<*>>()
     var compositeCondition: CompositeSpawningCondition? = null
@@ -79,7 +78,7 @@ abstract class SpawnDetail : ModDependant {
         "weight" to { DoubleValue(weight) },
         "percentage" to { DoubleValue(percentage) },
         "id" to { StringValue(id) },
-        "bucket" to { StringValue(bucket.name) },
+        "bucket" to { StringValue(bucket) },
         "width" to { DoubleValue(width.toDouble()) },
         "height" to { DoubleValue(height.toDouble()) },
         "spawnable_position_type" to { StringValue(spawnablePositionType.name) },
@@ -136,6 +135,10 @@ abstract class SpawnDetail : ModDependant {
             containsNullValues = true
             LOGGER.error("Spawn Detail with id $id is invalid as it contains invalid values in its anticonditions (commonly caused by trailing comma in biomes or other arrays)")
         }
+        if (bucket.isBlank()) {
+            containsNullValues = true
+            LOGGER.error("Spawn Detail with id $id is invalid as it does not have a bucket assigned")
+        }
         return super.isModDependencySatisfied() && !containsNullValues
     }
 
@@ -163,7 +166,7 @@ abstract class SpawnDetail : ModDependant {
      */
     fun choose(
         spawnablePosition: SpawnablePosition,
-        bucket: SpawnBucket,
+        bucket: String,
         selectionData: SpawnSelectionData
     ): SpawnAction<*> {
         val action = createSpawnAction(spawnablePosition, bucket, selectionData)
@@ -175,10 +178,10 @@ abstract class SpawnDetail : ModDependant {
         return action
     }
 
-    /** Instantiates an action at the given [SpawnablePosition] for the given [SpawnBucket]. */
+    /** Instantiates an action at the given [SpawnablePosition] for the given spawn bucket. */
     protected abstract fun createSpawnAction(
         spawnablePosition: SpawnablePosition,
-        bucket: SpawnBucket,
+        bucket: String,
         selectionData: SpawnSelectionData
     ): SpawnAction<*>
 }

common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/detail/SpawnPool.kt

@@ -11,7 +11,6 @@ package com.cobblemon.mod.common.api.spawning.detail
 import com.cobblemon.mod.common.api.data.JsonDataRegistry
 import com.cobblemon.mod.common.api.reactive.SimpleObservable
 import com.cobblemon.mod.common.api.spawning.CobblemonSpawnPools
-import com.cobblemon.mod.common.api.spawning.SpawnBucket
 import com.cobblemon.mod.common.api.spawning.SpawnLoader
 import com.cobblemon.mod.common.api.spawning.SpawnSet
 import com.cobblemon.mod.common.api.spawning.condition.PrecalculationResult
@@ -61,12 +60,13 @@ class SpawnPool(val name: String) : JsonDataRegistry<SpawnSet>, Iterable<SpawnDe
     }
 
     val details = mutableListOf<SpawnDetail>()
+    /** Tracks which buckets are in use by the pool, to prevent spawners for rolling buckets that don't exist. */
+    val buckets = mutableListOf<String>()
     var precalculation: PrecalculationResult<*> = RootPrecalculation.generate(details, emptyList())
     val precalculators = mutableListOf<SpawningPrecalculation<*>>()
 
     override fun iterator() = details.iterator()
 
-
     fun addPrecalculators(vararg precalculators: SpawningPrecalculation<*>): SpawnPool {
         this.precalculators.addAll(precalculators)
         precalculate()
@@ -88,6 +88,9 @@ class SpawnPool(val name: String) : JsonDataRegistry<SpawnSet>, Iterable<SpawnDe
      * be slow, especially if there are many precalculators and spawns.
      */
     fun precalculate() {
+        buckets.clear()
+        buckets.addAll(details.asSequence().map(SpawnDetail::bucket).distinct())
+
         if (precalculators.isEmpty()) {
             precalculation = RootPrecalculation.generate(details, emptyList())
         } else {
@@ -103,7 +106,7 @@ class SpawnPool(val name: String) : JsonDataRegistry<SpawnSet>, Iterable<SpawnDe
      * to leverage the precalculation to get a smaller list of spawns as quickly
      * as possible.
      */
-    fun retrieve(bucket: SpawnBucket, spawnablePosition: SpawnablePosition): List<SpawnDetail> {
+    fun retrieve(bucket: String, spawnablePosition: SpawnablePosition): List<SpawnDetail> {
         return precalculation.retrieve(bucket, spawnablePosition)
     }
 

common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/fishing/FishingSpawnCause.kt

@@ -70,6 +70,10 @@ class FishingSpawnCause(
             pokemonEntity.pokemon.applyPotentialMarks(1.0 + (effect.value / 100))
         }
 
+        fun alterSize(pokemonEntity: PokemonEntity, effect: SpawnBait.Effect) {
+            pokemonEntity.pokemon.scaleModifier *= effect.value.toFloat() / 1000.0f
+        }
+
         fun saveDropsReroll(pokemonEntity: PokemonEntity, effect: SpawnBait.Effect) {
             pokemonEntity.pokemon.forcedAspects += DROPS_REROLL_ASPECT
         }
@@ -141,7 +145,7 @@ class FishingSpawnCause(
                 return
             }
             pokemonEntity.pokemon.isAlpha = true
-            pokemonEntity.pokemon.initializeMovesetWithRandomTm(2)
+            pokemonEntity.pokemon.initializeMovesetFromDefault()
             if (!pokemonEntity.level().isClientSide) {
                 // Alpha status is applied after entity creation in bait flows, so rebuild the brain
                 // to ensure alpha-only sensors/memories are actually attached.

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

@@ -8,19 +8,19 @@
 
 package com.cobblemon.mod.common.api.spawning.influence
 
-import com.cobblemon.mod.common.api.spawning.SpawnBucket
-
 /**
  * A [SpawningInfluence] that multiplies bucket weights by the provided values
  * and then normalizes the resulting weights so that their total adds up to 100.
+ *
+ * No longer used by the mod, but kept for external suers.
  */
 class BucketMultiplyingInfluence(
     val multipliers: Map<String, Float>,
 ) : SpawningInfluence {
-    override fun affectBucketWeights(bucketWeights: MutableMap<SpawnBucket, Float>) {
-        val updates = mutableMapOf<SpawnBucket, Float>()
+    override fun affectBucketWeights(bucketWeights: MutableMap<String, Float>) {
+        val updates = mutableMapOf<String, Float>()
         for ((bucket, weight) in bucketWeights) {
-            val multiplier = multipliers[bucket.name]
+            val multiplier = multipliers[bucket]
             if (multiplier != null) {
                 updates[bucket] = weight * multiplier
             }

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

@@ -8,7 +8,6 @@
 
 package com.cobblemon.mod.common.api.spawning.influence
 
-import com.cobblemon.mod.common.api.spawning.SpawnBucket
 import kotlin.math.pow
 
 /**
@@ -33,7 +32,7 @@ open class BucketNormalizingInfluence(
     val gradient: Float = 0.2F,
     val firstTier: Float = 1.29F
 ) : SpawningInfluence {
-    override fun affectBucketWeights(bucketWeights: MutableMap<SpawnBucket, Float>) {
+    override fun affectBucketWeights(bucketWeights: MutableMap<String, Float>) {
         if (tier == 0) {
             return
         }

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

@@ -150,7 +150,7 @@ class SaccharineLogSlatheredInfluence(val pos: BlockPos? = null) : SpawningInflu
         val chance = Cobblemon.config.honeySlatherAlphaChance
         if (chance > 0 && Random.nextInt(chance) == 0) {
             pokemon.isAlpha = true
-            pokemon.initializeMovesetWithRandomTm(2)
+            pokemon.initializeMovesetFromDefault()
         }
     }
 

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

@@ -9,7 +9,6 @@
 package com.cobblemon.mod.common.api.spawning.influence
 
 import com.cobblemon.mod.common.api.spawning.BestSpawner
-import com.cobblemon.mod.common.api.spawning.SpawnBucket
 import com.cobblemon.mod.common.api.spawning.detail.SpawnAction
 import com.cobblemon.mod.common.api.spawning.detail.SpawnDetail
 import com.cobblemon.mod.common.api.spawning.position.SpawnablePosition
@@ -39,9 +38,9 @@ interface SpawningInfluence {
     /** Applies some influence over the entity that's been spawned. */
     fun affectSpawn(action: SpawnAction<*>, entity: Entity) {}
     /** Applies some influence over the weight of spawn buckets. */
-    fun affectBucketWeights(bucketWeights: MutableMap<SpawnBucket, Float>) {}
+    fun affectBucketWeights(bucketWeights: MutableMap<String, Float>) {}
     /** Normalizes all bucket weights to add up to 100 */
-    fun normalizeBucketWeights(bucketWeights: MutableMap<SpawnBucket, Float>) {
+    fun normalizeBucketWeights(bucketWeights: MutableMap<String, Float>) {
         val sum = bucketWeights.values.sum()
         val to100 = 100F / sum
         bucketWeights.keys.toList().forEach {
@@ -56,5 +55,5 @@ interface SpawningInfluence {
      *
      * You should make sure the spawn position satisfies any spawn details that you inject.
      */
-    fun injectSpawns(bucket: SpawnBucket, spawnablePosition: SpawnablePosition): List<SpawnDetail>? = null
+    fun injectSpawns(bucket: String, spawnablePosition: SpawnablePosition): List<SpawnDetail>? = null
 }

common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/preset/BestSpawnerConfig.kt

@@ -11,7 +11,6 @@ package com.cobblemon.mod.common.api.spawning.preset
 import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.Cobblemon.LOGGER
 import com.cobblemon.mod.common.api.spawning.BestSpawner
-import com.cobblemon.mod.common.api.spawning.SpawnBucket
 import com.cobblemon.mod.common.api.spawning.position.SpawnablePositionType
 import com.cobblemon.mod.common.util.adapters.RegisteredSpawnablePositionAdapter
 import com.google.gson.GsonBuilder
@@ -39,11 +38,34 @@ class BestSpawnerConfig {
         "surface" to 0.01F,
         "seafloor" to 1F
     )
-    val buckets = mutableListOf(
-        SpawnBucket("common", 94.3F),
-        SpawnBucket("uncommon", 5F),
-        SpawnBucket("rare", 0.5F),
-        SpawnBucket("ultra-rare", 0.2F)
+
+    val worldBuckets = mutableMapOf(
+        "common" to 94F,
+        "uncommon" to 5F,
+        "rare" to 0.5F,
+        "ultra-rare" to 0.2F,
+        "boss" to 0.3F,
+    )
+
+    val fishingBuckets = mutableMapOf(
+        "common" to 83.25F,
+        "uncommon" to 11.25F,
+        "rare" to 4.125F,
+        "ultra-rare" to 1.375F
+    )
+
+    val activatedHabitatBuckets: MutableMap<String, Float> = mutableMapOf(
+        "common" to 83.25F,
+        "uncommon" to 11.25F,
+        "rare" to 4.125F,
+        "ultra-rare" to 1.375F
+    )
+
+    val pokeSnackBuckets = mutableMapOf(
+        "common" to 83.25F,
+        "uncommon" to 11.25F,
+        "rare" to 4.125F,
+        "ultra-rare" to 1.375F
     )
 
     companion object {

common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/preset/SpawnDetailPreset.kt

@@ -8,13 +8,12 @@
 
 package com.cobblemon.mod.common.api.spawning.preset
 
-import com.cobblemon.mod.common.api.spawning.SpawnBucket
 import com.cobblemon.mod.common.api.spawning.SpawnDetailPresets
 import com.cobblemon.mod.common.api.spawning.SpawnLoader
 import com.cobblemon.mod.common.api.spawning.condition.SpawningCondition
-import com.cobblemon.mod.common.api.spawning.position.SpawnablePositionType
 import com.cobblemon.mod.common.api.spawning.detail.SpawnDetail
 import com.cobblemon.mod.common.api.spawning.multiplier.WeightMultiplier
+import com.cobblemon.mod.common.api.spawning.position.SpawnablePositionType
 import com.cobblemon.mod.common.util.MergeMode
 import com.cobblemon.mod.common.util.adapters.SpawnDetailAdapter
 import com.google.gson.JsonObject
@@ -41,7 +40,7 @@ import com.google.gson.annotations.SerializedName
  * @since July 8th, 2022
  */
 abstract class SpawnDetailPreset {
-    var bucket: SpawnBucket? = null
+    var bucket: String? = null
     var spawnDetailType: String? = null
     @SerializedName("spawnablePositionType", alternate = ["context"])
     var spawnablePositionType: SpawnablePositionType<*>? = null

common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/selection/FlatSelector.kt

@@ -9,7 +9,6 @@
 package com.cobblemon.mod.common.api.spawning.selection
 
 import com.cobblemon.mod.common.Cobblemon
-import com.cobblemon.mod.common.api.spawning.SpawnBucket
 import com.cobblemon.mod.common.api.spawning.detail.SpawnAction
 import com.cobblemon.mod.common.api.spawning.detail.SpawnDetail
 import com.cobblemon.mod.common.api.spawning.position.SpawnablePosition
@@ -88,12 +87,12 @@ open class FlatSelector : SpawningSelector<FlatSelector.SpawnablePositionSelecti
     class SpawnablePositionSelectionData(
         val spawner: Spawner,
         val spawnablePositions: List<SpawnablePosition>,
-        val selectingSpawnInformation: MutableMap<SpawnBucket, SpawnablePositionBucketSelectionData>,
+        val selectingSpawnInformation: MutableMap<String, SpawnablePositionBucketSelectionData>,
     ): SpawnSelectionData {
         override val spawnActions = mutableListOf<SpawnAction<*>>()
         override val context = mutableMapOf<String, Any>()
 
-        fun getDataForBucket(bucket: SpawnBucket): SpawnablePositionBucketSelectionData {
+        fun getDataForBucket(bucket: String): SpawnablePositionBucketSelectionData {
             val existing = selectingSpawnInformation[bucket]
             if (existing != null) {
                 return existing
@@ -130,14 +129,14 @@ open class FlatSelector : SpawningSelector<FlatSelector.SpawnablePositionSelecti
         spawner: Spawner,
         spawnablePositions: List<SpawnablePosition>
     ): SpawnablePositionSelectionData {
-        val selectingSpawnInformation: MutableMap<SpawnBucket, SpawnablePositionBucketSelectionData> = mutableMapOf()
+        val selectingSpawnInformation: MutableMap<String, SpawnablePositionBucketSelectionData> = mutableMapOf()
 
         return SpawnablePositionSelectionData(spawner, spawnablePositions, selectingSpawnInformation)
     }
 
     override fun selectSpawnAction(
         spawner: Spawner,
-        bucket: SpawnBucket,
+        bucket: String,
         selectionData: SpawnablePositionSelectionData,
     ): SpawnAction<*>? {
         val selectingSpawnInformation = selectionData.getDataForBucket(bucket) ?: return null
@@ -149,7 +148,7 @@ open class FlatSelector : SpawningSelector<FlatSelector.SpawnablePositionSelecti
             if (percentSum > 100) {
                 Cobblemon.LOGGER.warn(
                     """
-                        A spawn list for ${spawner.name} exceeded 100% on percentage sums in bucket ${bucket.name}...
+                        A spawn list for ${spawner.name} exceeded 100% on percentage sums in bucket $bucket...
                         This means you don't understand how this option works.
                     """.trimIndent()
                 )
@@ -186,7 +185,7 @@ open class FlatSelector : SpawningSelector<FlatSelector.SpawnablePositionSelecti
 
     override fun getTotalWeights(
         spawner: Spawner,
-        bucket: SpawnBucket,
+        bucket: String,
         spawnablePositions: List<SpawnablePosition>
     ): Map<SpawnDetail, Float> {
         val selectionData = getSelectionData(spawner, spawnablePositions).getDataForBucket(bucket)

common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/selection/FlatSpawnablePositionWeightedSelector.kt

@@ -9,7 +9,6 @@
 package com.cobblemon.mod.common.api.spawning.selection
 
 import com.cobblemon.mod.common.Cobblemon.LOGGER
-import com.cobblemon.mod.common.api.spawning.SpawnBucket
 import com.cobblemon.mod.common.api.spawning.detail.SpawnAction
 import com.cobblemon.mod.common.api.spawning.detail.SpawnDetail
 import com.cobblemon.mod.common.api.spawning.position.SpawnablePosition
@@ -105,7 +104,7 @@ open class FlatSpawnablePositionWeightedSelector : SpawningSelector<FlatSpawnabl
         override val spawnActions = mutableListOf<SpawnAction<*>>()
         override val context = mutableMapOf<String, Any>()
 
-        val bucketData = mutableMapOf<SpawnBucket, MutableMap<SpawnablePositionType<*>, SpawnablePositionSelectionData>>()
+        val bucketData = mutableMapOf<String, MutableMap<SpawnablePositionType<*>, SpawnablePositionSelectionData>>()
 
         override fun removeSpawnDetails(shouldRemove: (SpawnDetail) -> Boolean) {
             bucketData.values.forEach {
@@ -121,7 +120,7 @@ open class FlatSpawnablePositionWeightedSelector : SpawningSelector<FlatSpawnabl
             }
         }
 
-        fun getDataForBucket(bucket: SpawnBucket): MutableMap<SpawnablePositionType<*>, SpawnablePositionSelectionData> {
+        fun getDataForBucket(bucket: String): MutableMap<SpawnablePositionType<*>, SpawnablePositionSelectionData> {
             bucketData[bucket]?.let { return it }
 
             val spawnablePositionTypeToSpawns = mutableMapOf<SpawnablePositionType<*>, SpawnablePositionSelectionData>()
@@ -149,7 +148,7 @@ open class FlatSpawnablePositionWeightedSelector : SpawningSelector<FlatSpawnabl
 
     override fun selectSpawnAction(
         spawner: Spawner,
-        bucket: SpawnBucket,
+        bucket: String,
         selectionData: SeparatedSelectionData
     ): SpawnAction<*>? {
         val bucketData = selectionData.getDataForBucket(bucket)
@@ -172,7 +171,7 @@ open class FlatSpawnablePositionWeightedSelector : SpawningSelector<FlatSpawnabl
             if (percentSum > 100) {
                 LOGGER.warn(
                     """
-                        A spawn list for ${spawner.name} exceeded 100% on percentage sums in bucket ${bucket.name}...
+                        A spawn list for ${spawner.name} exceeded 100% on percentage sums in bucket $bucket...
                         This means you don't understand how this option works.
                     """.trimIndent()
                 )
@@ -244,7 +243,7 @@ open class FlatSpawnablePositionWeightedSelector : SpawningSelector<FlatSpawnabl
 
     override fun getTotalWeights(
         spawner: Spawner,
-        bucket: SpawnBucket,
+        bucket: String,
         spawnablePositions: List<SpawnablePosition>
     ): Map<SpawnDetail, Float> {
         val selectionData = getSelectionData(spawner, spawnablePositions).getDataForBucket(bucket)

common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/selection/SpawningSelector.kt

@@ -8,7 +8,6 @@
 
 package com.cobblemon.mod.common.api.spawning.selection
 
-import com.cobblemon.mod.common.api.spawning.SpawnBucket
 import com.cobblemon.mod.common.api.spawning.detail.SpawnAction
 import com.cobblemon.mod.common.api.spawning.detail.SpawnDetail
 import com.cobblemon.mod.common.api.spawning.position.SpawnablePosition
@@ -33,13 +32,13 @@ interface SpawningSelector<T : SpawnSelectionData> {
 
     fun selectSpawnAction(
         spawner: Spawner,
-        bucket: SpawnBucket,
+        bucket: String,
         selectionData: T
     ): SpawnAction<*>?
 
     fun select(
         spawner: Spawner,
-        bucketSelector: () -> SpawnBucket,
+        bucketSelector: () -> String,
         spawnablePositions: List<SpawnablePosition>,
         maxSpawns: Int
     ): List<SpawnAction<*>> {
@@ -65,7 +64,7 @@ interface SpawningSelector<T : SpawnSelectionData> {
         return spawnActions
     }
 
-    fun getProbabilities(spawner: Spawner, bucket: SpawnBucket, spawnablePositions: List<SpawnablePosition>): Map<SpawnDetail, Float> {
+    fun getProbabilities(spawner: Spawner, bucket: String, spawnablePositions: List<SpawnablePosition>): Map<SpawnDetail, Float> {
         val weights = getTotalWeights(spawner, bucket, spawnablePositions)
         val totalWeight = weights.values.sum()
         val percentages = mutableMapOf<SpawnDetail, Float>()
@@ -73,5 +72,5 @@ interface SpawningSelector<T : SpawnSelectionData> {
         return percentages
     }
 
-    fun getTotalWeights(spawner: Spawner, bucket: SpawnBucket, spawnablePositions: List<SpawnablePosition>): Map<SpawnDetail, Float>
+    fun getTotalWeights(spawner: Spawner, bucket: String, spawnablePositions: List<SpawnablePosition>): Map<SpawnDetail, Float>
 }

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

@@ -25,7 +25,8 @@ import com.cobblemon.mod.common.api.spawning.selection.SpawningSelector
 open class BasicSpawner(
     override val name: String,
     override var spawnPool: SpawnPool,
-    override var maxPokemonPerChunk: Float = Cobblemon.config.pokemonPerChunk
+    override var maxPokemonPerChunk: Float = Cobblemon.config.pokemonPerChunk,
+    override val buckets: Map<String, Float>
 ) : Spawner {
     override var selector: SpawningSelector<*> = SpawningSelector.DEFAULT
     override var generator: SpawningZoneGenerator = Cobblemon.spawningZoneGenerator

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

@@ -8,11 +8,11 @@
 
 package com.cobblemon.mod.common.api.spawning.spawner
 
+import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.CobblemonPoiTypes
 import com.cobblemon.mod.common.api.spawning.BestSpawner
 import com.cobblemon.mod.common.api.spawning.CobblemonSpawnPools
 import com.cobblemon.mod.common.api.spawning.detail.SpawnPool
-import com.cobblemon.mod.common.api.spawning.influence.BucketMultiplyingInfluence
 import com.cobblemon.mod.common.api.spawning.influence.BucketNormalizingInfluence
 import com.cobblemon.mod.common.api.spawning.influence.PlayerLevelRangeInfluence
 import com.cobblemon.mod.common.api.spawning.influence.PlayerLevelRangeInfluence.Companion.TYPICAL_VARIATION
@@ -72,16 +72,9 @@ object FishingSpawnerFactory {
     fun createSharedSpawner(): BasicSpawner {
         return BasicSpawner(
             name = "fishing",
-            spawnPool = spawnPool
-        ).also { spawner ->
-            spawner.influences += BucketMultiplyingInfluence(
-                multipliers = mapOf(
-                    "uncommon" to 2.25f,
-                    "rare" to 5.5f,
-                    "ultra-rare" to 5.5f,
-                )
-            )
-        }
+            spawnPool = spawnPool,
+            buckets = Cobblemon.bestSpawner.config.fishingBuckets,
+        )
     }
 
     fun findHabitatInfluences(world: ServerLevel, position: BlockPos, spawner: Spawner): Array<HabitatBlockEntity> {

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

@@ -11,8 +11,8 @@ package com.cobblemon.mod.common.api.spawning.spawner
 import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.api.spawning.SpawnCause
 import com.cobblemon.mod.common.api.spawning.detail.SpawnPool
-import net.minecraft.server.level.ServerLevel
 import net.minecraft.core.BlockPos
+import net.minecraft.server.level.ServerLevel
 
 /**
  * A spawner that works within a fixed area. Instances provide the center point and the radii and then the spawner
@@ -24,12 +24,13 @@ import net.minecraft.core.BlockPos
 open class FixedAreaSpawner(
     name: String,
     spawnPool: SpawnPool,
+    buckets: Map<String, Float>,
     val world: ServerLevel,
     val position: BlockPos,
     val horizontalRadius: Int,
     val verticalRadius: Int,
     maxPokemonPerChunk: Float = Cobblemon.config.pokemonPerChunk
-) : BasicSpawner(name, spawnPool, maxPokemonPerChunk) {
+) : BasicSpawner(name, spawnPool, maxPokemonPerChunk, buckets) {
     fun run(cause: SpawnCause, maxSpawns: Int? = null): List<Any> {
         return runForArea(
             zoneInput = getZoneInput(cause),

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

@@ -8,20 +8,21 @@
 
 package com.cobblemon.mod.common.api.spawning.spawner
 
+import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.Cobblemon.config
 import com.cobblemon.mod.common.api.spawning.SpawnCause
 import com.cobblemon.mod.common.api.spawning.detail.SpawnPool
 import com.cobblemon.mod.common.util.getPlayer
 import com.cobblemon.mod.common.util.nextBetween
-import net.minecraft.server.level.ServerLevel
-import net.minecraft.server.level.ServerPlayer
-import net.minecraft.util.Mth.PI
-import net.minecraft.util.Mth.ceil
-import java.util.*
+import java.util.UUID
 import kotlin.math.atan
 import kotlin.math.cos
 import kotlin.math.sin
 import kotlin.random.Random
+import net.minecraft.server.level.ServerLevel
+import net.minecraft.server.level.ServerPlayer
+import net.minecraft.util.Mth.PI
+import net.minecraft.util.Mth.ceil
 
 /**
  * A spawner that works around a single player. It will do basic tracking of a player's speed
@@ -35,7 +36,8 @@ open class PlayerSpawner(
     spawnPool: SpawnPool
 ) : BasicSpawner(
     name = player.name.string,
-    spawnPool = spawnPool
+    spawnPool = spawnPool,
+    buckets = Cobblemon.bestSpawner.config.worldBuckets
 ) {
     val uuid: UUID = player.uuid
 

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

@@ -8,11 +8,11 @@
 
 package com.cobblemon.mod.common.api.spawning.spawner
 
+import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.api.fishing.SpawnBait
 import com.cobblemon.mod.common.api.spawning.CobblemonSpawnPools
 import com.cobblemon.mod.common.api.spawning.CobblemonSpawnRules
 import com.cobblemon.mod.common.api.spawning.detail.SpawnPool
-import com.cobblemon.mod.common.api.spawning.influence.BucketMultiplyingInfluence
 import com.cobblemon.mod.common.api.spawning.influence.BucketNormalizingInfluence
 import com.cobblemon.mod.common.api.spawning.influence.SpawnBaitInfluence
 import com.cobblemon.mod.common.api.spawning.influence.SpawningInfluence
@@ -61,15 +61,6 @@ object PokeSnackSpawnerFactory {
                 firstTier = 1.2F
             )
         },
-        { _ ->
-            BucketMultiplyingInfluence(
-                mapOf(
-                    "uncommon" to 2.25f,
-                    "rare" to 5.5f,
-                    "ultra-rare" to 5.5f,
-                )
-            )
-        },
         { ctx ->
             SpawnBaitInfluence(effects = ctx.baitEffects)
         },
@@ -81,6 +72,7 @@ object PokeSnackSpawnerFactory {
         return FixedAreaSpawner(
             name = ctx.name,
             spawnPool = spawnPool,
+            buckets = Cobblemon.bestSpawner.config.pokeSnackBuckets,
             world = ctx.world,
             position = ctx.pos,
             horizontalRadius = ctx.horizontalRadius,

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

@@ -12,7 +12,6 @@ import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.api.events.CobblemonEvents
 import com.cobblemon.mod.common.api.events.entity.SpawnBucketChosenEvent
 import com.cobblemon.mod.common.api.spawning.BestSpawner
-import com.cobblemon.mod.common.api.spawning.SpawnBucket
 import com.cobblemon.mod.common.api.spawning.SpawnCause
 import com.cobblemon.mod.common.api.spawning.SpawningZoneGenerator
 import com.cobblemon.mod.common.api.spawning.detail.EntitySpawnResult
@@ -26,6 +25,7 @@ import com.cobblemon.mod.common.api.spawning.position.calculators.SpawnablePosit
 import com.cobblemon.mod.common.api.spawning.selection.SpawningSelector
 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.toVec3f
 import com.cobblemon.mod.common.util.weightedSelection
@@ -52,6 +52,7 @@ import net.minecraft.world.phys.Vec3
 interface Spawner {
     val name: String
     val influences: MutableList<SpawningInfluence>
+    val buckets: Map<String, Float>
     var spawnPool: SpawnPool
     var selector: SpawningSelector<*>
     var generator: SpawningZoneGenerator
@@ -65,7 +66,7 @@ interface Spawner {
         const val ENTITY_LIMIT_CHUNK_RANGE = 3
     }
 
-    fun getMatchingSpawns(bucket: SpawnBucket, spawnablePosition: SpawnablePosition): List<SpawnDetail> {
+    fun getMatchingSpawns(bucket: String, spawnablePosition: SpawnablePosition): List<SpawnDetail> {
         val spawns = mutableListOf<SpawnDetail>()
         spawns.addAll(spawnPool.retrieve(bucket, spawnablePosition).filter { it.isSatisfiedBy(spawnablePosition) })
         spawnablePosition.influences.forEach { influence ->
@@ -172,11 +173,12 @@ interface Spawner {
 
     fun copyInfluences() = influences.filter { !it.isExpired() }.toMutableList()
 
-    fun chooseBucket(cause: SpawnCause, influences: List<SpawningInfluence>): SpawnBucket {
-        val buckets = Cobblemon.bestSpawner.config.buckets
-        val bucketWeights = buckets.associateWith { it.weight }.toMutableMap()
+    fun chooseBucket(cause: SpawnCause, influences: List<SpawningInfluence>): String {
+        val bucketWeights = buckets.toMutableMap()
         influences.forEach { it.affectBucketWeights(bucketWeights) }
-        val bucket = bucketWeights.entries.weightedSelection { it.value }?.key ?: buckets.first()
+        val usedBuckets = spawnPool.buckets.intersect(bucketWeights.keys)
+        bucketWeights.removeIf { it.key !in usedBuckets }
+        val bucket = bucketWeights.entries.weightedSelection { it.value }?.key ?: buckets.keys.first()
         val event = SpawnBucketChosenEvent(
             spawner = this,
             spawnCause = cause,

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

@@ -45,11 +45,13 @@ object CobblemonBiomeTags {
     @JvmField
     val IS_END = create("is_end")
     @JvmField
-    val IS_STONY_SHORE = create("is_stony_shore")
+    val IS_STONY_BEACH = create("is_stony_beach")
     @JvmField
-    val IS_SOUL_FIRE = create("is_soul_fire")
+    val IS_SOUL_SAND = create("nether/is_soul_sand")
     @JvmField
-    val IS_FUNGUS = create("is_fungus")
+    val IS_FUNGUS = create("nether/is_fungus")
+    @JvmField
+    val IS_WASTELAND = create("nether/is_wasteland")
     @JvmField
     val IS_GLACIAL = create("is_glacial")
     @JvmField

common/src/main/kotlin/com/cobblemon/mod/common/battles/ShowdownInterpreter.kt

@@ -68,7 +68,7 @@ object ShowdownInterpreter {
         updateInstructionParser["-endability"]           = { _, _, message, _ -> EndAbilityInstruction(message) }
         updateInstructionParser["-end"]                  = { _, _, message, _ -> EndInstruction(message) }
         updateInstructionParser["-enditem"]              = { _, _, message, _ -> EndItemInstruction(message) }
-        updateInstructionParser["-fail"]                 = { _, _, message, _ -> FailInstruction(message) }
+        updateInstructionParser["-fail"]                 = { battle, _, message, _ -> FailInstruction(battle, message) }
         updateInstructionParser["faint"]                 = { battle, _, message, _ -> FaintInstruction(battle, message) }
         updateInstructionParser["-fieldactivate"]        = { _, _, message, _ -> FieldActivateInstruction(message) }
         updateInstructionParser["-fieldend"]             = { _, _, message, _ -> FieldEndInstruction(message) }

common/src/main/kotlin/com/cobblemon/mod/common/battles/ShowdownThread.kt

@@ -38,15 +38,8 @@ class ShowdownThread : Thread("Cobblemon Showdown") {
 
     override fun run() {
         LOGGER.info("Starting showdown service...")
-        try {
-            ShowdownService.service.openConnection()
-            LOGGER.info("Showdown has been started!")
-        } catch (e: Exception) {
-            LOGGER.error("Failed to start showdown service!", e)
-        } finally {
-            this.latch.countDown()
-            throw RuntimeException("Showdown service failed to initialize...")
-        }
-
+        ShowdownService.service.openConnection()
+        LOGGER.info("Showdown has been started!")
+        this.latch.countDown()
     }
 }

common/src/main/kotlin/com/cobblemon/mod/common/battles/ai/RandomBattleAI.kt

@@ -18,6 +18,7 @@ import com.cobblemon.mod.common.battles.PassActionResponse
 import com.cobblemon.mod.common.battles.ShowdownActionResponse
 import com.cobblemon.mod.common.battles.ShowdownMoveset
 import com.cobblemon.mod.common.battles.SwitchActionResponse
+import com.cobblemon.mod.common.exception.IllegalActionChoiceException
 
 /**
  * AI that randomly chooses a move from its moveset at a random target.
@@ -40,17 +41,19 @@ class RandomBattleAI : BattleAI {
             return SwitchActionResponse(switchTo.uuid)
         }
 
-        if (moveset == null) {
+        if (moveset == null)
             return PassActionResponse
+
+        val move = moveset.moves.filter { it.canBeUsed() }.randomOrNull()
+        if (move == null) {
+            if (moveset.moves.any { it.id == "struggle" })
+                return MoveActionResponse("struggle")
+            else throw IllegalActionChoiceException(activeBattlePokemon.actor,
+                "No valid AI move choices, but Showdown never injected Struggle!")
         }
-        val move = moveset.moves
-            .filter { it.canBeUsed() }
-            .filter { it.mustBeUsed() || it.target.targetList(activeBattlePokemon)?.isEmpty() != true }
-            .randomOrNull()
-            ?: return MoveActionResponse("struggle")
 
         val target = if (move.mustBeUsed()) null else move.target.targetList(activeBattlePokemon)
-        return if (target == null) {
+        return if (target.isNullOrEmpty()) {
             MoveActionResponse(move.id)
         } else {
             // prioritize opponents rather than allies

common/src/main/kotlin/com/cobblemon/mod/common/battles/ai/StrongBattleAI.kt

@@ -25,6 +25,7 @@ import com.cobblemon.mod.common.battles.ai.strongBattleAI.AIUtility
 import com.cobblemon.mod.common.battles.ai.strongBattleAI.ActiveTracker
 import com.cobblemon.mod.common.battles.ai.strongBattleAI.TrackerPokemon
 import com.cobblemon.mod.common.battles.pokemon.BattlePokemon
+import com.cobblemon.mod.common.exception.IllegalActionChoiceException
 import com.cobblemon.mod.common.pokemon.status.PersistentStatus
 import kotlin.random.Random
 import kotlin.collections.associateWith
@@ -94,14 +95,14 @@ class StrongBattleAI(skill: Int) : BattleAI {
             return null to 0.0 // we do not care about moves that dont target opponents during damage calculations
         val singleTargetList = move.first.target.targetList.invoke(attacker)?.map { it as ActiveBattlePokemon }?.filter { it.battlePokemon != null }
         val multiTargetList = attacker.getMultiTargetList(move.first.target)?.map { it as ActiveBattlePokemon }?.filter { it.battlePokemon != null }
-        if (singleTargetList != null && singleTargetList.isNotEmpty()) {
+        if (!singleTargetList.isNullOrEmpty()) {
             // figure out target that will take the most damage
             val potentialTargets = activeTracker.opponentSide.activePokemon
                 .filter { opp -> opp.id in singleTargetList.map { it.battlePokemon!!.uuid } }
                 .map { opp -> singleTargetList.first { it.battlePokemon!!.uuid == opp.id} to calculateDamage(move.first, attackerTracker, opp) }
 
             return potentialTargets.maxBy { it.second }
-        } else if (multiTargetList != null && multiTargetList.isNotEmpty()) {
+        } else if (!multiTargetList.isNullOrEmpty()) {
             val (allies, opponents) = multiTargetList.partition { it.isAllied(attacker) }
             // weigh up allied damage against opponents
             val totalOpponentDamage = activeTracker.opponentSide.activePokemon
@@ -188,10 +189,8 @@ class StrongBattleAI(skill: Int) : BattleAI {
 
     // function for finding the most damaging moves in the moveset
     fun mostDamagingMove(selectedMove: InBattleMove, moveset: ShowdownMoveset?, mon: TrackerPokemon, opponent: TrackerPokemon): Boolean {
-
         if (moveset != null) {
             for (move in moveset.moves.filter { !it.disabled && it.id != selectedMove.id}) {
-
                 if (calculateDamage(move, mon, opponent) > calculateDamage(selectedMove, mon, opponent)) {
                     return false
                 }
@@ -251,18 +250,19 @@ class StrongBattleAI(skill: Int) : BattleAI {
 
         val availableMoves = moveset.moves.filter { it.canBeUsed() }.map { Pair(it, Moves.getByName(it.id)!!)}
 
-        if (!checkSkillLevel()){
-            val move = availableMoves
-                .filter { it.first.target.targetList(activeBattlePokemon)?.isEmpty() != true }
-                .randomOrNull()
-                ?: return MoveActionResponse("struggle")
-
-            return chooseMove(move.first, activeBattlePokemon)
+        val randomMove = availableMoves.randomOrNull()
+        if (randomMove == null) {
+            if (moveset.moves.any { it.id == "struggle" })
+                return MoveActionResponse("struggle")
+            else throw IllegalActionChoiceException(activeBattlePokemon.actor,
+                "No valid AI move choices, but Showdown never injected Struggle!")
         }
 
+        if (!checkSkillLevel()) return chooseMove(randomMove.first, activeBattlePokemon)
+
         // switch out based on current matchup on the field
         if (checkSwitchOutSkill() && shouldSwitchOut(aiSide, battle, activeBattlePokemon, moveset)) {
-            considerSwitching(activeBattlePokemon, activeTrackerPokemon, opponents, availableMoves, availableSwitches, battle, aiSide)
+            considerSwitching(activeBattlePokemon, activeTrackerPokemon, opponents, availableMoves, availableSwitches, battle, aiSide)?.let { return it }
         }
 
         // If HP is below 30% and not switching out, always use the most damaging move
@@ -358,7 +358,7 @@ class StrongBattleAI(skill: Int) : BattleAI {
                 }
             }
 
-            considerAntiBoost(activeBattlePokemon, activeTrackerPokemon, opponents, availableMoves)
+            considerAntiBoost(activeBattlePokemon, activeTrackerPokemon, opponents, availableMoves)?.let { return it }
 
             // Court Change
             for (move in availableMoves) {
@@ -414,7 +414,7 @@ class StrongBattleAI(skill: Int) : BattleAI {
                 }
             }
 
-            considerInflictingStatus(activeBattlePokemon, activeTrackerPokemon, opponents, availableMoves, battle, aiSide)
+            considerInflictingStatus(activeBattlePokemon, activeTrackerPokemon, opponents, availableMoves, battle, aiSide)?.let { return it }
 
             // Protect style moves
             for (move in availableMoves) {
@@ -430,7 +430,7 @@ class StrongBattleAI(skill: Int) : BattleAI {
                 }
             }
 
-            findAndUseMostDamagingMove(activeBattlePokemon, activeTrackerPokemon, opponents, availableMoves, moveset, battle, aiSide)
+            findAndUseMostDamagingMove(activeBattlePokemon, activeTrackerPokemon, opponents, availableMoves, moveset, battle, aiSide)?.let { return it }
         }
 
         // healing wish (dealing with it here because you'd only use it if you should switch out anyway)
@@ -450,13 +450,7 @@ class StrongBattleAI(skill: Int) : BattleAI {
         }
         activeTrackerPokemon.firstTurn = false
 
-        val move = availableMoves
-            .filter { it.first.canBeUsed() }
-            .filter { it.first.mustBeUsed() || it.first.target.targetList(activeBattlePokemon)?.isEmpty() != true }
-            .randomOrNull()
-            ?: return MoveActionResponse("struggle")
-
-        return chooseMove(move.first, activeBattlePokemon)
+        return chooseMove(randomMove.first, activeBattlePokemon)
     }
 
     // estimate mid-battle switch in value
@@ -978,12 +972,12 @@ class StrongBattleAI(skill: Int) : BattleAI {
 
         val bestMove = moveValues.maxBy { it.value.second }
         val target = if (bestMove.key.first.mustBeUsed()) null else bestMove.value.first
-        return MoveActionResponse(bestMove.key.first.id, target?.getPNX())
+        return chooseMove(bestMove.key.first, activeBattlePokemon, target)
     }
 
     private fun chooseMove(move: InBattleMove, activeBattlePokemon: ActiveBattlePokemon, target: ActiveBattlePokemon? = null): MoveActionResponse {
         val targets = if (move.mustBeUsed()) null else move.target.targetList(activeBattlePokemon)
-        if (targets == null)
+        if (targets.isNullOrEmpty())
             return MoveActionResponse(move.id)
         else {
             val chosenTarget = target ?: targets.filter { !it.isAllied(activeBattlePokemon) }.randomOrNull() ?: targets.random()

common/src/main/kotlin/com/cobblemon/mod/common/battles/interpreter/instructions/FailInstruction.kt

@@ -22,8 +22,8 @@ import com.cobblemon.mod.common.util.battleLang
  * @author Hunter
  * @since September 25th, 2022
  */
-class FailInstruction(val message: BattleMessage): InterpreterInstruction {
-
+class FailInstruction(val battle: PokemonBattle, val message: BattleMessage): InterpreterInstruction {
+    val target = message.battlePokemon(0, battle)
     override fun invoke(battle: PokemonBattle) {
         battle.dispatchWaiting(1.5F){
             val pokemon = message.battlePokemon(0, battle) ?: return@dispatchWaiting

common/src/main/kotlin/com/cobblemon/mod/common/battles/interpreter/instructions/MoveInstruction.kt

@@ -100,6 +100,8 @@ class MoveInstruction(
                     battleLang("used_move", pokemonName, move.displayName)
             }
             battle.broadcastChatMessage(lang)
+            // Notify the actor that one of their Pokemon used a move so they can react (eg. NPC play animation)
+            userPokemon.actor.onUseMove(userPokemon, targetPokemon)
             battle.majorBattleActions[userPokemon.uuid] = message
 
             val runtime = MoLangRuntime().also {
@@ -135,6 +137,8 @@ class MoveInstruction(
 
             val subsequentInstructions = instructionSet.findInstructionsCausedBy(this)
             val missedTargets = subsequentInstructions.filterIsInstance<MissInstruction>().mapNotNull { it.target }
+            val failed = subsequentInstructions.any { it is FailInstruction }
+            val failedTargets = subsequentInstructions.filterIsInstance<FailInstruction>().mapNotNull { it.target }
             val hitCountInstruction = subsequentInstructions.filterIsInstance<HitCountInstruction>().firstOrNull()
 
             runtime.environment.query.addFunction("missed") { params ->
@@ -146,6 +150,15 @@ class MoveInstruction(
                 }
             }
 
+            runtime.environment.query.addFunction("failed") { params ->
+                if (params.params.size == 0) {
+                    return@addFunction DoubleValue(failed)
+                } else {
+                    val entityUUID = params.getString(0)
+                    return@addFunction DoubleValue(failedTargets.any { it.entity?.stringUUID == entityUUID })
+                }
+            }
+
             val hurtTargets = subsequentInstructions.filterIsInstance<DamageInstruction>().mapNotNull { it.expectedTarget }
             runtime.environment.query.addFunction("hurt") { params ->
                 if (params.params.size == 0) {

common/src/main/kotlin/com/cobblemon/mod/common/battles/runner/graal/GraalShowdownService.kt

@@ -66,6 +66,7 @@ class GraalShowdownService : ShowdownService {
             .allowArrayAccess(true)
             .allowListAccess(true)
             .allowMapAccess(true)
+            .allowAccessAnnotatedBy(Export::class.java)
             .build()
         context = Context.newBuilder("js")
             .allowIO(true)

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

@@ -8,6 +8,7 @@
 
 package com.cobblemon.mod.common.block
 
+import com.cobblemon.mod.common.CobblemonSounds
 import com.cobblemon.mod.common.api.apricorn.Apricorn
 import com.cobblemon.mod.common.api.events.CobblemonEvents
 import com.cobblemon.mod.common.api.events.farming.ApricornHarvestEvent
@@ -176,7 +177,7 @@ class ApricornBlock(settings: Properties, val apricorn: Apricorn) : HorizontalDi
         world.gameEvent(GameEvent.BLOCK_CHANGE, pos, GameEvent.Context.of(player, resetState))
 
         if (!world.isClientSide) {
-            world.playSoundServer(position = pos.toVec3d(), sound = SoundEvents.ITEM_PICKUP, volume = 0.7F, pitch = 1.4F)
+            world.playSoundServer(position = pos.toVec3d(), sound = CobblemonSounds.APRICORN_HARVEST, volume = 1.0F, pitch = 1.0F)
 
             if (world is ServerLevel && player is ServerPlayer) {
                 CobblemonEvents.APRICORN_HARVESTED.post(ApricornHarvestEvent(player, apricorn, world, pos))

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

@@ -203,6 +203,7 @@ class BerryBlock(private val berryIdentifier: ResourceLocation, settings: Proper
     ): InteractionResult {
         val treeEntity = world.getBlockEntity(pos) as BerryBlockEntity
         if (player.getItemInHand(InteractionHand.MAIN_HAND).item is ShovelItem && getMulch(treeEntity) != MulchVariant.NONE) {
+            treeEntity.setMulch(MulchVariant.NONE, world, state, pos)
             treeEntity.setChanged()
             world.playSound(null, pos, CobblemonSounds.MULCH_REMOVE, SoundSource.BLOCKS, 0.6F, 1F)
             this.spawnDestroyParticles(world, player, pos, state.setValue(AGE, 0))

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

@@ -8,7 +8,7 @@
 
 package com.cobblemon.mod.common.block
 
-import com.cobblemon.mod.common.block.entity.TMShelfBlockEntity
+import com.cobblemon.mod.common.block.entity.DiscShelfBlockEntity
 import com.mojang.serialization.MapCodec
 import net.minecraft.core.BlockPos
 import net.minecraft.core.Direction
@@ -24,37 +24,29 @@ 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.BooleanProperty
 import net.minecraft.world.level.block.state.properties.DirectionProperty
 import net.minecraft.world.Containers
 import net.minecraft.world.phys.BlockHitResult
 import net.minecraft.world.phys.shapes.VoxelShape
 
-class TMShelfBlock(properties: Properties) : BaseEntityBlock(properties) {
+class DiscShelfBlock(properties: Properties) : BaseEntityBlock(properties) {
     companion object {
-        val CODEC: MapCodec<TMShelfBlock> = simpleCodec(::TMShelfBlock)
+        val CODEC: MapCodec<DiscShelfBlock> = simpleCodec(::DiscShelfBlock)
         val FACING: DirectionProperty = HorizontalDirectionalBlock.FACING
-        val SLOT_OCCUPIED_PROPERTIES = (0 until 14).map {
-            BooleanProperty.create("slot_${it}_occupied")
-        }
     }
 
     init {
-        val baseState = stateDefinition.any().setValue(FACING, Direction.NORTH)
-        registerDefaultState(SLOT_OCCUPIED_PROPERTIES.fold(baseState) { state, prop ->
-            state.setValue(prop, false)
-        })
+        registerDefaultState(stateDefinition.any().setValue(FACING, Direction.NORTH))
     }
 
     override fun codec() = CODEC
 
     override fun newBlockEntity(pos: BlockPos, state: BlockState): BlockEntity {
-        return TMShelfBlockEntity(pos, state)
+        return DiscShelfBlockEntity(pos, state)
     }
 
     override fun createBlockStateDefinition(builder: StateDefinition.Builder<Block, BlockState>) {
         builder.add(FACING)
-        SLOT_OCCUPIED_PROPERTIES.forEach { builder.add(it) }
     }
 
     override fun getRenderShape(state: BlockState): RenderShape = RenderShape.MODEL
@@ -67,7 +59,7 @@ class TMShelfBlock(properties: Properties) : BaseEntityBlock(properties) {
         state: BlockState, level: Level, pos: BlockPos,
         player: Player, hit: BlockHitResult
     ): InteractionResult {
-        val entity = level.getBlockEntity(pos) as? TMShelfBlockEntity ?: return InteractionResult.PASS
+        val entity = level.getBlockEntity(pos) as? DiscShelfBlockEntity ?: return InteractionResult.PASS
         return entity.handleUseWithoutItem(state, level, pos, player, hit)
     }
 
@@ -75,21 +67,21 @@ class TMShelfBlock(properties: Properties) : BaseEntityBlock(properties) {
         stack: ItemStack, state: BlockState, level: Level, pos: BlockPos,
         player: Player, hand: InteractionHand, hit: BlockHitResult
     ): ItemInteractionResult {
-        val entity = level.getBlockEntity(pos) as? TMShelfBlockEntity ?: return ItemInteractionResult.SKIP_DEFAULT_BLOCK_INTERACTION
+        val entity = level.getBlockEntity(pos) as? DiscShelfBlockEntity ?: return ItemInteractionResult.SKIP_DEFAULT_BLOCK_INTERACTION
         return entity.handleUseItem(stack, state, level, pos, player, hit)
     }
 
     override fun hasAnalogOutputSignal(state: BlockState) = true
 
     override fun getAnalogOutputSignal(state: BlockState, level: Level, pos: BlockPos): Int {
-        val entity = level.getBlockEntity(pos) as? TMShelfBlockEntity
+        val entity = level.getBlockEntity(pos) as? DiscShelfBlockEntity
         return entity?.items?.count { !it.isEmpty }?.coerceIn(0, 14) ?: 0
     }
 
     override fun onRemove(state: BlockState, level: Level, pos: BlockPos, newState: BlockState, movedByPiston: Boolean) {
         if (!state.`is`(newState.block)) {
             if (!level.isClientSide && !movedByPiston) {
-                val entity = level.getBlockEntity(pos) as? TMShelfBlockEntity
+                val entity = level.getBlockEntity(pos) as? DiscShelfBlockEntity
                 if (entity != null) {
                     for (index in entity.items.indices) {
                         val stack = entity.items[index]

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

@@ -127,7 +127,7 @@ class LecternBlock(properties: Properties): BaseEntityBlock(properties) {
                     else {
                         blockEntity.incrementViewerCount()
                         PokedexUIPacket(type = (blockEntity.getItemStack().item as PokedexItem).type, blockPos = blockPos).sendToPlayer(player as ServerPlayer)
-                        level.playSoundServer(position = blockPos.toVec3d(), sound = CobblemonSounds.POKEDEX_OPEN, volume = 0.25F)
+                        level.playSoundServer(position = blockPos.bottomCenter, sound = CobblemonSounds.POKEDEX_OPEN, volume = 0.25F)
                     }
                 }
             }

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

@@ -287,7 +287,7 @@ class PCBlock(properties: Properties): BaseEntityBlock(properties), SimpleWaterl
         PCLinkManager.addLink(ProximityPCLink(pc, player.uuid, baseEntity))
         OpenPCPacket(pc).sendToPlayer(player)
         world.playSoundServer(
-            position = blockPos.toVec3d(),
+            position = blockPos.bottomCenter,
             sound = CobblemonSounds.PC_ON,
             volume = 0.5F,
             pitch = 1F

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

@@ -290,7 +290,7 @@ class PastureBlock(settings: Properties): BaseEntityBlock(settings), SimpleWater
             PastureLinkManager.createLink(player.uuid, PastureLink(linkId, pcId, ResourceLocation.tryParse(world.dimensionTypeRegistration().registeredName)!!, getBasePosition(state, pos), perms))
 
             world.playSoundServer(
-                position = pos.toVec3d(),
+                position = pos.bottomCenter,
                 sound = CobblemonSounds.PC_ON,
                 volume = 0.5F,
                 pitch = 1F

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

@@ -10,6 +10,7 @@ package com.cobblemon.mod.common.block
 
 import com.bedrockk.molang.runtime.value.DoubleValue
 import com.cobblemon.mod.common.entity.MoLangScriptingEntity
+import com.cobblemon.mod.common.util.giveOrDropItemStack
 import com.cobblemon.mod.common.util.isServerSide
 import net.minecraft.core.BlockPos
 import net.minecraft.core.Direction
@@ -285,7 +286,7 @@ class SaccharineLeafBlock(settings: Properties) : LeavesBlock(settings) {
                     // Replace the consumed empty bottle with a honey bottle
                     player.setItemInHand(hand, ItemStack(Items.HONEY_BOTTLE));
                 } else {
-                    player.addItem(Items.HONEY_BOTTLE.defaultInstance)
+                    player.giveOrDropItemStack(Items.HONEY_BOTTLE.defaultInstance)
                 }
 
                 level.playSound(null, pos, SoundEvents.BOTTLE_FILL, SoundSource.BLOCKS)

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

@@ -15,6 +15,7 @@ import com.mojang.serialization.codecs.RecordCodecBuilder
 import net.minecraft.core.BlockPos
 import net.minecraft.core.Direction
 import net.minecraft.core.component.DataComponents
+import net.minecraft.core.registries.BuiltInRegistries
 import net.minecraft.resources.ResourceLocation
 import net.minecraft.server.level.ServerLevel
 import net.minecraft.util.RandomSource
@@ -64,7 +65,6 @@ class TypeGemClusterBlock(
         val FACING: DirectionProperty = DirectionalBlock.FACING
         val STAGE: IntegerProperty = IntegerProperty.create("stage", 0, 3)
         val STUNTED: BooleanProperty = BooleanProperty.create("stunted")
-        private val DIRECTIONS = Direction.entries.toTypedArray()
 
         fun clusterFromGemBlock(gemBlock: Block): TypeGemClusterBlock? {
             return gemToClusterMap[gemBlock]
@@ -94,20 +94,20 @@ class TypeGemClusterBlock(
             .setValue(STUNTED, false)
     }
 
-    override fun isRandomlyTicking(state: BlockState): Boolean = state.getValue(SHOULD_GROW)
+    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) {
-        if (!state.getValue(SHOULD_GROW)) return
+        if (!gemClusterCanGrow(state, level, pos)) return
 
         val currentStage = state.getValue(STAGE)
 
         if (currentStage < 3) {
             // Progress through stages regardless of STUNTED
-            level.setBlock(pos, state.setValue(STAGE, currentStage + 1), UPDATE_CLIENTS)
+            level.setBlock(pos, state.setValue(STAGE, currentStage + 1), UPDATE_ALL)
             return
         }
 
@@ -116,32 +116,31 @@ class TypeGemClusterBlock(
         val facing = state.getValue(FACING)
 
         if (isStunted) {
-            level.setBlock(pos, state.setValue(SHOULD_GROW, false), UPDATE_CLIENTS)
+            level.setBlock(pos, state.setValue(SHOULD_GROW, false), UPDATE_ALL)
             return
         }
 
         // Check neighboring gem blocks
-        var hasConflict = false
-        for (dir in DIRECTIONS) {
-            if (dir == facing.opposite) continue
-            if (isGem(level.getBlockState(pos.relative(dir)))) {
-                hasConflict = true
-                break
-            }
-        }
+        val hasConflict = Direction.entries
+                .filter { it != facing.opposite }
+                .any { dir ->
+                    val neighborPos = pos.relative(dir)
+                    val neighborState = level.getBlockState(neighborPos)
+                    isGem(neighborState)
+                }
 
         if (hasConflict) {
             level.setBlock(
                 pos,
                 state.setValue(STUNTED, true).setValue(SHOULD_GROW, false),
-                UPDATE_CLIENTS
+                UPDATE_ALL
             )
         } else {
             var nextState = nextStage.defaultBlockState()
             if (nextState.hasProperty(FACING)) {
                 nextState = nextState.setValue(FACING, facing)
             }
-            level.setBlock(pos, nextState, UPDATE_CLIENTS)
+            level.setBlock(pos, nextState, UPDATE_ALL)
             attachDecorativeClusters(level, pos, random)
         }
     }
@@ -151,28 +150,22 @@ class TypeGemClusterBlock(
     }
 
     private fun attachDecorativeClusters(level: LevelAccessor, gemPos: BlockPos, random: RandomSource) {
-        val openDirections = ArrayList<Direction>(DIRECTIONS.size)
-        for (direction in DIRECTIONS) {
-            if (level.getBlockState(gemPos.relative(direction)).isAir) {
-                openDirections.add(direction)
-            }
-        }
+        val openDirections = Direction.entries.filter { direction ->
+            level.getBlockState(gemPos.relative(direction)).isAir
+        }.toMutableList()
 
         if (openDirections.isEmpty()) {
             return
         }
 
-        var remaining = openDirections.size
-        val minClusters = maxOf(1, (remaining * 0.75f).toInt())
-        val clusterCount = random.nextInt(minClusters, remaining + 1)
+        val minClusters = maxOf(1, (openDirections.size * 0.75f).toInt())
+        val clusterCount = random.nextInt(minClusters, openDirections.size + 1)
 
         repeat(clusterCount) {
-            if (remaining == 0) return@repeat
+            if (openDirections.isEmpty()) return@repeat
 
-            val index = random.nextInt(remaining)
-            val direction = openDirections[index]
-            remaining--
-            openDirections[index] = openDirections[remaining]
+            val index = random.nextInt(openDirections.size)
+            val direction = openDirections.removeAt(index)
             val clusterPos = gemPos.relative(direction)
             val stage = random.nextInt(0, 4)
 
@@ -182,23 +175,33 @@ class TypeGemClusterBlock(
                 .setValue(SHOULD_GROW, false) // so we can reduce lag... hopefully
                 .setValue(STUNTED, false)
 
-            level.setBlock(clusterPos, clusterState, UPDATE_CLIENTS)
+            level.setBlock(clusterPos, clusterState, UPDATE_ALL)
         }
     }
 
+    fun gemClusterCanGrow(state: BlockState, level: LevelReader, pos: BlockPos): Boolean {
+        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)
 
         for (stack in drops) {
             val blockItem = stack.item as? BlockItem ?: continue
             if (blockItem.block !is TypeGemClusterBlock) continue
+            val itemPath = BuiltInRegistries.ITEM.getKey(stack.item).path
+            if (!itemPath.endsWith("_gem_cluster")) continue
 
             stack.set(
                 DataComponents.BLOCK_STATE,
                 BlockItemStateProperties.EMPTY
                     .with(STAGE, state.getValue(STAGE))
                     .with(SHOULD_GROW, false)
-                    .with(STUNTED, state.getValue(STUNTED))
+                    .with(STUNTED, false)
             )
             stack.set(
                 DataComponents.CUSTOM_MODEL_DATA,
@@ -253,9 +256,9 @@ class TypeGemClusterBlock(
     }
 
     override fun canSurvive(state: BlockState, level: LevelReader, pos: BlockPos): Boolean {
-        val supportPos = pos.relative(state.getValue(FACING).opposite)
-        val supportState = level.getBlockState(supportPos)
-        return supportState.`is`(CobblemonBlockTags.TYPE_GEM_BLOCKS) || (supportState.block == CobblemonBlocks.TYPE_GEM_CORE)
+        val direction = state.getValue(FACING)
+        val supportPos = pos.relative(direction.opposite)
+        return level.getBlockState(supportPos).isFaceSturdy(level, supportPos, direction)
     }
 
     override fun propagatesSkylightDown(state: BlockState, level: net.minecraft.world.level.BlockGetter, pos: BlockPos): Boolean = true
@@ -271,4 +274,23 @@ class TypeGemClusterBlock(
         super.createBlockStateDefinition(builder)
         builder.add(FACING, SHOULD_GROW, STAGE, STUNTED)
     }
+
+    override fun getCloneItemStack(level: LevelReader, pos: BlockPos, state: BlockState): ItemStack {
+        val stack = super.getCloneItemStack(level, pos, state)
+        val itemPath = BuiltInRegistries.ITEM.getKey(stack.item).path
+        if (itemPath.endsWith("_gem_cluster")) {
+            stack.set(
+                DataComponents.BLOCK_STATE,
+                BlockItemStateProperties.EMPTY
+                    .with(STAGE, state.getValue(STAGE))
+                    .with(SHOULD_GROW, false)
+                    .with(STUNTED, false)
+            )
+            stack.set(
+                DataComponents.CUSTOM_MODEL_DATA,
+                CustomModelData(state.getValue(STAGE))
+            )
+        }
+        return stack
+    }
 }

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

@@ -8,22 +8,22 @@
 
 package com.cobblemon.mod.common.block
 
+import com.cobblemon.mod.common.CobblemonBlocks
 import com.cobblemon.mod.common.api.tags.CobblemonBlockTags
 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
+import net.minecraft.resources.ResourceLocation
 import net.minecraft.server.level.ServerLevel
 import net.minecraft.util.RandomSource
 import net.minecraft.world.level.BlockGetter
-import net.minecraft.world.level.Level
 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.DirectionalBlock
 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 java.util.*
 
 class TypeGemCoreBlock(properties: Properties) : Block(properties) {
@@ -32,14 +32,33 @@ class TypeGemCoreBlock(properties: Properties) : Block(properties) {
         const val MAX_CONNECTED_GEMS = 7
         const val MIN_DISTANCE_BETWEEN_GEMS = 1
         const val CONTINUATION_CHANCE = 0.8f
-        const val INACTIVE_WAKE_RECHECK_CHANCE = 10
 
-        val ACTIVE: BooleanProperty = BooleanProperty.create("active")
-        private val DIRECTIONS = Direction.entries.toTypedArray()
+        val BLOCK_TO_CLUSTER: Map<ResourceLocation, Block> by lazy {
+            mapOf(
+                ResourceLocation.parse("cobblemon:normal_gem_block") to CobblemonBlocks.TYPE_GEM_CLUSTER_NORMAL,
+                ResourceLocation.parse("cobblemon:fire_gem_block") to CobblemonBlocks.TYPE_GEM_CLUSTER_FIRE,
+                ResourceLocation.parse("cobblemon:water_gem_block") to CobblemonBlocks.TYPE_GEM_CLUSTER_WATER,
+                ResourceLocation.parse("cobblemon:electric_gem_block") to CobblemonBlocks.TYPE_GEM_CLUSTER_ELECTRIC,
+                ResourceLocation.parse("cobblemon:grass_gem_block") to CobblemonBlocks.TYPE_GEM_CLUSTER_GRASS,
+                ResourceLocation.parse("cobblemon:ice_gem_block") to CobblemonBlocks.TYPE_GEM_CLUSTER_ICE,
+                ResourceLocation.parse("cobblemon:fighting_gem_block") to CobblemonBlocks.TYPE_GEM_CLUSTER_FIGHTING,
+                ResourceLocation.parse("cobblemon:poison_gem_block") to CobblemonBlocks.TYPE_GEM_CLUSTER_POISON,
+                ResourceLocation.parse("cobblemon:ground_gem_block") to CobblemonBlocks.TYPE_GEM_CLUSTER_GROUND,
+                ResourceLocation.parse("cobblemon:flying_gem_block") to CobblemonBlocks.TYPE_GEM_CLUSTER_FLYING,
+                ResourceLocation.parse("cobblemon:psychic_gem_block") to CobblemonBlocks.TYPE_GEM_CLUSTER_PSYCHIC,
+                ResourceLocation.parse("cobblemon:bug_gem_block") to CobblemonBlocks.TYPE_GEM_CLUSTER_BUG,
+                ResourceLocation.parse("cobblemon:rock_gem_block") to CobblemonBlocks.TYPE_GEM_CLUSTER_ROCK,
+                ResourceLocation.parse("cobblemon:ghost_gem_block") to CobblemonBlocks.TYPE_GEM_CLUSTER_GHOST,
+                ResourceLocation.parse("cobblemon:dragon_gem_block") to CobblemonBlocks.TYPE_GEM_CLUSTER_DRAGON,
+                ResourceLocation.parse("cobblemon:dark_gem_block") to CobblemonBlocks.TYPE_GEM_CLUSTER_DARK,
+                ResourceLocation.parse("cobblemon:steel_gem_block") to CobblemonBlocks.TYPE_GEM_CLUSTER_STEEL,
+                ResourceLocation.parse("cobblemon:fairy_gem_block") to CobblemonBlocks.TYPE_GEM_CLUSTER_FAIRY
+            )
+        }
 
         fun setStuntState(level: LevelAccessor, gemBlocks: List<Pair<BlockState, BlockPos>>, stunted: Boolean) {
             for ((_, gemPos) in gemBlocks) {
-                for (dir in DIRECTIONS) {
+                for (dir in Direction.entries) {
                     val neighborPos = gemPos.relative(dir)
                     val neighborState = level.getBlockState(neighborPos)
 
@@ -52,7 +71,7 @@ class TypeGemCoreBlock(properties: Properties) : Block(properties) {
                                 updatedState = updatedState.setValue(SHOULD_GROW, !stunted)
                             }
 
-                            level.setBlock(neighborPos, updatedState, UPDATE_CLIENTS)
+                            level.setBlock(neighborPos, updatedState, 3)
                         }
                     }
                 }
@@ -71,7 +90,7 @@ class TypeGemCoreBlock(properties: Properties) : Block(properties) {
             while (queue.isNotEmpty()) {
                 val current = queue.poll()
 
-                for (direction in DIRECTIONS) {
+                for (direction in Direction.entries) {
                     val neighbor = current.relative(direction)
                     if (visited.add(neighbor)) {
                         val state = level.getBlockState(neighbor)
@@ -86,26 +105,8 @@ class TypeGemCoreBlock(properties: Properties) : Block(properties) {
         }
     }
 
-    init {
-        registerDefaultState(stateDefinition.any().setValue(ACTIVE, true))
-    }
-
     override fun randomTick(state: BlockState, level: ServerLevel, pos: BlockPos, random: RandomSource) {
-        if (!state.getValue(ACTIVE)) {
-            if (random.nextInt(INACTIVE_WAKE_RECHECK_CHANCE) != 0) {
-                return
-            }
-
-            if (shouldWakeFromSleep(level, pos)) {
-                level.setBlock(pos, state.setValue(ACTIVE, true), UPDATE_CLIENTS)
-            }
-            return
-        }
-
-        val result = grow(level, pos, random)
-        if (!result.grew && !result.shouldKeepTicking) {
-            level.setBlock(pos, state.setValue(ACTIVE, false), UPDATE_CLIENTS)
-        }
+        grow(level, pos, random)
     }
 
     fun forceGrow(level: WorldGenLevel, pos: BlockPos, random: RandomSource, percentage: Float) {
@@ -113,21 +114,19 @@ class TypeGemCoreBlock(properties: Properties) : Block(properties) {
 
         while (true) {
             val growInfo = grow(level, pos, random, true)
-            val grown = growInfo.grew
-            val clusterSize = growInfo.clusterSize
+            val grown = growInfo.first
+            val clusterSize = growInfo.second
 
             if (!grown || clusterSize >= desiredLength) break
         }
     }
 
-    private data class GrowResult(val grew: Boolean, val clusterSize: Int, val shouldKeepTicking: Boolean)
-
     private fun grow(
         level: WorldGenLevel,
         pos: BlockPos,
         random: RandomSource,
         forced: Boolean = false
-    ): GrowResult {
+    ): 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
@@ -135,24 +134,23 @@ class TypeGemCoreBlock(properties: Properties) : Block(properties) {
         if (overLimit) {
             // if there is no open air pockets to grow any new clusters then exit early
             if (!hasBreathingRoom(level, connectedGems)) {
-                return GrowResult(false, gemCount, false)
+                return Pair(false, gemCount)
             }
             // max type gem block count met, tell clusters to grow but not turn into blocks
             setStuntState(level, connectedGems, true)
-            return GrowResult(false, gemCount, false)
+            //return Pair(false, gemCount)
         } else {
             // make sure connected clusters know they can grow and turn into blocks
             setStuntState(level, connectedGems, false)
         }
 
-        val gemStart = random.nextInt(gemCount)
-        for (gemOffset in 0 until gemCount) {
-            val (gemState, gemPos) = connectedGems[(gemStart + gemOffset) % gemCount]
-            val clusterBlock = TypeGemClusterBlock.clusterFromGemBlock(gemState.block)
-            val directionStart = random.nextInt(DIRECTIONS.size)
+        val javaRandom = java.util.Random(random.nextLong())
 
-            for (dirOffset in DIRECTIONS.indices) {
-                val dir = DIRECTIONS[(directionStart + dirOffset) % DIRECTIONS.size]
+        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)
 
@@ -160,26 +158,24 @@ class TypeGemCoreBlock(properties: Properties) : Block(properties) {
                 if (!isPositionValidForGrowth(level, targetPos)) continue
 
                 // Place gem cluster
-                if (clusterBlock != null) {
-                    var placeState = clusterBlock.defaultBlockState()
-                        .setValue(DirectionalBlock.FACING, dir)
-                        .setValue(TypeGemClusterBlock.STAGE, 0)
-                        .setValue(SHOULD_GROW, true)
+                val placeState = clusterBlock.defaultBlockState()
+                    .setValue(DirectionalBlock.FACING, dir)
+                    .setValue(TypeGemClusterBlock.STAGE, 0)
+                    .setValue(SHOULD_GROW, true)
 
-                    level.setBlock(targetPos, placeState, UPDATE_CLIENTS)
-                }
+                level.setBlock(targetPos, placeState, UPDATE_ALL)
 
-                if (forced && clusterBlock != null) {
+                if (forced) {
                     forceAdvanceClusterGrowth(level, targetPos, random)
                 }
 
                 val updatedGemCount = if (forced) getConnectedGemBlocks(level, pos).size else connectedGems.size
-                return GrowResult(true, updatedGemCount, true)
+                return Pair(true, updatedGemCount)
             }
         }
 
         // println("[TypeGemCoreBlock] No valid spot found for gem placement.")
-        return GrowResult(false, connectedGems.size, false)
+        return Pair(false, connectedGems.size)
     }
 
     private fun forceAdvanceClusterGrowth(level: WorldGenLevel, clusterPos: BlockPos, random: RandomSource) {
@@ -190,18 +186,9 @@ class TypeGemCoreBlock(properties: Properties) : Block(properties) {
         }
     }
 
-    private fun shouldWakeFromSleep(level: ServerLevel, pos: BlockPos): Boolean {
-        val connectedGems = getConnectedGemBlocks(level, pos)
-        if (connectedGems.size >= MAX_CONNECTED_GEMS) {
-            return false
-        }
-
-        return hasBreathingRoom(level, connectedGems)
-    }
-
     private fun hasBreathingRoom(level: WorldGenLevel, gems: List<Pair<BlockState, BlockPos>>): Boolean {
         for ((_, gemPos) in gems) {
-            for (dir in DIRECTIONS) {
+            for (dir in Direction.entries) {
                 if (level.getBlockState(gemPos.relative(dir)).isAir) {
                     return true
                 }
@@ -211,7 +198,7 @@ class TypeGemCoreBlock(properties: Properties) : Block(properties) {
     }
 
     private fun isPositionValidForGrowth(level: WorldGenLevel, pos: BlockPos): Boolean {
-        return DIRECTIONS.none { dir ->
+        return Direction.entries.none { dir ->
             val nearby = pos.relative(dir)
             isGem(level.getBlockState(nearby)) &&
                     pos.distManhattan(nearby) < MIN_DISTANCE_BETWEEN_GEMS
@@ -222,17 +209,5 @@ class TypeGemCoreBlock(properties: Properties) : Block(properties) {
         return state.`is`(CobblemonBlockTags.TYPE_GEM_BLOCKS)
     }
 
-    override fun neighborChanged(state: BlockState, level: Level, pos: BlockPos, block: Block, fromPos: BlockPos, isMoving: Boolean) {
-        super.neighborChanged(state, level, pos, block, fromPos, isMoving)
-        if (!level.isClientSide && !state.getValue(ACTIVE)) {
-            level.setBlock(pos, state.setValue(ACTIVE, true), UPDATE_CLIENTS)
-        }
-    }
-
-    override fun createBlockStateDefinition(builder: StateDefinition.Builder<Block, BlockState>) {
-        super.createBlockStateDefinition(builder)
-        builder.add(ACTIVE)
-    }
-
     override fun isRandomlyTicking(state: BlockState): Boolean = true
 }

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

@@ -10,7 +10,7 @@ package com.cobblemon.mod.common.block.entity
 
 import com.cobblemon.mod.common.CobblemonBlockEntities
 import com.cobblemon.mod.common.CobblemonItems
-import com.cobblemon.mod.common.block.TMShelfBlock
+import com.cobblemon.mod.common.block.DiscShelfBlock
 import com.cobblemon.mod.common.item.interactive.TechnicalMachineItem
 import net.minecraft.core.BlockPos
 import net.minecraft.core.Direction
@@ -36,7 +36,7 @@ import net.minecraft.world.level.gameevent.GameEvent
 import java.util.OptionalInt
 import kotlin.math.pow
 
-class TMShelfBlockEntity(pos: BlockPos, state: BlockState) : BlockEntity(CobblemonBlockEntities.TM_SHELF, pos, state), WorldlyContainer {
+class DiscShelfBlockEntity(pos: BlockPos, state: BlockState) : BlockEntity(CobblemonBlockEntities.DISC_SHELF, pos, state), WorldlyContainer {
     val items: NonNullList<ItemStack> = NonNullList.withSize(14, ItemStack.EMPTY)
     var lastInteractedSlot: Int = -1
     private val accessibleSlots = IntArray(14) { it }
@@ -56,10 +56,11 @@ class TMShelfBlockEntity(pos: BlockPos, state: BlockState) : BlockEntity(Cobblem
         }
 
         items[slot] = stack.copyWithCount(1)
-        stack.shrink(1)
+        if (!player.isCreative) {
+            stack.shrink(1)
+        }
         lastInteractedSlot = slot
-        updateBlockState(level, pos)
-        markUpdated()
+        onInventoryChanged(level, pos)
 
         return ItemInteractionResult.sidedSuccess(level.isClientSide)
     }
@@ -75,23 +76,20 @@ class TMShelfBlockEntity(pos: BlockPos, state: BlockState) : BlockEntity(Cobblem
         }
 
         lastInteractedSlot = slot
-        updateBlockState(level, pos)
+        onInventoryChanged(level, pos)
 
         return InteractionResult.sidedSuccess(level.isClientSide)
     }
 
-    private fun updateBlockState(level: Level, pos: BlockPos) {
-        val newState = TMShelfBlock.SLOT_OCCUPIED_PROPERTIES.fold(blockState) { acc, prop ->
-            val index = TMShelfBlock.SLOT_OCCUPIED_PROPERTIES.indexOf(prop)
-            acc.setValue(prop, !items[index].isEmpty)
-        }
-        level.setBlock(pos, newState, 3)
-        level.updateNeighbourForOutputSignal(pos, newState.block)
-        level.gameEvent(GameEvent.BLOCK_CHANGE, pos, GameEvent.Context.of(newState))
+    private fun onInventoryChanged(level: Level, pos: BlockPos) {
+        setChanged()
+        level.updateNeighbourForOutputSignal(pos, blockState.block)
+        level.gameEvent(GameEvent.BLOCK_CHANGE, pos, GameEvent.Context.of(blockState))
+        level.sendBlockUpdated(pos, blockState, blockState, 3)
     }
 
     private fun getHitSlot(hit: BlockHitResult, state: BlockState): OptionalInt {
-        val facing = state.getValue(TMShelfBlock.FACING)
+        val facing = state.getValue(DiscShelfBlock.FACING)
         if (hit.direction != facing) {
             return OptionalInt.empty()
         }
@@ -102,8 +100,8 @@ class TMShelfBlockEntity(pos: BlockPos, state: BlockState) : BlockEntity(Cobblem
             // Face-local X where 0 = visual left and 1 = visual right.
             Direction.NORTH -> 1.0 - relative.x to relative.y
             Direction.SOUTH -> relative.x to relative.y
-            Direction.WEST  -> 1.0 - relative.z to relative.y
-            Direction.EAST  -> relative.z to relative.y
+            Direction.WEST  -> relative.z to relative.y
+            Direction.EAST  -> 1.0 - relative.z to relative.y
             else -> return OptionalInt.empty()
         }
 
@@ -175,16 +173,10 @@ class TMShelfBlockEntity(pos: BlockPos, state: BlockState) : BlockEntity(Cobblem
         NOTE_SLOT_TO_SEMITONE.forEach { (slot, semitone) ->
             if (items[slot].isEmpty) return@forEach
             val pitch = 2.0.pow((semitone + octaveShift) / 12.0).toFloat()
-            level.playSound(null, noteBlockPos, soundEvent, SoundSource.BLOCKS, 3.0f, pitch)
+            level.playSound(null, noteBlockPos, soundEvent, SoundSource.RECORDS, 3.0f, pitch)
         }
     }
 
-    fun markUpdated() {
-        level?.setBlock(blockPos, blockState, 3)
-        level?.sendBlockUpdated(blockPos, blockState, blockState, 3)
-        setChanged()
-    }
-
     override fun clearContent() {
         var changed = false
         for (index in items.indices) {
@@ -194,8 +186,7 @@ class TMShelfBlockEntity(pos: BlockPos, state: BlockState) : BlockEntity(Cobblem
             }
         }
         if (changed) {
-            level?.let { updateBlockState(it, blockPos) }
-            markUpdated()
+            level?.let { onInventoryChanged(it, blockPos) }
         }
     }
 
@@ -214,8 +205,7 @@ class TMShelfBlockEntity(pos: BlockPos, state: BlockState) : BlockEntity(Cobblem
             if (items[slot].isEmpty) {
                 lastInteractedSlot = slot
             }
-            level?.let { updateBlockState(it, blockPos) }
-            markUpdated()
+            level?.let { onInventoryChanged(it, blockPos) }
         }
         return removed
     }
@@ -223,8 +213,7 @@ class TMShelfBlockEntity(pos: BlockPos, state: BlockState) : BlockEntity(Cobblem
     override fun removeItemNoUpdate(slot: Int): ItemStack {
         val removed = ContainerHelper.takeItem(items, slot)
         if (!removed.isEmpty) {
-            level?.let { updateBlockState(it, blockPos) }
-            markUpdated()
+            level?.let { onInventoryChanged(it, blockPos) }
         }
         return removed
     }
@@ -235,8 +224,7 @@ class TMShelfBlockEntity(pos: BlockPos, state: BlockState) : BlockEntity(Cobblem
 
         items[slot] = if (stack.isEmpty) ItemStack.EMPTY else stack.copyWithCount(1)
         lastInteractedSlot = slot
-        level?.let { updateBlockState(it, blockPos) }
-        markUpdated()
+        level?.let { onInventoryChanged(it, blockPos) }
     }
 
     override fun stillValid(player: Player): Boolean {