speed

.gitignore

@@ -36,7 +36,6 @@ common/src/main/resources/assets/cobblemon/showdown
 # Generated files
 */generated/resources/*
 /fabric/src/generated/resources/cobblemon-common.accesswidener
-/fabric/src/main/generated/*
 /.ignored/
 common/.fabric
 .kotlin/

CHANGELOG-1.8.md

@@ -1,31 +0,0 @@
-# Changelog
-## [1.8.0 (MONTH Xth, 2026)](#1-8-0)
-
-### Additions
-- Added a new `cobblemon:structure`, which is a feature without any restrictions allowing the Builders to place certain structures in much more specific manner.
-- Added Configs for Infinite Use TMs and Unlocking all TMs
-- Added Type Gem blocks
-- Added Type Gem Clusters
-- Added TMs
-- Added TM Machine
-- Added Deepslate Core Block
-- Added /givetm Command
-- Added Move Dex to Pokedex
-- Added Disk Rack for storing disks and being an audio sequencer for Noteblocks
-
-
-### Changes
-- Data Monitor can accept Disks (TMs, Music Disks, Upgrade, Dubious Disk, etc) to change look
-
-### Fixes
-- Fixed rare Pokémon being far too likely to spawn multiple times in a single spawn cycle. The dev told me that the exact bug is too complicated to explain.
-
-### Developer
-- Tweaked the spawning selector interface to take a bucket function rather than a bucket directly.
-
-### Molang & Datapacks
-
-### Particles
-
-### Localization
-- Updated translations for:

CHANGELOG-COMPLEX_MOVESETS.md

@@ -1,16 +0,0 @@
-### Additions
-
-### Changes
-- Wild Pokémon now reliably have at least one offensive move, if they can have offensive moves at that level.
-
-### Fixes
-
-### Developer
-
-### Molang & Datapacks
-- Added `moveset_builders` datapack folder for different styles of movesets.
-- Added `party_pools` datapack folder for defining groups of Pokémon for the purposes of complex NPC party definitions.
-- Added `party_compositions` datapack folder for arranging parties on NPCs that rely on party pools.
-- Added `composed_pool` NPC party provider type which combines a party pool with a party composition to create more complex NPC parties.
-
-### Particles

CHANGELOG.md

@@ -2,10 +2,7 @@
 ## [1.7.4 (MONTH Xth, 2026)](#1-7-4)
 
 ### Additions
-- Party Overlay Exp Gained Animation will now display the amount of EXP the Pokémon gained
 - Added a toast to notify players of how they can scroll through their party. Did you know you can hold R and scroll instead of using arrow keys??!
-- Added new layer property that makes a layer scroll in a direction. "scrolling": {"speedU": 0.1, "speedV": 0.1}
-- Added missing crops to Botany Pots integration
 
 ### New rideable Pokémon
 
@@ -16,38 +13,16 @@
 ### Animation updates for the following Pokémon
 
 ### Changes
-- Restructured Botany Pots integration folder structure
-- Decrease default pastured mon wander radius to 32.
-- Factor in the weight of pokemon when calculating pushing forces between hitboxes.
-- Remade the Starter Selection Screen with new assets
-- Refactored berry trees to be less impactful on TPS (more performant)
 
 ### Fixes
 - Fixes https://gitlab.com/cable-mc/cobblemon/-/issues/1943
 - Fix 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 issue where particle like beam can disappear when you don't see the beginning of the beam or you look away
- - Fixes https://gitlab.com/cable-mc/cobblemon/-/issues/1943
- - Fix occasional crash on retrieving revived fossils
- - Fix brushing not working on Neoforge
- - [Various Submarine Ride Fixes](https://gitlab.com/cable-mc/cobblemon/-/merge_requests/2157)
- - Fix Pastured mons despawning and running away.
- - Fix Apricorn trees crashing when other mods bonemeal it
- - [Various UFO Ride Improvements](https://gitlab.com/cable-mc/cobblemon/-/merge_requests/2156)
-- Fixed NeoForge brewing stand unexpectedly crashing users when shift clicking items within it's menu
-- Fixed NPCs switching pokemon very often during battles
-- Fixed Campfire pot causing crashes under certain circumstances
 
 ### Developer
-- Added `PokeSnackSpawnerFactory` which allows influence registration on PokeSnack encounters
-- Added `FishingSpawnerFactory` which allows influence registration on fishing encounters
 
 ### Molang & Datapacks
-- q.item.is_enchanted()
-- q.item.has_enchantment(minecraft:sharpness, 3)
-- Added `has_chosen_starter` & `get_starter_uuid` as available Molang functions
-- Added `marks`, `has_mark`, & `remove_marks` as available Molang functions for pokemon
 
 ### Localization
 - Updated translations for:

changelogs/CHANGELOG-1.7.3.md

@@ -6,6 +6,7 @@
 - Fixed players failing to join servers randomly.
 - Fixed some Pokémon having no stamina for flying.
 - Fixed `/pctake` not respecting the actual size of the PC.
+
 ### Developer
 - Poké Ball GUI textures now respect the ball's namespace, enabling proper texture loading for custom balls from other mods.
 

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

@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.mixin;
-
-import com.cobblemon.mod.common.block.entity.TMShelfBlockEntity;
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.Holder;
-import net.minecraft.sounds.SoundEvent;
-import net.minecraft.sounds.SoundEvents;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.level.block.NoteBlock;
-import net.minecraft.world.level.block.state.properties.NoteBlockInstrument;
-import net.minecraft.world.level.block.entity.BlockEntity;
-import net.minecraft.world.level.block.state.BlockState;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-
-@Mixin(NoteBlock.class)
-public abstract class NoteBlockMixin {
-    @Inject(method = "triggerEvent", at = @At("HEAD"), cancellable = true)
-    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)) {
-            return;
-        }
-
-        if (!level.isClientSide) {
-            final BlockPos instrumentPos = shelfPos.below();
-            final SoundEvent soundEvent;
-            if (level.getBlockState(instrumentPos).isAir()) {
-                soundEvent = SoundEvents.NOTE_BLOCK_BIT.value();
-            } else {
-                final NoteBlockInstrument instrument = level.getBlockState(instrumentPos).instrument();
-                final Holder<SoundEvent> holder = instrument.getSoundEvent();
-                soundEvent = holder.value();
-            }
-            tmShelfBlockEntity.onNoteBlockPulse(level, pos, soundEvent);
-        }
-
-        // Suppress vanilla note-block playback while it is on top of a TM Shelf.
-        cir.setReturnValue(false);
-    }
-}

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

@@ -15,8 +15,6 @@ import com.cobblemon.mod.common.api.events.CobblemonEvents;
 import com.cobblemon.mod.common.api.events.item.LeftoversCreatedEvent;
 import com.cobblemon.mod.common.api.orientation.OrientationController;
 import com.cobblemon.mod.common.api.pokemon.PokemonSpecies;
-import com.cobblemon.mod.common.api.riding.RidingStyle;
-import com.cobblemon.mod.common.api.riding.behaviour.types.air.HoverBehaviour;
 import com.cobblemon.mod.common.api.storage.party.PartyStore;
 import com.cobblemon.mod.common.api.storage.party.PlayerPartyStore;
 import com.cobblemon.mod.common.api.tags.CobblemonItemTags;
@@ -61,7 +59,6 @@ import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
@@ -172,32 +169,6 @@ public abstract class PlayerMixin extends LivingEntity implements ScannableEntit
         }
     }
 
-    @Redirect(
-            method = "getDestroySpeed",
-            at = @At(
-                    value = "INVOKE",
-                    target = "Lnet/minecraft/world/entity/player/Player;onGround()Z"
-            )
-    )
-    private boolean cobblemon$considerHoverOnGround(Player player) {
-        // If riding a Hover Mount, return true to bypass the 5x slowdown
-        if (player.getVehicle() instanceof PokemonEntity vehicle) {
-
-            var ridingController = vehicle.getRidingController();
-            if (ridingController == null) player.onGround();
-
-            var activeContext = ridingController.getContext();
-            if (activeContext == null) player.onGround();
-
-            if (activeContext.getStyle() == RidingStyle.AIR &&
-                activeContext.getBehaviour().equals(HoverBehaviour.Companion.getKEY())) {
-                return true;
-            }
-        }
-        // Otherwise, return the actual value
-        return player.onGround();
-    }
-
     @Inject(
         method = "eat",
         at = @At(

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

@@ -23,7 +23,6 @@ import net.minecraft.client.sounds.ChannelAccess;
 import net.minecraft.client.sounds.SoundEngine;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.sounds.SoundSource;
-import net.minecraft.util.Mth;
 import net.minecraft.world.phys.Vec3;
 import org.jetbrains.annotations.Nullable;
 import org.spongepowered.asm.mixin.Final;
@@ -33,7 +32,6 @@ import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
 
 import java.util.Iterator;
@@ -110,17 +108,6 @@ public abstract class SoundEngineMixin implements SoundEngineDuck {
         }
     }
 
-    /**
-     * TM Shelf can intentionally push note-block pitches above vanilla's 2.0f ceiling for octave-up playback.
-     * Keep vanilla clamping for all other sounds.
-     */
-    @Inject(method = "calculatePitch", at = @At("HEAD"), cancellable = true)
-    private void cobblemon$allowExtendedNoteblockPitch(SoundInstance sound, CallbackInfoReturnable<Float> cir) {
-        if (sound.getLocation().getPath().startsWith("block.note_block.")) {
-            cir.setReturnValue(Mth.clamp(sound.getPitch(), 0.5F, 4.0F));
-        }
-    }
-
     /** Different behavior for resuming SoundInstances while a BattleMusicInstance is being played. We do not want to resume filtered sounds. */
     @Inject(method = "resume()V", at = @At("HEAD"), cancellable = true)
     public void resume(CallbackInfo cb) {

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

@@ -313,7 +313,7 @@ public abstract class MouseHandlerMixin {
         var playerRotater = (RidePassenger)player;
         playerRotater.cobblemon$setRideXRot(playerRotater.cobblemon$getRideXRot() + f);
         playerRotater.cobblemon$setRideYRot(playerRotater.cobblemon$getRideYRot() + g);
-        playerRotater.cobblemon$setRideXRot(Mth.clamp(playerRotater.cobblemon$getRideXRot(), -89.0F, 89.0F));
+        playerRotater.cobblemon$setRideXRot(Mth.clamp(playerRotater.cobblemon$getRideXRot(), -90.0F, 90.0F));
         playerRotater.cobblemon$setRideYRot(Mth.clamp(playerRotater.cobblemon$getRideYRot(), -105.0F, 105.0F));
         if (player.getVehicle() != null) {
             player.getVehicle().onPassengerTurned(player);

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

@@ -14,14 +14,9 @@ import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
 import com.cobblemon.mod.common.pokemon.Pokemon;
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
-import com.llamalad7.mixinextras.sugar.Local;
-import com.llamalad7.mixinextras.sugar.Share;
-import com.llamalad7.mixinextras.sugar.ref.LocalBooleanRef;
-import com.llamalad7.mixinextras.sugar.ref.LocalFloatRef;
 import net.minecraft.client.player.LocalPlayer;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
-import net.minecraft.util.Mth;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.level.Level;
@@ -94,61 +89,4 @@ public abstract class EntityMixin {
         cir.setReturnValue(customEyePos);
     }
 
-
-    @WrapOperation(
-            method = "push(Lnet/minecraft/world/entity/Entity;)V",
-            at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/Entity;push(DDD)V", ordinal = 0)
-    )
-    public void cobblemon$customPusherLogic(Entity pusher, double x, double y, double z,
-                                            Operation<Void> original,
-                                            @Local(argsOnly = true) Entity pushee,
-                                            @Local(name = "e") double e, @Local(name = "d") double d,
-                                            @Share("pusherIsPlayerOrPokemon") LocalBooleanRef pusherIsPlayerOrPokemon,
-                                            @Share("pusheeIsPlayerOrPokemon") LocalBooleanRef pusheeIsPlayerOrPokemon,
-                                            @Share("pusheeReceivedForce")LocalFloatRef pusheeReceivedForce) {
-        pusherIsPlayerOrPokemon.set(pusher instanceof PokemonEntity || pusher instanceof Player);
-        pusheeIsPlayerOrPokemon.set(pushee instanceof PokemonEntity || pushee instanceof Player);
-
-        if (!pusheeIsPlayerOrPokemon.get() || !pusherIsPlayerOrPokemon.get()) {
-            original.call(pusher, x, y, z);
-            return;
-        }
-
-        /**********************************************
-         * Custom portion of the code:
-         * Handle collisions with weight in mind. Use
-         * the weight value of pokemon to determine
-         * which side gets what portion of the total
-         * force.
-         *********************************************/
-        // Weights in hectograms
-        // Check to see if the pusher or pushee is a player. 200ish pounds. Steve's like a 6'6 miner
-        var pusherWeight = pusher instanceof PokemonEntity pusherPokemon ? pusherPokemon.getPokemon().getSpecies().getWeight() : 900F;
-        var pusheeWeight = pushee instanceof PokemonEntity pusheePokemon ? pusheePokemon.getPokemon().getSpecies().getWeight() : 900F;
-
-        // Calculate the portion of force received for both entities. Bigger receives less from the
-        // collision than the smaller one.
-        var totalWeight = pusherWeight + pusheeWeight;
-        var pusherReceivedForce = pusheeWeight / totalWeight * 2F;
-        pusheeReceivedForce.set((pusherWeight / totalWeight) * 2F);
-
-        original.call(pusher, -d * pusherReceivedForce, 0.0, -e * pusherReceivedForce);
-    }
-
-    @WrapOperation(
-            method = "push(Lnet/minecraft/world/entity/Entity;)V",
-            at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/Entity;push(DDD)V", ordinal = 1)
-    )
-    public void cobblemon$customPusheeLogic(Entity pusher, double x, double y, double z, Operation<Void> original,
-                                            @Local(name = "e") double e, @Local(name = "d") double d,
-                                            @Share("pusherIsPlayerOrPokemon") LocalBooleanRef pusherIsPlayerOrPokemon,
-                                            @Share("pusheeIsPlayerOrPokemon") LocalBooleanRef pusheeIsPlayerOrPokemon,
-                                            @Share("pusheeReceivedForce")LocalFloatRef pusheeReceivedForce) {
-        if (!pusheeIsPlayerOrPokemon.get() || !pusherIsPlayerOrPokemon.get()) {
-            original.call(pusher, x, y, z);
-            return;
-        }
-
-        original.call(pusher, d * pusheeReceivedForce.get(), 0.0, e * pusheeReceivedForce.get());
-    }
 }

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

@@ -62,8 +62,6 @@ import com.cobblemon.mod.common.api.storage.player.adapter.DexDataMongoBackend
 import com.cobblemon.mod.common.api.storage.player.adapter.DexDataNbtBackend
 import com.cobblemon.mod.common.api.storage.player.adapter.PlayerDataJsonBackend
 import com.cobblemon.mod.common.api.storage.player.adapter.PlayerDataMongoBackend
-import com.cobblemon.mod.common.api.storage.player.adapter.TMMoveMongoBackend
-import com.cobblemon.mod.common.api.storage.player.adapter.TMMoveNbtBackend
 import com.cobblemon.mod.common.api.storage.player.factory.CachedPlayerDataStoreFactory
 import com.cobblemon.mod.common.api.tags.CobblemonEntityTypeTags
 import com.cobblemon.mod.common.api.tags.CobblemonItemTags
@@ -111,7 +109,13 @@ import com.cobblemon.mod.common.pokemon.properties.UnaspectPropertyType
 import com.cobblemon.mod.common.pokemon.properties.UncatchableProperty
 import com.cobblemon.mod.common.pokemon.stat.CobblemonStatProvider
 import com.cobblemon.mod.common.starter.CobblemonStarterHandler
-import com.cobblemon.mod.common.util.*
+import com.cobblemon.mod.common.util.DataKeys
+import com.cobblemon.mod.common.util.cobblemonResource
+import com.cobblemon.mod.common.util.ifDedicatedServer
+import com.cobblemon.mod.common.util.isLaterVersion
+import com.cobblemon.mod.common.util.party
+import com.cobblemon.mod.common.util.requestWallpapers
+import com.cobblemon.mod.common.util.server
 import com.cobblemon.mod.common.world.feature.CobblemonPlacedFeatures
 import com.cobblemon.mod.common.world.feature.ore.CobblemonOrePlacedFeatures
 import com.cobblemon.mod.common.world.gamerules.CobblemonGameRules
@@ -240,8 +244,6 @@ object Cobblemon {
 
         DATA_SYNCHRONIZED.subscribe {
             storage.onPlayerDataSync(it)
-            it.tmList().scheduleFullSyncFromStores(it.party(), it.pc())
-            it.pokedex().scheduleFullSyncFromStores(it.party(), it.pc())
             playerDataManager.syncAllToPlayer(it)
             starterHandler.handleJoin(it)
             it.requestWallpapers()
@@ -304,7 +306,6 @@ object Cobblemon {
             this.config.maxPokemonLevel,
             this.config.maxPokemonFriendship,
             this.config.maxDynamaxLevel,
-            this.config.unlockAllMoveDexMovesByDefault
         ).sendToPlayer(player)
     }
 
@@ -374,12 +375,8 @@ object Cobblemon {
                     val pokedexNbtFactory = CachedPlayerDataStoreFactory(DexDataNbtBackend())
                     pokedexNbtFactory.setup(server)
 
-                    val tmMoveFactory = CachedPlayerDataStoreFactory(TMMoveNbtBackend())
-                    tmMoveFactory.setup(server)
-
                     playerDataManager.setFactory(generalJsonFactory, PlayerInstancedDataStoreTypes.GENERAL)
                     playerDataManager.setFactory(pokedexNbtFactory, PlayerInstancedDataStoreTypes.POKEDEX)
-                    playerDataManager.setFactory(tmMoveFactory, PlayerInstancedDataStoreTypes.TM_MOVES)
 
                     if (config.storageFormat == "nbt") {
                         NBTStoreAdapter(pokemonStoreRoot.absolutePath, useNestedFolders = true, folderPerClass = true)
@@ -406,14 +403,8 @@ object Cobblemon {
                         val pokedexMongoFactory = CachedPlayerDataStoreFactory(DexDataMongoBackend(mongoClient, config.mongoDBDatabaseName, "PokeDexCollection"))
                         pokedexMongoFactory.setup(server)
 
-                        val tmMovesMongoFactory = CachedPlayerDataStoreFactory(
-                                TMMoveMongoBackend(mongoClient, config.mongoDBDatabaseName, "TMMovesCollection")
-                        )
-                        tmMovesMongoFactory.setup(server)
-
                         playerDataManager.setFactory(generalMongoFactory, PlayerInstancedDataStoreTypes.GENERAL)
                         playerDataManager.setFactory(pokedexMongoFactory, PlayerInstancedDataStoreTypes.POKEDEX)
-                        playerDataManager.setFactory(tmMovesMongoFactory, PlayerInstancedDataStoreTypes.TM_MOVES)
                         MongoDBStoreAdapter(mongoClient, config.mongoDBDatabaseName)
                     } catch (e: ClassNotFoundException) {
                         LOGGER.error("MongoDB driver not found.")
@@ -597,7 +588,6 @@ object Cobblemon {
         this.implementation.registerCommandArgument(cobblemonResource("mark"), MarkArgumentType::class, SingletonArgumentInfo.contextFree(MarkArgumentType::mark))
         this.implementation.registerCommandArgument(cobblemonResource("transform_type"), TransformTypeArgumentType::class, SingletonArgumentInfo.contextFree(TransformTypeArgumentType::transformType))
         this.implementation.registerCommandArgument(cobblemonResource("model_part"), ModelPartArgumentType::class, SingletonArgumentInfo.contextFree(ModelPartArgumentType::modelPart))
-        this.implementation.registerCommandArgument(cobblemonResource("tm"), TmArgumentType::class, SingletonArgumentInfo.contextFree(TmArgumentType::tm))
     }
 
 }

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

@@ -39,9 +39,6 @@ object CobblemonBlockEntities : PlatformRegistry<Registry<BlockEntityType<*>>, R
     @JvmField
     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))
-
     @JvmField
     val BERRY = this.create("berry", BlockEntityType.Builder.of(::BerryBlockEntity, *CobblemonBlocks.berries().values.toTypedArray()).build(null))
 
@@ -51,8 +48,6 @@ object CobblemonBlockEntities : PlatformRegistry<Registry<BlockEntityType<*>>, R
     val SIGN: BlockEntityType<CobblemonSignBlockEntity> = this.create("sign", BlockEntityType.Builder.of(::CobblemonSignBlockEntity, CobblemonBlocks.APRICORN_SIGN, CobblemonBlocks.APRICORN_WALL_SIGN, CobblemonBlocks.SACCHARINE_SIGN, CobblemonBlocks.SACCHARINE_WALL_SIGN).build(null))
     @JvmField
     val HANGING_SIGN: BlockEntityType<CobblemonHangingSignBlockEntity> = this.create("hanging_sign", BlockEntityType.Builder.of(::CobblemonHangingSignBlockEntity, CobblemonBlocks.APRICORN_HANGING_SIGN, CobblemonBlocks.APRICORN_WALL_HANGING_SIGN, CobblemonBlocks.SACCHARINE_HANGING_SIGN, CobblemonBlocks.SACCHARINE_WALL_HANGING_SIGN).build(null))
-    @JvmField
-    val TM_MACHINE: BlockEntityType<TMMachineBlockEntity> = this.create("tm_machine", BlockEntityType.Builder.of(::TMMachineBlockEntity, CobblemonBlocks.TM_MACHINE).build(null))
 
     @JvmField
     val GILDED_CHEST: BlockEntityType<GildedChestBlockEntity> = this.create("chest", BlockEntityType.Builder.of(::GildedChestBlockEntity,

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

@@ -22,7 +22,6 @@ import com.cobblemon.mod.common.block.sign.CobblemonHangingSignBlock
 import com.cobblemon.mod.common.block.sign.CobblemonSignBlock
 import com.cobblemon.mod.common.block.sign.CobblemonWallHangingSignBlock
 import com.cobblemon.mod.common.block.sign.CobblemonWallSignBlock
-import com.cobblemon.mod.common.block.tmmachine.TMMachineBlock
 import com.cobblemon.mod.common.block.general.HorizontalRotationCarpetBlock
 import com.cobblemon.mod.common.block.general.HorizontalRotationalBlock
 import com.cobblemon.mod.common.mixin.invoker.*
@@ -250,31 +249,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", GrowableStoneBlock.STAGE_3, 7, 3, null)
     @JvmField
-    val LARGE_BUDDING_TUMBLESTONE = tumblestoneBlock("large_budding_tumblestone", TumblestoneBlock.STAGE_2, 5, 3, TUMBLESTONE_CLUSTER)
+    val LARGE_BUDDING_TUMBLESTONE = tumblestoneBlock("large_budding_tumblestone", GrowableStoneBlock.STAGE_2, 5, 3, TUMBLESTONE_CLUSTER)
     @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", GrowableStoneBlock.STAGE_1, 4, 3, LARGE_BUDDING_TUMBLESTONE)
     @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", GrowableStoneBlock.STAGE_0, 3, 4, MEDIUM_BUDDING_TUMBLESTONE)
 
     @JvmField
-    val SKY_TUMBLESTONE_CLUSTER = tumblestoneBlock("sky_tumblestone_cluster", TumblestoneBlock.STAGE_3, 7, 3, null)
+    val SKY_TUMBLESTONE_CLUSTER = tumblestoneBlock("sky_tumblestone_cluster", GrowableStoneBlock.STAGE_3, 7, 3, null)
     @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", GrowableStoneBlock.STAGE_2, 5, 3, SKY_TUMBLESTONE_CLUSTER)
     @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", GrowableStoneBlock.STAGE_1, 4, 3, LARGE_BUDDING_SKY_TUMBLESTONE)
     @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", GrowableStoneBlock.STAGE_0, 3, 4, MEDIUM_BUDDING_SKY_TUMBLESTONE)
 
     @JvmField
-    val BLACK_TUMBLESTONE_CLUSTER = tumblestoneBlock("black_tumblestone_cluster", TumblestoneBlock.STAGE_3, 7, 3, null)
+    val BLACK_TUMBLESTONE_CLUSTER = tumblestoneBlock("black_tumblestone_cluster", GrowableStoneBlock.STAGE_3, 7, 3, null)
     @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", GrowableStoneBlock.STAGE_2, 5, 3, BLACK_TUMBLESTONE_CLUSTER)
     @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", GrowableStoneBlock.STAGE_1, 4, 3, LARGE_BUDDING_BLACK_TUMBLESTONE)
     @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", GrowableStoneBlock.STAGE_0, 3, 4, MEDIUM_BUDDING_BLACK_TUMBLESTONE)
 
     @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)))
@@ -283,87 +282,6 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<
     @JvmField
     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("type_gem_core", TypeGemCoreBlock(BlockBehaviour.Properties.of().strength(4.0f, 10.0f).requiresCorrectToolForDrops()))
-
-    private val typeGemBlocks = mutableMapOf<ResourceLocation, TypeGemBlock>()
-
-    @JvmField
-    val TYPE_GEM_BLOCK_NORMAL = typeGemBlock("type_gem_block_normal")
-    @JvmField
-    val TYPE_GEM_BLOCK_FIRE = typeGemBlock("type_gem_block_fire")
-    @JvmField
-    val TYPE_GEM_BLOCK_WATER = typeGemBlock("type_gem_block_water")
-    @JvmField
-    val TYPE_GEM_BLOCK_ELECTRIC = typeGemBlock("type_gem_block_electric")
-    @JvmField
-    val TYPE_GEM_BLOCK_GRASS = typeGemBlock("type_gem_block_grass")
-    @JvmField
-    val TYPE_GEM_BLOCK_ICE = typeGemBlock("type_gem_block_ice")
-    @JvmField
-    val TYPE_GEM_BLOCK_FIGHTING = typeGemBlock("type_gem_block_fighting")
-    @JvmField
-    val TYPE_GEM_BLOCK_POISON = typeGemBlock("type_gem_block_poison")
-    @JvmField
-    val TYPE_GEM_BLOCK_GROUND = typeGemBlock("type_gem_block_ground")
-    @JvmField
-    val TYPE_GEM_BLOCK_FLYING = typeGemBlock("type_gem_block_flying")
-    @JvmField
-    val TYPE_GEM_BLOCK_PSYCHIC = typeGemBlock("type_gem_block_psychic")
-    @JvmField
-    val TYPE_GEM_BLOCK_BUG = typeGemBlock("type_gem_block_bug")
-    @JvmField
-    val TYPE_GEM_BLOCK_ROCK = typeGemBlock("type_gem_block_rock")
-    @JvmField
-    val TYPE_GEM_BLOCK_GHOST = typeGemBlock("type_gem_block_ghost")
-    @JvmField
-    val TYPE_GEM_BLOCK_DRAGON = typeGemBlock("type_gem_block_dragon")
-    @JvmField
-    val TYPE_GEM_BLOCK_DARK = typeGemBlock("type_gem_block_dark")
-    @JvmField
-    val TYPE_GEM_BLOCK_STEEL = typeGemBlock("type_gem_block_steel")
-    @JvmField
-    val TYPE_GEM_BLOCK_FAIRY = typeGemBlock("type_gem_block_fairy")
-
-    private val typeGemClusters = mutableMapOf<ResourceLocation, TypeGemClusterBlock>()
-
-    @JvmField
-    val TYPE_GEM_CLUSTER_NORMAL = typeGemCluster("type_gem_cluster_normal", TYPE_GEM_BLOCK_NORMAL, cobblemonResource("normal_gem"))
-    @JvmField
-    val TYPE_GEM_CLUSTER_FIRE = typeGemCluster("type_gem_cluster_fire", TYPE_GEM_BLOCK_FIRE, cobblemonResource("fire_gem"))
-    @JvmField
-    val TYPE_GEM_CLUSTER_WATER = typeGemCluster("type_gem_cluster_water", TYPE_GEM_BLOCK_WATER, cobblemonResource("water_gem"))
-    @JvmField
-    val TYPE_GEM_CLUSTER_ELECTRIC = typeGemCluster("type_gem_cluster_electric", TYPE_GEM_BLOCK_ELECTRIC, cobblemonResource("electric_gem"))
-    @JvmField
-    val TYPE_GEM_CLUSTER_GRASS = typeGemCluster("type_gem_cluster_grass", TYPE_GEM_BLOCK_GRASS, cobblemonResource("grass_gem"))
-    @JvmField
-    val TYPE_GEM_CLUSTER_ICE = typeGemCluster("type_gem_cluster_ice", TYPE_GEM_BLOCK_ICE, cobblemonResource("ice_gem"))
-    @JvmField
-    val TYPE_GEM_CLUSTER_FIGHTING = typeGemCluster("type_gem_cluster_fighting", TYPE_GEM_BLOCK_FIGHTING, cobblemonResource("fighting_gem"))
-    @JvmField
-    val TYPE_GEM_CLUSTER_POISON = typeGemCluster("type_gem_cluster_poison", TYPE_GEM_BLOCK_POISON, cobblemonResource("poison_gem"))
-    @JvmField
-    val TYPE_GEM_CLUSTER_GROUND = typeGemCluster("type_gem_cluster_ground", TYPE_GEM_BLOCK_GROUND, cobblemonResource("ground_gem"))
-    @JvmField
-    val TYPE_GEM_CLUSTER_FLYING = typeGemCluster("type_gem_cluster_flying", TYPE_GEM_BLOCK_FLYING, cobblemonResource("flying_gem"))
-    @JvmField
-    val TYPE_GEM_CLUSTER_PSYCHIC = typeGemCluster("type_gem_cluster_psychic", TYPE_GEM_BLOCK_PSYCHIC, cobblemonResource("psychic_gem"))
-    @JvmField
-    val TYPE_GEM_CLUSTER_BUG = typeGemCluster("type_gem_cluster_bug", TYPE_GEM_BLOCK_BUG, cobblemonResource("bug_gem"))
-    @JvmField
-    val TYPE_GEM_CLUSTER_ROCK = typeGemCluster("type_gem_cluster_rock", TYPE_GEM_BLOCK_ROCK, cobblemonResource("rock_gem"))
-    @JvmField
-    val TYPE_GEM_CLUSTER_GHOST = typeGemCluster("type_gem_cluster_ghost", TYPE_GEM_BLOCK_GHOST, cobblemonResource("ghost_gem"))
-    @JvmField
-    val TYPE_GEM_CLUSTER_DRAGON = typeGemCluster("type_gem_cluster_dragon", TYPE_GEM_BLOCK_DRAGON, cobblemonResource("dragon_gem"))
-    @JvmField
-    val TYPE_GEM_CLUSTER_DARK = typeGemCluster("type_gem_cluster_dark", TYPE_GEM_BLOCK_DARK, cobblemonResource("dark_gem"))
-    @JvmField
-    val TYPE_GEM_CLUSTER_STEEL = typeGemCluster("type_gem_cluster_steel", TYPE_GEM_BLOCK_STEEL, cobblemonResource("steel_gem"))
-    @JvmField
-    val TYPE_GEM_CLUSTER_FAIRY = typeGemCluster("type_gem_cluster_fairy", TYPE_GEM_BLOCK_FAIRY, cobblemonResource("fairy_gem"))
-
     @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)))
     @JvmField
@@ -538,7 +456,6 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<
     @JvmField
     val SOUL_CAMPFIRE = create("soul_campfire", CampfireBlock(BlockBehaviour.Properties.of().sound(SoundType.WOOD).noOcclusion().pushReaction(PushReaction.BLOCK).mapColor(MapColor.PODZOL).strength(2.0F).lightLevel{9}, true))
 
-
     @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
@@ -667,25 +584,9 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<
     @JvmField
     val PC = create("pc", PCBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).sound(SoundType.METAL).pushReaction(PushReaction.BLOCK).strength(2F).noOcclusion().lightLevel { if ((it.getValue(PCBlock.ON) as Boolean) && (it.getValue(PCBlock.PART) == PCBlock.PCPart.TOP)) 13 else 0 }))
 
-    val TM_MACHINE = create(
-            "tm_machine",
-        TMMachineBlock(
-            BlockBehaviour.Properties.of()
-                .mapColor(MapColor.COLOR_GREEN)
-                .sound(SoundType.METAL)
-                .pushReaction(PushReaction.BLOCK)
-                .strength(2F)
-                .noOcclusion()
-        )
-    )
-
-
     @JvmField
     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)))
-
     @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()))
 
@@ -989,28 +890,4 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<
         val block = BlocksInvoker.createLeavesBlock(SoundType.GRASS)
         return this.create(name, block)
     }
-
-    private fun typeGemBlock(name: String): TypeGemBlock {
-        val typeGemBlock = this.create(name, TypeGemBlock(BlockBehaviour.Properties.of().strength(3.0f, 6.0f)))
-
-        val identifier = cobblemonResource(name)
-        typeGemBlocks[identifier] = typeGemBlock
-
-        return typeGemBlock
-    }
-
-    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).pushReaction(PushReaction.DESTROY), gemBlock, dropItemId))
-
-        TypeGemClusterBlock.gemToClusterMap[gemBlock] = gemClusterBlock
-
-        val identifier = cobblemonResource(name)
-        typeGemClusters[identifier] = gemClusterBlock
-
-        return gemClusterBlock
-    }
-
-    fun typeGemClusters() = typeGemClusters.toMap()
 }

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

@@ -71,12 +71,10 @@ object CobblemonCommands {
         MarkGiveAllCommand.register(dispatcher)
         PcSearchCommand.register(dispatcher)
         PcTakeCommand.register(dispatcher)
-        GiveTmCommand.register(dispatcher)
-        TmCommand.register(dispatcher)
 
         // Possibly lock down registration if and only if under dev environment or running in an environment
         // with a certain system environment variable set
         CobblemonInfoCommand.register(dispatcher)
         CalculateSeatPositionCommand.register(dispatcher)
     }
-}
+}

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

@@ -19,7 +19,6 @@ import net.minecraft.server.level.ServerPlayer
 import net.minecraft.server.packs.PackType
 import net.minecraft.server.packs.resources.PreparableReloadListener
 import net.minecraft.tags.TagKey
-import net.minecraft.world.inventory.MenuType
 import net.minecraft.world.level.GameRules
 import net.minecraft.world.level.ItemLike
 import net.minecraft.world.level.biome.Biome

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

@@ -69,12 +69,6 @@ object CobblemonItemComponents : PlatformRegistry<Registry<DataComponentType<*>>
         .networkSynchronized(FoodColourComponent.PACKET_CODEC)
         .build())
 
-    @JvmField
-    val TM_MOVE: DataComponentType<TMMoveComponent> = create("tm_move", DataComponentType.builder<TMMoveComponent>()
-        .persistent(TMMoveComponent.CODEC)
-        .networkSynchronized(TMMoveComponent.PACKET_CODEC)
-        .build())
-
     @JvmField
     val INGREDIENT: DataComponentType<IngredientComponent> = create("ingredient", DataComponentType.builder<IngredientComponent>()
             .persistent(IngredientComponent.CODEC)
@@ -107,7 +101,6 @@ object CobblemonItemComponents : PlatformRegistry<Registry<DataComponentType<*>>
         Registry.register(BuiltInRegistries.DATA_COMPONENT_TYPE, ResourceLocation.parse("cobblemon:flavour"), FLAVOUR)
         Registry.register(BuiltInRegistries.DATA_COMPONENT_TYPE, ResourceLocation.parse("cobblemon:ride_boosts"), RIDE_BOOST)
         Registry.register(BuiltInRegistries.DATA_COMPONENT_TYPE, ResourceLocation.parse("cobblemon:food_colour"), FOOD_COLOUR)
-        Registry.register(BuiltInRegistries.DATA_COMPONENT_TYPE, ResourceLocation.parse("cobblemon:tm_move"), TM_MOVE)
         Registry.register(BuiltInRegistries.DATA_COMPONENT_TYPE, ResourceLocation.parse("cobblemon:ingredient"), INGREDIENT)
         Registry.register(BuiltInRegistries.DATA_COMPONENT_TYPE, ResourceLocation.parse("cobblemon:food"), FOOD)
         Registry.register(BuiltInRegistries.DATA_COMPONENT_TYPE, ResourceLocation.parse("cobblemon:mob_effects"), MOB_EFFECTS)

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

@@ -457,10 +457,6 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
     @JvmField
     val PC = blockItem("pc", CobblemonBlocks.PC)
     @JvmField
-    val TM_MACHINE = blockItem("tm_machine", CobblemonBlocks.TM_MACHINE)
-    @JvmField
-    val TM_SHELF = blockItem("tm_shelf", CobblemonBlocks.TM_SHELF)
-    @JvmField
     val PASTURE = blockItem("pasture", CobblemonBlocks.PASTURE)
     @JvmField
     val DISPLAY_CASE = blockItem("display_case", CobblemonBlocks.DISPLAY_CASE)
@@ -1212,83 +1208,6 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
     @JvmField
     val BLACK_TUMBLESTONE_BLOCK = blockItem("black_tumblestone_block", CobblemonBlocks.BLACK_TUMBLESTONE_BLOCK)
 
-    @JvmField
-    val TYPE_GEM_CORE = blockItem("type_gem_core", CobblemonBlocks.TYPE_GEM_CORE)
-
-    @JvmField
-    val TYPE_GEM_CLUSTER_NORMAL = blockItem("type_gem_cluster_normal", CobblemonBlocks.TYPE_GEM_CLUSTER_NORMAL)
-    @JvmField
-    val TYPE_GEM_CLUSTER_FIRE = blockItem("type_gem_cluster_fire", CobblemonBlocks.TYPE_GEM_CLUSTER_FIRE)
-    @JvmField
-    val TYPE_GEM_CLUSTER_WATER = blockItem("type_gem_cluster_water", CobblemonBlocks.TYPE_GEM_CLUSTER_WATER)
-    @JvmField
-    val TYPE_GEM_CLUSTER_ELECTRIC = blockItem("type_gem_cluster_electric", CobblemonBlocks.TYPE_GEM_CLUSTER_ELECTRIC)
-    @JvmField
-    val TYPE_GEM_CLUSTER_GRASS = blockItem("type_gem_cluster_grass", CobblemonBlocks.TYPE_GEM_CLUSTER_GRASS)
-    @JvmField
-    val TYPE_GEM_CLUSTER_ICE = blockItem("type_gem_cluster_ice", CobblemonBlocks.TYPE_GEM_CLUSTER_ICE)
-    @JvmField
-    val TYPE_GEM_CLUSTER_FIGHTING = blockItem("type_gem_cluster_fighting", CobblemonBlocks.TYPE_GEM_CLUSTER_FIGHTING)
-    @JvmField
-    val TYPE_GEM_CLUSTER_POISON = blockItem("type_gem_cluster_poison", CobblemonBlocks.TYPE_GEM_CLUSTER_POISON)
-    @JvmField
-    val TYPE_GEM_CLUSTER_GROUND = blockItem("type_gem_cluster_ground", CobblemonBlocks.TYPE_GEM_CLUSTER_GROUND)
-    @JvmField
-    val TYPE_GEM_CLUSTER_FLYING = blockItem("type_gem_cluster_flying", CobblemonBlocks.TYPE_GEM_CLUSTER_FLYING)
-    @JvmField
-    val TYPE_GEM_CLUSTER_PSYCHIC = blockItem("type_gem_cluster_psychic", CobblemonBlocks.TYPE_GEM_CLUSTER_PSYCHIC)
-    @JvmField
-    val TYPE_GEM_CLUSTER_BUG = blockItem("type_gem_cluster_bug", CobblemonBlocks.TYPE_GEM_CLUSTER_BUG)
-    @JvmField
-    val TYPE_GEM_CLUSTER_ROCK = blockItem("type_gem_cluster_rock", CobblemonBlocks.TYPE_GEM_CLUSTER_ROCK)
-    @JvmField
-    val TYPE_GEM_CLUSTER_GHOST = blockItem("type_gem_cluster_ghost", CobblemonBlocks.TYPE_GEM_CLUSTER_GHOST)
-    @JvmField
-    val TYPE_GEM_CLUSTER_DRAGON = blockItem("type_gem_cluster_dragon", CobblemonBlocks.TYPE_GEM_CLUSTER_DRAGON)
-    @JvmField
-    val TYPE_GEM_CLUSTER_DARK = blockItem("type_gem_cluster_dark", CobblemonBlocks.TYPE_GEM_CLUSTER_DARK)
-    @JvmField
-    val TYPE_GEM_CLUSTER_STEEL = blockItem("type_gem_cluster_steel", CobblemonBlocks.TYPE_GEM_CLUSTER_STEEL)
-    @JvmField
-    val TYPE_GEM_CLUSTER_FAIRY = blockItem("type_gem_cluster_fairy", CobblemonBlocks.TYPE_GEM_CLUSTER_FAIRY)
-
-    @JvmField
-    val TYPE_GEM_BLOCK_NORMAL = blockItem("type_gem_block_normal", CobblemonBlocks.TYPE_GEM_BLOCK_NORMAL)
-    @JvmField
-    val TYPE_GEM_BLOCK_FIRE = blockItem("type_gem_block_fire", CobblemonBlocks.TYPE_GEM_BLOCK_FIRE)
-    @JvmField
-    val TYPE_GEM_BLOCK_WATER = blockItem("type_gem_block_water", CobblemonBlocks.TYPE_GEM_BLOCK_WATER)
-    @JvmField
-    val TYPE_GEM_BLOCK_ELECTRIC = blockItem("type_gem_block_electric", CobblemonBlocks.TYPE_GEM_BLOCK_ELECTRIC)
-    @JvmField
-    val TYPE_GEM_BLOCK_GRASS = blockItem("type_gem_block_grass", CobblemonBlocks.TYPE_GEM_BLOCK_GRASS)
-    @JvmField
-    val TYPE_GEM_BLOCK_ICE = blockItem("type_gem_block_ice", CobblemonBlocks.TYPE_GEM_BLOCK_ICE)
-    @JvmField
-    val TYPE_GEM_BLOCK_FIGHTING = blockItem("type_gem_block_fighting", CobblemonBlocks.TYPE_GEM_BLOCK_FIGHTING)
-    @JvmField
-    val TYPE_GEM_BLOCK_POISON = blockItem("type_gem_block_poison", CobblemonBlocks.TYPE_GEM_BLOCK_POISON)
-    @JvmField
-    val TYPE_GEM_BLOCK_GROUND = blockItem("type_gem_block_ground", CobblemonBlocks.TYPE_GEM_BLOCK_GROUND)
-    @JvmField
-    val TYPE_GEM_BLOCK_FLYING = blockItem("type_gem_block_flying", CobblemonBlocks.TYPE_GEM_BLOCK_FLYING)
-    @JvmField
-    val TYPE_GEM_BLOCK_PSYCHIC = blockItem("type_gem_block_psychic", CobblemonBlocks.TYPE_GEM_BLOCK_PSYCHIC)
-    @JvmField
-    val TYPE_GEM_BLOCK_BUG = blockItem("type_gem_block_bug", CobblemonBlocks.TYPE_GEM_BLOCK_BUG)
-    @JvmField
-    val TYPE_GEM_BLOCK_ROCK = blockItem("type_gem_block_rock", CobblemonBlocks.TYPE_GEM_BLOCK_ROCK)
-    @JvmField
-    val TYPE_GEM_BLOCK_GHOST = blockItem("type_gem_block_ghost", CobblemonBlocks.TYPE_GEM_BLOCK_GHOST)
-    @JvmField
-    val TYPE_GEM_BLOCK_DRAGON = blockItem("type_gem_block_dragon", CobblemonBlocks.TYPE_GEM_BLOCK_DRAGON)
-    @JvmField
-    val TYPE_GEM_BLOCK_DARK = blockItem("type_gem_block_dark", CobblemonBlocks.TYPE_GEM_BLOCK_DARK)
-    @JvmField
-    val TYPE_GEM_BLOCK_STEEL = blockItem("type_gem_block_steel", CobblemonBlocks.TYPE_GEM_BLOCK_STEEL)
-    @JvmField
-    val TYPE_GEM_BLOCK_FAIRY = blockItem("type_gem_block_fairy", CobblemonBlocks.TYPE_GEM_BLOCK_FAIRY)
-
     @JvmField
     val POKEROD_SMITHING_TEMPLATE = create("pokerod_smithing_template", SmithingTemplateItem(
         Component.translatable("item.minecraft.fishing_rod").blue(),
@@ -1513,49 +1432,44 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
     val RELIC_COIN_POUCH = blockItem("relic_coin_pouch", CobblemonBlocks.RELIC_COIN_POUCH)
     @JvmField
     val RELIC_COIN_SACK = blockItem("relic_coin_sack", CobblemonBlocks.RELIC_COIN_SACK)
-    @JvmField
-    val TECHNICAL_MACHINE = this.create("technical_machine", TechnicalMachineItem(Properties()))
-    @JvmField
-    val BLANK_TM = this.create("blank_tm", CobblemonItem(Item.Properties()))
 
     // Type Gems
     @JvmField
-    val NORMAL_GEM = this.create("normal_gem", TypeGemItem(CobblemonBlocks.TYPE_GEM_CLUSTER_NORMAL, Item.Properties()))
+    val NORMAL_GEM = noSettingsItem("normal_gem")
     @JvmField
-    val FIRE_GEM = this.create("fire_gem", TypeGemItem(CobblemonBlocks.TYPE_GEM_CLUSTER_FIRE, Item.Properties()))
+    val FIRE_GEM = noSettingsItem("fire_gem")
     @JvmField
-    val WATER_GEM = this.create("water_gem", TypeGemItem(CobblemonBlocks.TYPE_GEM_CLUSTER_WATER, Item.Properties()))
+    val WATER_GEM = noSettingsItem("water_gem")
     @JvmField
-    val GRASS_GEM = this.create("grass_gem", TypeGemItem(CobblemonBlocks.TYPE_GEM_CLUSTER_GRASS, Item.Properties()))
+    val GRASS_GEM = noSettingsItem("grass_gem")
     @JvmField
-    val ELECTRIC_GEM = this.create("electric_gem", TypeGemItem(CobblemonBlocks.TYPE_GEM_CLUSTER_ELECTRIC, Item.Properties()))
+    val ELECTRIC_GEM = noSettingsItem("electric_gem")
     @JvmField
-    val ICE_GEM = this.create("ice_gem", TypeGemItem(CobblemonBlocks.TYPE_GEM_CLUSTER_ICE, Item.Properties()))
+    val ICE_GEM = noSettingsItem("ice_gem")
     @JvmField
-    val FIGHTING_GEM = this.create("fighting_gem", TypeGemItem(CobblemonBlocks.TYPE_GEM_CLUSTER_FIGHTING, Item.Properties()))
+    val FIGHTING_GEM = noSettingsItem("fighting_gem")
     @JvmField
-    val POISON_GEM = this.create("poison_gem", TypeGemItem(CobblemonBlocks.TYPE_GEM_CLUSTER_POISON, Item.Properties()))
+    val POISON_GEM = noSettingsItem("poison_gem")
     @JvmField
-    val GROUND_GEM = this.create("ground_gem", TypeGemItem(CobblemonBlocks.TYPE_GEM_CLUSTER_GROUND, Item.Properties()))
+    val GROUND_GEM = noSettingsItem("ground_gem")
     @JvmField
-    val FLYING_GEM = this.create("flying_gem", TypeGemItem(CobblemonBlocks.TYPE_GEM_CLUSTER_FLYING, Item.Properties()))
+    val FLYING_GEM = noSettingsItem("flying_gem")
     @JvmField
-    val PSYCHIC_GEM = this.create("psychic_gem", TypeGemItem(CobblemonBlocks.TYPE_GEM_CLUSTER_PSYCHIC, Item.Properties()))
+    val PSYCHIC_GEM = noSettingsItem("psychic_gem")
     @JvmField
-    val BUG_GEM = this.create("bug_gem", TypeGemItem(CobblemonBlocks.TYPE_GEM_CLUSTER_BUG, Item.Properties()))
+    val BUG_GEM = noSettingsItem("bug_gem")
     @JvmField
-    val ROCK_GEM = this.create("rock_gem", TypeGemItem(CobblemonBlocks.TYPE_GEM_CLUSTER_ROCK, Item.Properties()))
+    val ROCK_GEM = noSettingsItem("rock_gem")
     @JvmField
-    val GHOST_GEM = this.create("ghost_gem", TypeGemItem(CobblemonBlocks.TYPE_GEM_CLUSTER_GHOST, Item.Properties()))
+    val GHOST_GEM = noSettingsItem("ghost_gem")
     @JvmField
-    val DRAGON_GEM = this.create("dragon_gem", TypeGemItem(CobblemonBlocks.TYPE_GEM_CLUSTER_DRAGON, Item.Properties()))
+    val DRAGON_GEM = noSettingsItem("dragon_gem")
     @JvmField
-    val DARK_GEM = this.create("dark_gem", TypeGemItem(CobblemonBlocks.TYPE_GEM_CLUSTER_DARK, Item.Properties()))
+    val DARK_GEM = noSettingsItem("dark_gem")
     @JvmField
-    val STEEL_GEM = this.create("steel_gem", TypeGemItem(CobblemonBlocks.TYPE_GEM_CLUSTER_STEEL, Item.Properties()))
+    val STEEL_GEM = noSettingsItem("steel_gem")
     @JvmField
-    val FAIRY_GEM = this.create("fairy_gem", TypeGemItem(CobblemonBlocks.TYPE_GEM_CLUSTER_FAIRY, Item.Properties()))
-
+    val FAIRY_GEM = noSettingsItem("fairy_gem")
     //@JvmField
     //val BINDING_SOIL = blockItem("binding_soil", CobblemonBlocks.BINDING_SOIL)
 

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

@@ -10,7 +10,6 @@ package com.cobblemon.mod.common
 
 
 import com.cobblemon.mod.common.block.campfirepot.CookingPotMenu
-import com.cobblemon.mod.common.block.tmmachine.TMMachineMenu
 import com.cobblemon.mod.common.platform.PlatformRegistry
 import net.minecraft.core.Registry
 import net.minecraft.core.registries.BuiltInRegistries
@@ -20,8 +19,7 @@ import net.minecraft.world.inventory.MenuType
 
 object CobblemonMenuType : PlatformRegistry<Registry<MenuType<*>>, ResourceKey<Registry<MenuType<*>>>, MenuType<*>>() {
 
-    val COOKING_POT = MenuType.register("cooking_pot_menu", ::CookingPotMenu)
-    val TM_MACHINE = MenuType.register("tm_machine_menu", ::TMMachineMenu)
+    val COOKING_POT = MenuType.register("cooking_pot", ::CookingPotMenu)
 
     override val registry: Registry<MenuType<*>>
         get() = BuiltInRegistries.MENU

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

@@ -1,55 +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
-
-import com.cobblemon.mod.common.api.data.JsonDataRegistry
-import com.cobblemon.mod.common.api.moves.MoveSelector
-import com.cobblemon.mod.common.api.moves.MovesetBuilder
-import com.cobblemon.mod.common.api.reactive.SimpleObservable
-import com.cobblemon.mod.common.util.adapters.IdentifierAdapter
-import com.cobblemon.mod.common.util.adapters.MovesetBuilderAdapter
-import com.cobblemon.mod.common.util.adapters.StringToObjectAdapter
-import com.cobblemon.mod.common.util.cobblemonResource
-import com.google.gson.Gson
-import com.google.gson.GsonBuilder
-import com.google.gson.reflect.TypeToken
-import net.minecraft.resources.ResourceLocation
-import net.minecraft.server.level.ServerPlayer
-import net.minecraft.server.packs.PackType
-
-object CobblemonMovesetBuilders : JsonDataRegistry<MovesetBuilder> {
-    override val gson: Gson = GsonBuilder()
-        .setPrettyPrinting()
-        .registerTypeAdapter(ResourceLocation::class.java, IdentifierAdapter)
-        .registerTypeAdapter(MovesetBuilder::class.java, MovesetBuilderAdapter)
-        .registerTypeAdapter(MoveSelector::class.java, StringToObjectAdapter(MoveSelector.selectors))
-        .create()
-
-    override val typeToken = TypeToken.get(MovesetBuilder::class.java)
-    override val resourcePath = "moveset_builders"
-    override val id: ResourceLocation = cobblemonResource("moveset_builders")
-    override val type = PackType.SERVER_DATA
-    override val observable = SimpleObservable<CobblemonMovesetBuilders>()
-
-    val movesetBuilders = mutableMapOf<ResourceLocation, MovesetBuilder>()
-
-    fun getOrThrow(id: ResourceLocation): MovesetBuilder {
-        return movesetBuilders[id]
-            ?: throw IllegalArgumentException("Unknown MovesetBuilder id: $id")
-    }
-
-    override fun sync(player: ServerPlayer) { /* These don't sync. But what if they did? Nah probably shouldn't sync. */ }
-
-    override fun reload(data: Map<ResourceLocation, MovesetBuilder>) {
-        movesetBuilders.clear()
-        data.forEach { (id, value) -> value.id = id }
-        movesetBuilders.putAll(data)
-        observable.emit(this)
-    }
-}

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

@@ -25,15 +25,15 @@ import com.cobblemon.mod.common.client.net.data.RideSettingsSyncHandler
 import com.cobblemon.mod.common.client.net.debug.OpenRidingStatsDebugGUIHandler
 import com.cobblemon.mod.common.client.net.dialogue.DialogueClosedHandler
 import com.cobblemon.mod.common.client.net.dialogue.DialogueOpenedHandler
-import com.cobblemon.mod.common.client.net.effect.*
-import com.cobblemon.mod.common.client.net.gui.*
 import com.cobblemon.mod.common.client.net.effect.PokeSnackBlockParticlesHandler
 import com.cobblemon.mod.common.client.net.effect.RunPosableMoLangHandler
 import com.cobblemon.mod.common.client.net.effect.SaccharineLogBlockParticlesHandler
 import com.cobblemon.mod.common.client.net.effect.SpawnSnowstormEntityParticleHandler
 import com.cobblemon.mod.common.client.net.effect.SpawnSnowstormParticleHandler
 import com.cobblemon.mod.common.client.net.gui.ExpGainedDataPacketHandler
-import com.cobblemon.mod.common.client.net.gui.*
+import com.cobblemon.mod.common.client.net.gui.InteractPokemonUIPacketHandler
+import com.cobblemon.mod.common.client.net.gui.PokedexUIPacketHandler
+import com.cobblemon.mod.common.client.net.gui.SummaryUIPacketHandler
 import com.cobblemon.mod.common.client.net.npc.CloseNPCEditorHandler
 import com.cobblemon.mod.common.client.net.npc.OpenNPCEditorHandler
 import com.cobblemon.mod.common.client.net.orientation.ClientboundUpdateOrientationHandler
@@ -137,7 +137,9 @@ import com.cobblemon.mod.common.net.messages.client.trade.TradeProcessStartedPac
 import com.cobblemon.mod.common.net.messages.client.trade.TradeStartedPacket
 import com.cobblemon.mod.common.net.messages.client.trade.TradeUpdatedPacket
 import com.cobblemon.mod.common.net.messages.client.ui.ExpGainedDataPacket
-import com.cobblemon.mod.common.net.messages.client.ui.*
+import com.cobblemon.mod.common.net.messages.client.ui.InteractPokemonUIPacket
+import com.cobblemon.mod.common.net.messages.client.ui.PokedexUIPacket
+import com.cobblemon.mod.common.net.messages.client.ui.SummaryUIPacket
 import com.cobblemon.mod.common.net.messages.server.*
 import com.cobblemon.mod.common.net.messages.server.battle.BattleSelectActionsPacket
 import com.cobblemon.mod.common.net.messages.server.battle.BattleTeamLeavePacket
@@ -148,7 +150,6 @@ import com.cobblemon.mod.common.net.messages.server.battle.SpectateBattlePacket
 import com.cobblemon.mod.common.net.messages.server.behaviour.DamageOnCollisionPacket
 import com.cobblemon.mod.common.net.messages.server.behaviour.SetEntityBehaviourPacket
 import com.cobblemon.mod.common.net.messages.server.block.AdjustBlockEntityViewerCountPacket
-import com.cobblemon.mod.common.net.messages.server.block.TMMachineTeachMovePacket
 import com.cobblemon.mod.common.net.messages.server.callback.move.MoveSelectCancelledPacket
 import com.cobblemon.mod.common.net.messages.server.callback.move.MoveSelectedPacket
 import com.cobblemon.mod.common.net.messages.server.callback.party.PartyPokemonSelectedPacket
@@ -204,7 +205,6 @@ import com.cobblemon.mod.common.net.serverhandling.battle.TeamRequestResponseHan
 import com.cobblemon.mod.common.net.serverhandling.behaviour.DamageOnCollisionPacketHandler
 import com.cobblemon.mod.common.net.serverhandling.behaviour.SetEntityBehaviourHandler
 import com.cobblemon.mod.common.net.serverhandling.block.AdjustBlockEntityViewerCountHandler
-import com.cobblemon.mod.common.net.serverhandling.block.TMMachineTeachMoveHandler
 import com.cobblemon.mod.common.net.serverhandling.callback.move.MoveSelectCancelledHandler
 import com.cobblemon.mod.common.net.serverhandling.callback.move.MoveSelectedHandler
 import com.cobblemon.mod.common.net.serverhandling.callback.party.PartyPokemonSelectedHandler
@@ -228,8 +228,6 @@ import com.cobblemon.mod.common.net.serverhandling.pasture.UnpasturePokemonHandl
 import com.cobblemon.mod.common.net.serverhandling.pokedex.scanner.FinishScanningHandler
 import com.cobblemon.mod.common.net.serverhandling.pokedex.scanner.StartScanningHandler
 import com.cobblemon.mod.common.net.serverhandling.pokemon.interact.InteractPokemonHandler
-import com.cobblemon.mod.common.net.serverhandling.pokemon.update.*
-import com.cobblemon.mod.common.net.serverhandling.pokemon.update.*
 import com.cobblemon.mod.common.net.serverhandling.pokemon.update.ServerboundUpdateRidingStateHandler
 import com.cobblemon.mod.common.net.serverhandling.pokemon.update.SetActiveMarkHandler
 import com.cobblemon.mod.common.net.serverhandling.pokemon.update.SetItemHiddenHandler
@@ -572,7 +570,6 @@ object CobblemonNetwork {
 
         // Block entity
         list.add(PacketRegisterInfo(AdjustBlockEntityViewerCountPacket.ID, AdjustBlockEntityViewerCountPacket::decode, AdjustBlockEntityViewerCountHandler))
-        list.add(PacketRegisterInfo(TMMachineTeachMovePacket.ID, TMMachineTeachMovePacket::decode, TMMachineTeachMoveHandler))
 
         // Move select packets
         list.add(PacketRegisterInfo(MoveSelectedPacket.ID, MoveSelectedPacket::decode, MoveSelectedHandler))
@@ -609,10 +606,6 @@ object CobblemonNetwork {
         // Cooking
         list.add(PacketRegisterInfo(ToggleCookingPotLidPacket.ID, ToggleCookingPotLidPacket::decode, ToggleCookingPotLidHandler))
 
-        // TM Machine
-        list.add(PacketRegisterInfo(SetActiveTMPacket.ID, SetActiveTMPacket::decode, SetActiveTMPacketHandler))
-        list.add(PacketRegisterInfo(SetTMMachineContainerDataPacket.ID, SetTMMachineContainerDataPacket::decode, SetTMMachineContainerDataPacketHandler))
-
         // Behaviour Packets
         list.add(PacketRegisterInfo(SetEntityBehaviourPacket.ID, SetEntityBehaviourPacket::decode, SetEntityBehaviourHandler))
         list.add(PacketRegisterInfo(DamageOnCollisionPacket.ID, DamageOnCollisionPacket::decode, DamageOnCollisionPacketHandler))

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

@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common
-
-import com.cobblemon.mod.common.api.data.JsonDataRegistry
-import com.cobblemon.mod.common.api.npc.PartyComposition
-import com.cobblemon.mod.common.api.reactive.SimpleObservable
-import com.cobblemon.mod.common.util.adapters.IdentifierAdapter
-import com.cobblemon.mod.common.util.cobblemonResource
-import com.google.gson.Gson
-import com.google.gson.GsonBuilder
-import com.google.gson.reflect.TypeToken
-import net.minecraft.resources.ResourceLocation
-import net.minecraft.server.level.ServerPlayer
-import net.minecraft.server.packs.PackType
-
-object CobblemonPartyCompositions : JsonDataRegistry<PartyComposition> {
-    override val id: ResourceLocation = cobblemonResource("party_compositions")
-    override val type = PackType.SERVER_DATA
-    override val typeToken: TypeToken<PartyComposition> = TypeToken.get(PartyComposition::class.java)
-    override val resourcePath: String = "party_compositions"
-    override val observable = SimpleObservable<CobblemonPartyCompositions>()
-    override val gson: Gson = GsonBuilder()
-        .registerTypeAdapter(ResourceLocation::class.java, IdentifierAdapter)
-        .setPrettyPrinting()
-        .create()
-
-    val partyCompositions = mutableMapOf<ResourceLocation, PartyComposition>()
-
-    override fun sync(player: ServerPlayer) {
-        // probably worth syncing which exist, yeah. the deeper details probably not. I'll get to this eventually.
-    }
-
-    override fun reload(data: Map<ResourceLocation, PartyComposition>) {
-        data.entries.forEach { it.value.id = it.key }
-        partyCompositions.clear()
-        partyCompositions.putAll(data)
-        observable.emit(this)
-        Cobblemon.LOGGER.info("Loaded ${data.size} party compositions.")
-    }
-}

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

@@ -1,60 +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
-
-import com.cobblemon.mod.common.api.data.JsonDataRegistry
-import com.cobblemon.mod.common.api.molang.ExpressionLike
-import com.cobblemon.mod.common.api.moves.MovesetBuilder
-import com.cobblemon.mod.common.api.npc.PartyPool
-import com.cobblemon.mod.common.api.pokemon.PokemonProperties
-import com.cobblemon.mod.common.api.reactive.SimpleObservable
-import com.cobblemon.mod.common.util.ScriptableIntRange
-import com.cobblemon.mod.common.util.adapters.ExpressionLikeAdapter
-import com.cobblemon.mod.common.util.adapters.IdentifierAdapter
-import com.cobblemon.mod.common.util.adapters.IntRangeAdapter
-import com.cobblemon.mod.common.util.adapters.MovesetBuilderReferenceAdapter
-import com.cobblemon.mod.common.util.adapters.PokemonPropertiesAdapter
-import com.cobblemon.mod.common.util.adapters.ScriptableIntRangeAdapter
-import com.cobblemon.mod.common.util.cobblemonResource
-import com.google.gson.Gson
-import com.google.gson.GsonBuilder
-import com.google.gson.reflect.TypeToken
-import net.minecraft.resources.ResourceLocation
-import net.minecraft.server.level.ServerPlayer
-import net.minecraft.server.packs.PackType
-
-object CobblemonPartyPools : JsonDataRegistry<PartyPool> {
-    override val id: ResourceLocation = cobblemonResource("party_pools")
-    override val type = PackType.SERVER_DATA
-    override val typeToken: TypeToken<PartyPool> = TypeToken.get(PartyPool::class.java)
-    override val resourcePath: String = "party_pools"
-    override val observable = SimpleObservable<CobblemonPartyPools>()
-    override val gson: Gson = GsonBuilder()
-        .registerTypeAdapter(ResourceLocation::class.java, IdentifierAdapter)
-        .registerTypeAdapter(PokemonProperties::class.java, PokemonPropertiesAdapter(saveLong = false))
-        .registerTypeAdapter(IntRange::class.java, IntRangeAdapter)
-        .registerTypeAdapter(ScriptableIntRange::class.java, ScriptableIntRangeAdapter)
-        .registerTypeAdapter(MovesetBuilder::class.java, MovesetBuilderReferenceAdapter)
-        .registerTypeAdapter(ExpressionLike::class.java, ExpressionLikeAdapter)
-        .setPrettyPrinting()
-        .create()
-
-    val partyPools = mutableMapOf<ResourceLocation, PartyPool>()
-
-    override fun sync(player: ServerPlayer) {
-        // probably worth syncing. Knowing the details might help exploit the server? lot of effort for little though.
-    }
-
-    override fun reload(data: Map<ResourceLocation, PartyPool>) {
-        data.entries.forEach { it.value.id = it.key }
-        partyPools.clear()
-        partyPools.putAll(data)
-        observable.emit(this)
-    }
-}

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

@@ -200,22 +200,6 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, ResourceKey<Regi
     @JvmField
     val TUMBLESTONE_STEP = this.create("block.tumblestone.step")
 
-    @JvmField
-    val TM_USE = this.create("item.tm.use")
-    @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")
-    @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")
-
-
     @JvmField
     val EVOLUTION_STONE_BLOCK_BREAK = this.create("block.evolution_stone_block.break")
     @JvmField

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

@@ -14,7 +14,7 @@ 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.*
+import java.util.Optional
 
 class PlantTumblestoneContext(val pos: BlockPos, val block: TumblestoneBlock)
 
@@ -29,6 +29,42 @@ class PlantTumblestoneCriterion(
     }
 
     override fun matches(player: ServerPlayer, context: PlantTumblestoneContext): Boolean {
-        return context.block.canGrow(player.level().getBlockState(context.pos), context.pos, player.level())
+        return context.block.canGrow(context.pos, player.level())
     }
-}
+}
+
+///**
+// * A criterion condition for when a tumblestone block is planted
+// * @param id The identifier of the criterion
+// * @param predicate The predicate for the criterion
+// *
+// * @author Aethen
+// * @since 02/28/2024
+// */
+//class PlantTumblestoneCriterionCondition(id: Identifier, predicate: LootContextPredicate) :
+//    SimpleCriterionCondition<PlantTumblestoneContext>(id, predicate) {
+//    override fun toJson(json: JsonObject) {
+//        // Add properties to json if needed. None needed for this criterion
+//    }
+//
+//    override fun fromJson(json: JsonObject) {
+//        // Parse properties from json if needed. None needed for this criterion
+//    }
+//
+//    /**
+//     * Checks if the tumblestone block can grow at the given position
+//     * @param player The player that planted the tumblestone block
+//     * @param context The context of the criterion
+//     * @return True if the tumblestone block can grow at the given position, false otherwise
+//     */
+//    override fun matches(player: ServerPlayer, context: PlantTumblestoneContext): Boolean {
+//        return context.tumbleStoneBlock.canGrow(context.pos, player.level())
+//    }
+//}
+//
+///**
+// * The context of the [PlantTumblestoneCriterionCondition]
+// * @param pos The position of the tumblestone block
+// * @param tumbleStoneBlock The tumblestone block
+// */
+//open class PlantTumblestoneContext(var pos: BlockPos, var tumbleStoneBlock: TumblestoneBlock)

common/src/main/kotlin/com/cobblemon/mod/common/api/ai/config/task/WanderTaskConfig.kt

@@ -17,7 +17,6 @@ import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangV
 import com.cobblemon.mod.common.entity.OmniPathingEntity
 import com.cobblemon.mod.common.entity.ai.CobblemonRandomSurfacePos
 import com.cobblemon.mod.common.entity.ai.CobblemonWalkTarget
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.util.asExpression
 import com.cobblemon.mod.common.util.mainThreadRuntime
 import com.cobblemon.mod.common.util.resolveFloat
@@ -185,12 +184,6 @@ class WanderTaskConfig : SingleTaskConfig {
 
                         if (targetVec == null) continue
 
-                        // Ignore pathing targets outside of the pasture zone if the pokemon is pastured.
-                        val tethering = (entity as? PokemonEntity)?.tethering
-                        if (tethering?.canRoamTo(BlockPos.containing(targetVec)) == false) {
-                            continue
-                        }
-
                         pos = applyHeightConstraints(
                             pos = BlockPos.containing(targetVec),
                             minimumHeight = minimumHeight,

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

@@ -145,7 +145,6 @@ import net.minecraft.world.entity.item.ItemEntity
 import net.minecraft.world.entity.monster.Monster
 import net.minecraft.world.entity.player.Player
 import net.minecraft.world.item.ItemStack
-import net.minecraft.world.item.enchantment.EnchantmentHelper
 import net.minecraft.world.level.ClipContext
 import net.minecraft.world.level.GameType
 import net.minecraft.world.level.Level
@@ -872,8 +871,6 @@ object MoLangFunctions {
 
                     DoubleValue(value)
                 }
-                map.put("get_starter_uuid") { _ -> Cobblemon.playerDataManager.getGenericData(player).starterUUID?.let{ StringValue(it.toString()) } ?: DoubleValue.ZERO }
-                map.put("has_chosen_starter") { _ -> DoubleValue(Cobblemon.playerDataManager.getGenericData(player).starterSelected) }
             }
             map
         }
@@ -894,15 +891,6 @@ object MoLangFunctions {
             map.put("is_of") { params -> DoubleValue(holder.`is`(params.getString(0).asIdentifierDefaultingNamespace())) }
             map.put("is_in") { params -> DoubleValue(holder.`is`(TagKey.create(Registries.ITEM, params.getString(0).replace("#", "").asIdentifierDefaultingNamespace()))) }
             map.put("is_food") { params -> DoubleValue(stack.has(DataComponents.FOOD)) }
-            map.put("is_enchanted") { params -> DoubleValue(stack.hasFoil()) }
-            map.put("has_enchantment") { params ->
-                val enchantmentId = params.getString(0).asIdentifierDefaultingNamespace()
-                val minLevel = params.getIntOrNull(1) ?: 1
-                val enchantmentRegistry = registryAccess.registryOrThrow(Registries.ENCHANTMENT)
-                val holder = enchantmentRegistry.getHolder(enchantmentId).orElse(null) ?: return@put DoubleValue.ZERO
-                val level = EnchantmentHelper.getItemEnchantmentLevel(holder, stack)
-                return@put DoubleValue(level >= minLevel)
-            }
             return@mutableListOf map
         }
     )
@@ -1842,30 +1830,6 @@ object MoLangFunctions {
             map.put("remove_cosmetic_item") { _ ->
                 pokemon.removeCosmeticItem()
             }
-            map.put("marks") { _ -> pokemon.marks.asArrayValue { StringValue(it.identifier.toString()) } }
-            map.put("has_mark") { params ->
-                var hasMark = false
-                val identifier = params.getString(0).asIdentifierDefaultingNamespace()
-                val mark = Marks.getByIdentifier(identifier)
-                if (mark != null) {
-                    hasMark = pokemon.marks.contains(mark)
-                }
-
-                DoubleValue(hasMark)
-            }
-            map.put("remove_marks") { params ->
-                var removedMark = false
-                for (param in params.params) {
-                    val identifier = param.asString().asIdentifierDefaultingNamespace()
-                    val mark = Marks.getByIdentifier(identifier)
-                    if (mark != null) {
-                        pokemon.exchangeMark(mark, false)
-                        removedMark = true
-                    }
-                }
-
-                DoubleValue(removedMark)
-            }
             map.put("add_marks") { params ->
                 var appliedMark = false
                 for (param in params.params) {
@@ -1965,7 +1929,8 @@ object MoLangFunctions {
                 return@put DoubleValue(if (pokemon.addRideBoost(stat, value)) 1.0 else 0.0)
             }
             map.put("initialize_moveset") { params ->
-                pokemon.initializeMovesetFromDefault()
+                val preferLatest = params.getBooleanOrNull(0) ?: true
+                pokemon.initializeMoveset(preferLatest)
                 return@put DoubleValue.ONE
             }
             map.put("validate_moveset") { params ->

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

@@ -24,7 +24,6 @@ import net.minecraft.network.RegistryFriendlyByteBuf
 
 class BenchedMoves : Iterable<BenchedMove> {
     var changeFunction: ((BenchedMoves) -> Unit) = {}
-//    var moveAddedFunction: (BenchedMove) -> Unit = {}
     private var emit = true
     private val benchedMoves = mutableListOf<BenchedMove>()
 
@@ -59,9 +58,6 @@ class BenchedMoves : Iterable<BenchedMove> {
             return false
         }
 
-        /*if (emit) {
-            moveAddedFunction(benchedMove)
-        }*/
         doThenEmit { benchedMoves.add(benchedMove) }
         return true
     }
@@ -178,4 +174,4 @@ data class BenchedMove(val moveTemplate: MoveTemplate, val ppRaisedStages: Int)
             Codec.intRange(0, 3).fieldOf(DataKeys.POKEMON_MOVESET_RAISED_PP_STAGES).forGetter(BenchedMove::ppRaisedStages)
         ).apply(it, ::BenchedMove) }
     }
-}
+}

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

@@ -1,57 +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.moves
-
-import com.cobblemon.mod.common.pokemon.FormData
-import com.cobblemon.mod.common.util.cobblemonResource
-import net.minecraft.resources.ResourceLocation
-
-/**
- * This is all you need tbh. A moveset builder that picks moves from up to 4 slots of move selectors.
- *
- * @author Hiroku
- * @since December 5th, 2025
- */
-class DefaultMovesetBuilder : MovesetBuilder {
-    companion object {
-        val TYPE = cobblemonResource("default")
-    }
-
-    override val type: ResourceLocation = TYPE
-    override var id: ResourceLocation = cobblemonResource("temp") // replaced on load.
-
-    val slot1: List<MoveSelector> = listOf()
-    val slot2: List<MoveSelector> = listOf()
-    val slot3: List<MoveSelector> = listOf()
-    val slot4: List<MoveSelector> = listOf()
-
-    override fun build(form: FormData, level: Int): MoveSet {
-        val chosenMoves = mutableSetOf<MoveTemplate>()
-        tryAddMoveFromSlot(form, level, slot1, chosenMoves)
-        tryAddMoveFromSlot(form, level, slot2, chosenMoves)
-        tryAddMoveFromSlot(form, level, slot3, chosenMoves)
-        tryAddMoveFromSlot(form, level, slot4, chosenMoves)
-        if (chosenMoves.isEmpty()) {
-            chosenMoves.add(Moves.getExceptional())
-        }
-        val moveset = MoveSet()
-        chosenMoves.map(MoveTemplate::create).forEach(moveset::add)
-        return moveset
-    }
-
-    fun tryAddMoveFromSlot(form: FormData, level: Int, selectors: List<MoveSelector>, chosenMoves: MutableSet<MoveTemplate>) {
-        for (selector in selectors) {
-            val move = selector(form, form.moves, level, chosenMoves)
-            if (move != null) {
-                chosenMoves.add(move)
-                return
-            }
-        }
-    }
-}

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

@@ -1,148 +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.moves
-
-import com.cobblemon.mod.common.api.moves.categories.DamageCategories
-import com.cobblemon.mod.common.api.pokemon.moves.Learnset
-import com.cobblemon.mod.common.api.pokemon.stats.Stats
-import com.cobblemon.mod.common.pokemon.FormData
-import com.cobblemon.mod.common.util.weightedSelection
-
-/**
- * A function that selects a move from a given [Learnset] for a particular [FormData] at a certain level,
- * taking into account any moves that have already been chosen for the moveset.
- *
- * @author Hiroku
- * @since December 5th, 2025
- */
-fun interface MoveSelector {
-    operator fun invoke(form: FormData, learnset: Learnset, level: Int, chosenMoves: Set<MoveTemplate>): MoveTemplate?
-
-    companion object {
-        val NONE = MoveSelector { _, _, _, _ -> null }
-        val LAST_LEVELUP = MoveSelector { form, learnset, level, chosenMoves ->
-            val levels = learnset.levelUpMoves.keys.filter { it <= level }.sortedDescending()
-            levels.forEach {
-                val moves = (learnset.levelUpMoves[it] ?: return@forEach) - chosenMoves
-                if (moves.isNotEmpty()) {
-                    return@MoveSelector moves.weightedSelection { it.getSelectionWeight(form) }
-                }
-            }
-            return@MoveSelector null
-        }
-        val LAST_OFFENSIVE = MoveSelector { form, learnset, level, chosenMoves ->
-            val levels = learnset.levelUpMoves.keys.filter { it <= level }.sortedDescending()
-            levels.forEach {
-                val moves = (learnset.levelUpMoves[it]?.filter { it.damageCategory != DamageCategories.STATUS } ?: return@forEach) - chosenMoves
-                if (moves.isNotEmpty()) {
-                    return@MoveSelector moves.weightedSelection { it.getSelectionWeight(form) }
-                }
-            }
-            return@MoveSelector null
-        }
-        val LAST_SUITABLE_OFFENSIVE = MoveSelector { form, learnset, level, chosenMoves ->
-            val levels = learnset.levelUpMoves.keys.filter { it <= level }.sortedDescending()
-            val suitableCategories = if (form.baseStats[Stats.ATTACK]!! > form.baseStats[Stats.SPECIAL_ATTACK]!!) {
-                setOf(DamageCategories.PHYSICAL)
-            } else if (form.baseStats[Stats.SPECIAL_ATTACK]!! > form.baseStats[Stats.ATTACK]!!) {
-                setOf(DamageCategories.SPECIAL)
-            } else {
-                setOf(DamageCategories.PHYSICAL, DamageCategories.SPECIAL)
-            }
-            levels.forEach {
-                val moves = (learnset.levelUpMoves[it]?.filter { it.damageCategory in suitableCategories } ?: return@forEach) - chosenMoves
-                if (moves.isNotEmpty()) {
-                    return@MoveSelector moves.weightedSelection { it.getSelectionWeight(form) }
-                }
-            }
-            return@MoveSelector null
-        }
-        val LAST_STATUS = MoveSelector { form, learnset, level, chosenMoves ->
-            val levels = learnset.levelUpMoves.keys.filter { it <= level }.sortedDescending()
-            levels.forEach {
-                val moves = (learnset.levelUpMoves[it]?.filter { it.damageCategory == DamageCategories.STATUS } ?: return@forEach) - chosenMoves
-                if (moves.isNotEmpty()) {
-                    return@MoveSelector moves.weightedSelection { it.getSelectionWeight(form) }
-                }
-            }
-            return@MoveSelector null
-        }
-        val STAB = MoveSelector { form, learnset, level, chosenMoves ->
-            val moves = learnset.getLevelUpMovesUpTo(level) - chosenMoves
-            val stabMoves = moves.filter { it.elementalType in form.types && it.damageCategory != DamageCategories.STATUS }
-            return@MoveSelector stabMoves.weightedSelection { it.getSelectionWeight(form) }
-        }
-        val STAB_PHYSICAL = MoveSelector { form, learnset, level, chosenMoves ->
-            val moves = learnset.getLevelUpMovesUpTo(level) - chosenMoves
-            val stabMoves = moves.filter { it.elementalType in form.types && it.damageCategory == DamageCategories.PHYSICAL }
-            return@MoveSelector stabMoves.weightedSelection { it.getSelectionWeight(form) }
-        }
-        val STAB_SPECIAL = MoveSelector { form, learnset, level, chosenMoves ->
-            val moves = learnset.getLevelUpMovesUpTo(level) - chosenMoves
-            val stabMoves = moves.filter { it.elementalType in form.types && it.damageCategory == DamageCategories.SPECIAL }
-            return@MoveSelector stabMoves.weightedSelection { it.getSelectionWeight(form) }
-        }
-        val PHYSICAL = MoveSelector { form, learnset, level, chosenMoves ->
-            val moves = learnset.getLevelUpMovesUpTo(level) - chosenMoves
-            val physicalMoves = moves.filter { it.damageCategory == DamageCategories.PHYSICAL }
-            return@MoveSelector physicalMoves.weightedSelection { it.getSelectionWeight(form) }
-        }
-        val SPECIAL = MoveSelector { form, learnset, level, chosenMoves ->
-            val moves = learnset.getLevelUpMovesUpTo(level) - chosenMoves
-            val specialMoves = moves.filter { it.damageCategory == DamageCategories.SPECIAL }
-            return@MoveSelector specialMoves.weightedSelection { it.getSelectionWeight(form) }
-        }
-        val OFFENSIVE = MoveSelector { form, learnset, level, chosenMoves ->
-            val moves = learnset.getLevelUpMovesUpTo(level) - chosenMoves
-            val offensiveMoves = moves.filter { it.damageCategory != DamageCategories.STATUS }
-            return@MoveSelector offensiveMoves.weightedSelection { it.getSelectionWeight(form) }
-        }
-        val RANDOM_LEVELUP = MoveSelector { form, learnset, level, chosenMoves ->
-            val moves = learnset.getLevelUpMovesUpTo(level) - chosenMoves
-            return@MoveSelector moves.weightedSelection { it.getSelectionWeight(form) }
-        }
-        val STATUS = MoveSelector { form, learnset, level, chosenMoves ->
-            val moves = learnset.getLevelUpMovesUpTo(level) - chosenMoves
-            val statusMoves = moves.filter { it.damageCategory == DamageCategories.STATUS }
-            return@MoveSelector statusMoves.weightedSelection { it.getSelectionWeight(form) }
-        }
-        val TM = MoveSelector { form, learnset, level, chosenMoves ->
-            val moves = learnset.tmMoves - chosenMoves - learnset.getLevelUpMovesUpTo(level)
-            return@MoveSelector moves.weightedSelection { it.getSelectionWeight(form) }
-        }
-        val STAB_TM = MoveSelector { form, learnset, level, chosenMoves ->
-            val moves = learnset.tmMoves - chosenMoves - learnset.getLevelUpMovesUpTo(level)
-            val stabMoves = moves.filter { it.elementalType in form.types }
-            return@MoveSelector stabMoves.weightedSelection { it.getSelectionWeight(form) }
-        }
-        val EGG = MoveSelector { form, learnset, level, chosenMoves ->
-            val moves = learnset.eggMoves - chosenMoves - learnset.getLevelUpMovesUpTo(level)
-            return@MoveSelector moves.weightedSelection { it.getSelectionWeight(form) }
-        }
-
-        val selectors = mutableMapOf(
-            "none" to NONE,
-            "last_levelup" to LAST_LEVELUP,
-            "last_offensive" to LAST_OFFENSIVE,
-            "last_suitable_offensive" to LAST_SUITABLE_OFFENSIVE,
-            "last_status" to LAST_STATUS,
-            "levelup" to RANDOM_LEVELUP,
-            "stab" to STAB,
-            "stab_physical" to STAB_PHYSICAL,
-            "stab_special" to STAB_SPECIAL,
-            "physical" to PHYSICAL,
-            "special" to SPECIAL,
-            "offensive" to OFFENSIVE,
-            "status" to STATUS,
-            "tm" to TM,
-            "stab_tm" to STAB_TM,
-            "egg" to EGG
-        )
-    }
-}

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

@@ -54,7 +54,6 @@ class MoveSet : Iterable<Move> {
      */
     fun getMoves() = moves.filterNotNull()
     fun getMovesWithNulls() = moves.toList()
-    fun getMoveTemplates() = getMoves().map { move -> move.template }
     fun hasSpace() = moves.any { it == null }
 
     /**
@@ -223,4 +222,4 @@ class MoveSet : Iterable<Move> {
                 { moveSet -> moveSet.toList() }
             )
     }
-}
+}

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

@@ -12,12 +12,12 @@ import com.bedrockk.molang.runtime.struct.MoStruct
 import com.bedrockk.molang.runtime.struct.QueryStruct
 import com.bedrockk.molang.runtime.value.DoubleValue
 import com.bedrockk.molang.runtime.value.StringValue
+import com.cobblemon.mod.common.api.moves.animations.ActionEffectTimeline
 import com.cobblemon.mod.common.api.moves.categories.DamageCategories
 import com.cobblemon.mod.common.api.moves.categories.DamageCategory
 import com.cobblemon.mod.common.api.types.ElementalType
 import com.cobblemon.mod.common.api.types.ElementalTypes
 import com.cobblemon.mod.common.battles.MoveTarget
-import com.cobblemon.mod.common.pokemon.FormData
 import com.cobblemon.mod.common.util.codec.CodecUtils
 import com.cobblemon.mod.common.pokemon.Pokemon
 import com.cobblemon.mod.common.util.lang
@@ -53,8 +53,7 @@ open class MoveTemplate(
     val pp: Int,
     val priority: Int,
     val critRatio: Double,
-    val effectChances: Array<Double>,
-    val weight: Float
+    val effectChances: Array<Double>
 ) {
     val struct: MoStruct by lazy {
         QueryStruct(hashMapOf())
@@ -70,9 +69,9 @@ open class MoveTemplate(
             .addFunction("max_pp") { DoubleValue(maxPp) }
             .addFunction("priority") { DoubleValue(priority) }
             .addFunction("crit_ratio") { DoubleValue(critRatio) }
-            .addFunction("weight") { DoubleValue(weight.toDouble()) }
     }
 
+
     val displayName: MutableComponent
         get() = lang("move.$name")
     val description: MutableComponent
@@ -90,8 +89,7 @@ open class MoveTemplate(
         pp = 5,
         priority = 0,
         critRatio = 0.0,
-        effectChances = emptyArray(),
-        weight = 0F,
+        effectChances = emptyArray()
     )
 
     companion object {
@@ -162,12 +160,4 @@ open class MoveTemplate(
         }
         return this.elementalType
     }
-
-    fun getSelectionWeight(form: FormData): Float {
-        return if (this in form.signatureMoves) {
-            weight * MovesetBuilder.signatureMoveWeightMultiplier
-        } else {
-            weight
-        }
-    }
 }

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

@@ -10,15 +10,15 @@ package com.cobblemon.mod.common.api.moves
 
 import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.api.data.DataRegistry
+import com.cobblemon.mod.common.api.moves.animations.ActionEffects
 import com.cobblemon.mod.common.api.moves.categories.DamageCategories
 import com.cobblemon.mod.common.api.reactive.SimpleObservable
 import com.cobblemon.mod.common.api.types.ElementalTypes
 import com.cobblemon.mod.common.battles.MoveTarget
 import com.cobblemon.mod.common.battles.runner.ShowdownService
 import com.cobblemon.mod.common.net.messages.client.data.MovesRegistrySyncPacket
+import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
 import com.cobblemon.mod.common.util.cobblemonResource
-import com.cobblemon.mod.common.util.fromJson
-import com.google.gson.GsonBuilder
 import com.google.gson.JsonArray
 import com.google.gson.JsonObject
 import net.minecraft.resources.ResourceLocation
@@ -46,14 +46,6 @@ object Moves : DataRegistry {
         this.idMapping.clear()
         this.moveScripts.clear()
 
-        val weights = mutableMapOf<String, Number>()
-        manager.getResourceStack(cobblemonResource("move_weights.json")).forEach {
-            it.open().use {
-                val map = GsonBuilder().create().fromJson<Map<String, Number>>(it.reader())
-                weights.putAll(map)
-            }
-        }
-
         ShowdownService.service.resetRegistryData("move")
         manager.listResources("moves") { it.path.endsWith(".js") }.forEach { (identifier, resource) ->
             resource.open().use { stream ->
@@ -83,7 +75,6 @@ object Moves : DataRegistry {
                 val priority = jsMove.get("priority").asInt
                 val critRatio = jsMove.get("critRatio")?.asDouble ?: 1.0
                 val effectChances = arrayListOf<Double>()
-                val weight = weights[id]?.toFloat() ?: 50F
                 val secondariesMember = jsMove.get("secondaries")
                 val secondaryMember = jsMove.get("secondary")
                 if (secondariesMember != null && secondariesMember is JsonArray) {
@@ -101,20 +92,7 @@ object Moves : DataRegistry {
                         effectChances += secondaryMember.get("chance").asDouble
                     }
                 }
-                val move = MoveTemplate(
-                    name = id,
-                    num = num,
-                    elementalType = elementalType,
-                    damageCategory = damageCategory,
-                    power = power,
-                    target = target,
-                    accuracy = accuracy,
-                    pp = pp,
-                    priority = priority,
-                    critRatio = critRatio,
-                    effectChances = effectChances.toTypedArray(),
-                    weight = weight
-                )
+                val move = MoveTemplate(id, num, elementalType, damageCategory, power, target, accuracy, pp, priority, critRatio, effectChances.toTypedArray())
                 this.register(move)
             } catch (e: Exception) {
                 Cobblemon.LOGGER.error("Caught exception trying to resolve the move '{}'", id, e)
@@ -135,7 +113,7 @@ object Moves : DataRegistry {
     @JvmStatic
     fun getByNameOrDummy(name: String) = allMoves[name.lowercase()] ?: MoveTemplate.dummy(name.lowercase())
     @JvmStatic
-    fun getExceptional() = getByName("tackle") ?: allMoves.values.first()
+    fun getExceptional() = getByName("tackle") ?: allMoves.values.random()
     @JvmStatic
     fun count() = allMoves.size
     @JvmStatic
@@ -151,4 +129,5 @@ object Moves : DataRegistry {
         this.allMoves[move.name] = move
         this.idMapping[move.num] = move
     }
+
 }

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

@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.moves
-
-import com.cobblemon.mod.common.pokemon.FormData
-import com.cobblemon.mod.common.util.cobblemonResource
-import net.minecraft.resources.ResourceLocation
-
-/**
- * Builders a moveset for a particular [FormData] and level. Probably only really need [DefaultMovesetBuilder] though.
- *
- * @author Hiroku
- * @since December 5th, 2025
- */
-interface MovesetBuilder {
-    /** The ID of this builder. It's autofilled from the registry loader. */
-    var id: ResourceLocation
-    /** The subtype designation for this moveset builder. Generally unused once read from JSON. */
-    val type: ResourceLocation
-
-    /** Builds a brand new moveset for the [form] and [level]. */
-    fun build(form: FormData, level: Int): MoveSet
-
-    companion object {
-        /** Weight multiplier for moves that are in the form's signatureMoves list. Makes them way more likely to be chosen. */
-        var signatureMoveWeightMultiplier = 5F
-        /** Subtypes of MovesetBuilder. I personally doubt you'll need any other subtypes, but hey. */
-        val movesetBuilderTypes = mutableMapOf<ResourceLocation, Class<out MovesetBuilder>>(
-            cobblemonResource("default") to DefaultMovesetBuilder::class.java
-        )
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/api/npc/NPCPartyProvider.kt

@@ -8,14 +8,12 @@
 
 package com.cobblemon.mod.common.api.npc
 
-import com.cobblemon.mod.common.api.npc.partyproviders.ComposedPoolPartyProvider
 import com.cobblemon.mod.common.api.npc.partyproviders.PoolPartyProvider
 import com.cobblemon.mod.common.api.npc.partyproviders.ScriptPartyProvider
 import com.cobblemon.mod.common.api.npc.partyproviders.SimplePartyProvider
 import com.cobblemon.mod.common.api.storage.party.NPCPartyStore
 import com.cobblemon.mod.common.entity.npc.NPCEntity
 import com.google.gson.JsonElement
-import net.minecraft.resources.ResourceLocation
 import net.minecraft.server.level.ServerPlayer
 
 /**
@@ -27,15 +25,14 @@ import net.minecraft.server.level.ServerPlayer
  */
 interface NPCPartyProvider {
     companion object {
-        val types = mutableMapOf(
-            SimplePartyProvider.TYPE to ::SimplePartyProvider,
-            PoolPartyProvider.TYPE to ::PoolPartyProvider,
-            ScriptPartyProvider.TYPE to ::ScriptPartyProvider,
-            ComposedPoolPartyProvider.TYPE to ::ComposedPoolPartyProvider
+        val types = mutableMapOf<String, (String) -> NPCPartyProvider>(
+            SimplePartyProvider.TYPE to { SimplePartyProvider() },
+            PoolPartyProvider.TYPE to { PoolPartyProvider() },
+            ScriptPartyProvider.TYPE to { ScriptPartyProvider() }
         )
     }
 
-    val type: ResourceLocation
+    val type: String
     val isStatic: Boolean
     fun provide(npc: NPCEntity, level: Int, players: List<ServerPlayer> = emptyList()): NPCPartyStore
     // Why did I opt for manual JSON loading??? I must have had a reason but I can't remember. Maybe for S2C? Use a codec doofus

common/src/main/kotlin/com/cobblemon/mod/common/api/npc/PartyComposition.kt

@@ -1,68 +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.npc
-
-import com.bedrockk.molang.runtime.MoLangRuntime
-import com.cobblemon.mod.common.pokemon.Pokemon
-import com.cobblemon.mod.common.util.cobblemonResource
-import kotlin.random.Random
-
-/**
- * A kind of definition for how to compose a party of Pokémon given a [PartyPool].
- *
- * @author Hiroku
- * @since December 7th, 2025
- */
-class PartyComposition {
-    var id = cobblemonResource("dummy_composition")
-//    val displayName = "cobblemon.party_composition.$id" // dunno if i will use this yet
-    val scrambleOrder: Boolean = false
-    val slot1 = listOf<String>()
-    val slot2 = listOf<String>()
-    val slot3 = listOf<String>()
-    val slot4 = listOf<String>()
-    val slot5 = listOf<String>()
-    val slot6 = listOf<String>()
-
-    fun compose(pool: PartyPool, level: Int, aspects: Set<String>, desiredPokemonCount: Int, runtime: MoLangRuntime, random: Random = Random.Default): List<Pokemon> {
-        val chosenEntries = mutableListOf<PartyPool.PoolEntry>()
-        val availableEntries = pool.entries.filter { level in it.npcLevels.resolve(runtime) && (it.npcAspects.isEmpty() || it.npcAspects.all(aspects::contains)) }
-
-        for (labelSet in listOf(slot1, slot2, slot3, slot4, slot5, slot6)) {
-            pool.tryChoosingEntry(labelSet, runtime, random, availableEntries, chosenEntries)
-            if (chosenEntries.size >= desiredPokemonCount) {
-                break
-            }
-        }
-
-        val finalEntries = if (scrambleOrder) {
-            chosenEntries.shuffled(random)
-        } else {
-            chosenEntries
-        }
-
-        val pokemon = finalEntries.map { entry ->
-            val levelVariation = entry.levelVariation.resolve(runtime)
-            val lvlVariation = if (levelVariation.first == levelVariation.last) {
-                levelVariation.first
-            } else {
-                levelVariation.random(random)
-            }
-
-            val finalLevel = level + lvlVariation
-            val properties = entry.pokemon.copy()
-            properties.level = properties.level ?: finalLevel
-            val pokemon = properties.create()
-            entry.movesetBuilders.randomOrNull()?.let(pokemon::initializeMovesetFrom)
-            pokemon
-        }
-
-        return pokemon
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/api/npc/PartyPool.kt

@@ -1,77 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.npc
-
-import com.bedrockk.molang.runtime.MoLangRuntime
-import com.cobblemon.mod.common.api.molang.ExpressionLike
-import com.cobblemon.mod.common.api.moves.MovesetBuilder
-import com.cobblemon.mod.common.api.pokemon.PokemonProperties
-import com.cobblemon.mod.common.util.ScriptableIntRange
-import com.cobblemon.mod.common.util.asExpressionLike
-import com.cobblemon.mod.common.util.cobblemonResource
-import com.cobblemon.mod.common.util.toProperties
-import com.cobblemon.mod.common.util.weightedSelection
-import kotlin.random.Random
-
-/**
- * A pool of Pokémon to choose from, typically for generating a party for an NPC. The entries
- * of the pool work on a weight and label system which is used as part of a [PartyComposition].
- *
- * @author Hiroku
- * @since December 7th, 2025
- */
-class PartyPool {
-    var id = cobblemonResource("dummy")
-    val displayName = "cobblemon.party_pool.$id"
-    val entries = mutableListOf<PoolEntry>()
-
-    class PoolEntry {
-        val pokemon: PokemonProperties = "pikachu".toProperties()
-        val labels: List<String> = emptyList()
-        val npcAspects: List<String> = emptyList()
-        val required: List<String> = emptyList()
-        val excluded: List<String> = emptyList()
-        val maxSelectableTimes: ExpressionLike = "6".asExpressionLike()
-        val levelVariation: ScriptableIntRange = ScriptableIntRange(0, 0)
-        val npcLevels: ScriptableIntRange = ScriptableIntRange(1, 100)
-        val movesetBuilders: List<MovesetBuilder> = emptyList()
-        val weight: ExpressionLike = "50".asExpressionLike()
-    }
-
-    /**
-     * Goes through each of the labels in order, trying to find a valid choice. Once it finds one, it skips the later
-     * labels and adds the value to [chosenEntries] and returns. If none of the labels could find a valid entry, nothing is added.
-     */
-    fun tryChoosingEntry(
-        labels: List<String>,
-        runtime: MoLangRuntime,
-        random: Random,
-        availableEntries: List<PoolEntry>,
-        chosenEntries: MutableList<PoolEntry>,
-    ) {
-        for (label in labels) {
-            val entries = availableEntries
-                .filter { label in it.labels || label.lowercase() == "any" }
-                .filter { entry ->
-                    // Check required labels
-                    entry.required.all { it in labels } &&
-                            // Check excluded labels
-                            entry.excluded.none { it in labels } &&
-                            // Check max selectable times
-                            chosenEntries.count { it == entry } < entry.maxSelectableTimes.resolveFloat(runtime)
-                }
-
-            if (entries.isNotEmpty()) {
-                val selectedEntry = entries.weightedSelection(random) { it.weight.resolveFloat(runtime) } ?: return
-                chosenEntries.add(selectedEntry)
-                return
-            }
-        }
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/api/npc/partyproviders/ComposedPoolPartyProvider.kt

@@ -1,94 +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.npc.partyproviders
-
-import com.bedrockk.molang.Expression
-import com.bedrockk.molang.runtime.MoLangRuntime
-import com.bedrockk.molang.runtime.value.DoubleValue
-import com.cobblemon.mod.common.CobblemonPartyCompositions
-import com.cobblemon.mod.common.CobblemonPartyPools
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMoLangValue
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.setup
-import com.cobblemon.mod.common.api.npc.NPCPartyProvider
-import com.cobblemon.mod.common.api.npc.PartyComposition
-import com.cobblemon.mod.common.api.npc.PartyPool
-import com.cobblemon.mod.common.api.storage.party.NPCPartyStore
-import com.cobblemon.mod.common.entity.npc.NPCEntity
-import com.cobblemon.mod.common.util.asArrayValue
-import com.cobblemon.mod.common.util.asExpression
-import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
-import com.cobblemon.mod.common.util.cobblemonResource
-import com.cobblemon.mod.common.util.resolveInt
-import com.cobblemon.mod.common.util.withQueryValue
-import com.google.gson.JsonElement
-import com.google.gson.JsonObject
-import kotlin.random.Random
-import kotlin.ranges.random
-import net.minecraft.server.level.ServerPlayer
-
-/**
- * An [NPCPartyProvider] which uses a [PartyComposition] and [PartyPool] to generate a party.
- *
- * There are controls for minimum and maximum Pokémon count, as well as whether to use a fixed random seed for the NPC.
- *
- * @author Hiroku
- * @since December 8th, 2025
- */
-class ComposedPoolPartyProvider : NPCPartyProvider {
-    companion object {
-        val TYPE = cobblemonResource("composed_pool")
-    }
-
-    override val type = TYPE
-    override var isStatic: Boolean = true
-    var useFixedRandom: Boolean = false
-    var minPokemon: Expression = "1".asExpression()
-    var maxPokemon: Expression = "6".asExpression()
-    lateinit var pool: PartyPool
-    lateinit var composition: PartyComposition
-
-    override fun loadFromJSON(json: JsonElement) {
-        json as JsonObject
-        isStatic = json.getAsJsonPrimitive("isStatic")?.asBoolean ?: true
-        useFixedRandom = json.getAsJsonPrimitive("useFixedRandom")?.asBoolean ?: false
-        pool = CobblemonPartyPools.partyPools[json.get("pool").asString.asIdentifierDefaultingNamespace()]
-            ?: throw IllegalArgumentException("Unknown PartyPool id: ${json.get("pool").asString}")
-        composition = CobblemonPartyCompositions.partyCompositions[json.get("composition").asString.asIdentifierDefaultingNamespace()]
-            ?: throw IllegalArgumentException("Unknown PartyComposition id: ${json.get("composition").asString}")
-        minPokemon = json.getAsJsonPrimitive("minPokemon").asString?.asExpression() ?: "1".asExpression()
-        maxPokemon = json.getAsJsonPrimitive("maxPokemon").asString?.asExpression() ?: "6".asExpression()
-    }
-
-    override fun provide(npc: NPCEntity, level: Int, players: List<ServerPlayer>): NPCPartyStore {
-        val runtime = MoLangRuntime().setup().withQueryValue("npc", npc.struct)
-        val random = if (useFixedRandom) Random(npc.uuid.hashCode()) else Random.Default
-        runtime.withQueryValue("level", DoubleValue(level))
-        runtime.withQueryValue("players", players.asArrayValue { it.asMoLangValue() })
-        if (players.size == 1) {
-            // This is for the convenience, most cases will be pvn one player
-            runtime.withQueryValue("player", players.first().asMoLangValue())
-        }
-        val minPokemon = runtime.resolveInt(this.minPokemon)
-        val maxPokemon = runtime.resolveInt(this.maxPokemon)
-        val desiredPokemonCount = (minPokemon..maxPokemon).random(random)
-
-        val pokemonList = composition.compose(
-            pool = pool,
-            level = level,
-            aspects = npc.aspects,
-            desiredPokemonCount = desiredPokemonCount,
-            runtime = runtime,
-            random = random
-        )
-
-        val partyStore = NPCPartyStore(npc)
-        pokemonList.forEach(partyStore::add)
-        return partyStore
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/api/npc/partyproviders/PoolPartyProvider.kt

@@ -48,7 +48,7 @@ import kotlin.random.Random
  */
 class PoolPartyProvider : NPCPartyProvider {
     companion object {
-        val TYPE = cobblemonResource("pool")
+        const val TYPE = "pool"
     }
 
     @Transient
@@ -150,10 +150,10 @@ class PoolPartyProvider : NPCPartyProvider {
             val instance = selected.pokemon.copy().also { it.level = it.level ?: dictatedLevel ?: randomLevel }.create()
             party.add(instance)
         }
-
         if (party.none()) {
-            LOGGER.error("$npc had no Pokémon produced by their party provider")
+            LOGGER.error("${npc} has no Pokemon on Party")
         }
+
     }
 
     override fun provide(npc: NPCEntity, level: Int, players: List<ServerPlayer>): NPCPartyStore {

common/src/main/kotlin/com/cobblemon/mod/common/api/npc/partyproviders/ScriptPartyProvider.kt

@@ -28,7 +28,7 @@ import net.minecraft.server.level.ServerPlayer
 
 class ScriptPartyProvider : NPCPartyProvider {
     companion object {
-        val TYPE = cobblemonResource("script")
+        const val TYPE = "script"
     }
 
     override val type = TYPE

common/src/main/kotlin/com/cobblemon/mod/common/api/npc/partyproviders/SimplePartyProvider.kt

@@ -16,7 +16,6 @@ import com.cobblemon.mod.common.api.pokemon.PokemonProperties
 import com.cobblemon.mod.common.api.storage.party.NPCPartyStore
 import com.cobblemon.mod.common.entity.npc.NPCEntity
 import com.cobblemon.mod.common.util.asArrayValue
-import com.cobblemon.mod.common.util.cobblemonResource
 import com.cobblemon.mod.common.util.getBooleanOrNull
 import com.cobblemon.mod.common.util.toProperties
 import com.google.gson.JsonElement
@@ -30,7 +29,7 @@ import net.minecraft.server.level.ServerPlayer
  */
 class SimplePartyProvider : NPCPartyProvider {
     companion object {
-        val TYPE = cobblemonResource("simple")
+        const val TYPE = "simple"
     }
 
     @Transient

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

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

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

@@ -29,6 +29,7 @@ abstract class AbstractPokedexManager {
 
     fun deleteSpeciesRecord(speciesId: ResourceLocation) {
         speciesRecords.remove(speciesId)
+        markDirty()
     }
 
     fun deleteFormRecord(speciesId: ResourceLocation, formName: String) {
@@ -39,6 +40,8 @@ abstract class AbstractPokedexManager {
             deleteSpeciesRecord(speciesId)
             return
         }
+
+        markDirty()
     }
 
     fun getSpeciesRecord(speciesId: ResourceLocation): SpeciesDexRecord? {
@@ -161,4 +164,8 @@ abstract class AbstractPokedexManager {
             return newValue
         }
     }
+
+    open fun markDirty() {
+        // Save stuff
+    }
 }

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

@@ -10,9 +10,7 @@ package com.cobblemon.mod.common.api.pokedex
 
 import com.bedrockk.molang.runtime.struct.QueryStruct
 import com.bedrockk.molang.runtime.struct.VariableStruct
-import com.bedrockk.molang.runtime.value.DoubleValue
 import com.bedrockk.molang.runtime.value.StringValue
-import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.api.events.CobblemonEvents
 import com.cobblemon.mod.common.api.events.pokemon.PokedexDataChangedEvent
 import com.cobblemon.mod.common.api.pokemon.PokemonSpecies
@@ -27,7 +25,6 @@ import com.google.common.collect.Sets
 import com.mojang.datafixers.util.Either
 import com.mojang.serialization.Codec
 import com.mojang.serialization.codecs.ListCodec
-import com.mojang.serialization.codecs.PrimitiveCodec
 import com.mojang.serialization.codecs.RecordCodecBuilder
 import net.minecraft.network.RegistryFriendlyByteBuf
 
@@ -44,13 +41,11 @@ class FormDexRecord {
             instance.group(
                 ListCodec(Codec.STRING, 0, 3).fieldOf("genders").forGetter { it.genders.map { it.name } },
                 ListCodec(Codec.STRING, 0, 2).fieldOf("seenShinyStates").forGetter { it.seenShinyStates.toList() },
-                PrimitiveCodec.INT.optionalFieldOf("highest_level", -1).forGetter { it.highestLevel },
                 Codec.STRING.fieldOf("knowledge").forGetter { it.knowledge.name }
-            ).apply(instance) { genders, seenShinyStates, highestLevel, knowledge ->
+            ).apply(instance) { genders, seenShinyStates, knowledge ->
                 FormDexRecord().also {
                     it.genders.addAll(genders.map(Gender::valueOf))
                     it.seenShinyStates.addAll(seenShinyStates)
-                    it.highestLevel = highestLevel
                     it.knowledge = PokedexEntryProgress.valueOf(knowledge)
                 }
             }
@@ -64,9 +59,6 @@ class FormDexRecord {
     private val seenShinyStates =
         mutableSetOf<String>() // consider: radiants in the future (radiants should just be a resource pack tbh)
 
-    var highestLevel = -1
-        private set
-
     /** The current awareness of the form that the dex has. */
     var knowledge = PokedexEntryProgress.NONE
         private set
@@ -88,17 +80,11 @@ class FormDexRecord {
         struct = QueryStruct(hashMapOf())
             .addFunction("data") { data }
             .addFunction("knowledge") { StringValue(knowledge.name) }
-            .addFunction("has_seen_gender") { params -> DoubleValue(genders.contains(Gender.valueOf(params.getString(0).uppercase()))) }
-            .addFunction("highest_level") { _ -> DoubleValue(highestLevel) }
-            .addFunction("set_highest_level") { params ->
-                highestLevel = maxOf(highestLevel, params.getDouble(0).toInt())
-                DoubleValue.ONE
-            }
+            .addFunction("has_seen_gender") { params -> genders.contains(Gender.valueOf(params.getString(0).uppercase())) }
     }
 
     fun clone() = FormDexRecord().also {
         it.genders.addAll(genders)
-        it.highestLevel = highestLevel
         it.seenShinyStates.addAll(seenShinyStates)
         it.knowledge = knowledge
     }
@@ -128,7 +114,7 @@ class FormDexRecord {
     fun addAllShinyStatesAndGenders() {
         val form = PokemonSpecies.getByIdentifier(speciesDexRecord.id)?.getFormByName(formName)
         genders.addAll(form?.possibleGenders ?: listOf(Gender.MALE, Gender.FEMALE))
-        highestLevel = Cobblemon.config.maxPokemonLevel
+
         seenShinyStates.addAll(listOf("shiny", "normal"))
         speciesDexRecord.onFormRecordUpdated(this)
     }
@@ -149,9 +135,6 @@ class FormDexRecord {
                 ),
                 ifSucceeded = {
                     genders.add(pokedexEntityData.pokemon.gender)
-                    if (knowledge == PokedexEntryProgress.CAUGHT) {
-                        highestLevel = maxOf(highestLevel, pokedexEntityData.pokemon.level)
-                    }
                     seenShinyStates.add(if (pokedexEntityData.pokemon.shiny) "shiny" else "normal")
                     if (knowledge.ordinal > this.knowledge.ordinal) {
                         this.knowledge = knowledge
@@ -176,7 +159,6 @@ class FormDexRecord {
                 || (pokedexEntityData.pokemon.shiny && "shiny" !in seenShinyStates)
                 || (!pokedexEntityData.pokemon.shiny && "normal" !in seenShinyStates)
                 || knowledge.ordinal > this.knowledge.ordinal
-                || (highestLevel < pokedexEntityData.pokemon.level && knowledge == PokedexEntryProgress.CAUGHT)
                 || speciesDexRecord.wouldBeDifferent(pokedexEntityData)
     }
 

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

@@ -9,8 +9,6 @@
 package com.cobblemon.mod.common.api.pokedex
 
 import com.cobblemon.mod.common.CobblemonNetwork.sendPacket
-import com.cobblemon.mod.common.api.scheduling.ScheduledTask
-import com.cobblemon.mod.common.api.scheduling.ServerTaskTracker
 import com.cobblemon.mod.common.api.storage.player.InstancedPlayerData
 import com.cobblemon.mod.common.api.storage.player.PlayerInstancedDataStoreTypes
 import com.cobblemon.mod.common.api.storage.player.client.ClientPokedexManager
@@ -50,44 +48,10 @@ class PokedexManager(
     fun obtain(pokemon: Pokemon) {
         val speciesId = pokemon.species.resourceIdentifier
         val formName = pokemon.form.name
-        getOrCreateSpeciesRecord(speciesId).getOrCreateFormRecord(formName).obtained(PokedexEntityData(pokemon = pokemon, disguise = null))
+        getOrCreateSpeciesRecord(speciesId).getOrCreateFormRecord(formName).caught(PokedexEntityData(pokemon = pokemon, disguise = null))
     }
 
-    fun scheduleFullSyncFromStores(
-        party: Iterable<Pokemon?>,
-        pc: Iterable<Pokemon?>,
-        batchSize: Int = 50
-    ) {
-        val iterator = sequence {
-            for (pokemon in party) {
-                if (pokemon != null) yield(pokemon)
-            }
-            for (pokemon in pc) {
-                if (pokemon != null) yield(pokemon)
-            }
-        }.iterator()
-
-        if (!iterator.hasNext()) {
-            return
-        }
-
-        ScheduledTask.Builder()
-            .tracker(ServerTaskTracker)
-            .interval(0F)
-            .infiniteIterations()
-            .execute { task ->
-                var processed = 0
-                while (processed < batchSize && iterator.hasNext()) {
-                    val pokemon = iterator.next()
-                    obtain(pokemon)
-                    processed++
-                }
-
-                if (!iterator.hasNext()) {
-                    task.expire()
-                }
-            }
-            .build()
+    override fun markDirty() {
     }
 
     override fun initialize() {

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

@@ -26,8 +26,7 @@ import net.minecraft.resources.ResourceLocation
 /**
  * Dex recorded information about a particular Pokémon species. This includes all forms and their information.
  * Across all forms there is a single list of known aspects which is generally used to track cosmetic variation
- * though technically things like gender and form-motivating aspects will get collected inadvertently. The highest
- * level of the species that the player has owned is also tracked.
+ * though technically things like gender and form-motivating aspects will get collected inadvertently.
  *
  * @author Hiroku
  * @since August 23rd, 2024
@@ -37,12 +36,10 @@ class SpeciesDexRecord {
         val CODEC: Codec<SpeciesDexRecord> = RecordCodecBuilder.create { instance ->
             instance.group(
                 ListCodec(PrimitiveCodec.STRING, 0, 512).fieldOf("aspects").forGetter { it.aspects.toList() },
-                PrimitiveCodec.INT.optionalFieldOf("highestLevel", -1).forGetter { it.highestLevel },
                 Codec.unboundedMap(Codec.STRING, FormDexRecord.CODEC).fieldOf("formRecords").forGetter { it.formRecords }
-            ).apply(instance) { aspects, highestLevel, formRecords ->
+            ).apply(instance) { aspects, formRecords ->
                 SpeciesDexRecord().also {
                     it.aspects.addAll(aspects)
-                    it.highestLevel = highestLevel
                     it.formRecords.putAll(formRecords)
                 }
             }
@@ -51,16 +48,13 @@ class SpeciesDexRecord {
 
     @Transient
     lateinit var id: ResourceLocation
-    /** The highest level of the species that the player has owned. */
-    var highestLevel = -1
-        private set
     private val aspects: MutableSet<String> = mutableSetOf()
     private val formRecords: MutableMap<String, FormDexRecord> = mutableMapOf()
     val isFormRecordsEmpty: Boolean
         get() = formRecords.isEmpty()
 
     fun describe(): String {
-        return "SpeciesDexRecord(aspects=$aspects, highestLevel=$highestLevel, formRecords=$formRecords)"
+        return "SpeciesDexRecord(aspects=$aspects, formRecords=$formRecords)"
     }
 
     @Transient
@@ -83,14 +77,7 @@ class SpeciesDexRecord {
         .addFunction("is_caught") { params ->
             DoubleValue(formRecords.values.any { it.knowledge.name.equals("CAUGHT", ignoreCase = true) })
         }
-        .addFunction("highest_level") { params ->
-            DoubleValue(highestLevel)
-        }
-        .addFunction("set_highest_level") { params ->
-            highestLevel = params.getDouble(0).toInt()
-            DoubleValue.ONE
-        }
-            // more, also worth moving to something like MoLangFunctions.kt so it's easier to API in more values
+        // more, also worth moving to something like MoLangFunctions.kt so it's easier to API in more values
 
     @Transient
     lateinit var pokedexManager: AbstractPokedexManager
@@ -107,16 +94,10 @@ class SpeciesDexRecord {
 
     fun addInformation(pokemon: Pokemon, knowledge: PokedexEntryProgress) {
         aspects.addAll(pokemon.aspects)
-        if (knowledge == PokedexEntryProgress.CAUGHT) {
-            highestLevel = maxOf(highestLevel, pokemon.level)
-        }
     }
 
     fun addInformation(pokedexEntityData: PokedexEntityData, knowledge: PokedexEntryProgress) {
         aspects.addAll(pokedexEntityData.pokemon.aspects)
-        if (knowledge == PokedexEntryProgress.CAUGHT) {
-            highestLevel = maxOf(highestLevel, pokedexEntityData.pokemon.level)
-        }
     }
 
     fun addAspects(addedAspects: Set<String>) {
@@ -147,7 +128,6 @@ class SpeciesDexRecord {
 
     fun clone() = SpeciesDexRecord().also {
         it.aspects.addAll(aspects)
-        it.highestLevel = highestLevel
         it.formRecords.putAll(formRecords.mapValues { it.value.clone() })
     }
 
@@ -159,7 +139,6 @@ class SpeciesDexRecord {
 
     fun encode(buffer: RegistryFriendlyByteBuf) {
         buffer.writeCollection(aspects) { _, it -> buffer.writeString(it) }
-        buffer.writeInt(highestLevel)
         buffer.writeInt(formRecords.size)
         for ((formName, formRecord) in formRecords) {
             buffer.writeString(formName)
@@ -170,7 +149,6 @@ class SpeciesDexRecord {
     fun decode(buffer: RegistryFriendlyByteBuf) {
         aspects.clear()
         aspects.addAll(buffer.readCollection(Sets::newHashSetWithExpectedSize) { buffer.readString() })
-        highestLevel = buffer.readInt()
         formRecords.clear()
         val numForms = buffer.readInt()
         for (i in 0 until numForms) {

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

@@ -11,6 +11,5 @@ package com.cobblemon.mod.common.api.pokedex.filter
 enum class SearchByType {
     SPECIES,
     ABILITIES,
-    MOVES,
     DROPS;
 }

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

@@ -9,22 +9,14 @@
 package com.cobblemon.mod.common.api.pokedex.filter
 
 import com.cobblemon.mod.common.api.drop.ItemDropEntry
-import com.cobblemon.mod.common.api.moves.MoveTemplate
 import com.cobblemon.mod.common.api.pokedex.AbstractPokedexManager
 import com.cobblemon.mod.common.api.pokedex.PokedexEntryProgress
 import com.cobblemon.mod.common.api.pokedex.entry.PokedexEntry
 import com.cobblemon.mod.common.api.pokemon.PokemonSpecies
-import com.cobblemon.mod.common.api.pokemon.evolution.Evolution
-import com.cobblemon.mod.common.api.storage.player.client.ClientPokedexManager
-import com.cobblemon.mod.common.api.tms.TechnicalMachines
-import com.cobblemon.mod.common.client.CobblemonClient
 import com.cobblemon.mod.common.pokemon.abilities.HiddenAbility
-import com.cobblemon.mod.common.pokemon.FormData
-import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
 import com.cobblemon.mod.common.util.asTranslated
 import com.cobblemon.mod.common.util.itemRegistry
 import net.minecraft.client.Minecraft
-import net.minecraft.resources.ResourceLocation
 import net.minecraft.world.item.ItemStack
 
 /**
@@ -55,23 +47,6 @@ class SearchFilter(val pokedexManager: AbstractPokedexManager, val searchString:
                 }
                 return abilityList.any { it.contains(searchString.trim().lowercase()) }
             }
-            SearchByType.MOVES -> {
-                if (pokedexManager.getHighestKnowledgeFor(entry) !== PokedexEntryProgress.CAUGHT) return false
-                val search = searchString.trim().lowercase()
-                val learnedTMs = CobblemonClient.clientTMMoveData.learnedTMs
-                val forms = pokedexManager.getCaughtForms(entry)
-                val formData = if (forms.isEmpty()) {
-                    listOf(species.standardForm)
-                } else {
-                    forms.map { form ->
-                        species.forms.find { it.name.equals(form.displayForm, ignoreCase = true) } ?: species.standardForm
-                    }
-                }
-                return formData.any { form ->
-                    val highestLevel = pokedexManager.getSpeciesRecord(form.species.resourceIdentifier)?.getFormRecord(form.name)?.highestLevel ?: -1
-                    hasDiscoveredMove(form, search, highestLevel, pokedexManager, learnedTMs)
-                }
-            }
             SearchByType.DROPS -> {
                 if (pokedexManager.getHighestKnowledgeFor(entry) !== PokedexEntryProgress.CAUGHT) return false
                 val dropsList = mutableListOf<String>()
@@ -93,132 +68,4 @@ class SearchFilter(val pokedexManager: AbstractPokedexManager, val searchString:
         }
     }
 
-    private fun hasDiscoveredMove(
-        form: FormData,
-        search: String,
-        highestLevel: Int,
-        pokedex: AbstractPokedexManager,
-        learnedTMs: Set<ResourceLocation>
-    ): Boolean {
-        val evolutionMoveLevels = buildEvolutionMoveLevelIndex(form)
-
-        fun matches(move: MoveTemplate): Boolean {
-            return move.displayName.string.lowercase().contains(search)
-        }
-
-        fun isLevelUpDiscovered(move: MoveTemplate, level: Int): Boolean {
-            if (highestLevel >= level) return true
-
-            for ((evolutionSpeciesId, moveLevels) in evolutionMoveLevels) {
-                val evolutionLevel = moveLevels[move.name] ?: continue
-                val evolutionHighest = pokedex.getSpeciesRecord(evolutionSpeciesId)?.highestLevel ?: -1
-                if (evolutionHighest >= evolutionLevel) return true
-            }
-            return false
-        }
-
-        form.moves.levelUpMoves.forEach { (level, moves) ->
-            for (move in moves) {
-                if (matches(move) && isLevelUpDiscovered(move, level)) return true
-            }
-        }
-
-        form.moves.tmMoves.forEach { move ->
-            val tmId = TechnicalMachines.moveToTM[move]?.id
-            val discovered = tmId == null || tmId in learnedTMs
-            if (discovered && matches(move)) return true
-        }
-
-        val alwaysDiscovered = sequenceOf(
-            form.moves.tutorMoves,
-            form.moves.eggMoves,
-            form.moves.evolutionMoves,
-            form.moves.formChangeMoves,
-            form.moves.specialMoves,
-            form.moves.legacyMoves
-        )
-
-        for (moves in alwaysDiscovered) {
-            for (move in moves) {
-                if (matches(move)) return true
-            }
-        }
-
-        return false
-    }
-
-    private fun buildEvolutionMoveLevelIndex(form: FormData): Map<ResourceLocation, Map<String, Int>> {
-        val evolutionForms = collectEvolutionForms(form)
-        val levelsBySpecies = mutableMapOf<ResourceLocation, MutableMap<String, Int>>()
-
-        for (evolutionForm in evolutionForms) {
-            val speciesId = evolutionForm.species.resourceIdentifier
-            val moveLevels = levelsBySpecies.getOrPut(speciesId) { mutableMapOf() }
-            buildMoveLevelIndex(evolutionForm).forEach { (moveName, level) ->
-                val current = moveLevels[moveName]
-                if (current == null || level < current) {
-                    moveLevels[moveName] = level
-                }
-            }
-        }
-
-        return levelsBySpecies
-    }
-
-    private fun buildMoveLevelIndex(form: FormData): Map<String, Int> {
-        val levels = mutableMapOf<String, Int>()
-        form.moves.levelUpMoves.forEach { (level, moves) ->
-            moves.forEach { move ->
-                val current = levels[move.name]
-                if (current == null || level < current) {
-                    levels[move.name] = level
-                }
-            }
-        }
-        return levels
-    }
-
-    private fun collectEvolutionForms(rootForm: FormData): List<FormData> {
-        val results = mutableListOf<FormData>()
-        val visited = mutableSetOf<String>()
-
-        fun key(form: FormData): String {
-            return "${form.species.resourceIdentifier}|${form.name.lowercase()}"
-        }
-
-        fun nextEvolutions(current: FormData): Set<Evolution> {
-            return if (current.evolutions.isNotEmpty()) {
-                current.evolutions
-            } else {
-                current.species.evolutions
-            }
-        }
-
-        fun traverse(current: FormData) {
-            for (evolution in nextEvolutions(current)) {
-                val evolutionForm = resolveEvolutionForm(evolution) ?: continue
-                val evolutionKey = key(evolutionForm)
-                if (!visited.add(evolutionKey)) continue
-                results.add(evolutionForm)
-                traverse(evolutionForm)
-            }
-        }
-
-        traverse(rootForm)
-        return results
-    }
-
-    private fun resolveEvolutionForm(evolution: Evolution): FormData? {
-        val speciesId = evolution.result.species?.asIdentifierDefaultingNamespace() ?: return null
-        val species = PokemonSpecies.getByIdentifier(speciesId) ?: return null
-        val formId = evolution.result.form
-        return if (formId == null) {
-            species.standardForm
-        } else {
-            species.forms.firstOrNull {
-                it.formOnlyShowdownId().equals(formId, ignoreCase = true) || it.name.equals(formId, ignoreCase = true)
-            } ?: species.standardForm
-        }
-    }
-
-}
+}

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

@@ -1,166 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.pokedex.filter
-
-import com.cobblemon.mod.common.api.moves.MoveTemplate
-import com.cobblemon.mod.common.api.pokedex.AbstractPokedexManager
-import com.cobblemon.mod.common.api.pokedex.PokedexEntryProgress
-import com.cobblemon.mod.common.api.pokedex.entry.PokedexEntry
-import com.cobblemon.mod.common.api.pokemon.PokemonSpecies
-import com.cobblemon.mod.common.api.pokemon.evolution.Evolution
-import com.cobblemon.mod.common.api.tms.TechnicalMachines
-import com.cobblemon.mod.common.client.CobblemonClient
-import com.cobblemon.mod.common.pokemon.FormData
-import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
-import net.minecraft.resources.ResourceLocation
-
-enum class SecondaryPokedexFilterType {
-    ALL,
-    CAUGHT,
-    SEEN,
-    UNDISCOVERED,
-    LEVEL_UP_TM_UNDISCOVERED
-}
-
-class SecondaryPokedexFilter(
-    private val pokedexManager: AbstractPokedexManager,
-    private val filterType: SecondaryPokedexFilterType
-) : EntryFilter() {
-
-    override fun test(entry: PokedexEntry): Boolean {
-        return when (filterType) {
-            SecondaryPokedexFilterType.ALL -> true
-            SecondaryPokedexFilterType.CAUGHT -> pokedexManager.getHighestKnowledgeFor(entry) >= PokedexEntryProgress.CAUGHT
-            SecondaryPokedexFilterType.SEEN -> pokedexManager.getHighestKnowledgeFor(entry) == PokedexEntryProgress.ENCOUNTERED
-            SecondaryPokedexFilterType.UNDISCOVERED -> pokedexManager.getHighestKnowledgeFor(entry) == PokedexEntryProgress.NONE
-            SecondaryPokedexFilterType.LEVEL_UP_TM_UNDISCOVERED -> hasUndiscoveredLevelUpTM(entry)
-        }
-    }
-
-    private fun hasUndiscoveredLevelUpTM(entry: PokedexEntry): Boolean {
-        if (pokedexManager.getHighestKnowledgeFor(entry) != PokedexEntryProgress.CAUGHT) return false
-        val species = PokemonSpecies.getByIdentifier(entry.speciesId) ?: return false
-        val forms = pokedexManager.getCaughtForms(entry)
-        val formData = if (forms.isEmpty()) {
-            listOf(species.standardForm)
-        } else {
-            forms.map { form ->
-                species.forms.find { it.name.equals(form.displayForm, ignoreCase = true) } ?: species.standardForm
-            }
-        }
-
-        return formData.any { form ->
-            val highestLevel = pokedexManager.getSpeciesRecord(form.species.resourceIdentifier)?.getFormRecord(form.name)?.highestLevel ?: -1
-            hasUndiscoveredLevelUpTM(form, highestLevel)
-        }
-    }
-
-    private fun hasUndiscoveredLevelUpTM(
-        form: FormData,
-        highestLevel: Int
-    ): Boolean {
-        val evolutionMoveLevels = buildEvolutionMoveLevelIndex(form)
-
-        fun isLevelUpDiscovered(move: MoveTemplate, level: Int): Boolean {
-            if (highestLevel >= level) return true
-
-            for ((evolutionSpeciesId, moveLevels) in evolutionMoveLevels) {
-                val evolutionLevel = moveLevels[move.name] ?: continue
-                val evolutionHighest = pokedexManager.getSpeciesRecord(evolutionSpeciesId)?.highestLevel ?: -1
-                if (evolutionHighest >= evolutionLevel) return true
-            }
-
-            return false
-        }
-
-        form.moves.levelUpMoves.forEach { (level, moves) ->
-            for (move in moves) {
-                if (TechnicalMachines.moveToTM[move] != null && !isLevelUpDiscovered(move, level)) {
-                    return true
-                }
-            }
-        }
-
-        return false
-    }
-
-    private fun buildEvolutionMoveLevelIndex(form: FormData): Map<ResourceLocation, Map<String, Int>> {
-        val evolutionForms = collectEvolutionForms(form)
-        val levelsBySpecies = mutableMapOf<ResourceLocation, MutableMap<String, Int>>()
-
-        for (evolutionForm in evolutionForms) {
-            val speciesId = evolutionForm.species.resourceIdentifier
-            val moveLevels = levelsBySpecies.getOrPut(speciesId) { mutableMapOf() }
-            buildMoveLevelIndex(evolutionForm).forEach { (moveName, level) ->
-                val current = moveLevels[moveName]
-                if (current == null || level < current) {
-                    moveLevels[moveName] = level
-                }
-            }
-        }
-
-        return levelsBySpecies
-    }
-
-    private fun buildMoveLevelIndex(form: FormData): Map<String, Int> {
-        val levels = mutableMapOf<String, Int>()
-        form.moves.levelUpMoves.forEach { (level, moves) ->
-            moves.forEach { move ->
-                val current = levels[move.name]
-                if (current == null || level < current) {
-                    levels[move.name] = level
-                }
-            }
-        }
-        return levels
-    }
-
-    private fun collectEvolutionForms(rootForm: FormData): List<FormData> {
-        val results = mutableListOf<FormData>()
-        val visited = mutableSetOf<String>()
-
-        fun key(form: FormData): String {
-            return "${form.species.resourceIdentifier}|${form.name.lowercase()}"
-        }
-
-        fun nextEvolutions(current: FormData): Set<Evolution> {
-            return if (current.evolutions.isNotEmpty()) {
-                current.evolutions
-            } else {
-                current.species.evolutions
-            }
-        }
-
-        fun traverse(current: FormData) {
-            for (evolution in nextEvolutions(current)) {
-                val evolutionForm = resolveEvolutionForm(evolution) ?: continue
-                val evolutionKey = key(evolutionForm)
-                if (!visited.add(evolutionKey)) continue
-                results.add(evolutionForm)
-                traverse(evolutionForm)
-            }
-        }
-
-        traverse(rootForm)
-        return results
-    }
-
-    private fun resolveEvolutionForm(evolution: Evolution): FormData? {
-        val speciesId = evolution.result.species?.asIdentifierDefaultingNamespace() ?: return null
-        val species = PokemonSpecies.getByIdentifier(speciesId) ?: return null
-        val formId = evolution.result.form
-        return if (formId == null) {
-            species.standardForm
-        } else {
-            species.forms.firstOrNull {
-                it.formOnlyShowdownId().equals(formId, ignoreCase = true) || it.name.equals(formId, ignoreCase = true)
-            } ?: species.standardForm
-        }
-    }
-}

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

@@ -10,7 +10,6 @@ package com.cobblemon.mod.common.api.pokemon
 
 import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.Cobblemon.config
-import com.cobblemon.mod.common.CobblemonMovesetBuilders
 import com.cobblemon.mod.common.api.abilities.Abilities
 import com.cobblemon.mod.common.api.abilities.Ability
 import com.cobblemon.mod.common.api.events.CobblemonEvents
@@ -149,13 +148,6 @@ open class PokemonProperties {
             props.originalTrainerType = OriginalTrainerType.entries.toList().parsePropertyOfCollection(keyPairs, listOf("originaltrainertype", "ottype"), labelsOptional = true) { it.name.lowercase() }
             props.originalTrainer = parsePlayerProperty(keyPairs, listOf("originaltrainer", "ot"))
             props.moves = parseString(keyPairs, listOf("moves"))?.split(",")
-            props.movesetBuilders = parseString(keyPairs, listOf("moveset_builders", "movesetbuilders", "moveset_builder", "movesetbuilder"))?.split(",")?.mapNotNull {
-                try {
-                    it.asIdentifierDefaultingNamespace()
-                } catch (_: ResourceLocationException) {
-                    null
-                }
-            }
             props.heldItem = parseString(keyPairs, listOf("helditem", "held_item"))
             props.minPerfectIVs = parseIntProperty(keyPairs, listOf("min_perfect_ivs"))?.coerceIn(0, Stats.PERMANENT.size)
             props.scaleModifier = parseFloatProperty(keyPairs, listOf("scale_modifier"))
@@ -364,7 +356,6 @@ open class PokemonProperties {
     var originalTrainerType: OriginalTrainerType? = null
     var originalTrainer: String? = null // Original Trainer by Username or UUID
     var moves: List<String>? = null
-    var movesetBuilders: List<ResourceLocation>? = null
     var heldItem: String? = null
     var cosmeticItem: String? = null
     var scaleModifier: Float? = null
@@ -471,7 +462,7 @@ open class PokemonProperties {
         }
         moves?.let { moves ->
             if (pokemon.moveSet.getMoves().isEmpty()) {
-                pokemon.initializeMovesetFromDefault()
+                pokemon.initializeMoveset(preferLatest = true)
             }
             val moveTemplates = moves.mapNotNull(Moves::getByName).shuffled()
             val replaceableIndices = (0..3).filterNot { pokemon.moveSet[it]?.template?.let(moveTemplates::contains) == true }.shuffled()
@@ -484,13 +475,6 @@ open class PokemonProperties {
                 pokemon.moveSet.update()
             }
         }
-        movesetBuilders?.let { movesetBuilders ->
-            val builders = movesetBuilders.mapNotNull { CobblemonMovesetBuilders.movesetBuilders[it] }
-            if (builders.isNotEmpty()) {
-                val movesetBuilder = builders.random()
-                pokemon.initializeMovesetFrom(movesetBuilder)
-            }
-        }
         heldItem?.let { itemKey ->
             val server = server() ?: return@let
             val parser = ItemParser(server.registryAccess())
@@ -694,7 +678,6 @@ open class PokemonProperties {
         originalTrainerType?.let { nbt.putInt(DataKeys.POKEMON_ORIGINAL_TRAINER_TYPE, it.ordinal) }
         originalTrainer?.let { nbt.putString(DataKeys.POKEMON_ORIGINAL_TRAINER, it) }
         moves?.let { nbt.putString(DataKeys.POKEMON_PROPERTIES_MOVES, it.joinToString(separator = ",")) }
-        movesetBuilders?.let { nbt.putString(DataKeys.POKEMON_PROPERTIES_MOVESET_BUILDERS, it.joinToString(separator = ",") { source -> source.toString() }) }
         heldItem?.let {nbt.putString(DataKeys.POKEMON_PROPERTIES_HELDITEM, it)}
         scaleModifier?.let { nbt.putFloat(DataKeys.POKEMON_SCALE_MODIFIER, it) }
         val custom = ListTag()
@@ -729,7 +712,6 @@ open class PokemonProperties {
         originalTrainerType = if (tag.contains(DataKeys.POKEMON_ORIGINAL_TRAINER_TYPE)) OriginalTrainerType.valueOf(tag.getString(DataKeys.POKEMON_ORIGINAL_TRAINER_TYPE)) else null
         originalTrainer = if (tag.contains(DataKeys.POKEMON_ORIGINAL_TRAINER)) tag.getString(DataKeys.POKEMON_ORIGINAL_TRAINER) else null
         moves = if (tag.contains(DataKeys.POKEMON_PROPERTIES_MOVES)) tag.getString(DataKeys.POKEMON_PROPERTIES_MOVES).split(",") else null
-        movesetBuilders = if (tag.contains(DataKeys.POKEMON_PROPERTIES_MOVESET_BUILDERS)) tag.getString(DataKeys.POKEMON_PROPERTIES_MOVESET_BUILDERS).split(",").map { it.asIdentifierDefaultingNamespace() } else null
         heldItem = if (tag.contains(DataKeys.POKEMON_PROPERTIES_HELDITEM)) tag.getString(DataKeys.POKEMON_PROPERTIES_HELDITEM) else null
         scaleModifier = if (tag.contains(DataKeys.POKEMON_SCALE_MODIFIER)) tag.getFloat(DataKeys.POKEMON_SCALE_MODIFIER) else null
         val custom = tag.getList(DataKeys.POKEMON_PROPERTIES_CUSTOM, Tag.TAG_STRING.toInt())
@@ -765,7 +747,6 @@ open class PokemonProperties {
         originalTrainerType?.let { json.addProperty(DataKeys.POKEMON_ORIGINAL_TRAINER_TYPE, it.name) }
         originalTrainer?.let { json.addProperty(DataKeys.POKEMON_ORIGINAL_TRAINER, it) }
         moves?.let { json.addProperty(DataKeys.POKEMON_PROPERTIES_MOVES, it.joinToString(separator = ",")) }
-        movesetBuilders?.let { json.addProperty(DataKeys.POKEMON_PROPERTIES_MOVESET_BUILDERS, it.joinToString(separator = ",") { source -> source.toString() }) }
         heldItem?.let {json.addProperty(DataKeys.POKEMON_PROPERTIES_HELDITEM, it)}
         scaleModifier?.let { json.addProperty(DataKeys.POKEMON_SCALE_MODIFIER, it) }
         val custom = JsonArray()
@@ -800,7 +781,6 @@ open class PokemonProperties {
         originalTrainerType = json.get(DataKeys.POKEMON_ORIGINAL_TRAINER_TYPE)?.asString?.let { OriginalTrainerType.valueOf(it) }
         originalTrainer = json.get(DataKeys.POKEMON_ORIGINAL_TRAINER)?.asString
         moves = json.get(DataKeys.POKEMON_PROPERTIES_MOVES)?.asString?.split(",")
-        movesetBuilders = json.get(DataKeys.POKEMON_PROPERTIES_MOVESET_BUILDERS)?.asString?.split(",")?.map { it.asIdentifierDefaultingNamespace() }
         heldItem = json.get(DataKeys.POKEMON_PROPERTIES_HELDITEM)?.asString
         scaleModifier = json.get(DataKeys.POKEMON_SCALE_MODIFIER)?.asFloat
         val custom = json.get(DataKeys.POKEMON_PROPERTIES_CUSTOM)?.asJsonArray
@@ -840,7 +820,6 @@ open class PokemonProperties {
         originalTrainer?.let { pieces.add("originaltrainer=$it") }
         customProperties.forEach { pieces.add(it.asString()) }
         moves?.let { pieces.add("moves=${it.joinToString(separator = ",")}") }
-        movesetBuilders?.let { pieces.add("movesetbuilders=${it.joinToString(separator = ",") { source -> source.toString() }}") }
         heldItem?.let {pieces.add("helditem=$it")}
         scaleModifier?.let { pieces.add("scale_modifier=$it") }
         return pieces.joinToString(separator)

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

@@ -23,7 +23,6 @@ import com.cobblemon.mod.common.api.drop.ItemDropMethod
 import com.cobblemon.mod.common.api.entity.EntityDimensionsAdapter
 import com.cobblemon.mod.common.api.molang.ExpressionLike
 import com.cobblemon.mod.common.api.moves.MoveTemplate
-import com.cobblemon.mod.common.api.moves.MovesetBuilder
 import com.cobblemon.mod.common.api.moves.adapters.MoveTemplateAdapter
 import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable
 import com.cobblemon.mod.common.api.pokemon.PokemonSpecies.getByIdentifier
@@ -132,7 +131,6 @@ object PokemonSpecies : JsonDataRegistry<Species> {
         .registerTypeAdapter(RidingBehaviourSettings::class.java, RidingBehaviourSettingsAdapter)
         .registerTypeAdapter(RideSoundSettingsList::class.java, RideSoundSettingsListAdapter)
         .registerTypeAdapter(ObtainableItemCondition::class.java, ObtainableItemConditionAdapter)
-        .registerTypeAdapter(MovesetBuilder::class.java, MovesetBuilderReferenceAdapter)
         .disableHtmlEscaping()
         .enableComplexMapKeySerialization()
         .create()
@@ -316,11 +314,11 @@ object PokemonSpecies : JsonDataRegistry<Species> {
         val result = mutableMapOf<String, String>()
         this.species.forEach {species ->
             val baseSpecies = ShowdownSpecies(species, null)
-            result[ShowdownIdentifiable.REGEX.replace(baseSpecies.name.lowercase(), "")] = this.gson.toJson(baseSpecies)
+            result[ShowdownIdentifiable.REGEX.replace(baseSpecies.name, "")] = this.gson.toJson(baseSpecies)
             species.forms.forEach { form ->
                 if (form != species.standardForm) {
                     val formSpecies = ShowdownSpecies(species, form)
-                    result[ShowdownIdentifiable.REGEX.replace(formSpecies.name.lowercase(), "")] = this.gson.toJson(formSpecies)
+                    result[ShowdownIdentifiable.REGEX.replace(formSpecies.name, "")] = this.gson.toJson(formSpecies)
                 }
             }
         }

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.Cobblemon
 import com.cobblemon.mod.common.api.data.ClientDataSynchronizer
 import com.cobblemon.mod.common.api.moves.MoveTemplate
 import com.cobblemon.mod.common.api.moves.Moves
@@ -20,7 +19,9 @@ import com.google.gson.JsonElement
 import net.minecraft.network.RegistryFriendlyByteBuf
 
 open class Learnset : ClientDataSynchronizer<Learnset> {
-    class Interpreter(val loadMove: (JsonElement, Learnset) -> Boolean) {
+    class Interpreter(
+        val loadMove: (JsonElement, Learnset) -> Boolean
+    ) {
         companion object {
             fun parseFromPrefixIntoList(prefix: String, list: (Learnset) -> MutableList<MoveTemplate>): Interpreter {
                 return Interpreter { element, learnset ->
@@ -72,7 +73,8 @@ open class Learnset : ClientDataSynchronizer<Learnset> {
             eggInterpreter,
             tutorInterpreter,
             legacyInterpreter,
-            specialInterpreter, levelUpInterpreter,
+            specialInterpreter,
+            levelUpInterpreter,
             formChangeInterpreter
         )
     }
@@ -97,20 +99,6 @@ open class Learnset : ClientDataSynchronizer<Learnset> {
         .flatMap { it.value }
         .toSet()
 
-    fun tmLearnableMoves(): MutableList<MoveTemplate> {
-        val moves = mutableListOf<MoveTemplate>()
-
-        moves.addAll(tmMoves)
-        moves.addAll(tutorMoves)
-        moves.addAll(eggMoves)
-        moves.addAll(getLevelUpMovesUpTo(Cobblemon.config.maxPokemonLevel))
-        moves.addAll(evolutionMoves)
-        moves.addAll(formChangeMoves)
-
-        return moves
-    }
-
-
     fun getAllLegalMoves(): Set<MoveTemplate> {
         return levelUpMoves.values.flatten().toSet() +
                 eggMoves +

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

@@ -119,10 +119,7 @@ class RidingController(
     private fun canTransitionToLand(): Boolean {
         if ((entity.isUnderWater)) return false
         if ((entity.isEyeInFluid(FluidTags.WATER) || entity.isEyeInFluid(FluidTags.LAVA))) return false
-        // If the currently in the air but has no land style then don't transition and render the ride useless.
-        // Hover is a good example for this.
-        val shouldStayInAir = entity.pokemon.riding.behaviours?.get(RidingStyle.LAND) == null && context?.style == RidingStyle.AIR
-        return entity.onGround() && !shouldStayInAir
+        return entity.onGround()
     }
 
     private fun canTransitionToLiquid(): Boolean {

common/src/main/kotlin/com/cobblemon/mod/common/api/riding/behaviour/types/air/HoverBehaviour.kt

@@ -213,23 +213,10 @@ class HoverBehaviour : RidingBehaviour<HoverSettings, HoverState> {
         val accel = topSpeed / (vehicle.runtime.resolveDouble(settings.accelerationExpr ?: globalHover.accelerationExpr!!) * 20.0)
 
         var newVelocity = state.rideVelocity.get()
-        val unrotateVel = vehicle.deltaMovement.yRot(vehicle.yRot)
-
-        val vehicleFrontVec = Vec3(0.0, 0.0, 1.0)
-        val faceVel = Vec3(vehicle.deltaMovement.x, 0.0, vehicle.deltaMovement.z)
-
-        val d = vehicle.deltaMovement.horizontalDistance()
-        val v2 = Vec3(faceVel.dot(Vec3(1.0, 0.0, 0.0)) * d, newVelocity.y, faceVel.dot(Vec3(0.0, 0.0, 1.0)) * d)
 
         // Check for collisions and if found, update the speed to reflect it
-        if (vehicle.horizontalCollision) {
-            val smackingIntoWallSpeed = max( vehicle.deltaMovement.horizontalDistance(), 0.2)
-            newVelocity = Vec3(newVelocity.x, 0.0, newVelocity.z).normalize().scale(smackingIntoWallSpeed).add(0.0, newVelocity.y, 0.0)
-        }
-
-
-        if (vehicle.verticalCollision) {
-            newVelocity = Vec3(newVelocity.x, 0.0, newVelocity.z)
+        if (vehicle.verticalCollision || vehicle.horizontalCollision) {
+            state.speed.set(vehicle.deltaMovement.length())
         }
 
         // align the velocity vector to be in local vehicle space

common/src/main/kotlin/com/cobblemon/mod/common/api/riding/behaviour/types/liquid/SubmarineBehaviour.kt

@@ -60,7 +60,7 @@ class SubmarineBehaviour : RidingBehaviour<SubmarineSettings, SubmarineState> {
     val poseProvider = PoseProvider<SubmarineSettings, SubmarineState>(PoseType.FLOAT)
         .with(PoseOption(PoseType.SWIM) { _, state, entity -> state.rideVelocity.get().z > 0.05 && !state.onSurface.get()})
         .with(PoseOption(PoseType.STAND) { _, state, entity -> state.rideVelocity.get().z <= 0.05 && state.onSurface.get()})
-        .with(PoseOption(PoseType.SWIM) { _, state, entity -> state.rideVelocity.get().z > 0.05 && state.onSurface.get()})
+        .with(PoseOption(PoseType.STAND) { _, state, entity -> state.rideVelocity.get().z > 0.05 && state.onSurface.get()})
 
     override fun isActive(settings: SubmarineSettings, state: SubmarineState, vehicle: PokemonEntity): Boolean {
         return vehicle.isInWater || !vehicle.onGround()
@@ -191,17 +191,11 @@ class SubmarineBehaviour : RidingBehaviour<SubmarineSettings, SubmarineState> {
          * Calculate Forward Velocity
          *********************************************/
         val currZVel = state.rideVelocity.get().z
-        var newZVel = when {
+        val newZVel = when {
             driver.zza > 0.0 -> min(topSpeed, currZVel + accel)
-            driver.zza < 0.0 -> max( -strafeSpeed, currZVel - strafeAccel)
-            else -> lerp(currZVel, 0.0, 0.02)
+            driver.zza < 0.0 -> max( -strafeSpeed, currZVel - strafeAccel) //TODO: Might need to be applied in addition to the normal braking force?
+            else -> lerp(currZVel, 0.0, 0.05)
         }
-
-        // If trying to brake then add the friction to the braking force
-        if (driver.zza != 0.0f && driver.zza.sign.toDouble() != newZVel.sign) {
-            newZVel = lerp(newZVel, 0.0, 0.02)
-        }
-
         currVel = Vec3(currVel.x, currVel.y, newZVel)
 
         /*********************************************
@@ -212,20 +206,14 @@ class SubmarineBehaviour : RidingBehaviour<SubmarineSettings, SubmarineState> {
         val gravity = (9.8 / ( 20.0)) * 0.2 * 0.4
         val terminalYVel = 2.0
         val driverYInput = if(driver.jumping) 1.0 else if (driver.isShiftKeyDown) -1.0 else 0.0
-        var newYVel = when {
+        val newYVel = when {
             (!vehicle.isInWater) -> max(-terminalYVel, currYVel - gravity)
             //(vehicle.isInWater && !vehicle.isUnderWater && currYVel > 0.001) -> lerp(currYVel, 0.0, 0.1) // Make sure that yVel is above a threshold before doing this otherwise it'll block submerging.
             //driverYInput != 0.0 && currYVel > 0.001 && driverYInput.sign != currYVel.sign -> lerp(currYVel, 0.0, 0.05)
             driverYInput > 0.0 -> min(vertTopSpeed, currYVel + strafeAccel)
             driverYInput < 0.0 -> max(-vertTopSpeed, currYVel - strafeAccel)
-            else -> lerp(currYVel, 0.0, 0.02)
+            else -> lerp(currYVel, 0.0, 0.05)
         }
-
-        // If trying to brake then add the friction to the braking force
-        if (driverYInput != 0.0 && driverYInput != newYVel.sign) {
-            newYVel = lerp(newYVel, 0.0, 0.02)
-        }
-
         currVel = Vec3(currVel.x, newYVel, currVel.z)
 
         /*********************************************
@@ -233,17 +221,11 @@ class SubmarineBehaviour : RidingBehaviour<SubmarineSettings, SubmarineState> {
          *********************************************/
         val currXVel = state.rideVelocity.get().x
         val horzTopSpeed = strafeSpeed
-        var newXVel = when {
+        val newXVel = when {
             driver.xxa > 0.0 -> min(horzTopSpeed, currXVel + strafeAccel)
             driver.xxa < 0.0 -> max( -horzTopSpeed, currXVel - strafeAccel)
-            else -> lerp(currXVel, 0.0, 0.02)
+            else -> lerp(currXVel, 0.0, 0.01)
         }
-
-        // If trying to brake then add the friction to the braking force
-        if (driver.xxa != 0.0f && driver.xxa.sign.toDouble() != newZVel.sign) {
-            newXVel = lerp(newXVel, 0.0, 0.02)
-        }
-
         currVel = Vec3(newXVel, currVel.y, currVel.z)
 
         // Set the new velocity
@@ -323,6 +305,81 @@ class SubmarineBehaviour : RidingBehaviour<SubmarineSettings, SubmarineState> {
 
     }
 
+    private fun correctOrientation(
+        settings: SubmarineSettings,
+        state: SubmarineState,
+        vehicle: PokemonEntity,
+        controller: OrientationController,
+        driver: Player,
+        deltaTime: Double
+    ) {
+
+// TODO: remove if not needed
+
+//        // Calculate correcting roll force.
+//        // If the ride is moving then have the correction rate be an equal proportion of:
+//        // - how rolled are you
+//        // - how long has it been since last mouse input (higher is stronger correction)
+//        // Also the correction is proportional as a whole to how NOT pitched are you so you don't spin endlessly when looking up or down
+//        val howRolledAmI =  sqrt(abs((cos(controller.roll.toRadians()) - 1.0f) * 0.5f)) // sqrt so it trends towards one pretty quickly
+//        val maxRollCorrectionRate =
+//            if (state.rideVelocity.get().length() < 0.2) 10.0f * abs(cos(controller.pitch.toRadians()))
+//            else 10.0f * cos(controller.pitch.toRadians()).pow(2) * (
+//                    howRolledAmI*1.0f +
+//                            (state.noInputTime.get() - rollCorrectionTimer).coerceIn(0.0, 1.0).pow(2).toFloat()*0.5f
+//                    )
+//        val maxRollForce = maxRollCorrectionRate / 40.0f
+//        val rollArrivalDeg = 60.0f
+//        val desiredRoll = 0.0f
+//
+//        // Calculate the signed error (how far and in what direction)
+//        val rollError = Mth.wrapDegrees(desiredRoll.angleDifference(controller.roll))
+//
+//        // Use the absolute error to     calculate the magnitude of the influence
+//        val influenceMagnitude = (min(rollArrivalDeg, abs(rollError)) / rollArrivalDeg)
+//        val desiredRollForce = maxRollCorrectionRate * influenceMagnitude * -rollError.sign
+//        var steeredRollForce = desiredRollForce - state.currRollCorrectionForce.get()
+//
+//        // Ensure the 'steering' correction force doesn't exceed our maxForce
+//        if (abs(steeredRollForce) > maxRollForce) {
+//            steeredRollForce = steeredRollForce.sign * maxRollForce
+//        }
+//
+//        // Apply the 'steered' force (its really not a steering force I need a better name)
+//        state.currRollCorrectionForce.set(
+//            state.currRollCorrectionForce.get() + steeredRollForce
+//        )
+
+        //Calculate correcting pitch force.
+//        val rollCorrectionTimer = vehicle.runtime.resolveDouble(settings.timeToRollCorrect ?: globalSubmarine.timeToRollCorrect!!)
+//        val maxPitchCorrectionRate = 5.0f * (state.noInputTime.get() - rollCorrectionTimer).coerceIn(0.0, 1.0).pow(2).toFloat()*0.5f
+//        val maxPitchForce = maxPitchCorrectionRate / 40.0f
+//        val pitchArrivalDeg = 45.0f
+//        val desiredPitch = 0.0f
+//
+//        if(state.rideVelocity.get().length() < 0.1 && state.noInputTime.get() > rollCorrectionTimer) {
+//            val pitchErrror = Mth.wrapDegrees(desiredPitch.angleDifference(controller.pitch))
+//            val arrivalInfluence = (min(pitchArrivalDeg,abs(pitchErrror)) / pitchArrivalDeg)
+//            val desiredPitchForce = maxPitchCorrectionRate * arrivalInfluence * -pitchErrror.sign
+//            var steeredPitchForce = desiredPitchForce - state.currPitchCorrectionForce.get()
+//
+//            // Ensure the 'steering' correction force doesn't exceed our maxForce
+//            if (abs(steeredPitchForce) > maxPitchForce) {
+//                steeredPitchForce = steeredPitchForce.sign * maxPitchForce
+//            }
+//
+//            // Apply the 'steered' force (its really not a steering force I need a better name)
+//            state.currPitchCorrectionForce.set(
+//                state.currPitchCorrectionForce.get() + steeredPitchForce
+//            )
+//        } else {
+//            state.currPitchCorrectionForce.set(
+//                //reduce rollCorrection gradually
+//                lerp(state.currPitchCorrectionForce.get(), 0.0, deltaTime * 0.98)
+//            )
+//        }
+    }
+
     override fun rotationOnMouseXY(
         settings: SubmarineSettings,
         state: SubmarineState,

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

@@ -44,7 +44,6 @@ import com.cobblemon.mod.common.api.spawning.preset.BestSpawnerConfig
 import com.cobblemon.mod.common.api.spawning.preset.PokemonSpawnDetailPreset
 import com.cobblemon.mod.common.api.spawning.selection.SpawningSelector
 import com.cobblemon.mod.common.api.spawning.spawner.BasicSpawner
-import com.cobblemon.mod.common.api.spawning.spawner.FishingSpawnerFactory
 import com.cobblemon.mod.common.api.spawning.spawner.FixedAreaSpawner
 import com.cobblemon.mod.common.api.spawning.spawner.PlayerSpawner
 import com.cobblemon.mod.common.api.spawning.spawner.PlayerSpawnerFactory
@@ -140,6 +139,19 @@ object BestSpawner {
 
     fun onServerStarted(server: MinecraftServer) {
         CobblemonSpawnPools.onServerLoad(server)
-        fishingSpawner = FishingSpawnerFactory.createSharedSpawner()
+        fishingSpawner = BasicSpawner(
+            name = "fishing",
+            spawnPool = CobblemonSpawnPools.WORLD_SPAWN_POOL
+        ).also {
+            it.influences.add(
+                BucketMultiplyingInfluence(
+                    multipliers = mapOf(
+                        "uncommon" to 2.25f,
+                        "rare" to 5.5f,
+                        "ultra-rare" to 5.5f,
+                    )
+                )
+            )
+        }
     }
 }

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

@@ -44,7 +44,7 @@ import kotlin.random.Random
  * @since July 10th, 2022
  */
 open class FlatSelector : SpawningSelector<FlatSelector.SpawnablePositionSelectionData> {
-    class SelectingSpawnInformation(val spawnDetail: SpawnDetail) {
+    class SelectingSpawnInformation {
         val spawnablePositions = mutableMapOf<SpawnablePosition, Float>()
         var highestWeight = 0F
 
@@ -58,81 +58,61 @@ open class FlatSelector : SpawningSelector<FlatSelector.SpawnablePositionSelecti
         fun chooseSpawnablePosition() = spawnablePositions.entries.weightedSelection { it.value }!!.key
     }
 
-    class SpawnablePositionBucketSelectionData(
-        val selectingSpawnInformation: MutableList<SelectingSpawnInformation>
-    ) {
-        var percentSum: Float = 0F
-        val seenSpawns = mutableListOf<SpawnDetail>()
-
-        fun add(spawnDetail: SpawnDetail, spawnablePosition: SpawnablePosition) {
-            // Only add to percentSum if this is the first time we've seen this SpawnDetail, otherwise
-            // the percentage will get amplified for every spawnable position the thing was possible, completely
-            // ruining the point of this pre-selection percentage.
-            if (spawnDetail.percentage > 0 && spawnDetail !in seenSpawns) {
-                seenSpawns.add(spawnDetail)
-                percentSum += spawnDetail.percentage
-            }
-            val spawnInformation = selectingSpawnInformation.find { it.spawnDetail == spawnDetail }
-                ?: SelectingSpawnInformation(spawnDetail).also { selectingSpawnInformation.add(it) }
-            spawnInformation.add(spawnablePosition, spawnablePosition.getWeight(spawnDetail))
-        }
-
-        fun remove(spawnInformation: SelectingSpawnInformation) {
-            selectingSpawnInformation -= spawnInformation
-            if (spawnInformation.spawnDetail.percentage > 0) {
-                percentSum -= spawnInformation.spawnDetail.percentage
-            }
-        }
-    }
-
     class SpawnablePositionSelectionData(
-        val spawner: Spawner,
-        val spawnablePositions: List<SpawnablePosition>,
-        val selectingSpawnInformation: MutableMap<SpawnBucket, SpawnablePositionBucketSelectionData>,
+        val spawnToSpawnablePosition: MutableMap<SpawnDetail, SelectingSpawnInformation>,
+        var percentSum: Float
     ): SpawnSelectionData {
+        val size: Int
+            get() = spawnToSpawnablePosition.size
+
         override val spawnActions = mutableListOf<SpawnAction<*>>()
         override val context = mutableMapOf<String, Any>()
 
-        fun getDataForBucket(bucket: SpawnBucket): SpawnablePositionBucketSelectionData {
-            val existing = selectingSpawnInformation[bucket]
-            if (existing != null) {
-                return existing
-            }
-
-            val bucketSpawnInformation = SpawnablePositionBucketSelectionData(mutableListOf())
-            spawnablePositions.forEach { spawnablePosition ->
-                spawner.getMatchingSpawns(bucket, spawnablePosition).forEach {
-                    bucketSpawnInformation.add(it, spawnablePosition)
-                }
-            }
-
-            selectingSpawnInformation[bucket] = bucketSpawnInformation
-            return bucketSpawnInformation
-        }
-
         override fun removeSpawnDetails(shouldRemove: (SpawnDetail) -> Boolean) {
-            selectingSpawnInformation.flatMap { it.value.selectingSpawnInformation.filter { shouldRemove(it.spawnDetail) } }
-                .forEach { selectingSpawnInformation[it.spawnDetail.bucket]?.remove(it) }
+            val toRemove = spawnToSpawnablePosition.entries.filter { shouldRemove(it.key) }
+            toRemove.forEach { spawnToSpawnablePosition.remove(it.key) }
+            percentSum -= toRemove.sumOf { it.key.percentage.toDouble().takeIf { it > 0 } ?: 0.0 }.toFloat()
         }
 
         override fun removeSpawnablePositions(shouldRemove: (SpawnDetail, SpawnablePosition) -> Boolean) {
-            val toRemove = selectingSpawnInformation.flatMap { it.value.selectingSpawnInformation }.filter { positionData ->
-                positionData.spawnablePositions.removeIf { shouldRemove(positionData.spawnDetail, it.key) }
+            val toRemove = spawnToSpawnablePosition.entries.filter { (spawnDetail, positionData) ->
+                positionData.spawnablePositions.removeIf { shouldRemove(spawnDetail, it.key) }
                 positionData.highestWeight = positionData.spawnablePositions.maxOfOrNull { it.value } ?: 0F
                 positionData.spawnablePositions.isEmpty()
             }
 
-            toRemove.forEach { selectingSpawnInformation[it.spawnDetail.bucket]?.remove(it) }
+            toRemove.forEach { spawnToSpawnablePosition.remove(it.key) }
+
+            percentSum -= toRemove.sumOf { it.key.percentage.toDouble().takeIf { it > 0 } ?: 0.0 }.toFloat()
         }
     }
 
     override fun getSelectionData(
         spawner: Spawner,
+        bucket: SpawnBucket,
         spawnablePositions: List<SpawnablePosition>
     ): SpawnablePositionSelectionData {
-        val selectingSpawnInformation: MutableMap<SpawnBucket, SpawnablePositionBucketSelectionData> = mutableMapOf()
+        val spawnToSpawnablePosition: MutableMap<SpawnDetail, SelectingSpawnInformation> = mutableMapOf()
+        var percentSum = 0F
 
-        return SpawnablePositionSelectionData(spawner, spawnablePositions, selectingSpawnInformation)
+        spawnablePositions.forEach { spawnablePosition ->
+            spawner.getMatchingSpawns(bucket, spawnablePosition).forEach {
+                // Only add to percentSum if this is the first time we've seen this SpawnDetail, otherwise
+                // the percentage will get amplified for every spawnable position the thing was possible, completely
+                // ruining the point of this pre-selection percentage.
+                if (it.percentage > 0 && !spawnToSpawnablePosition.containsKey(it)) {
+                    percentSum += it.percentage
+                }
+
+                val selectingSpawnInformation = spawnToSpawnablePosition.getOrPut(
+                    it,
+                    ::SelectingSpawnInformation
+                )
+                selectingSpawnInformation.add(spawnablePosition, spawnablePosition.getWeight(it))
+            }
+        }
+
+        return SpawnablePositionSelectionData(spawnToSpawnablePosition, percentSum)
     }
 
     override fun selectSpawnAction(
@@ -140,8 +120,8 @@ open class FlatSelector : SpawningSelector<FlatSelector.SpawnablePositionSelecti
         bucket: SpawnBucket,
         selectionData: SpawnablePositionSelectionData,
     ): SpawnAction<*>? {
-        val selectingSpawnInformation = selectionData.getDataForBucket(bucket) ?: return null
-        var percentSum = selectingSpawnInformation.percentSum
+        val spawnToSpawnablePosition = selectionData.spawnToSpawnablePosition
+        var percentSum = selectionData.percentSum
 
         // First pass is doing percentage checks.
         if (percentSum > 0) {
@@ -149,7 +129,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...
                         This means you don't understand how this option works.
                     """.trimIndent()
                 )
@@ -160,13 +140,13 @@ open class FlatSelector : SpawningSelector<FlatSelector.SpawnablePositionSelecti
              * It's [0, 1) and I want (0, 1]
              * See half-open intervals here https://en.wikipedia.org/wiki/Interval_(mathematics)#Terminology
              */
-            val selectedPercentage = 100 - Random.nextFloat() * 100
+            val selectedPercentage = 100 - Random.Default.nextFloat() * 100
             percentSum = 0F
-            for (info in selectingSpawnInformation.selectingSpawnInformation) {
-                if (info.spawnDetail.percentage > 0) {
-                    percentSum += info.spawnDetail.percentage
+            for ((spawnDetail, info) in spawnToSpawnablePosition) {
+                if (spawnDetail.percentage > 0) {
+                    percentSum += spawnDetail.percentage
                     if (percentSum >= selectedPercentage) {
-                        return info.spawnDetail.choose(
+                        return spawnDetail.choose(
                             spawnablePosition = info.chooseSpawnablePosition(),
                             bucket = bucket,
                             selectionData = selectionData
@@ -176,9 +156,9 @@ open class FlatSelector : SpawningSelector<FlatSelector.SpawnablePositionSelecti
             }
         }
 
-        val selectedSpawn = selectingSpawnInformation.selectingSpawnInformation.toList().weightedSelection { it.highestWeight }!!
-        return selectedSpawn.spawnDetail.choose(
-            spawnablePosition = selectedSpawn.chooseSpawnablePosition(),
+        val selectedSpawn = spawnToSpawnablePosition.entries.toList().weightedSelection { it.value.highestWeight }!!
+        return selectedSpawn.key.choose(
+            spawnablePosition = selectedSpawn.value.chooseSpawnablePosition(),
             bucket = bucket,
             selectionData = selectionData
         )
@@ -189,16 +169,16 @@ open class FlatSelector : SpawningSelector<FlatSelector.SpawnablePositionSelecti
         bucket: SpawnBucket,
         spawnablePositions: List<SpawnablePosition>
     ): Map<SpawnDetail, Float> {
-        val selectionData = getSelectionData(spawner, spawnablePositions).getDataForBucket(bucket)
+        val selectionData = getSelectionData(spawner, bucket, spawnablePositions)
 
-        if (selectionData.selectingSpawnInformation.isEmpty()) {
+        if (selectionData.size == 0) {
             return emptyMap()
         }
 
         val totalWeights = mutableMapOf<SpawnDetail, Float>()
 
-        for (info in selectionData.selectingSpawnInformation) {
-            totalWeights[info.spawnDetail] = info.highestWeight
+        for ((spawnDetail, info) in selectionData.spawnToSpawnablePosition.entries) {
+            totalWeights[spawnDetail] = info.highestWeight
         }
 
         return totalWeights

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

@@ -18,6 +18,7 @@ import com.cobblemon.mod.common.api.spawning.spawner.Spawner
 import com.cobblemon.mod.common.util.removeIf
 import com.cobblemon.mod.common.util.weightedSelection
 import kotlin.random.Random
+import kotlin.reflect.full.createInstance
 
 /**
  * A spawning selector that compiles a distinct list of all spawn details that
@@ -32,9 +33,9 @@ import kotlin.random.Random
  * of an entire spawnable position type to favour whichever are the more populous.
  *
  * The weight for a spawn when doing primary selection is whichever spawnable position-influenced
- * weight is highest (as weight multipliers exist per spawnable position). After the spawn has been
- * chosen, the selection of which spawnable position to spawn it at is selected via another weighted
- * selection using spawnable position-adjusted weights.
+ * weight is highest (as weight multipliers exist per spawnable position) and then the
+ * selection of which spawnable position to spawn the primary selected spawn uses the spawnable
+ * position-adjusted weight.
  *
  * At a glance:
  * - Spawn detail selection is flat across spawnable position quantity
@@ -44,6 +45,7 @@ import kotlin.random.Random
  * @since July 10th, 2022
  */
 open class FlatSpawnablePositionWeightedSelector : SpawningSelector<FlatSpawnablePositionWeightedSelector.SeparatedSelectionData> {
+    open fun getWeight(spawnablePositionType: SpawnablePositionType<*>) = spawnablePositionType.getWeight()
 
     class SelectingSpawnInformation {
         val spawnablePositionWeights = mutableMapOf<SpawnablePosition, Float>()
@@ -60,25 +62,13 @@ open class FlatSpawnablePositionWeightedSelector : SpawningSelector<FlatSpawnabl
         fun chooseSpawnablePosition() = spawnablePositionWeights.keys.toList().weightedSelection { spawnablePositionWeights[it]!! }!!
     }
 
-    class SpawnablePositionSelectionData {
-        val spawnToSpawnablePosition = mutableMapOf<SpawnDetail, SelectingSpawnInformation>()
-        var percentSum: Float = 0F
-        val seenSpawns = mutableListOf<SpawnDetail>()
+    class SpawnablePositionSelectionData(
+        val spawnToSpawnablePosition: MutableMap<SpawnDetail, SelectingSpawnInformation>,
+        var percentSum: Float
+    ) {
         val size: Int
             get() = spawnToSpawnablePosition.size
 
-        fun add(spawnDetail: SpawnDetail, spawnablePosition: SpawnablePosition) {
-            // Only add to percentSum if this is the first time we've seen this SpawnDetail for this spawnable
-            // position type, otherwise the percentage will get amplified for every spawnable position the thing
-            // was possible, completely ruining the point of this pre-selection percentage.
-            if (spawnDetail.percentage > 0 && spawnDetail !in seenSpawns) {
-                percentSum += spawnDetail.percentage
-                seenSpawns.add(spawnDetail)
-            }
-            val selectingSpawnInformation = spawnToSpawnablePosition.getOrPut(spawnDetail, ::SelectingSpawnInformation)
-            selectingSpawnInformation.add(spawnDetail, spawnablePosition, 1F)
-        }
-
         fun removeSpawnDetails(shouldRemove: (SpawnDetail) -> Boolean) {
             val toRemove = spawnToSpawnablePosition.entries.filter { shouldRemove(it.key) }
             toRemove.forEach { spawnToSpawnablePosition.remove(it.key) }
@@ -99,68 +89,67 @@ open class FlatSpawnablePositionWeightedSelector : SpawningSelector<FlatSpawnabl
     }
 
     class SeparatedSelectionData(
-        val spawner: Spawner,
-        val spawnablePositions: List<SpawnablePosition>
-    ) : SpawnSelectionData {
+        val spawnablePositionTypeToSpawns: MutableMap<SpawnablePositionType<*>, SpawnablePositionSelectionData>
+    ): SpawnSelectionData {
         override val spawnActions = mutableListOf<SpawnAction<*>>()
         override val context = mutableMapOf<String, Any>()
 
-        val bucketData = mutableMapOf<SpawnBucket, MutableMap<SpawnablePositionType<*>, SpawnablePositionSelectionData>>()
-
         override fun removeSpawnDetails(shouldRemove: (SpawnDetail) -> Boolean) {
-            bucketData.values.forEach {
-                it.values.forEach { it.removeSpawnDetails(shouldRemove) }
-                it.removeIf { it.value.size == 0 }
-            }
+            spawnablePositionTypeToSpawns.values.forEach { it.removeSpawnDetails(shouldRemove) }
+            spawnablePositionTypeToSpawns.removeIf { it.value.size == 0 }
         }
 
         override fun removeSpawnablePositions(shouldRemove: (SpawnDetail, SpawnablePosition) -> Boolean) {
-            bucketData.values.forEach {
-                it.values.forEach { it.removeSpawnablePositions(shouldRemove) }
-                it.removeIf { it.value.size == 0 }
-            }
-        }
-
-        fun getDataForBucket(bucket: SpawnBucket): MutableMap<SpawnablePositionType<*>, SpawnablePositionSelectionData> {
-            bucketData[bucket]?.let { return it }
-
-            val spawnablePositionTypeToSpawns = mutableMapOf<SpawnablePositionType<*>, SpawnablePositionSelectionData>()
-
-            spawnablePositions.forEach { spawnablePosition ->
-                val spawnablePositionType = SpawnablePosition.getByClass(spawnablePosition)!!
-
-                val possible = spawner.getMatchingSpawns(bucket, spawnablePosition)
-                if (possible.isNotEmpty()) {
-                    val spawnablePositionSelectionData = spawnablePositionTypeToSpawns
-                        .getOrPut(spawnablePositionType, ::SpawnablePositionSelectionData)
-                    possible.forEach { spawnablePositionSelectionData.add(it, spawnablePosition) }
-                }
-            }
-
-            bucketData[bucket] = spawnablePositionTypeToSpawns
-            return spawnablePositionTypeToSpawns
+            spawnablePositionTypeToSpawns.values.forEach { it.removeSpawnablePositions(shouldRemove) }
+            spawnablePositionTypeToSpawns.removeIf { it.value.size == 0 }
         }
     }
 
     override fun getSelectionData(
         spawner: Spawner,
+        bucket: SpawnBucket,
         spawnablePositions: List<SpawnablePosition>
-    ) = SeparatedSelectionData(spawner, spawnablePositions)
+    ): SeparatedSelectionData {
+        val spawnablePositionTypeToSpawns = mutableMapOf<SpawnablePositionType<*>, SpawnablePositionSelectionData>()
+
+        spawnablePositions.forEach { spawnablePosition ->
+            val spawnablePositionType = SpawnablePosition.getByClass(spawnablePosition)!!
+
+            val possible = spawner.getMatchingSpawns(bucket, spawnablePosition)
+            if (possible.isNotEmpty()) {
+                val spawnablePositionSelectionData = spawnablePositionTypeToSpawns.getOrPut(spawnablePositionType) { SpawnablePositionSelectionData(mutableMapOf(), 0F) }
+                possible.forEach {
+                    // Only add to percentSum if this is the first time we've seen this SpawnDetail for this spawnable
+                    // position type, otherwise the percentage will get amplified for every spawnable position the thing
+                    // was possible, completely ruining the point of this pre-selection percentage.
+                    if (it.percentage > 0 && !spawnablePositionSelectionData.spawnToSpawnablePosition.containsKey(it)) {
+                        spawnablePositionSelectionData.percentSum += it.percentage
+                    }
+
+                    val selectingSpawnInformation = spawnablePositionSelectionData.spawnToSpawnablePosition.getOrPut(
+                        it,
+                        SelectingSpawnInformation::class::createInstance
+                    )
+                    selectingSpawnInformation.add(it, spawnablePosition, getWeight(spawnablePositionType))
+                }
+            }
+        }
+
+        return SeparatedSelectionData(spawnablePositionTypeToSpawns)
+    }
 
     override fun selectSpawnAction(
         spawner: Spawner,
         bucket: SpawnBucket,
         selectionData: SeparatedSelectionData
     ): SpawnAction<*>? {
-        val bucketData = selectionData.getDataForBucket(bucket)
-
-        if (bucketData.isEmpty()) {
+        if (selectionData.spawnablePositionTypeToSpawns.isEmpty()) {
             return null
         }
 
         // Which spawnable position type should we use?
-        val spawnablePositionSelectionData = bucketData.entries.toList()
-            .weightedSelection { it.key.getWeight() * it.value.size }
+        val spawnablePositionSelectionData = selectionData.spawnablePositionTypeToSpawns.entries.toList()
+            .weightedSelection { getWeight(it.key) * it.value.size }
             ?.value
             ?: return null
 
@@ -172,7 +161,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...
                         This means you don't understand how this option works.
                     """.trimIndent()
                 )
@@ -184,7 +173,7 @@ open class FlatSpawnablePositionWeightedSelector : SpawningSelector<FlatSpawnabl
              * It's [0, 1) and I want (0, 1]
              * See half-open intervals here https://en.wikipedia.org/wiki/Interval_(mathematics)#Terminology
              */
-            val selectedPercentage = 100 - Random.nextFloat() * 100
+            val selectedPercentage = 100 - Random.Default.nextFloat() * 100
             percentSum = 0F
             for ((spawnDetail, info) in spawnToSpawnablePosition) {
                 if (spawnDetail.percentage > 0) {
@@ -235,8 +224,7 @@ open class FlatSpawnablePositionWeightedSelector : SpawningSelector<FlatSpawnabl
         val percentageWeight = (rescaledTotalWeight - totalWeight) / percentSum
 
         for ((spawnDetail, info) in spawnToSpawnablePosition.entries) {
-            totalWeights[spawnDetail] =
-                info.highestWeight + if (spawnDetail.percentage > 0) spawnDetail.percentage * percentageWeight else 0F
+            totalWeights[spawnDetail] = info.highestWeight + if (spawnDetail.percentage > 0) spawnDetail.percentage * percentageWeight else 0F
         }
 
         return totalWeights
@@ -247,18 +235,18 @@ open class FlatSpawnablePositionWeightedSelector : SpawningSelector<FlatSpawnabl
         bucket: SpawnBucket,
         spawnablePositions: List<SpawnablePosition>
     ): Map<SpawnDetail, Float> {
-        val selectionData = getSelectionData(spawner, spawnablePositions).getDataForBucket(bucket)
+        val selectionData = getSelectionData(spawner, bucket, spawnablePositions)
 
-        if (selectionData.isEmpty()) {
+        if (selectionData.spawnablePositionTypeToSpawns.isEmpty()) {
             return mapOf()
         }
 
         val totalWeights = mutableMapOf<SpawnDetail, Float>()
 
-        val totalSpawnablePositionWeight = selectionData.keys.sumOf { it.getWeight().toDouble() }.toFloat()
+        val totalSpawnablePositionWeight = selectionData.spawnablePositionTypeToSpawns.keys.sumOf { getWeight(it).toDouble() }.toFloat()
 
-        for ((spawnablePositionType, spawnPositionSelectionData) in selectionData) {
-            val spawnPositionWeightCorrection = spawnablePositionType.getWeight() / totalSpawnablePositionWeight
+        for ((spawnablePositionType, spawnPositionSelectionData) in selectionData.spawnablePositionTypeToSpawns) {
+            val spawnPositionWeightCorrection = getWeight(spawnablePositionType) / totalSpawnablePositionWeight
             val spawnPositionProbabilities = getProbabilitiesFromSpawnablePositionType(spawner, spawnPositionSelectionData)
 
             spawnPositionProbabilities.entries.forEach {

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

@@ -29,7 +29,7 @@ interface SpawningSelector<T : SpawnSelectionData> {
         val DEFAULT = FlatSpawnablePositionWeightedSelector()
     }
 
-    fun getSelectionData(spawner: Spawner, spawnablePositions: List<SpawnablePosition>): T
+    fun getSelectionData(spawner: Spawner, bucket: SpawnBucket, spawnablePositions: List<SpawnablePosition>): T
 
     fun selectSpawnAction(
         spawner: Spawner,
@@ -37,18 +37,12 @@ interface SpawningSelector<T : SpawnSelectionData> {
         selectionData: T
     ): SpawnAction<*>?
 
-    fun select(
-        spawner: Spawner,
-        bucketSelector: () -> SpawnBucket,
-        spawnablePositions: List<SpawnablePosition>,
-        maxSpawns: Int
-    ): List<SpawnAction<*>> {
-        val selectionData = getSelectionData(spawner, spawnablePositions)
+    fun select(spawner: Spawner, bucket: SpawnBucket, spawnablePositions: List<SpawnablePosition>, maxSpawns: Int): List<SpawnAction<*>> {
+        val selectionData = getSelectionData(spawner, bucket, spawnablePositions)
 
         val spawnActions = selectionData.spawnActions
 
         while (spawnActions.size < maxSpawns) {
-            val bucket = bucketSelector()
             val spawnAction = selectSpawnAction(
                 spawner = spawner,
                 bucket = bucket,

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

@@ -1,86 +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.spawner
-
-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.PlayerLevelRangeInfluence
-import com.cobblemon.mod.common.api.spawning.influence.PlayerLevelRangeInfluence.Companion.TYPICAL_VARIATION
-import com.cobblemon.mod.common.api.spawning.influence.SpawningInfluence
-import com.cobblemon.mod.common.util.mutableLazy
-import net.minecraft.core.BlockPos
-import net.minecraft.server.level.ServerLevel
-import net.minecraft.server.level.ServerPlayer
-import net.minecraft.world.item.ItemStack
-import com.cobblemon.mod.common.api.spawning.BestSpawner;
-import com.cobblemon.mod.common.api.spawning.position.FishingSpawnablePosition
-
-
-/**
- * This isn't really a factory, one FishingSpawner is created as a field on [BestSpawner] on
- * server start.  However, this emulates the systems that PlayerSpawner uses so extenders can
- * add influences that affect all fishing encounters.
- *
- * Responsible for creating [BasicSpawner]s for Fishing with whatever appropriate settings.
- * You can swap over the spawn pool and the influences here, and it will apply to all newly-generated
- * [BasicSpawner]s for Fishing.  Has a global every-cast influence list, as well as a context-sensitive
- * influence list.
- *
- * @author Andy
- * @since January 23rd, 2026
- */
-object FishingSpawnerFactory {
-    var spawnPool: SpawnPool by mutableLazy {
-        CobblemonSpawnPools.WORLD_SPAWN_POOL
-    }
-
-    data class Context(
-        val player: ServerPlayer,
-        val rodStack: ItemStack,
-        val lureLevel: Int,
-        val luckOfTheSeaLevel: Int,
-        val world: ServerLevel,
-        val pos: BlockPos,
-        val spawner: BasicSpawner
-    )
-
-    /**
-     * List of influences for a new cast of the fishing rod. Context is provided at
-     * build time in [buildPositionInfluences]
-     */
-    var positionInfluenceBuilders = mutableListOf<(ctx: Context) -> SpawningInfluence?>(
-        { ctx -> PlayerLevelRangeInfluence(ctx.player, TYPICAL_VARIATION) },
-        { ctx -> BucketNormalizingInfluence(tier = ctx.lureLevel + ctx.luckOfTheSeaLevel) }
-    )
-
-    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,
-                )
-            )
-        }
-    }
-
-    /**
-     * Builds the per-cast influences for [FishingSpawnablePosition]
-     */
-    fun buildPositionInfluences(ctx: Context): MutableList<SpawningInfluence> {
-        return positionInfluenceBuilders.mapNotNullTo(mutableListOf()) { it(ctx) }
-    }
-}

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

@@ -1,101 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.spawning.spawner
-
-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
-import com.cobblemon.mod.common.api.spawning.rules.SpawnRule
-import com.cobblemon.mod.common.util.mutableLazy
-import net.minecraft.core.BlockPos
-import net.minecraft.server.level.ServerLevel
-
-/**
- * Responsible for creating [FixedAreaSpawner]s for PokeSnacks with whatever appropriate settings.
- * You can swap over the spawn pool and the influences here, and it will apply to all newly-generated
- * [FixedAreaSpawner]s for PokeSnacks.
- *
- * @author Andy
- * @since January 23rd, 2026
- */
-object PokeSnackSpawnerFactory {
-    var spawnPool: SpawnPool by mutableLazy {
-        CobblemonSpawnPools.WORLD_SPAWN_POOL
-    }
-
-    data class Context(
-        val world: ServerLevel,
-        val pos: BlockPos,
-        val horizontalRadius: Int,
-        val verticalRadius: Int,
-        val maxPokemonPerChunk: Float,
-        val name: String,
-        val baitEffects: List<SpawnBait.Effect>
-    )
-
-    /**
-     * The list of influences for a new [FixedAreaSpawner] for a PokeSnack.
-     * The influences will be added to the spawner in the order they are added to this list.
-     */
-    var influenceBuilders = mutableListOf<(ctx: Context) -> SpawningInfluence?>(
-        { ctx ->
-            val stackedLureTier = ctx.baitEffects
-                .filter { it.type == SpawnBait.Effects.RARITY_BUCKET }
-                .sumOf { it.value }
-                .toInt()
-
-            if (stackedLureTier <= 0) null else BucketNormalizingInfluence(
-                tier = stackedLureTier,
-                gradient = 0.2F,
-                firstTier = 1.2F
-            )
-        },
-        { _ ->
-            BucketMultiplyingInfluence(
-                mapOf(
-                    "uncommon" to 2.25f,
-                    "rare" to 5.5f,
-                    "ultra-rare" to 5.5f,
-                )
-            )
-        },
-        { ctx ->
-            SpawnBaitInfluence(effects = ctx.baitEffects)
-        },
-    )
-
-    fun create(ctx: Context): FixedAreaSpawner {
-        val influences = influenceBuilders.mapNotNull { it(ctx) }
-
-        return FixedAreaSpawner(
-            name = ctx.name,
-            spawnPool = spawnPool,
-            world = ctx.world,
-            position = ctx.pos,
-            horizontalRadius = ctx.horizontalRadius,
-            verticalRadius = ctx.verticalRadius,
-            maxPokemonPerChunk = ctx.maxPokemonPerChunk
-        ).also { spawner ->
-            spawner.influences.addAll(influences)
-
-            // TODO(Andy): PokeSnacks currently bypass pokemon spawn rules, should that be true?
-            // Adding this rule will change that
-            spawner.influences.addAll(
-                CobblemonSpawnRules.rules.values
-                    .filter(SpawnRule::enabled)
-                    .flatMap(SpawnRule::components)
-            )
-        }
-    }
-}

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

@@ -29,6 +29,13 @@ import com.cobblemon.mod.common.util.isBoxLoaded
 import com.cobblemon.mod.common.util.squeezeWithinBounds
 import com.cobblemon.mod.common.util.toVec3f
 import com.cobblemon.mod.common.util.weightedSelection
+import kotlin.Any
+import kotlin.Boolean
+import kotlin.Float
+import kotlin.Int
+import kotlin.Pair
+import kotlin.String
+import kotlin.collections.plus
 import kotlin.math.max
 import net.minecraft.core.BlockPos
 import net.minecraft.core.SectionPos
@@ -88,9 +95,10 @@ interface Spawner {
     ): SpawnAction<*>? {
         influences.removeIf { it.isExpired() }
         spawnablePosition.influences.addAll(influences)
+        val bucket = chooseBucket(cause, spawnablePosition.influences)
         return selector.select(
             spawner = this,
-            bucketSelector = { chooseBucket(cause, spawnablePosition.influences) },
+            bucket = bucket,
             spawnablePositions = listOf(spawnablePosition),
             maxSpawns = 1
         ).firstOrNull()
@@ -108,9 +116,9 @@ interface Spawner {
 
         val areaBox = AABB.ofSize(
             Vec3(constrainedArea.getCenter().toVec3f()),
-            ENTITY_LIMIT_CHUNK_RANGE * 16.0,
+            ENTITY_LIMIT_CHUNK_RANGE * 16.0 * 2,
             1000.0,
-            ENTITY_LIMIT_CHUNK_RANGE * 16.0
+            ENTITY_LIMIT_CHUNK_RANGE * 16.0 * 2
         )
 
         if (!constrainedArea.world.isBoxLoaded(areaBox)) {
@@ -132,10 +140,11 @@ interface Spawner {
         val zone = generator.generate(this, constrainedArea)
         val spawnablePositions = resolver.resolve(this, prioritizedAreaCalculators, zone)
         val influences = influences + zone.unconditionalInfluences
+        val bucket = chooseBucket(zoneInput.cause, influences)
 
         return selector.select(
             spawner = this,
-            bucketSelector = { chooseBucket(zoneInput.cause, influences) },
+            bucket = bucket,
             spawnablePositions = spawnablePositions,
             maxSpawns = maxSpawns
         )

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

@@ -77,7 +77,6 @@ abstract class PokemonStore<T : StorePosition> : Iterable<Pokemon> {
         remove(pokemon)
         val position = getFirstAvailablePosition() ?: return false // Couldn't fit, shrug emoji
         set(position, pokemon)
-        Cobblemon.playerDataManager.getTMData(uuid)?.syncTMsFromPokemon(pokemon)
         return true
     }
 
@@ -171,4 +170,4 @@ abstract class PokemonStore<T : StorePosition> : Iterable<Pokemon> {
      * each change, accessed by [Pokemon.getChangeObservable].
      */
     abstract fun getAnyChangeObservable(): Observable<Unit>
-}
+}

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

@@ -332,7 +332,7 @@ open class PCStore(
                                 val toast = Toast(
                                     title = lang("wallpaper_unlocked"),
                                     description = unlockableWallpaper.displayName?.let { "\"".text().add(it.asTranslated()).add("\"") } ?: lang("unknown_wallpaper") ,
-                                    icons = listOf(ItemStack(CobblemonItems.PC))
+                                    icon = ItemStack(CobblemonItems.PC)
                                 )
                                 toast.addListeners(player)
                                 toast.expireAfter(5F)

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

@@ -8,17 +8,14 @@
 
 package com.cobblemon.mod.common.api.storage.player
 
-import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.Cobblemon.MODID
 import com.cobblemon.mod.common.api.pokedex.PokedexManager
 import com.cobblemon.mod.common.api.scheduling.ScheduledTask
 import com.cobblemon.mod.common.api.scheduling.ServerTaskTracker
-import com.cobblemon.mod.common.api.storage.player.client.ClientInstancedPlayerData
-import com.cobblemon.mod.common.api.storage.player.factory.CachedPlayerDataStoreFactory
-import com.cobblemon.mod.common.api.tms.TMMoveManager
 import com.google.common.util.concurrent.ThreadFactoryBuilder
 import java.util.UUID
 import java.util.concurrent.Executors
+import java.util.concurrent.TimeUnit
 import net.minecraft.server.MinecraftServer
 import net.minecraft.server.level.ServerPlayer
 import net.minecraft.world.entity.player.Player
@@ -33,6 +30,7 @@ import net.minecraft.world.entity.player.Player
  * @author Apion
  * @since February 21, 2024
  */
+
 open class PlayerInstancedDataStoreManager {
     val saveExecutor = Executors.newSingleThreadExecutor(
         ThreadFactoryBuilder()
@@ -55,27 +53,19 @@ open class PlayerInstancedDataStoreManager {
         //Should put this somewhere else
         saveTasks[PlayerInstancedDataStoreTypes.GENERAL] = ScheduledTask.Builder()
             .execute { saveAllOfOneType(PlayerInstancedDataStoreTypes.GENERAL) }
-            .delay(30F)
-            .interval(120F)
+            .delay(30f)
+            .interval(120f)
             .infiniteIterations()
             .tracker(ServerTaskTracker)
             .build()
 
         saveTasks[PlayerInstancedDataStoreTypes.POKEDEX] = ScheduledTask.Builder()
             .execute { saveAllOfOneType(PlayerInstancedDataStoreTypes.POKEDEX) }
-            .delay(30F)
-            .interval(120F)
+            .delay(30f)
+            .interval(120f)
             .infiniteIterations()
             .tracker(ServerTaskTracker)
             .build()
-
-        saveTasks[PlayerInstancedDataStoreTypes.TM_MOVES] = ScheduledTask.Builder()
-                .execute { saveAllOfOneType(PlayerInstancedDataStoreTypes.TM_MOVES) }
-                .delay(30F)
-                .interval(120F)
-                .infiniteIterations()
-                .tracker(ServerTaskTracker)
-                .build()
     }
 
     open fun get(playerId: UUID, dataType: PlayerInstancedDataStoreType): InstancedPlayerData {
@@ -136,16 +126,4 @@ open class PlayerInstancedDataStoreManager {
     open fun getPokedexData(playerId: UUID): PokedexManager {
         return get(playerId, PlayerInstancedDataStoreTypes.POKEDEX) as PokedexManager
     }
-
-    fun getTMData(player: ServerPlayer): TMMoveManager {
-        return getTMData(player.uuid)
-    }
-
-    fun getTMData(playerId: UUID): TMMoveManager {
-        val data = get(playerId, PlayerInstancedDataStoreTypes.TM_MOVES)
-        if (data !is TMMoveManager) {
-            Cobblemon.LOGGER.warn("getTMData: No TMMoveManager found for $playerId (got ${data?.javaClass?.name})")
-        }
-        return data as TMMoveManager
-    }
-}
+}

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

@@ -8,10 +8,8 @@
 
 package com.cobblemon.mod.common.api.storage.player
 
-import com.cobblemon.mod.common.Cobblemon
-import com.cobblemon.mod.common.api.storage.player.client.ClientPokedexManager
 import com.cobblemon.mod.common.api.storage.player.client.ClientGeneralPlayerData
-import com.cobblemon.mod.common.api.storage.player.client.ClientTMMoveManager
+import com.cobblemon.mod.common.api.storage.player.client.ClientPokedexManager
 import com.cobblemon.mod.common.util.cobblemonResource
 import net.minecraft.resources.ResourceLocation
 
@@ -29,22 +27,11 @@ object PlayerInstancedDataStoreTypes {
         ClientPokedexManager::runAction,
         ClientPokedexManager::runIncremental
     ))
-    val TM_MOVES = register(PlayerInstancedDataStoreType(
-        cobblemonResource("tm_moves"),
-        ClientTMMoveManager::decode,
-        ClientTMMoveManager::runAction,
-        ClientTMMoveManager::runIncremental
-    ))
 
     fun register(type: PlayerInstancedDataStoreType): PlayerInstancedDataStoreType {
-        Cobblemon.LOGGER.debug("Registering PlayerInstancedDataStoreType: {}", type.id)
         types[type.id] = type
         return type
     }
 
-    fun getTypeById(id: ResourceLocation): PlayerInstancedDataStoreType? {
-        val type = types[id]
-        if (type == null) Cobblemon.LOGGER.warn("Unknown PlayerInstancedDataStoreType ID: {}", id)
-        return type
-    }
-}
+    fun getTypeById(id: ResourceLocation) = types[id]
+}

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

@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.storage.player.adapter
-
-import com.cobblemon.mod.common.api.storage.player.PlayerInstancedDataStoreTypes
-import com.cobblemon.mod.common.api.tms.TMMoveManager
-import com.cobblemon.mod.common.util.adapters.CodecBackedAdapter
-import com.google.gson.GsonBuilder
-import com.google.gson.reflect.TypeToken
-import java.util.UUID
-
-class TMMoveJsonBackend : JsonBackedPlayerDataStoreBackend<TMMoveManager>("tm_moves", PlayerInstancedDataStoreTypes.TM_MOVES) {
-    override val gson = GsonBuilder()
-        .setPrettyPrinting()
-        .disableHtmlEscaping()
-        .registerTypeAdapter(TMMoveManager::class.java, CodecBackedAdapter(TMMoveManager.CODEC))
-        .create()
-
-    override val classToken = TypeToken.get(TMMoveManager::class.java)
-    override val defaultData = defaultDataFunc
-
-    override fun initialize(store: TMMoveManager) {
-        store.initialize()
-    }
-
-    companion object {
-        val defaultDataFunc = { uuid: UUID -> TMMoveManager(uuid) }
-    }
-}

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

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

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

@@ -1,18 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.storage.player.adapter
-
-import com.cobblemon.mod.common.api.storage.player.PlayerInstancedDataStoreTypes
-import com.cobblemon.mod.common.api.tms.TMMoveManager
-import java.util.UUID
-
-class TMMoveNbtBackend : NbtBackedPlayerData<TMMoveManager>("tm_moves", PlayerInstancedDataStoreTypes.TM_MOVES) {
-    override val codec = TMMoveManager.CODEC
-    override val defaultData = TMMoveJsonBackend.defaultDataFunc
-}

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

@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.storage.player.client
-
-import com.cobblemon.mod.common.api.storage.player.PlayerInstancedDataStoreTypes
-import com.cobblemon.mod.common.client.CobblemonClient
-import com.cobblemon.mod.common.net.messages.client.SetClientPlayerDataPacket
-import com.cobblemon.mod.common.util.readString
-import com.cobblemon.mod.common.util.writeString
-import net.minecraft.network.RegistryFriendlyByteBuf
-import net.minecraft.resources.ResourceLocation
-
-class ClientTMMoveManager(
-    val learnedTMs: MutableSet<ResourceLocation>
-) : ClientInstancedPlayerData {
-
-    override fun encode(buf: RegistryFriendlyByteBuf) {
-        buf.writeCollection(learnedTMs) { _, id -> buf.writeString(id.toString()) }
-    }
-
-    companion object {
-        fun decode(buf: RegistryFriendlyByteBuf): SetClientPlayerDataPacket {
-            val tms = buf.readCollection(
-                { mutableSetOf<ResourceLocation>() },
-                { buf.readString().let(ResourceLocation::tryParse) ?: ResourceLocation("minecraft", "empty") }
-            )
-            return SetClientPlayerDataPacket(
-                PlayerInstancedDataStoreTypes.TM_MOVES,
-                ClientTMMoveManager(tms)
-            )
-        }
-
-        fun runAction(data: ClientInstancedPlayerData) {
-            if (data !is ClientTMMoveManager) return
-            CobblemonClient.clientTMMoveData = data
-        }
-
-        fun runIncremental(data: ClientInstancedPlayerData) {
-            if (data !is ClientTMMoveManager) return
-            CobblemonClient.clientTMMoveData.learnedTMs.addAll(data.learnedTMs)
-        }
-    }
-}

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

@@ -40,6 +40,8 @@ class CachedPlayerDataStoreFactory<T : InstancedPlayerData>(val backend: PlayerD
         }
     }
 
+
+
     override fun saveAll() {
         cache.forEach { (_, pd) -> backend.save(pd) }
         cache.removeIf { (uuid, _) -> uuid.getPlayer() == null }

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

@@ -91,7 +91,6 @@ object CobblemonBlockTags {
     @JvmField val TUMBLESTONE_BRICKS = createTag("tumblestone_bricks")
     @JvmField val TUMBLESTONES = createTag("tumblestones")
     @JvmField val TUMBLESTONE_HEAT_SOURCE = createTag("tumblestone_heat_source")
-    @JvmField val TYPE_GEM_BLOCKS = createTag("type_gem_blocks")
     @JvmField val WALL_HANGING_SIGNS = createTag("wall_hanging_signs")
     @JvmField val WALL_SIGNS = createTag("wall_signs")
     @JvmField val WATER_STONE_ORES = createTag("water_stone_ores")

common/src/main/kotlin/com/cobblemon/mod/common/api/tms/ObtainMethod.kt

@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.tms
-
-import com.cobblemon.mod.common.tms.obtain.DefaultObtainMethod
-import com.cobblemon.mod.common.tms.obtain.PlayerHasAdvancementObtainMethod
-import com.cobblemon.mod.common.tms.obtain.PlayerYObtainMethod
-import com.cobblemon.mod.common.tms.obtain.UnlockableObtainMethod
-import net.minecraft.network.RegistryFriendlyByteBuf
-import net.minecraft.server.level.ServerPlayer
-
-interface ObtainMethod {
-    val passive: Boolean
-
-    /**
-     * Checks if this [ObtainMethod] matches the given player.
-     */
-    fun matches(player: ServerPlayer): Boolean
-
-    /**
-     * Serializes this [ObtainMethod] to the buffer.
-     */
-    fun writeToBuffer(buffer: RegistryFriendlyByteBuf)
-
-    companion object {
-        /**
-         * Deserializes an [ObtainMethod] from the buffer.
-         */
-        fun readFromBuffer(buffer: RegistryFriendlyByteBuf): ObtainMethod {
-            val variant = buffer.readUtf()
-            return when (variant) {
-                "cobblemon:unlockable" -> UnlockableObtainMethod()
-                "cobblemon:default" -> DefaultObtainMethod()
-                "cobblemon:advancement" -> {
-                    val advancement = buffer.readResourceLocation()
-                    PlayerHasAdvancementObtainMethod(advancement)
-                }
-                "cobblemon:y_level" -> {
-                    val yLevel = buffer.readVarInt()
-                    val operator = buffer.readUtf()
-                    PlayerYObtainMethod(yLevel, operator)
-                }
-                else -> throw IllegalArgumentException("Unknown ObtainMethod variant: $variant")
-            }
-        }
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/api/tms/TMMoveManager.kt

@@ -1,177 +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.tms
-
-import com.cobblemon.mod.common.CobblemonNetwork.sendPacket
-import com.cobblemon.mod.common.api.moves.MoveTemplate
-import com.cobblemon.mod.common.api.scheduling.ScheduledTask
-import com.cobblemon.mod.common.api.scheduling.ServerTaskTracker
-import com.cobblemon.mod.common.api.storage.player.InstancedPlayerData
-import com.cobblemon.mod.common.api.storage.player.PlayerInstancedDataStoreTypes
-import com.cobblemon.mod.common.api.storage.player.client.ClientTMMoveManager
-import com.cobblemon.mod.common.net.messages.client.SetClientPlayerDataPacket
-import com.cobblemon.mod.common.net.messages.client.toast.ToastPacket
-import com.cobblemon.mod.common.pokemon.Pokemon
-import com.cobblemon.mod.common.util.getPlayer
-import com.cobblemon.mod.common.util.lang
-import com.mojang.serialization.Codec
-import com.mojang.serialization.codecs.RecordCodecBuilder
-import java.util.UUID
-import net.minecraft.network.chat.Component
-import net.minecraft.resources.ResourceLocation
-
-class TMMoveManager(
-    override val uuid: UUID,
-    val learnedTMs: MutableSet<ResourceLocation> = mutableSetOf()
-) : InstancedPlayerData {
-
-    val storeType = PlayerInstancedDataStoreTypes.TM_MOVES
-
-    override fun toClientData() = ClientTMMoveManager(learnedTMs.toMutableSet())
-    fun toClientDataFrom(set: Set<ResourceLocation>) = ClientTMMoveManager(set.toMutableSet())
-
-    fun syncTMsFromPokemon(pokemon: Pokemon) {
-        learn(getLearnableTMsFromPokemon(pokemon))
-    }
-
-    fun syncTMFromMove(moveTemplate: MoveTemplate) {
-        val tmId = TechnicalMachines.moveToTM[moveTemplate]?.id ?: return
-        learn(listOf(tmId))
-    }
-
-    fun getLearnableTMsFromPokemon(pokemon: Pokemon): Collection<ResourceLocation> {
-        return TechnicalMachines.tmMap.values
-            .filter { tm -> tm.moveName in pokemon.allAccessibleMoves }
-            .map(TechnicalMachine::id)
-    }
-
-    fun scheduleFullSyncFromStores(
-        party: Iterable<Pokemon?>,
-        pc: Iterable<Pokemon?>,
-        batchSize: Int = 25
-    ) {
-        val iterator = sequence {
-            for (pokemon in party) {
-                if (pokemon != null) yield(pokemon)
-            }
-            for (pokemon in pc) {
-                if (pokemon != null) yield(pokemon)
-            }
-        }.iterator()
-
-        if (!iterator.hasNext()) return
-
-        val tmIds = mutableSetOf<ResourceLocation>()
-
-        ScheduledTask.Builder()
-            .tracker(ServerTaskTracker)
-            .interval(0F)
-            .infiniteIterations()
-            .execute { task ->
-                var processed = 0
-                while (processed < batchSize && iterator.hasNext()) {
-                    val pokemon = iterator.next()
-                    for (move in pokemon.allAccessibleMoves) {
-                        TechnicalMachines.moveToTM[move]?.id?.let { tmIds.add(it) }
-                    }
-                    processed++
-                }
-
-                if (!iterator.hasNext()) {
-                    learn(tmIds)
-                    task.expire()
-                }
-            }
-            .build()
-    }
-
-    fun learn(tmIds: Collection<ResourceLocation>): Boolean {
-        val newLearnedTms = mutableListOf<ResourceLocation>()
-        for (tmId in tmIds) {
-            if (learnedTMs.add(tmId)) {
-                newLearnedTms.add(tmId)
-            }
-        }
-
-        if (newLearnedTms.isEmpty()) return false
-
-        syncClient(newLearnedTms.toSet())
-        sendTMToast(newLearnedTms)
-
-        return true
-    }
-
-    fun unlearn(tmIds: Collection<ResourceLocation>): Boolean {
-        val removedTms = mutableListOf<ResourceLocation>()
-
-        for (tmId in tmIds) {
-            if (learnedTMs.remove(tmId)) {
-                removedTms.add(tmId)
-            }
-        }
-
-        if (removedTms.isEmpty()) return false
-
-        syncClient(learnedTMs, isIncremental = false)
-
-        return true
-    }
-
-    fun sendTMToast(tmIds: List<ResourceLocation>) {
-        val player = uuid.getPlayer() ?: return
-        var moveName: Component = Component.empty()
-        val icons = tmIds.mapNotNull {
-            val tm = TechnicalMachines.tmMap[it] ?: return@mapNotNull null
-            moveName = tm.translatedMoveName()
-
-            return@mapNotNull tm.createItemStack()
-        }
-
-        val description = if (icons.size == 1) moveName else lang("tms.check_tmm")
-
-        val packet = ToastPacket(
-            title = lang("tms.new_tms_learned"),
-            description = description,
-            icons = icons,
-            frameTexture = ResourceLocation.parse("minecraft:toast/advancement"),
-            progress = -1F,
-            progressColor = 0x00FF00,
-            // Keeping it a fixed UUID makes it so the ToastTracker merges different toasts on the client
-            uuid = UUID.nameUUIDFromBytes("tm_toast".toByteArray()),
-            behaviour = ToastPacket.Behaviour.SHOW_OR_UPDATE,
-            durationMs = 4000L
-        )
-
-        player.sendPacket(packet)
-    }
-
-    fun syncClient(updateSet: Set<ResourceLocation> = learnedTMs, isIncremental: Boolean = true) {
-        uuid.getPlayer()?.sendPacket(
-            SetClientPlayerDataPacket(
-                type = storeType,
-                playerData = toClientDataFrom(updateSet),
-                isIncremental = isIncremental
-            )
-        )
-    }
-
-    companion object {
-        val CODEC: Codec<TMMoveManager> = RecordCodecBuilder.create { instance ->
-            instance.group(
-                Codec.STRING.xmap(UUID::fromString, UUID::toString)
-                    .fieldOf("uuid")
-                    .forGetter { it.uuid },
-                Codec.list(ResourceLocation.CODEC)
-                    .xmap({ it.toMutableSet() }, { it.toList() })
-                    .fieldOf("learnedTMs")
-                    .forGetter { it.learnedTMs }
-            ).apply(instance, ::TMMoveManager)
-        }
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/api/tms/TechnicalMachine.kt

@@ -1,126 +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.tms
-
-import com.cobblemon.mod.common.CobblemonItems
-import com.cobblemon.mod.common.api.moves.MoveTemplate
-import com.cobblemon.mod.common.api.types.ElementalType
-import com.cobblemon.mod.common.api.types.ElementalTypes
-import com.cobblemon.mod.common.client.CobblemonClient
-import com.cobblemon.mod.common.item.components.TMMoveComponent
-import com.cobblemon.mod.common.pokemon.Pokemon
-import com.cobblemon.mod.common.tms.obtain.DefaultObtainMethod
-import com.cobblemon.mod.common.util.lang
-import net.minecraft.resources.ResourceLocation
-import net.minecraft.server.level.ServerPlayer
-import net.minecraft.network.chat.MutableComponent
-import net.minecraft.world.entity.player.Player
-import net.minecraft.world.item.ItemStack
-
-class TechnicalMachine(
-    val moveName: MoveTemplate,
-    val recipe: List<TechnicalMachineRecipe>?,
-    val obtainMethods: List<ObtainMethod> = emptyList(),
-    val type: String
-) {
-    companion object {
-        /**
-         * Filters all available [TechnicalMachines] based on three optional arguments
-         *
-         * @param search A [String] to check against move names
-         * @param type An [ElementalType] to check for
-         * @param pokemon A [Pokemon] to check the [Learnset] of
-         * @return A [MutableSet] of [TechnicalMachine] that passed the filter
-         */
-        fun filterTms(
-            search: String?,
-            type: ElementalType?,
-            pokemon: Pokemon?,
-            player: Player? = null,
-            includeUnlearned: Boolean = false
-        ): MutableSet<TechnicalMachine> {
-            val tms = TechnicalMachines.tmMap.values.toMutableSet()
-
-            type?.let {
-                val iterator = tms.iterator()
-                while (iterator.hasNext()) {
-                    val tm = iterator.next()
-                    if (ElementalTypes.get(tm.type) != type) {
-                        iterator.remove()
-                    }
-                }
-            }
-
-            pokemon?.let {
-                val iterator = tms.iterator()
-                while (iterator.hasNext()) {
-                    val tm = iterator.next()
-                    if (tm.moveName !in pokemon.form.moves.tmLearnableMoves()) {
-                        iterator.remove()
-                    }
-                }
-            }
-
-            search?.let {
-                val iterator = tms.iterator()
-                while (iterator.hasNext()) {
-                    val tm = iterator.next()
-                    if (!tm.translatedMoveName().string.contains(search, ignoreCase = true)) {
-                        iterator.remove()
-                    }
-                }
-            }
-
-            if (player != null && !includeUnlearned) {
-                val learnedTMs = CobblemonClient.clientTMMoveData.learnedTMs
-                tms.retainAll { tm -> tm.isPassivelyObtained() || tm.id in learnedTMs }
-            }
-
-            return tms
-        }
-    }
-
-    lateinit var id: ResourceLocation
-
-    /**
-     * Gets the recipe list limited to the provided amount to match the slot amount of the TM Machine.
-     *
-     * @param limit The amount of recipe item slots to take.
-     * @return The recipe list limited to 3 ingredients.
-     */
-    fun getClampedRecipe(limit: Int = 3): List<TechnicalMachineRecipe>? = recipe?.take(limit)
-
-    /**
-     * Unlocks this [TechnicalMachine] for the player.
-     *
-     * @param player The [ServerPlayer] to give this [TechnicalMachine] to.
-     * @return Whether the player was successfully granted the [TechnicalMachine]
-     */
-    fun unlock(player: ServerPlayer): Boolean {
-        if (!obtainMethods.any { it is DefaultObtainMethod }) {
-            player.sendSystemMessage(lang("tms.unlock_tm", moveName.displayName))
-        }
-        return true
-    }
-
-    fun isPassivelyObtained() = obtainMethods.any { it is DefaultObtainMethod }
-
-    /**
-     * Returns a [MutableComponent] of the translated move name of this [TechnicalMachine]
-     *
-     * @return This [TechnicalMachine]'s move name, translated
-     */
-    fun translatedMoveName(): MutableComponent = moveName.displayName
-
-    fun createItemStack(): ItemStack {
-        val stack = ItemStack(CobblemonItems.TECHNICAL_MACHINE)
-        TMMoveComponent.setTMMove(stack, moveName)
-        return stack
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/api/tms/TechnicalMachineDTO.kt

@@ -1,30 +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.tms
-
-import com.cobblemon.mod.common.api.moves.MoveTemplate
-
-/**
- * DTO used for [TechnicalMachine] JSON loading because Gson cannot deserialize Minecraft Ingredients.
- */
-data class TechnicalMachineDTO(
-    val moveName: MoveTemplate,
-    val recipe: List<TechnicalMachineRecipeDTO>?,
-    val obtainMethods: List<ObtainMethod> = emptyList(),
-    val type: String
-) {
-    fun toTechnicalMachine(): TechnicalMachine {
-        return TechnicalMachine(
-            moveName = moveName,
-            recipe = recipe?.map { it.toTechnicalMachineRecipe() },
-            obtainMethods = obtainMethods,
-            type = type
-        )
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/api/tms/TechnicalMachineRecipe.kt

@@ -1,19 +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.tms
-
-import net.minecraft.world.item.crafting.Ingredient
-
-/**
- * Represents the ingredients necessary to craft a [TechnicalMachine] in the [TMBlock]
- */
-data class TechnicalMachineRecipe(
-    val ingredient: Ingredient,
-    val count: Int
-)

common/src/main/kotlin/com/cobblemon/mod/common/api/tms/TechnicalMachineRecipeDTO.kt

@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.tms
-
-import com.google.gson.annotations.SerializedName
-import net.minecraft.core.registries.BuiltInRegistries
-import net.minecraft.core.registries.Registries
-import net.minecraft.resources.ResourceLocation
-import net.minecraft.tags.TagKey
-import net.minecraft.world.item.crafting.Ingredient
-
-/**
- * DTO used for [TechnicalMachineRecipe] JSON loading because Gson cannot deserialize Minecraft Ingredients.
- */
-data class TechnicalMachineRecipeDTO(
-    val item: ResourceLocation?,
-    val tag: ResourceLocation?,
-    @SerializedName("count") private val _count: Int?,
-) {
-    private val count: Int
-        get() = _count ?: 1
-
-    fun toTechnicalMachineRecipe(): TechnicalMachineRecipe {
-        val ingredient = when {
-            item != null ->
-                Ingredient.of(
-                    BuiltInRegistries.ITEM.get(item)
-                )
-
-            tag != null ->
-                Ingredient.of(
-                    TagKey.create(Registries.ITEM, tag)
-                )
-
-            else ->
-                error("Recipe entry must define either 'item' or 'tag'")
-        }
-
-        return TechnicalMachineRecipe(
-            ingredient = ingredient,
-            count = count
-        )
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/api/tms/TechnicalMachines.kt

@@ -1,74 +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.tms
-
-import com.cobblemon.mod.common.api.data.JsonDataRegistry
-import com.cobblemon.mod.common.api.moves.MoveTemplate
-import com.cobblemon.mod.common.api.moves.adapters.MoveTemplateAdapter
-import com.cobblemon.mod.common.api.reactive.SimpleObservable
-import com.cobblemon.mod.common.util.adapters.TMObtainMethodAdapter
-import com.cobblemon.mod.common.util.adapters.IdentifierAdapter
-import com.cobblemon.mod.common.util.cobblemonResource
-import com.google.gson.GsonBuilder
-import com.google.gson.reflect.TypeToken
-import java.io.BufferedReader
-import java.util.concurrent.ExecutionException
-import net.minecraft.resources.ResourceLocation
-import net.minecraft.server.level.ServerPlayer
-import net.minecraft.server.packs.PackType
-
-object TechnicalMachines : JsonDataRegistry<TechnicalMachine> {
-    override val gson = GsonBuilder()
-            .registerTypeAdapter(ResourceLocation::class.java, IdentifierAdapter)
-            .registerTypeAdapter(ObtainMethod::class.java, TMObtainMethodAdapter)
-            .registerTypeAdapter(MoveTemplate::class.java, MoveTemplateAdapter)
-            .create()
-
-    override val typeToken = TypeToken.get(TechnicalMachine::class.java)
-    override val resourcePath = "tms"
-    override val id = cobblemonResource("technical_machines")
-    override val type = PackType.SERVER_DATA
-    override val observable = SimpleObservable<TechnicalMachines>()
-
-    val tmMap = mutableMapOf<ResourceLocation, TechnicalMachine>()
-    val moveToTM = mutableMapOf<MoveTemplate, TechnicalMachine>()
-
-    /**
-     * Overridden to deserialize a DTO first and convert it to a runtime
-     * [TechnicalMachine], since Gson cannot deserialize Minecraft Ingredients
-     * directly.
-     */
-    override fun parse(
-        reader: BufferedReader,
-        identifier: ResourceLocation
-    ): TechnicalMachine {
-        try {
-            val technicalMachineDto = gson.fromJson(reader, TechnicalMachineDTO::class.java)
-            val technicalMachine = technicalMachineDto.toTechnicalMachine()
-            return technicalMachine
-        } catch (exception: Exception) {
-            throw ExecutionException(
-                "Error loading Technical Machine JSON: $identifier",
-                exception
-            )
-        }
-    }
-
-    override fun reload(data: Map<ResourceLocation, TechnicalMachine>) {
-        data.forEach { (id, tm) ->
-            tmMap[id] = tm
-            tm.id = id
-            moveToTM[tm.moveName] = tm
-        }
-    }
-
-    fun getByResourceLocation(resourceLocation: ResourceLocation) = tmMap[resourceLocation]
-    fun getAllResourceLocations() = tmMap.keys.toSet()
-    override fun sync(player: ServerPlayer) {}
-}

common/src/main/kotlin/com/cobblemon/mod/common/api/toast/Toast.kt

@@ -28,7 +28,7 @@ import net.minecraft.world.item.ItemStack
  *
  * @param title The [Component] representing the toast title, this can be a [Component.empty].
  * @param description The [Component] representing the toast description, this can be a [Component.empty].
- * @param icons The [ItemStack] that is rendered as the toast icon, this can be a [ItemStack.EMPTY].
+ * @param icon The [ItemStack] that is rendered as the toast icon, this can be a [ItemStack.EMPTY].
  * @param frameTexture The texture of the frame, default is the [VANILLA_BACKGROUND_SPRITE].
  * @param progress The value of the progress bar, this accepts a value between 0.0F and 1.0F, any other value will not render a progress bar.
  * @param progressColor The progress bar color in RGB, default is the [VANILLA_PROGRESS_COLOR].
@@ -38,7 +38,7 @@ import net.minecraft.world.item.ItemStack
 class Toast(
     title: Component,
     description: Component,
-    icons: List<ItemStack>,
+    icon: ItemStack,
     frameTexture: ResourceLocation = VANILLA_BACKGROUND_SPRITE,
     progress: Float = -1F,
     progressColor: Int = VANILLA_PROGRESS_COLOR
@@ -57,7 +57,7 @@ class Toast(
     /**
      * The [ItemStack] that is rendered as the toast icon, this can be a [ItemStack.EMPTY].
      */
-    var icons: List<ItemStack> by Delegates.observable(icons) { _, old, new -> if (old != new) this.launchUpdate() }
+    var icon: ItemStack by Delegates.observable(icon) { _, old, new -> if (old != new) this.launchUpdate() }
 
     /**
      * The texture of the frame.
@@ -185,7 +185,7 @@ class Toast(
     private fun toPacket(behaviour: ToastPacket.Behaviour): ToastPacket = ToastPacket(
         this.title,
         this.description,
-        this.icons,
+        this.icon,
         this.frameTexture,
         this.progress,
         this.progressColor,

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

@@ -29,12 +29,9 @@ class ElementalType(
     val displayName: MutableComponent,
     val hue: Int,
     val textureXMultiplier: Int,
-    val primaryColor: Int,
-    val secondaryColor: Int,
     val resourceLocation: ResourceLocation = ResourceLocation.fromNamespaceAndPath(Cobblemon.MODID, "ui/types.png"),
-    val showdownId: String = ShowdownIdentifiable.REGEX.replace(name.lowercase(), ""),
-    val typeGem: ResourceLocation = ResourceLocation.fromNamespaceAndPath(Cobblemon.MODID, showdownId + "_gem"),
-    ) : ShowdownIdentifiable {
+    val showdownId: String = ShowdownIdentifiable.REGEX.replace(name.lowercase(), "")
+) : ShowdownIdentifiable {
 
     override fun showdownId(): String {
         return showdownId

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

@@ -23,9 +23,7 @@ object ElementalTypes {
         name = "Normal",
         displayName = Component.translatable("cobblemon.type.normal"),
         hue = 0xE8E8DA,
-        textureXMultiplier = 0,
-        primaryColor = 0x8FA689,
-        secondaryColor = 0xFFFBE2
+        textureXMultiplier = 0
     )
 
     @JvmField
@@ -33,9 +31,7 @@ object ElementalTypes {
         name = "Fire",
         displayName = Component.translatable("cobblemon.type.fire"),
         hue = 0xFF6E21,
-        textureXMultiplier = 1,
-        primaryColor = 0xF92D2D,
-        secondaryColor = 0xF99B1D
+        textureXMultiplier = 1
     )
 
     @JvmField
@@ -43,9 +39,7 @@ object ElementalTypes {
         name = "Water",
         displayName = Component.translatable("cobblemon.type.water"),
         hue = 0x3FA5FF,
-        textureXMultiplier = 2,
-        primaryColor = 0x377AF6,
-        secondaryColor = 0x50DDF9
+        textureXMultiplier = 2
     )
 
     @JvmField
@@ -53,9 +47,7 @@ object ElementalTypes {
         name = "Grass",
         displayName = Component.translatable("cobblemon.type.grass"),
         hue = 0x62D14F,
-        textureXMultiplier = 3,
-        primaryColor = 0x0EAE95,
-        secondaryColor = 0xC6F554
+        textureXMultiplier = 3
     )
 
     @JvmField
@@ -63,9 +55,7 @@ object ElementalTypes {
         name = "Electric",
         displayName = Component.translatable("cobblemon.type.electric"),
         hue = 0xFFD314,
-        textureXMultiplier = 4,
-        primaryColor = 0xF7AB19,
-        secondaryColor = 0xFFF257
+        textureXMultiplier = 4
     )
 
     @JvmField
@@ -73,9 +63,7 @@ object ElementalTypes {
         name = "Ice",
         displayName = Component.translatable("cobblemon.type.ice"),
         hue = 0x54F2F2,
-        textureXMultiplier = 5,
-        primaryColor = 0x41BAED,
-        secondaryColor = 0x91F4F9
+        textureXMultiplier = 5
     )
 
     @JvmField
@@ -83,9 +71,7 @@ object ElementalTypes {
         name = "Fighting",
         displayName = Component.translatable("cobblemon.type.fighting"),
         hue = 0xEF565D,
-        textureXMultiplier = 6,
-        primaryColor = 0xC8356B,
-        secondaryColor = 0xF36A3F
+        textureXMultiplier = 6
     )
 
     @JvmField
@@ -93,9 +79,7 @@ object ElementalTypes {
         name = "Poison",
         displayName = Component.translatable("cobblemon.type.poison"),
         hue = 0xD651FF,
-        textureXMultiplier = 7,
-        primaryColor = 0x7B41DD,
-        secondaryColor = 0xE568F4
+        textureXMultiplier = 7
     )
 
     @JvmField
@@ -103,9 +87,7 @@ object ElementalTypes {
         name = "Ground",
         displayName = Component.translatable("cobblemon.type.ground"),
         hue = 0xF4A453,
-        textureXMultiplier = 8,
-        primaryColor = 0xE08835,
-        secondaryColor = 0xFFD057
+        textureXMultiplier = 8
     )
 
     @JvmField
@@ -113,9 +95,7 @@ object ElementalTypes {
         name = "Flying",
         displayName = Component.translatable("cobblemon.type.flying"),
         hue = 0xB8B2FF,
-        textureXMultiplier = 9,
-        primaryColor = 0x6083F6,
-        secondaryColor = 0xD5CCFA
+        textureXMultiplier = 9
     )
 
     @JvmField
@@ -123,9 +103,7 @@ object ElementalTypes {
         name = "Psychic",
         displayName = Component.translatable("cobblemon.type.psychic"),
         hue = 0xFF5E9E,
-        textureXMultiplier = 10,
-        primaryColor = 0xE553CE,
-        secondaryColor = 0xF69DD5
+        textureXMultiplier = 10
     )
 
     @JvmField
@@ -133,9 +111,7 @@ object ElementalTypes {
         name = "Bug",
         displayName = Component.translatable("cobblemon.type.bug"),
         hue = 0xD3D319,
-        textureXMultiplier = 11,
-        primaryColor = 0x9FBE1B,
-        secondaryColor = 0xE9FB5B
+        textureXMultiplier = 11
     )
 
     @JvmField
@@ -143,9 +119,7 @@ object ElementalTypes {
         name = "Rock",
         displayName = Component.translatable("cobblemon.type.rock"),
         hue = 0xB7A16E,
-        textureXMultiplier = 12,
-        primaryColor = 0x9F814A,
-        secondaryColor = 0xEECB7A
+        textureXMultiplier = 12
     )
 
     @JvmField
@@ -153,9 +127,7 @@ object ElementalTypes {
         name = "Ghost",
         displayName = Component.translatable("cobblemon.type.ghost"),
         hue = 0x9C80F7,
-        textureXMultiplier = 13,
-        primaryColor = 0x4F57DD,
-        secondaryColor = 0xC182F1
+        textureXMultiplier = 13
     )
 
     @JvmField
@@ -163,9 +135,7 @@ object ElementalTypes {
         name = "Dragon",
         displayName = Component.translatable("cobblemon.type.dragon"),
         hue = 0x7580FF,
-        textureXMultiplier = 14,
-        primaryColor = 0x4E68E2,
-        secondaryColor = 0x47C7F7
+        textureXMultiplier = 14
     )
 
     @JvmField
@@ -173,9 +143,7 @@ object ElementalTypes {
         name = "Dark",
         displayName = Component.translatable("cobblemon.type.dark"),
         hue = 0x587DA0,
-        textureXMultiplier = 15,
-        primaryColor = 0x465B99,
-        secondaryColor = 0x689EBF
+        textureXMultiplier = 15
     )
 
     @JvmField
@@ -183,9 +151,7 @@ object ElementalTypes {
         name = "Steel",
         displayName = Component.translatable("cobblemon.type.steel"),
         hue = 0xABD1F4,
-        textureXMultiplier = 16,
-        primaryColor = 0x628CB9,
-        secondaryColor = 0xD6F7F3
+        textureXMultiplier = 16
     )
 
     @JvmField
@@ -193,20 +159,16 @@ object ElementalTypes {
         name = "Fairy",
         displayName = Component.translatable("cobblemon.type.fairy"),
         hue = 0xFF7FE5,
-        textureXMultiplier = 17,
-        primaryColor = 0xE2678C,
-        secondaryColor = 0xF5A7B7
+        textureXMultiplier = 17
     )
 
     @JvmStatic
-    fun register(name: String, displayName: MutableComponent, hue: Int, textureXMultiplier: Int, primaryColor: Int, secondaryColor: Int): ElementalType {
+    fun register(name: String, displayName: MutableComponent, hue: Int, textureXMultiplier: Int): ElementalType {
         return ElementalType(
             name = name,
             displayName = displayName,
             hue = hue,
-            textureXMultiplier = textureXMultiplier,
-            primaryColor =  primaryColor,
-            secondaryColor = secondaryColor
+            textureXMultiplier = textureXMultiplier
         ).also {
             allTypes.add(it)
         }
@@ -311,4 +273,4 @@ object ElementalTypes {
     @JvmName("getFAIRY")
     @Deprecated("Use ElementalTypes.FAIRY, provided for backwards compatibility until Cobblemon 1.8.")
     fun getFAIRY() = FAIRY
-}
+}

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

@@ -31,6 +31,7 @@ import kotlin.collections.associateWith
 import kotlin.collections.partition
 import kotlin.math.absoluteValue
 
+
 /**
  * AI that tries to choose the best move for the given situations. Based off of the Pokemon Trainer Tournament Simulator Github
  * https://github.com/cRz-Shadows/Pokemon_Trainer_Tournament_Simulator/blob/main/pokemon-showdown/sim/examples/Simulation-test-1.ts#L330
@@ -48,7 +49,7 @@ class StrongBattleAI(skill: Int) : BattleAI {
     private val hpWeightConsideration = 0.25 // how much HP difference is a consideration for switchins
     private val hpFractionCoefficient = 0.4 // how much HP differences should be taken into account for switch ins
     private val boostWeightCoefficient = 1 // the amount of boosts considered a baseline to be removed
-    private val switchOutMatchupThreshold = -2 // todo change this to get it feeling just right (-7 never switches)
+    private val switchOutMatchupThreshold = 0 // todo change this to get it feeling just right (-7 never switches)
     private val selfKoMoveMatchupThreshold = 0.3
     private val trickRoomThreshold = 85
     private val recoveryMoveThreshold = 0.50
@@ -218,14 +219,19 @@ class StrongBattleAI(skill: Int) : BattleAI {
             .filter { it.second.canBeSentOut() }
 
         if (forceSwitch || activeBattlePokemon.isGone()) {
-            // When forced to switch, pick the Pokemon with the best matchup estimation
-            val bestSwitchScore = availableSwitches.maxOfOrNull { estimateMatchup(activeBattlePokemon, aiSide, battle, it.first) }
-                ?: return PassActionResponse
-            val bestSwitch = availableSwitches.firstOrNull { estimateMatchup(activeBattlePokemon, aiSide, battle, it.first) == bestSwitchScore }
-                ?: return PassActionResponse
+            if (battle.turn == 1) {
+                val switchTo = activeBattlePokemon.actor.pokemonList.filter { it.canBeSentOut() }.randomOrNull()
+                        ?: return DefaultActionResponse()
+                switchTo.willBeSwitchedIn = true
+                return SwitchActionResponse(switchTo.uuid)
+            }
+            else {
+                val bestEstimation = availableSwitches.maxByOrNull { estimateMatchup(activeBattlePokemon, aiSide, battle, it.first) }
+                    ?: return PassActionResponse
 
-            bestSwitch.second.willBeSwitchedIn = true
-            return SwitchActionResponse(bestSwitch.second.uuid)
+                bestEstimation.second.willBeSwitchedIn = true
+                return SwitchActionResponse(bestEstimation.second.uuid)
+            }
         }
         if (moveset == null) {
             return PassActionResponse
@@ -253,9 +259,9 @@ class StrongBattleAI(skill: Int) : BattleAI {
 
         if (!checkSkillLevel()){
             val move = availableMoves
-                .filter { it.first.target.targetList(activeBattlePokemon)?.isEmpty() != true }
-                .randomOrNull()
-                ?: return MoveActionResponse("struggle")
+                    .filter { it.first.target.targetList(activeBattlePokemon)?.isEmpty() != true }
+                    .randomOrNull()
+                    ?: return MoveActionResponse("struggle")
 
             return chooseMove(move.first, activeBattlePokemon)
         }
@@ -264,6 +270,7 @@ class StrongBattleAI(skill: Int) : BattleAI {
         if (checkSwitchOutSkill() && shouldSwitchOut(aiSide, battle, activeBattlePokemon, moveset)) {
             considerSwitching(activeBattlePokemon, activeTrackerPokemon, opponents, availableMoves, availableSwitches, battle, aiSide)
         }
+        activeTrackerPokemon.firstTurn = false
 
         // If HP is below 30% and not switching out, always use the most damaging move
         if (activeTrackerPokemon.currentHpPercent < 0.3 && !shouldSwitchOut(aiSide, battle, activeBattlePokemon, moveset)) {
@@ -289,6 +296,8 @@ class StrongBattleAI(skill: Int) : BattleAI {
                 return chooseMove(fakeOut.first, activeBattlePokemon, targets.firstOrNull { validTarget != null && validTarget.id == it.battlePokemon!!.uuid})
             }
 
+            activeTrackerPokemon.firstTurn = false
+
 
             // Explosion/Self destruct
             availableMoves.firstOrNull {
@@ -306,7 +315,7 @@ class StrongBattleAI(skill: Int) : BattleAI {
 
             // Deal with non-weather related field changing effects
             for (move in availableMoves) {
-
+                
                 // Tailwind
                 if (move.first.id == "tailwind" && move.first.id != activeTracker.alliedSide.tailwindCondition &&
                     availableSwitches.size > 2) {
@@ -315,21 +324,21 @@ class StrongBattleAI(skill: Int) : BattleAI {
 
                 // Trick room
                 if (move.first.id == "trickroom" && move.first.id != activeTracker.currentRoom
-                    && availableSwitches.count { statEstimationActive(it.first, Stats.SPEED) <= trickRoomThreshold } >= 2) {
+                        && availableSwitches.count { statEstimationActive(it.first, Stats.SPEED) <= trickRoomThreshold } >= 2) {
                     return chooseMove(move.first, activeBattlePokemon)
                 }
 
                 // todo find a way to get list of active screens
                 // Aurora veil
                 if (move.first.id == "auroraveil" && move.first.id != activeTracker.alliedSide.screenCondition
-                    && activeTracker.currentWeather in listOf("hail", "snow")) {
+                        && activeTracker.currentWeather in listOf("hail", "snow")) {
                     return chooseMove(move.first, activeBattlePokemon)
                 }
 
                 // todo find a way to get list of active screens
                 // Light Screen
                 if (move.first.id == "lightscreen" && move.first.id != activeTracker.alliedSide.screenCondition
-                    && opponents.any { (it.species?.baseStats?.get(Stats.SPECIAL_ATTACK) ?: 0) > (it.species?.baseStats?.get(Stats.ATTACK) ?: 0) }
+                    && opponents.any { (it.species?.baseStats?.get(Stats.SPECIAL_ATTACK) ?: 0) > (it.species?.baseStats?.get(Stats.ATTACK) ?: 0) } 
                     && availableSwitches.size > 1) {
                     return chooseMove(move.first, activeBattlePokemon)
                 }
@@ -347,13 +356,13 @@ class StrongBattleAI(skill: Int) : BattleAI {
             for (move in availableMoves) {
                 // Setup
                 if (nOppRemainingMons >= 3 && move.first.id in AIUtility.entryHazards
-                    && !activeTracker.opponentSide.sideHazards.contains(move.first.id)) {
+                        && !activeTracker.opponentSide.sideHazards.contains(move.first.id)) {
                     return chooseMove(move.first, activeBattlePokemon)
                 }
 
                 // Removal
                 if (nRemainingMons >= 2 && move.first.id in AIUtility.antiHazardsMoves
-                    && activeTracker.alliedSide.sideHazards.isNotEmpty()) {
+                        && activeTracker.alliedSide.sideHazards.isNotEmpty()) {
                     return chooseMove(move.first, activeBattlePokemon)
                 }
             }
@@ -363,10 +372,10 @@ class StrongBattleAI(skill: Int) : BattleAI {
             // Court Change
             for (move in availableMoves) {
                 if (move.first.id == "courtchange"
-                    && (!AIUtility.entryHazards.none { it in activeTracker.alliedSide.sideHazards }
-                            || setOf("tailwind", "lightscreen", "reflect").any { it in activeTracker.opponentSide.sideHazards })
-                    && setOf("tailwind", "lightscreen", "reflect").none { it in activeTracker.opponentSide.sideHazards }
-                    && AIUtility.entryHazards.none { it in activeTracker.opponentSide.sideHazards }) {
+                        && (!AIUtility.entryHazards.none { it in activeTracker.alliedSide.sideHazards }
+                                || setOf("tailwind", "lightscreen", "reflect").any { it in activeTracker.opponentSide.sideHazards })
+                        && setOf("tailwind", "lightscreen", "reflect").none { it in activeTracker.opponentSide.sideHazards }
+                        && AIUtility.entryHazards.none { it in activeTracker.opponentSide.sideHazards }) {
                     return chooseMove(move.first, activeBattlePokemon)
                 }
             }
@@ -374,7 +383,7 @@ class StrongBattleAI(skill: Int) : BattleAI {
             // Strength Sap
             for (move in availableMoves) {
                 if (move.first.id == "strengthsap" && activeTrackerPokemon.currentHpPercent < 0.5
-                    && activeTrackerPokemon.species!!.baseStats.getOrDefault(Stats.ATTACK, 0) > 80) {
+                        && activeTrackerPokemon.species!!.baseStats.getOrDefault(Stats.ATTACK, 0) > 80) {
                     return chooseMove(move.first, activeBattlePokemon)
                 }
             }
@@ -382,10 +391,10 @@ class StrongBattleAI(skill: Int) : BattleAI {
             // Belly Drum
             for (move in availableMoves) {
                 if (move.first.id == "bellydrum"
-                    && (activeTrackerPokemon.currentHpPercent > 0.6
-                            && activeTrackerPokemon.pokemon!!.heldItem().item == CobblemonItems.SITRUS_BERRY
-                            || activeTrackerPokemon.currentHpPercent > 0.8)
-                    && activeTrackerPokemon.boosts.getOrDefault(Stats.ATTACK, 0) < 1) {
+                        && (activeTrackerPokemon.currentHpPercent > 0.6
+                                && activeTrackerPokemon.pokemon!!.heldItem().item == CobblemonItems.SITRUS_BERRY
+                        || activeTrackerPokemon.currentHpPercent > 0.8)
+                        && activeTrackerPokemon.boosts.getOrDefault(Stats.ATTACK, 0) < 1) {
                     return chooseMove(move.first, activeBattlePokemon)
                 }
             }
@@ -395,8 +404,8 @@ class StrongBattleAI(skill: Int) : BattleAI {
             for (move in availableMoves) {
                 AIUtility.weatherSetupMoves[move.first.id]?.let { requiredWeather ->
                     if (activeTracker.currentWeather != requiredWeather.lowercase() &&
-                        !(activeTracker.currentWeather == "primordialsea" && requiredWeather == "raindance") &&
-                        !(activeTracker.currentWeather == "desolateland" && requiredWeather == "sunnyday")) {
+                            !(activeTracker.currentWeather == "primordialsea" && requiredWeather == "raindance") &&
+                            !(activeTracker.currentWeather == "desolateland" && requiredWeather == "sunnyday")) {
                         return chooseMove(move.first, activeBattlePokemon)
                     }
                 }
@@ -422,8 +431,8 @@ class StrongBattleAI(skill: Int) : BattleAI {
                     // Stall out side conditions
                     if ((activeTracker.opponentSide.screenCondition != null || activeTracker.opponentSide.tailwindCondition != null) &&
                         (activeTracker.alliedSide.screenCondition == null || activeTracker.alliedSide.tailwindCondition == null)  ||
-                        opponents.any { it.currentStatus == null } &&
-                        activeTrackerPokemon.protectCount == 0 && opponents.none { it.currentAbility?.name == "unseenfist"}) {
+                            opponents.any { it.currentStatus == null } &&
+                            activeTrackerPokemon.protectCount == 0 && opponents.none { it.currentAbility?.name == "unseenfist"}) {
                         activeTrackerPokemon.protectCount = 3
                         return chooseMove(move.first, activeBattlePokemon)
                     }
@@ -451,10 +460,10 @@ 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")
+                .filter { it.first.canBeUsed() }
+                .filter { it.first.mustBeUsed() || it.first.target.targetList(activeBattlePokemon)?.isEmpty() != true }
+                .randomOrNull()
+                ?: return MoveActionResponse("struggle")
 
         return chooseMove(move.first, activeBattlePokemon)
     }
@@ -511,10 +520,6 @@ class StrongBattleAI(skill: Int) : BattleAI {
             return false
 
         val activeTrackerPokemon = activeTracker.alliedSide.activePokemon.first { it.id == activeBattlePokemon.battlePokemon!!.uuid }
-
-        // Don't switch out if we just switched in
-        if (activeTrackerPokemon.firstTurn)
-            return false
         val actorTracker = activeTracker.alliedSide.actors.first { activeTrackerPokemon in it.activePokemon }
         val availableSwitches = actorTracker.party.filter { it.currentHp!! > 0 }
         val currentAbility = activeTrackerPokemon.pokemon!!.ability
@@ -527,7 +532,7 @@ class StrongBattleAI(skill: Int) : BattleAI {
         // Only switch if a switch-in is significantly better than the current Pokémon
         val currentScore = estimateMatchup(activeBattlePokemon, side, battle)
         val bestSwitchScore = availableSwitches.maxOfOrNull { estimateMatchup(activeBattlePokemon, side, battle, it) } ?: currentScore
-        val improvementThreshold = currentScore.absoluteValue * 0.5 + 3
+        val improvementThreshold = currentScore.absoluteValue * 0.25 + 2
         if (bestSwitchScore <= currentScore + improvementThreshold) {
             return false
         }
@@ -562,7 +567,7 @@ class StrongBattleAI(skill: Int) : BattleAI {
         if (availableSwitches.isEmpty() || availableSwitches.none { estimateMatchup(activeBattlePokemon, side, battle, it) > 0 })
             return false
 
-
+        
 
         // ...and a 'good' reason to switch out
         if (opponentActiveTracker.any { it.boosts.getOrDefault(Stats.ACCURACY, 0) <= accuracySwitchThreshold } ||
@@ -990,4 +995,6 @@ class StrongBattleAI(skill: Int) : BattleAI {
             return MoveActionResponse(move.id, chosenTarget.getPNX())
         }
     }
-}
+}
+
+

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

@@ -132,7 +132,6 @@ class TrackerActor(val uuid: UUID) {
         actor.activePokemon.filter { newActive -> activePokemon.none { it.id == newActive.battlePokemon?.uuid } }.forEach {
             val active = party.firstOrNull { trackMon -> trackMon.id == it.battlePokemon?.uuid } ?: return@forEach
             party.remove(active)
-            active.firstTurn = true // Reset firstTurn when switching in
             activePokemon.add(active)
         }
         val swappedOut = activePokemon.filter { trackMon -> actor.activePokemon.none { it.battlePokemon?.uuid == trackMon.id } }
@@ -146,7 +145,6 @@ class TrackerActor(val uuid: UUID) {
         actor.activePokemon.filter { newActive -> activePokemon.none { it.id == newActive.battlePokemon?.uuid } }.forEach {
             val active = party.firstOrNull { trackMon -> trackMon.id == it.battlePokemon?.uuid } ?: return@forEach
             party.remove(active)
-            active.firstTurn = true // Reset firstTurn when switching in
             activePokemon.add(active)
         }
         val swappedOut = activePokemon.filter { trackMon -> actor.activePokemon.none { it.battlePokemon?.uuid == trackMon.id } }

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

@@ -133,10 +133,7 @@ class ApricornBlock(settings: Properties, val apricorn: Apricorn) : HorizontalDi
     override fun isBonemealSuccess(world: Level, random: RandomSource, pos: BlockPos, state: BlockState) = true
 
     override fun performBonemeal(world: ServerLevel, random: RandomSource, pos: BlockPos, state: BlockState) {
-        val curAge = state.getValue(AGE)
-        val newAge = curAge + 1
-        if (newAge > MAX_AGE) return
-        world.setBlock(pos, state.setValue(AGE, newAge), UPDATE_CLIENTS)
+        world.setBlock(pos, state.setValue(AGE, state.getValue(AGE) + 1), 2)
     }
 
     override fun createBlockStateDefinition(builder: StateDefinition.Builder<Block, BlockState>) {
@@ -189,17 +186,17 @@ class ApricornBlock(settings: Properties, val apricorn: Apricorn) : HorizontalDi
      * This uses [Block.dropResources] to handle the drops.
      * It will also reset the [BlockState] of this block at the given location to the start of growth.
      *
-     * @param world The [Level] the apricorn is in.
+     * @param world The [World] the apricorn is in.
      * @param state The [BlockState] of the apricorn.
      * @param pos The [BlockPos] of the apricorn.
      * @return The [BlockState] after harvest.
      */
     fun harvest(world: Level, state: BlockState, pos: BlockPos): BlockState {
         // Uses loot tables, to change the drops use 'data/cobblemon/loot_tables/blocks/<color>_apricorn.json'
-        dropResources(state, world, pos)
+        Block.dropResources(state, world, pos)
         // Don't use default as we want to keep the facing
         val resetState = state.setValue(AGE, MIN_AGE)
-        world.setBlock(pos, resetState, UPDATE_CLIENTS)
+        world.setBlock(pos, resetState, Block.UPDATE_CLIENTS)
         return resetState
     }
 

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

@@ -81,32 +81,7 @@ class BerryBlock(private val berryIdentifier: ResourceLocation, settings: Proper
 
     override fun isBonemealSuccess(world: Level, random: RandomSource, pos: BlockPos, state: BlockState) = !this.isMaxAge(state)
 
-    // Use Random Tick instead of BlockEntityTicker for performance optimization
-    override fun <T : BlockEntity> getTicker(world: Level, blockState: BlockState, blockWithEntityType: BlockEntityType<T>): BlockEntityTicker<T>? = null
-
-    // Enable Random Tick: only immature and non-rooted berries need to tick
-    override fun isRandomlyTicking(state: BlockState): Boolean {
-        return state.getValue(AGE) < FRUIT_AGE && !state.getValue(IS_ROOTED)
-    }
-
-    // Random Tick handler: uses time compensation to ensure correct growth speed
-    @Deprecated("Deprecated in Java")
-    override fun randomTick(state: BlockState, world: ServerLevel, pos: BlockPos, random: RandomSource) {
-        val blockEntity = world.getBlockEntity(pos) as? BerryBlockEntity ?: return
-        
-        // processTick calculates elapsed time and updates timer, returns whether growth is needed
-        if (blockEntity.processTick(world, pos, state) && !world.getBlockTicks().hasScheduledTick(pos, this)) {
-            // Schedule growth for next tick to avoid tick scheduler conflicts during randomTick
-            world.scheduleTick(pos, this, 1)
-        }
-    }
-
-    // Scheduled tick handler: performs the actual growth
-    @Deprecated("Deprecated in Java")
-    override fun tick(state: BlockState, world: ServerLevel, pos: BlockPos, random: RandomSource) {
-        if (state.getValue(IS_ROOTED)) return
-        growHelper(world, random, pos, state)
-    }
+    override fun <T : BlockEntity> getTicker(world: Level, blockState: BlockState, blockWithEntityType: BlockEntityType<T>): BlockEntityTicker<T>? = createTickerHelper(blockWithEntityType, CobblemonBlockEntities.BERRY, BerryBlockEntity.TICKER)
 
     init {
         registerDefaultState(stateDefinition.any()

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

@@ -21,7 +21,6 @@ import net.minecraft.world.level.block.Blocks
 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.Property
 import net.minecraft.world.phys.shapes.CollisionContext
 import net.minecraft.world.phys.shapes.VoxelShape
 
@@ -43,8 +42,6 @@ abstract class GrowableStoneBlock(
     val nextStage: Block?
 ) : DirectionalBlock(settings) {
 
-    abstract val growthChance: Int
-
     private val upShape: VoxelShape = Block.box(
         xzOffset.toDouble(),
         0.0,
@@ -98,26 +95,20 @@ abstract class GrowableStoneBlock(
             .setValue(FACING, Direction.DOWN))
     }
 
-    abstract fun canGrow(state: BlockState, pos: BlockPos, world: BlockGetter): Boolean
+    abstract fun canGrow(pos: BlockPos, world: BlockGetter): Boolean
 
     override fun createBlockStateDefinition(builder: StateDefinition.Builder<Block, BlockState>) {
         builder.add(FACING)
     }
 
+    override fun isRandomlyTicking(state: BlockState): Boolean = stage < MAX_STAGE
+
     override fun randomTick(state: BlockState, world: ServerLevel, pos: BlockPos, random: RandomSource) {
-        if (world.random.nextInt(growthChance) == 0 && canGrow(state, pos, world)) {
+        if (world.random.nextInt(5) == 0 && canGrow(pos, world)) {
             val block = nextStage
 
             if (block != null) {
-                var newState = block.defaultBlockState()
-
-                @Suppress("UNCHECKED_CAST")
-                for (property in state.properties) {
-                    if (newState.hasProperty(property)) {
-                        newState = newState.setValue(property as Property<Comparable<Any>>, state.getValue(property) as Comparable<Any>)
-                    }
-                }
-
+                val newState = block.defaultBlockState().setValue(FACING, state.getValue(FACING)) as BlockState
                 world.setBlockAndUpdate(pos, newState)
             }
         }
@@ -164,4 +155,14 @@ abstract class GrowableStoneBlock(
             else -> upShape
         }
     }
+
+    companion object {
+        const val STAGE_0 = 0
+        const val STAGE_1 = 1
+        const val STAGE_2 = 2
+        const val STAGE_3 = 3
+
+        const val MAX_STAGE = STAGE_3
+        const val MIN_STAGE = STAGE_0
+    }
 }

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

@@ -16,11 +16,6 @@ import com.mojang.serialization.MapCodec
 import net.minecraft.core.BlockPos
 import net.minecraft.core.Direction
 import net.minecraft.util.StringRepresentable
-import net.minecraft.world.InteractionHand
-import net.minecraft.world.InteractionResult
-import net.minecraft.world.ItemInteractionResult
-import net.minecraft.world.entity.player.Player
-import net.minecraft.world.item.ItemStack
 import net.minecraft.world.item.context.BlockPlaceContext
 import net.minecraft.world.level.BlockGetter
 import net.minecraft.world.level.Level
@@ -33,7 +28,6 @@ import net.minecraft.world.level.block.state.StateDefinition
 import net.minecraft.world.level.block.state.properties.BlockStateProperties.HORIZONTAL_FACING
 import net.minecraft.world.level.block.state.properties.EnumProperty
 import net.minecraft.world.level.pathfinder.PathComputationType
-import net.minecraft.world.phys.BlockHitResult
 import net.minecraft.world.phys.shapes.CollisionContext
 import net.minecraft.world.phys.shapes.Shapes
 import net.minecraft.world.phys.shapes.VoxelShape
@@ -41,8 +35,7 @@ import net.minecraft.world.phys.shapes.VoxelShape
 class MonitorBlock(settings: Properties) : MultiblockBlock(settings) {
     init {
         registerDefaultState(stateDefinition.any()
-            .setValue(HORIZONTAL_FACING, Direction.NORTH)
-            .setValue(SCREEN, MonitorScreen.OFF))
+            .setValue(HORIZONTAL_FACING, Direction.NORTH))
     }
 
     override fun createMultiBlockEntity(
@@ -62,47 +55,6 @@ class MonitorBlock(settings: Properties) : MultiblockBlock(settings) {
         return defaultBlockState().setValue(HORIZONTAL_FACING, blockPlaceContext.horizontalDirection)
     }
 
-    override fun useWithoutItem(
-        state: BlockState,
-        level: Level,
-        pos: BlockPos,
-        player: Player,
-        hit: BlockHitResult
-    ): InteractionResult {
-        val entity = level.getBlockEntity(pos) as? FossilMultiblockEntity ?: return InteractionResult.PASS
-        return entity.handleUseWithoutItem(state, level, pos, player)
-    }
-
-    override fun useItemOn(
-        stack: ItemStack,
-        state: BlockState,
-        level: Level,
-        pos: BlockPos,
-        player: Player,
-        hand: InteractionHand,
-        hit: BlockHitResult
-    ): ItemInteractionResult {
-        val entity = level.getBlockEntity(pos) as? FossilMultiblockEntity
-            ?: return ItemInteractionResult.SKIP_DEFAULT_BLOCK_INTERACTION
-        val result = entity.handleUseItem(stack, state, level, pos, player, hand)
-        if (result == ItemInteractionResult.PASS_TO_DEFAULT_BLOCK_INTERACTION) {
-            return if (entity.handleUseWithoutItem(state, level, pos, player).consumesAction()) {
-                ItemInteractionResult.sidedSuccess(level.isClientSide)
-            } else {
-                ItemInteractionResult.PASS_TO_DEFAULT_BLOCK_INTERACTION
-            }
-        }
-        return result
-    }
-
-    override fun onRemove(state: BlockState, level: Level, pos: BlockPos, newState: BlockState, movedByPiston: Boolean) {
-        if (state.block != newState.block && !level.isClientSide && !movedByPiston) {
-            val entity = level.getBlockEntity(pos) as? FossilMultiblockEntity
-            entity?.dropDisk(level, pos, state)
-        }
-        super.onRemove(state, level, pos, newState, movedByPiston)
-    }
-
     override fun createBlockStateDefinition(builder: StateDefinition.Builder<Block, BlockState>) {
         builder.add(HORIZONTAL_FACING)
         builder.add(SCREEN)
@@ -191,27 +143,8 @@ class MonitorBlock(settings: Properties) : MultiblockBlock(settings) {
         BLUE_PROGRESS_7,
         BLUE_PROGRESS_8,
         BLUE_PROGRESS_9,
-        GREEN_PROGRESS_9,
-        TM_NORMAL,
-        TM_FIRE,
-        TM_WATER,
-        TM_GRASS,
-        TM_ELECTRIC,
-        TM_ICE,
-        TM_FIGHTING,
-        TM_POISON,
-        TM_GROUND,
-        TM_FLYING,
-        TM_PSYCHIC,
-        TM_BUG,
-        TM_ROCK,
-        TM_GHOST,
-        TM_DRAGON,
-        TM_DARK,
-        TM_STEEL,
-        TM_FAIRY,
-        MUSIC;
+        GREEN_PROGRESS_9;
 
         override fun getSerializedName(): String = this.name.lowercase()
     }
-}
+}

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

@@ -1,114 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.block
-
-import com.cobblemon.mod.common.block.entity.TMShelfBlockEntity
-import com.mojang.serialization.MapCodec
-import net.minecraft.core.BlockPos
-import net.minecraft.core.Direction
-import net.minecraft.world.InteractionHand
-import net.minecraft.world.InteractionResult
-import net.minecraft.world.ItemInteractionResult
-import net.minecraft.world.entity.player.Player
-import net.minecraft.world.item.ItemStack
-import net.minecraft.world.item.context.BlockPlaceContext
-import net.minecraft.world.level.BlockGetter
-import net.minecraft.world.level.Level
-import net.minecraft.world.level.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) {
-    companion object {
-        val CODEC: MapCodec<TMShelfBlock> = simpleCodec(::TMShelfBlock)
-        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)
-        })
-    }
-
-    override fun codec() = CODEC
-
-    override fun newBlockEntity(pos: BlockPos, state: BlockState): BlockEntity {
-        return TMShelfBlockEntity(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
-
-    override fun getStateForPlacement(ctx: BlockPlaceContext): BlockState {
-        return defaultBlockState().setValue(FACING, ctx.horizontalDirection.opposite)
-    }
-
-    override fun useWithoutItem(
-        state: BlockState, level: Level, pos: BlockPos,
-        player: Player, hit: BlockHitResult
-    ): InteractionResult {
-        val entity = level.getBlockEntity(pos) as? TMShelfBlockEntity ?: return InteractionResult.PASS
-        return entity.handleUseWithoutItem(state, level, pos, player, hit)
-    }
-
-    override fun useItemOn(
-        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
-        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
-        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
-                if (entity != null) {
-                    for (index in entity.items.indices) {
-                        val stack = entity.items[index]
-                        if (!stack.isEmpty) {
-                            Containers.dropItemStack(level, pos.x + 0.5, pos.y + 0.5, pos.z + 0.5, stack)
-                            entity.items[index] = ItemStack.EMPTY
-                        }
-                    }
-                    level.updateNeighbourForOutputSignal(pos, this)
-                }
-            }
-            super.onRemove(state, level, pos, newState, movedByPiston)
-        } else {
-            super.onRemove(state, level, pos, newState, movedByPiston)
-        }
-    }
-
-    override fun getShape(
-        state: BlockState, level: BlockGetter,
-        pos: BlockPos, context: net.minecraft.world.phys.shapes.CollisionContext
-    ): VoxelShape = Block.box(0.0, 0.0, 0.0, 16.0, 16.0, 16.0)
-}

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

@@ -44,25 +44,15 @@ class TumblestoneBlock(
             PrimitiveCodec.INT.fieldOf("xzOffset").forGetter { it.xzOffset },
             Block.CODEC.fieldOf("nextStage").forGetter { it.nextStage }
         ).apply(it, ::TumblestoneBlock) }
-
-        const val STAGE_0 = 0
-        const val STAGE_1 = 1
-        const val STAGE_2 = 2
-        const val STAGE_3 = 3
-
-        const val MAX_STAGE = STAGE_3
-        const val MIN_STAGE = STAGE_0
     }
 
-    override val growthChance = 5
-
     init {
         registerDefaultState(stateDefinition.any()
             .setValue(FACING, Direction.DOWN)
             .setValue(WATERLOGGED, false))
     }
 
-    override fun canGrow(state: BlockState, pos: BlockPos, world: BlockGetter): Boolean {
+    override fun canGrow(pos: BlockPos, world: BlockGetter): Boolean {
         if (stage == MAX_STAGE) return false
         val iterator: Iterator<BlockPos> =
             BlockPos.betweenClosed(pos.offset(-1, -1, -1), pos.offset(1, 1, 1))
@@ -76,8 +66,6 @@ class TumblestoneBlock(
         return true
     }
 
-    override fun isRandomlyTicking(state: BlockState): Boolean = stage < MAX_STAGE
-
     override fun codec(): MapCodec<out DirectionalBlock> {
         return CODEC
     }

common/src/main/kotlin/com/cobblemon/mod/common/block/TypeGemBlock.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.block
-
-import com.cobblemon.mod.common.CobblemonBlocks
-import com.cobblemon.mod.common.CobblemonItems
-import net.minecraft.world.item.Item
-import net.minecraft.world.level.block.Block
-
-class TypeGemBlock(
-    settings: Properties
-) : Block(settings) {
-
-    companion object {
-
-    }
-}

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

@@ -1,284 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.block
-
-import com.cobblemon.mod.common.CobblemonItems
-import com.cobblemon.mod.common.api.tags.CobblemonBlockTags
-import com.mojang.serialization.MapCodec
-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
-import net.minecraft.world.item.BlockItem
-import net.minecraft.world.item.Item
-import net.minecraft.world.item.ItemStack
-import net.minecraft.world.item.Items
-import net.minecraft.world.item.component.BlockItemStateProperties
-import net.minecraft.world.item.component.CustomModelData
-import net.minecraft.world.item.context.BlockPlaceContext
-import net.minecraft.world.item.enchantment.Enchantments
-import net.minecraft.world.item.enchantment.ItemEnchantments
-import net.minecraft.world.level.LevelAccessor
-import net.minecraft.world.level.LevelReader
-import net.minecraft.world.level.block.AirBlock
-import net.minecraft.world.level.block.Block
-import net.minecraft.world.level.block.Blocks
-import net.minecraft.world.level.block.DirectionalBlock
-import net.minecraft.world.level.block.Mirror
-import net.minecraft.world.level.block.Rotation
-import net.minecraft.world.level.block.state.BlockState
-import net.minecraft.world.level.block.state.StateDefinition
-import net.minecraft.world.level.block.state.properties.BooleanProperty
-import net.minecraft.world.level.block.state.properties.DirectionProperty
-import net.minecraft.world.level.block.state.properties.IntegerProperty
-import net.minecraft.world.level.material.PushReaction
-import net.minecraft.world.level.storage.loot.LootContext
-import net.minecraft.world.level.storage.loot.LootParams
-import net.minecraft.world.level.storage.loot.parameters.LootContextParams
-import net.minecraft.world.phys.shapes.Shapes
-import net.minecraft.world.phys.shapes.VoxelShape
-import javax.swing.text.html.HTML.Attribute.SHAPES
-import kotlin.io.path.Path
-
-class TypeGemClusterBlock(
-        settings: Properties,
-        val nextStage: Block,
-        val dropItemId: ResourceLocation
-) : DirectionalBlock(settings.pushReaction(PushReaction.DESTROY)) {
-
-    companion object {
-        val CODEC: MapCodec<TypeGemClusterBlock> = RecordCodecBuilder.mapCodec { instance ->
-            instance.group(
-                propertiesCodec(),
-                Block.CODEC.fieldOf("nextStage").forGetter { it.nextStage },
-                ResourceLocation.CODEC.fieldOf("dropItem").forGetter { it.dropItemId }
-            ).apply(instance) { settings, nextStage, dropItemId ->
-                TypeGemClusterBlock(settings, nextStage, dropItemId).also {
-                    gemToClusterMap[nextStage] = it
-                }
-            }
-        }
-        val gemToClusterMap: MutableMap<Block, TypeGemClusterBlock> = mutableMapOf()
-
-        val SHOULD_GROW: BooleanProperty = BooleanProperty.create("should_grow")
-        val FACING: DirectionProperty = DirectionalBlock.FACING
-        val STAGE: IntegerProperty = IntegerProperty.create("stage", 0, 3)
-        val STUNTED: BooleanProperty = BooleanProperty.create("stunted")
-
-        fun clusterFromGemBlock(gemBlock: Block): TypeGemClusterBlock? {
-            return gemToClusterMap[gemBlock]
-        }
-    }
-
-    init {
-        registerDefaultState(stateDefinition.any()
-                .setValue(FACING, Direction.UP)
-                .setValue(SHOULD_GROW, true)
-                .setValue(STAGE, 0)
-                .setValue(STUNTED, false)
-        )
-    }
-
-    override fun getStateForPlacement(context: BlockPlaceContext): BlockState? {
-        val facing = context.clickedFace
-        val world = context.level
-        val pos = context.clickedPos.relative(facing.opposite)
-        val blockBelow = world.getBlockState(pos).block
-        val shouldGrow = blockBelow is TypeGemCoreBlock
-
-        return defaultBlockState()
-                .setValue(FACING, facing)
-                .setValue(SHOULD_GROW, shouldGrow)
-                .setValue(STAGE, 0)
-                .setValue(STUNTED, false)
-    }
-
-    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
-
-        val currentStage = state.getValue(STAGE)
-
-        if (currentStage < 3) {
-            // Progress through stages regardless of STUNTED
-            level.setBlock(pos, state.setValue(STAGE, currentStage + 1), Block.UPDATE_ALL)
-            return
-        }
-
-        // At STAGE_3
-        val isStunted = state.getValue(STUNTED)
-        val facing = state.getValue(FACING)
-
-        if (isStunted) {
-            // println("[TypeGemClusterBlock] Cluster at $pos is STUNTED at STAGE_3. Finalizing growth.")
-            level.setBlock(pos, state.setValue(SHOULD_GROW, false), Block.UPDATE_ALL)
-            return
-        }
-
-        // Log type of cluster based on nextStage
-        val clusterType = level.registryAccess()
-                .registryOrThrow(BuiltInRegistries.BLOCK.key())
-                .getKey(nextStage)
-                .toString()
-
-        // println("[TypeGemClusterBlock] Attempting to grow into TypeGemBlock at $pos")
-        // println("[TypeGemClusterBlock] Cluster type: $clusterType")
-
-        // Check neighboring gem blocks
-        val hasConflict = Direction.entries
-                .filter { it != facing.opposite }
-                .any { dir ->
-                    val neighborPos = pos.relative(dir)
-                    val neighborState = level.getBlockState(neighborPos)
-                    val neighborBlockId = BuiltInRegistries.BLOCK.getKey(neighborState.block)
-                    // println("[TypeGemClusterBlock] Neighbor at $dir -> $neighborBlockId")
-                    isGem(neighborState)
-                }
-
-        if (hasConflict) {
-            // println("[TypeGemClusterBlock] Found nearby TypeGemBlock(s). Stunting cluster at $pos.")
-            level.setBlock(
-                    pos,
-                    state.setValue(STUNTED, true).setValue(SHOULD_GROW, false),
-                    Block.UPDATE_ALL
-            )
-        } else {
-            // println("[TypeGemClusterBlock] No conflicts. Converting cluster to TypeGemBlock.")
-            var nextState = nextStage.defaultBlockState()
-            if (nextState.hasProperty(FACING)) {
-                nextState = nextState.setValue(FACING, facing)
-            }
-            level.setBlock(pos, nextState, Block.UPDATE_ALL)
-            attachDecorativeClusters(level, pos, random)
-        }
-    }
-
-
-    private fun isGem(state: BlockState): Boolean {
-        return state.`is`(CobblemonBlockTags.TYPE_GEM_BLOCKS)
-    }
-
-    private fun attachDecorativeClusters(level: LevelAccessor, gemPos: BlockPos, random: RandomSource) {
-        val openDirections = Direction.entries.filter { direction ->
-            level.getBlockState(gemPos.relative(direction)).isAir
-        }.toMutableList()
-
-        if (openDirections.isEmpty()) {
-            return
-        }
-
-        val minClusters = maxOf(1, (openDirections.size * 0.75f).toInt())
-        val clusterCount = random.nextInt(minClusters, openDirections.size + 1)
-
-        repeat(clusterCount) {
-            if (openDirections.isEmpty()) return@repeat
-
-            val index = random.nextInt(openDirections.size)
-            val direction = openDirections.removeAt(index)
-            val clusterPos = gemPos.relative(direction)
-            val stage = random.nextInt(0, 4)
-
-            val clusterState = defaultBlockState()
-                .setValue(FACING, direction)
-                .setValue(STAGE, stage)
-                .setValue(SHOULD_GROW, false) // so we can reduce lag... hopefully
-                .setValue(STUNTED, false)
-
-            level.setBlock(clusterPos, clusterState, Block.UPDATE_ALL)
-        }
-    }
-
-    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
-
-            stack.set(
-                DataComponents.BLOCK_STATE,
-                BlockItemStateProperties.EMPTY
-                    .with(STAGE, state.getValue(STAGE))
-                    .with(SHOULD_GROW, false)
-                    .with(STUNTED, state.getValue(STUNTED))
-            )
-            stack.set(
-                DataComponents.CUSTOM_MODEL_DATA,
-                CustomModelData(state.getValue(STAGE))
-            )
-        }
-
-        return drops
-    }
-
-    override fun getShape(
-            state: BlockState,
-            level: net.minecraft.world.level.BlockGetter,
-            pos: BlockPos,
-            context: net.minecraft.world.phys.shapes.CollisionContext
-    ): VoxelShape {
-        val stage = state.getValue(STAGE)
-        val facing = state.getValue(FACING)
-
-        val (min, max) = when (stage) {
-            0 -> 5.0 to 11.0
-            1 -> 4.0 to 12.0
-            2 -> 3.0 to 13.0
-            3 -> 2.0 to 14.0
-            else -> return Shapes.empty()
-        }
-
-        return when (facing) {
-            Direction.UP    -> Shapes.box(min / 16, 0.0, min / 16, max / 16, (min + 1) / 16, max / 16)
-            Direction.DOWN  -> Shapes.box(min / 16, (16 - (min + 1)) / 16, min / 16, max / 16, 1.0, max / 16)
-            Direction.NORTH -> Shapes.box(min / 16, min / 16, (16 - (min + 1)) / 16, max / 16, max / 16, 1.0)
-            Direction.SOUTH -> Shapes.box((16 - max) / 16, min / 16, 0.0, (16 - min) / 16, max / 16, (min + 1) / 16)
-            Direction.WEST  -> Shapes.box((16 - (min + 1)) / 16, min / 16, min / 16, 1.0, max / 16, max / 16)
-            Direction.EAST  -> Shapes.box(0.0, min / 16, min / 16, (min + 1) / 16, max / 16, max / 16)
-        }
-    }
-
-    override fun updateShape(state: BlockState, direction: Direction, neighborState: BlockState, level: LevelAccessor, pos: BlockPos, neighborPos: BlockPos): BlockState {
-        val facing = state.getValue(FACING)
-        if (direction == facing.opposite && !canSurvive(state, level, pos)) {
-            return Blocks.AIR.defaultBlockState()
-        }
-        return super.updateShape(state, direction, neighborState, level, pos, neighborPos)
-    }
-
-    override fun rotate(state: BlockState, rotation: Rotation): BlockState {
-        return state.setValue(FACING, rotation.rotate(state.getValue(FACING)))
-    }
-
-    override fun mirror(state: BlockState, mirror: Mirror): BlockState {
-        return state.rotate(mirror.getRotation(state.getValue(FACING)))
-    }
-
-    override fun canSurvive(state: BlockState, level: LevelReader, pos: BlockPos): Boolean {
-        val supportPos = pos.relative(state.getValue(FACING).opposite)
-        val supportBlock = level.getBlockState(supportPos).block
-        return supportBlock !is AirBlock
-    }
-
-    override fun codec(): MapCodec<out DirectionalBlock> = CODEC
-
-    override fun createBlockStateDefinition(builder: StateDefinition.Builder<Block, BlockState>) {
-        super.createBlockStateDefinition(builder)
-        builder.add(FACING, SHOULD_GROW, STAGE, STUNTED)
-    }
-}

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

@@ -1,215 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.block
-
-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.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 java.util.*
-
-class TypeGemCoreBlock(properties: Properties) : Block(properties) {
-
-    companion object {
-        const val MAX_CONNECTED_GEMS = 7
-        const val MIN_DISTANCE_BETWEEN_GEMS = 1
-        const val CONTINUATION_CHANCE = 0.8f
-
-        val BLOCK_TO_CLUSTER: Map<ResourceLocation, Block> by lazy {
-            mapOf(
-                ResourceLocation.parse("cobblemon:type_gem_block_normal") to CobblemonBlocks.TYPE_GEM_CLUSTER_NORMAL,
-                ResourceLocation.parse("cobblemon:type_gem_block_fire") to CobblemonBlocks.TYPE_GEM_CLUSTER_FIRE,
-                ResourceLocation.parse("cobblemon:type_gem_block_water") to CobblemonBlocks.TYPE_GEM_CLUSTER_WATER,
-                ResourceLocation.parse("cobblemon:type_gem_block_electric") to CobblemonBlocks.TYPE_GEM_CLUSTER_ELECTRIC,
-                ResourceLocation.parse("cobblemon:type_gem_block_grass") to CobblemonBlocks.TYPE_GEM_CLUSTER_GRASS,
-                ResourceLocation.parse("cobblemon:type_gem_block_ice") to CobblemonBlocks.TYPE_GEM_CLUSTER_ICE,
-                ResourceLocation.parse("cobblemon:type_gem_block_fighting") to CobblemonBlocks.TYPE_GEM_CLUSTER_FIGHTING,
-                ResourceLocation.parse("cobblemon:type_gem_block_poison") to CobblemonBlocks.TYPE_GEM_CLUSTER_POISON,
-                ResourceLocation.parse("cobblemon:type_gem_block_ground") to CobblemonBlocks.TYPE_GEM_CLUSTER_GROUND,
-                ResourceLocation.parse("cobblemon:type_gem_block_flying") to CobblemonBlocks.TYPE_GEM_CLUSTER_FLYING,
-                ResourceLocation.parse("cobblemon:type_gem_block_psychic") to CobblemonBlocks.TYPE_GEM_CLUSTER_PSYCHIC,
-                ResourceLocation.parse("cobblemon:type_gem_block_bug") to CobblemonBlocks.TYPE_GEM_CLUSTER_BUG,
-                ResourceLocation.parse("cobblemon:type_gem_block_rock") to CobblemonBlocks.TYPE_GEM_CLUSTER_ROCK,
-                ResourceLocation.parse("cobblemon:type_gem_block_ghost") to CobblemonBlocks.TYPE_GEM_CLUSTER_GHOST,
-                ResourceLocation.parse("cobblemon:type_gem_block_dragon") to CobblemonBlocks.TYPE_GEM_CLUSTER_DRAGON,
-                ResourceLocation.parse("cobblemon:type_gem_block_dark") to CobblemonBlocks.TYPE_GEM_CLUSTER_DARK,
-                ResourceLocation.parse("cobblemon:type_gem_block_steel") to CobblemonBlocks.TYPE_GEM_CLUSTER_STEEL,
-                ResourceLocation.parse("cobblemon:type_gem_block_fairy") to CobblemonBlocks.TYPE_GEM_CLUSTER_FAIRY
-            )
-        }
-
-        fun setStuntState(level: LevelAccessor, gemBlocks: List<Pair<BlockState, BlockPos>>, stunted: Boolean) {
-            for ((_, gemPos) in gemBlocks) {
-                for (dir in Direction.entries) {
-                    val neighborPos = gemPos.relative(dir)
-                    val neighborState = level.getBlockState(neighborPos)
-
-                    if (neighborState.block is TypeGemClusterBlock) {
-                        if (neighborState.hasProperty(STUNTED) && neighborState.getValue(STUNTED) != stunted) {
-
-                            var updatedState = neighborState.setValue(STUNTED, stunted)
-
-                            if (updatedState.hasProperty(SHOULD_GROW)) {
-                                updatedState = updatedState.setValue(SHOULD_GROW, !stunted)
-                            }
-
-                            level.setBlock(neighborPos, updatedState, 3)
-                        }
-                    }
-                }
-            }
-        }
-
-        fun getConnectedGemBlocks(level: BlockGetter, pos: BlockPos): List<Pair<BlockState, BlockPos>> {
-            val connectedGems = mutableListOf<Pair<BlockState, BlockPos>>()
-            val visited = mutableSetOf<BlockPos>()
-            val queue: Queue<BlockPos> = LinkedList()
-
-            visited.add(pos)
-            queue.add(pos)
-            connectedGems.add(level.getBlockState(pos) to pos)
-
-            while (queue.isNotEmpty()) {
-                val current = queue.poll()
-
-                for (direction in Direction.entries) {
-                    val neighbor = current.relative(direction)
-                    if (visited.add(neighbor)) {
-                        val state = level.getBlockState(neighbor)
-                        if (state.`is`(CobblemonBlockTags.TYPE_GEM_BLOCKS)) {
-                            connectedGems.add(state to neighbor)
-                            queue.add(neighbor)
-                        }
-                    }
-                }
-            }
-            return connectedGems
-        }
-    }
-
-    override fun randomTick(state: BlockState, level: ServerLevel, pos: BlockPos, random: RandomSource) {
-        grow(level, pos, random)
-    }
-
-    fun forceGrow(level: WorldGenLevel, pos: BlockPos, random: RandomSource, percentage: Float) {
-        val desiredLength = MAX_CONNECTED_GEMS * percentage
-
-        while (true) {
-            val growInfo = grow(level, pos, random, true)
-            val grown = growInfo.first
-            val clusterSize = growInfo.second
-
-            if (!grown || clusterSize >= desiredLength) break
-        }
-    }
-
-    private fun grow(
-        level: WorldGenLevel,
-        pos: BlockPos,
-        random: RandomSource,
-        forced: Boolean = false
-    ): Pair<Boolean, Int> {
-        val connectedGems = getConnectedGemBlocks(level, pos) // maybe we can store this and access it for better performance? check for changes in list rather than checking each time grow is called? idk
-        val gemCount = connectedGems.size
-        val overLimit = gemCount >= MAX_CONNECTED_GEMS
-        
-        if (overLimit) {
-            // if there is no open air pockets to grow any new clusters then exit early
-            if (!hasBreathingRoom(level, connectedGems)) {
-                return Pair(false, gemCount)
-            }
-            // max type gem block count met, tell clusters to grow but not turn into blocks
-            setStuntState(level, connectedGems, true)
-            //return Pair(false, gemCount)
-        } else {
-            // make sure connected clusters know they can grow and turn into blocks
-            setStuntState(level, connectedGems, false)
-        }
-
-        val javaRandom = java.util.Random(random.nextLong())
-
-        for ((gemState, gemPos) in connectedGems.shuffled(javaRandom)) {
-            val registryKey = BuiltInRegistries.BLOCK.getKey(gemState.block)
-            val clusterBlock = BLOCK_TO_CLUSTER[registryKey]
-
-            for (dir in Direction.entries.shuffled(javaRandom)) {
-                val targetPos = gemPos.relative(dir)
-                val targetState = level.getBlockState(targetPos)
-
-                if (!targetState.isAir) continue
-                if (!isPositionValidForGrowth(level, targetPos)) continue
-
-                // Place gem cluster
-                if (clusterBlock != null) {
-                    var placeState = clusterBlock.defaultBlockState()
-                        .setValue(DirectionalBlock.FACING, dir)
-                        .setValue(TypeGemClusterBlock.STAGE, 0)
-                        .setValue(SHOULD_GROW, true)
-
-                    level.setBlock(targetPos, placeState, UPDATE_ALL)
-                }
-
-                if (forced && clusterBlock != null) {
-                    forceAdvanceClusterGrowth(level, targetPos, random)
-                }
-
-                val updatedGemCount = if (forced) getConnectedGemBlocks(level, pos).size else connectedGems.size
-                return Pair(true, updatedGemCount)
-            }
-        }
-
-        // println("[TypeGemCoreBlock] No valid spot found for gem placement.")
-        return Pair(false, connectedGems.size)
-    }
-
-    private fun forceAdvanceClusterGrowth(level: WorldGenLevel, clusterPos: BlockPos, random: RandomSource) {
-        repeat(5) {
-            val clusterState = level.getBlockState(clusterPos)
-            val clusterBlock = clusterState.block as? TypeGemClusterBlock ?: return
-            clusterBlock.advanceGrowth(clusterState, level, clusterPos, random)
-        }
-    }
-
-    private fun hasBreathingRoom(level: WorldGenLevel, gems: List<Pair<BlockState, BlockPos>>): Boolean {
-        for ((_, gemPos) in gems) {
-            for (dir in Direction.entries) {
-                if (level.getBlockState(gemPos.relative(dir)).isAir) {
-                    return true
-                }
-            }
-        }
-        return false
-    }
-
-    private fun isPositionValidForGrowth(level: WorldGenLevel, pos: BlockPos): Boolean {
-        return Direction.entries.none { dir ->
-            val nearby = pos.relative(dir)
-            isGem(level.getBlockState(nearby)) &&
-                    pos.distManhattan(nearby) < MIN_DISTANCE_BETWEEN_GEMS
-        }
-    }
-
-    private fun isGem(state: BlockState): Boolean {
-        return state.`is`(CobblemonBlockTags.TYPE_GEM_BLOCKS)
-    }
-
-    override fun isRandomlyTicking(state: BlockState): Boolean = true
-}

common/src/main/kotlin/com/cobblemon/mod/common/block/campfirepot/CampfireBlock.kt

@@ -151,15 +151,13 @@ class CampfireBlock(settings: Properties, val isSoul: Boolean) : BaseEntityBlock
     override fun placeLiquid(level: LevelAccessor, pos: BlockPos, state: BlockState, fluidState: FluidState): Boolean {
         val blockEntity = level.getBlockEntity(pos)
         if (fluidState.type === Fluids.WATER && blockEntity is CampfireBlockEntity) {
-            if (level is Level) {
-                if (!level.isClientSide) {
-                    removePotItem(blockEntity, state, level, pos, null, true)
-                    level.playSoundServer(pos.center, SoundEvents.GENERIC_EXTINGUISH_FIRE, SoundSource.BLOCKS, 1.0F, 1.0F)
-                }
-
-                if (level.isClientSide) for (i in 0..19) MCCampfireBlock.makeParticles(level, pos, false, true)
+            if (!level.isClientSide) {
+                removePotItem(blockEntity, state, level as Level, pos, null, true)
+                level.playSoundServer(pos.center, SoundEvents.GENERIC_EXTINGUISH_FIRE, SoundSource.BLOCKS, 1.0F, 1.0F)
             }
 
+            if (level.isClientSide) for (i in 0..19) MCCampfireBlock.makeParticles(level as Level, pos, false, true)
+
             level.scheduleTick(pos, fluidState.type, fluidState.type.getTickDelay(level))
             return true
         } else {

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

@@ -65,9 +65,6 @@ class BerryBlockEntity(pos: BlockPos, state: BlockState) : BlockEntity(Cobblemon
     private val growthPoints = arrayListOf<ResourceLocation>()
     var mulchVariant = MulchVariant.NONE
 
-    // For Random Tick compensation: records the game time of last tick
-    var lastTickTime: Long = 0L
-
     /**
      * The idea behind the growth point sequence is it's a 16-long string of
      * hexadecimal numbers. They represent the order of the growth points that
@@ -270,7 +267,6 @@ class BerryBlockEntity(pos: BlockPos, state: BlockState) : BlockEntity(Cobblemon
             } catch (ignored: ResourceLocationException) {}
         }
         this.mulchDuration = nbt.getInt(MULCH_DURATION)
-        this.lastTickTime = nbt.getLong(LAST_TICK_TIME)
         this.wasLoading = false
         if (nbt.contains(GROWTH_POINTS_SEQUENCE)) {
             growthPointSequence = nbt.getString(GROWTH_POINTS_SEQUENCE)
@@ -291,7 +287,6 @@ class BerryBlockEntity(pos: BlockPos, state: BlockState) : BlockEntity(Cobblemon
         nbt.putInt(MULCH_DURATION, mulchDuration)
         nbt.putString(GROWTH_POINTS_SEQUENCE, growthPointSequence)
         nbt.putString(MULCH_VARIANT, mulchVariant.toString())
-        nbt.putLong(LAST_TICK_TIME, lastTickTime)
     }
 
     override fun setChanged() {
@@ -351,39 +346,24 @@ class BerryBlockEntity(pos: BlockPos, state: BlockState) : BlockEntity(Cobblemon
         return
     }
 
-    /**
-     * Process Random Tick compensation logic.
-     * Calculates elapsed time since last tick and batch-decrements stageTimer.
-     */
-    fun processTick(world: ServerLevel, pos: BlockPos, state: BlockState): Boolean {
-        if (state.getValue(BerryBlock.IS_ROOTED)) return false
-        
-        val currentTime = world.gameTime
-        val elapsed = if (lastTickTime > 0L) {
-            (currentTime - lastTickTime).toInt().coerceAtLeast(1)
-        } else {
-            1 // First tick, only decrement by 1
-        }
-        lastTickTime = currentTime
-        
-        // Batch decrement the timer
-        if (stageTimer > 0) {
-            stageTimer = (stageTimer - elapsed).coerceAtLeast(0)
-        }
-        
-        // Return whether growth is needed
-        return stageTimer <= 0
-    }
-
     //Using a similar approach to ComputerCraft, implement this client side
     interface RenderState : AutoCloseable {
         var needsRebuild: Boolean
     }
 
     companion object {
+        internal val TICKER = BlockEntityTicker<BerryBlockEntity> { world, pos, state, blockEntity ->
+            if (world.isClientSide) return@BlockEntityTicker
+            if (state.getValue(BerryBlock.IS_ROOTED)) return@BlockEntityTicker
+            if (blockEntity.stageTimer >= 0) {
+                blockEntity.stageTimer--
+            }
+            if (blockEntity.stageTimer <= 0) {
+                (state.block as BerryBlock).growHelper(world as ServerLevel, world.random, pos, state)
+            }
+        }
         //private const val LIFE_CYCLES = "life_cycles"
         private const val GROWTH_POINTS = "GrowthPoints"
-        private const val LAST_TICK_TIME = "LastTickTime"
         private const val GROWTH_POINTS_SEQUENCE = "GrowthPointsSequence"
         private const val GROWTH_TIMER = "GrowthTimer"
         private const val STAGE_TIMER = "StageTimer"

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

@@ -12,35 +12,15 @@ import com.cobblemon.mod.common.CobblemonBlockEntities
 import com.cobblemon.mod.common.api.multiblock.MultiblockEntity
 import com.cobblemon.mod.common.api.multiblock.MultiblockStructure
 import com.cobblemon.mod.common.api.multiblock.builder.MultiblockStructureBuilder
-import com.cobblemon.mod.common.api.tms.TechnicalMachines
-import com.cobblemon.mod.common.api.types.ElementalTypes
-import com.cobblemon.mod.common.block.MonitorBlock
 import com.cobblemon.mod.common.block.multiblock.FossilMultiblockStructure
-import com.cobblemon.mod.common.item.components.TMMoveComponent
-import com.cobblemon.mod.common.item.interactive.TechnicalMachineItem
 import com.cobblemon.mod.common.util.DataKeys
-import com.cobblemon.mod.common.util.tmList
 import net.minecraft.core.BlockPos
 import net.minecraft.core.HolderLookup
 import net.minecraft.nbt.CompoundTag
-import net.minecraft.nbt.NbtOps
 import net.minecraft.nbt.NbtUtils
-import net.minecraft.server.level.ServerPlayer
 import net.minecraft.world.level.ChunkPos
-import net.minecraft.world.Containers
-import net.minecraft.world.InteractionResult
-import net.minecraft.world.ItemInteractionResult
-import net.minecraft.world.InteractionHand
-import net.minecraft.world.entity.item.ItemEntity
-import net.minecraft.world.entity.player.Player
-import net.minecraft.world.item.ItemStack
-import net.minecraft.world.item.Items
 import net.minecraft.world.level.block.entity.BlockEntityType
 import net.minecraft.world.level.block.state.BlockState
-import net.minecraft.world.level.Level
-import net.minecraft.world.level.block.HorizontalDirectionalBlock
-import net.minecraft.world.level.block.state.properties.BlockStateProperties
-import net.minecraft.world.level.gameevent.GameEvent
 
 open class FossilMultiblockEntity(
     pos: BlockPos,
@@ -48,30 +28,8 @@ open class FossilMultiblockEntity(
     multiblockBuilder: MultiblockStructureBuilder,
     type: BlockEntityType<*> = CobblemonBlockEntities.FOSSIL_MULTIBLOCK
 ) : MultiblockEntity(type, pos, state, multiblockBuilder) {
-    private val musicDiscs = setOf(
-        Items.MUSIC_DISC_13,
-        Items.MUSIC_DISC_CAT,
-        Items.MUSIC_DISC_BLOCKS,
-        Items.MUSIC_DISC_CHIRP,
-        Items.MUSIC_DISC_FAR,
-        Items.MUSIC_DISC_MALL,
-        Items.MUSIC_DISC_MELLOHI,
-        Items.MUSIC_DISC_STAL,
-        Items.MUSIC_DISC_STRAD,
-        Items.MUSIC_DISC_WARD,
-        Items.MUSIC_DISC_11,
-        Items.MUSIC_DISC_WAIT,
-        Items.MUSIC_DISC_OTHERSIDE,
-        Items.MUSIC_DISC_5,
-        Items.MUSIC_DISC_RELIC,
-        Items.MUSIC_DISC_PRECIPICE,
-        Items.MUSIC_DISC_CREATOR,
-        Items.MUSIC_DISC_CREATOR_MUSIC_BOX,
-        Items.MUSIC_DISC_PIGSTEP
-    )
 
     override var masterBlockPos: BlockPos? = null
-    private var diskStack: ItemStack = ItemStack.EMPTY
 
     override var multiblockStructure: MultiblockStructure? = null
         set(structure) {
@@ -118,164 +76,6 @@ open class FossilMultiblockEntity(
         } else {
             null
         }
-        diskStack = if (nbt.contains(DataKeys.MONITOR_DISK)) {
-            ItemStack.parse(registryLookup, nbt.get(DataKeys.MONITOR_DISK)).orElse(ItemStack.EMPTY)
-        } else {
-            ItemStack.EMPTY
-        }
-        updateMonitorScreen()
     }
 
-    override fun saveAdditional(nbt: CompoundTag, registryLookup: HolderLookup.Provider) {
-        super.saveAdditional(nbt, registryLookup)
-        if (!diskStack.isEmpty) {
-            nbt.put(DataKeys.MONITOR_DISK, ItemStack.CODEC.encodeStart(NbtOps.INSTANCE, diskStack).orThrow)
-        }
-    }
-
-    fun handleUseItem(
-        stack: ItemStack,
-        state: BlockState,
-        level: Level,
-        pos: BlockPos,
-        player: Player,
-        hand: InteractionHand
-    ): ItemInteractionResult {
-        val handStack = player.getItemInHand(hand)
-        if (!isValidDisk(handStack)) return ItemInteractionResult.PASS_TO_DEFAULT_BLOCK_INTERACTION
-        if (multiblockStructure != null) return ItemInteractionResult.PASS_TO_DEFAULT_BLOCK_INTERACTION
-
-        if (level.isClientSide) return ItemInteractionResult.SUCCESS
-
-        val newDisk = handStack.copyWithCount(1)
-        // In creative, prevent duplicate ejection spam when repeatedly inserting the same disk.
-        if (player.isCreative && !diskStack.isEmpty && ItemStack.isSameItemSameComponents(diskStack, newDisk)) {
-            return ItemInteractionResult.sidedSuccess(level.isClientSide)
-        }
-
-        val oldStack = diskStack
-        if (!oldStack.isEmpty) {
-            if (player is ServerPlayer) {
-                unlockTmForPlayer(player, oldStack)
-            }
-            ejectDiskStack(level, pos, state, oldStack)
-        }
-
-        diskStack = newDisk
-        if (!player.isCreative) {
-            handStack.shrink(1)
-        }
-
-        if (player is ServerPlayer) {
-            unlockTmForPlayer(player, diskStack)
-        }
-
-        updateMonitorScreen()
-        markUpdated(level, pos, state)
-
-        return ItemInteractionResult.sidedSuccess(level.isClientSide)
-    }
-
-    fun handleUseWithoutItem(
-        state: BlockState,
-        level: Level,
-        pos: BlockPos,
-        player: Player
-    ): InteractionResult {
-        if (diskStack.isEmpty) return InteractionResult.PASS
-        if (multiblockStructure != null) return InteractionResult.PASS
-
-        if (player is ServerPlayer) {
-            unlockTmForPlayer(player, diskStack)
-        }
-        ejectDiskStack(level, pos, state, diskStack)
-        diskStack = ItemStack.EMPTY
-        updateMonitorScreen()
-        markUpdated(level, pos, state)
-
-        return InteractionResult.sidedSuccess(level.isClientSide)
-    }
-
-    fun dropDisk(level: Level, pos: BlockPos, state: BlockState) {
-        if (diskStack.isEmpty) return
-        ejectDiskStack(level, pos, state, diskStack)
-        diskStack = ItemStack.EMPTY
-    }
-
-    private fun ejectDiskStack(level: Level, pos: BlockPos, state: BlockState, stack: ItemStack) {
-        val facing = if (state.hasProperty(BlockStateProperties.HORIZONTAL_FACING)) {
-            state.getValue(HorizontalDirectionalBlock.FACING)
-        } else {
-            null
-        }
-        if (facing == null) {
-            Containers.dropItemStack(level, pos.x + 0.5, pos.y + 0.5, pos.z + 0.5, stack)
-            return
-        }
-
-        val ejectFacing = facing.opposite
-        val x = pos.x + 0.5 + ejectFacing.stepX * 0.6
-        val y = pos.y + 0.5
-        val z = pos.z + 0.5 + ejectFacing.stepZ * 0.6
-        val itemEntity = ItemEntity(level, x, y, z, stack)
-        itemEntity.setDeltaMovement(ejectFacing.stepX * 0.15, 0.05, ejectFacing.stepZ * 0.15)
-        level.addFreshEntity(itemEntity)
-    }
-
-    private fun isValidDisk(stack: ItemStack): Boolean {
-        return stack.item is TechnicalMachineItem || musicDiscs.contains(stack.item)
-    }
-
-    private fun unlockTmForPlayer(player: ServerPlayer, stack: ItemStack) {
-        if (stack.item !is TechnicalMachineItem) return
-        val move = TMMoveComponent.getTMMove(stack) ?: return
-        val tmId = TechnicalMachines.moveToTM[move]?.id ?: return
-        player.tmList()?.learn(listOf(tmId))
-    }
-
-    private fun updateMonitorScreen() {
-        val level = level ?: return
-        if (level.isClientSide) return
-        if (multiblockStructure != null) return
-
-        val state = blockState
-        if (!state.hasProperty(MonitorBlock.SCREEN)) return
-        val targetScreen = getDiskScreen()
-        if (state.getValue(MonitorBlock.SCREEN) != targetScreen) {
-            level.setBlockAndUpdate(blockPos, state.setValue(MonitorBlock.SCREEN, targetScreen))
-        }
-    }
-
-    private fun getDiskScreen(): MonitorBlock.MonitorScreen {
-        if (diskStack.isEmpty) return MonitorBlock.MonitorScreen.OFF
-        if (musicDiscs.contains(diskStack.item)) return MonitorBlock.MonitorScreen.MUSIC
-        val move = TMMoveComponent.getTMMove(diskStack) ?: return MonitorBlock.MonitorScreen.TM_NORMAL
-        return when (move.elementalType) {
-            ElementalTypes.FIRE -> MonitorBlock.MonitorScreen.TM_FIRE
-            ElementalTypes.WATER -> MonitorBlock.MonitorScreen.TM_WATER
-            ElementalTypes.GRASS -> MonitorBlock.MonitorScreen.TM_GRASS
-            ElementalTypes.ELECTRIC -> MonitorBlock.MonitorScreen.TM_ELECTRIC
-            ElementalTypes.ICE -> MonitorBlock.MonitorScreen.TM_ICE
-            ElementalTypes.FIGHTING -> MonitorBlock.MonitorScreen.TM_FIGHTING
-            ElementalTypes.POISON -> MonitorBlock.MonitorScreen.TM_POISON
-            ElementalTypes.GROUND -> MonitorBlock.MonitorScreen.TM_GROUND
-            ElementalTypes.FLYING -> MonitorBlock.MonitorScreen.TM_FLYING
-            ElementalTypes.PSYCHIC -> MonitorBlock.MonitorScreen.TM_PSYCHIC
-            ElementalTypes.BUG -> MonitorBlock.MonitorScreen.TM_BUG
-            ElementalTypes.ROCK -> MonitorBlock.MonitorScreen.TM_ROCK
-            ElementalTypes.GHOST -> MonitorBlock.MonitorScreen.TM_GHOST
-            ElementalTypes.DRAGON -> MonitorBlock.MonitorScreen.TM_DRAGON
-            ElementalTypes.DARK -> MonitorBlock.MonitorScreen.TM_DARK
-            ElementalTypes.STEEL -> MonitorBlock.MonitorScreen.TM_STEEL
-            ElementalTypes.FAIRY -> MonitorBlock.MonitorScreen.TM_FAIRY
-            else -> MonitorBlock.MonitorScreen.TM_NORMAL
-        }
-    }
-
-    private fun markUpdated(level: Level, pos: BlockPos, state: BlockState) {
-        level.sendBlockUpdated(pos, state, state, 3)
-        level.gameEvent(GameEvent.BLOCK_CHANGE, pos, GameEvent.Context.of(state))
-        setChanged()
-    }
-
-}
+}

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

@@ -29,7 +29,6 @@ import com.cobblemon.mod.common.api.spawning.influence.SpawnBaitInfluence
 import com.cobblemon.mod.common.api.spawning.influence.SpawningInfluence
 import com.cobblemon.mod.common.api.spawning.position.SpawnablePosition
 import com.cobblemon.mod.common.api.spawning.spawner.FixedAreaSpawner
-import com.cobblemon.mod.common.api.spawning.spawner.PokeSnackSpawnerFactory
 import com.cobblemon.mod.common.block.PokeSnackBlock
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.item.components.BaitEffectsComponent
@@ -63,22 +62,41 @@ open class PokeSnackBlockEntity(pos: BlockPos, state: BlockState) :
     }
 
     val spawner: FixedAreaSpawner by lazy {
-        val server = level as ServerLevel
-
-        val baitEffects = getBaitEffects()
-
-        val ctx = PokeSnackSpawnerFactory.Context(
-            world = server,
-            pos = blockPos,
+        FixedAreaSpawner(
+            name = "poke_snack_spawner_${level?.dimension()?.location()}}_$blockPos",
+            spawnPool = CobblemonSpawnPools.WORLD_SPAWN_POOL,
+            world = level as ServerLevel,
+            position = blockPos,
             horizontalRadius = RADIUS,
             verticalRadius = RADIUS,
-            maxPokemonPerChunk = Cobblemon.config.pokeSnackPokemonPerChunk,
-            name = "poke_snack_spawner_${server.dimension().location()}_$blockPos",
-            baitEffects = baitEffects
-        )
+            maxPokemonPerChunk = Cobblemon.config.pokeSnackPokemonPerChunk
+        ).also {
+            it.influences.add(this)
 
-        PokeSnackSpawnerFactory.create(ctx).also { spawner ->
-            spawner.influences.add(this)
+            val baitEffects = getBaitEffects()
+
+            val stackedLureTier = baitEffects
+                .filter { it.type == SpawnBait.Effects.RARITY_BUCKET }
+                .sumOf { it.value }
+                .toInt()
+
+            if (stackedLureTier > 0) {
+                it.influences += BucketNormalizingInfluence(
+                    tier = stackedLureTier,
+                    gradient = 0.2F,
+                    firstTier = 1.2F
+                )
+            }
+
+            it.influences += BucketMultiplyingInfluence(
+                mapOf(
+                    "uncommon" to 2.25f,
+                    "rare" to 5.5f,
+                    "ultra-rare" to 5.5f,
+                )
+            )
+
+            it.influences += SpawnBaitInfluence(effects = baitEffects)
         }
     }
 

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

@@ -1,383 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.block.entity
-
-import com.cobblemon.mod.common.CobblemonBlockEntities
-import com.cobblemon.mod.common.CobblemonItems
-import com.cobblemon.mod.common.CobblemonSounds
-import com.cobblemon.mod.common.api.moves.Moves
-import com.cobblemon.mod.common.api.tms.TechnicalMachines
-import com.cobblemon.mod.common.block.tmmachine.TMMachineBlock
-import com.cobblemon.mod.common.block.tmmachine.TMMachineMenu
-import com.cobblemon.mod.common.client.gui.tmmachine.TMMachineScreen
-import com.cobblemon.mod.common.item.components.TMMoveComponent
-import com.cobblemon.mod.common.util.itemRegistry
-import net.minecraft.core.BlockPos
-import net.minecraft.core.HolderLookup
-import net.minecraft.core.NonNullList
-import net.minecraft.network.chat.Component
-import net.minecraft.network.protocol.Packet
-import net.minecraft.network.protocol.game.ClientGamePacketListener
-import net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket
-import net.minecraft.world.ContainerHelper
-import net.minecraft.world.SimpleContainer
-import net.minecraft.world.entity.player.Inventory
-import net.minecraft.world.entity.player.Player
-import net.minecraft.world.inventory.AbstractContainerMenu
-import net.minecraft.world.item.ItemStack
-import net.minecraft.world.level.block.entity.BaseContainerBlockEntity
-import net.minecraft.world.level.block.state.BlockState
-import net.minecraft.nbt.CompoundTag
-import net.minecraft.sounds.SoundEvent
-import net.minecraft.sounds.SoundSource
-import net.minecraft.world.Container
-import net.minecraft.world.inventory.ContainerData
-import net.minecraft.world.level.Level
-
-class TMMachineBlockEntity(pos: BlockPos, state: BlockState) :
-    BaseContainerBlockEntity(CobblemonBlockEntities.TM_MACHINE, pos, state) {
-    companion object {
-        const val BURN_ACTIVE_TAG = "burnActive"
-        const val BURN_PROGRESS_TAG = "burnProgress"
-        const val REPEAT_PROCESS_TAG = "repeatProcess"
-        const val ACTIVE_MOVE_TAG = "activeMove"
-
-        const val BURN_PROGRESS_PER_TICK = 2
-        const val BURN_TOTAL_TIME = 200
-        const val TOTAL_PROCESS_TIME =
-            BURN_TOTAL_TIME + ((TMMachineScreen.CRAFT_TICKS + TMMachineScreen.RESET_DISC_TICKS) * BURN_PROGRESS_PER_TICK)
-
-        // Container data IDs
-        const val BURN_PROGRESS_INDEX = 0
-        const val BURN_ACTIVE_INDEX = 1
-        const val REPEAT_PROCESS_INDEX = 2
-        const val POSITION_X_INDEX = 3
-        const val POSITION_Y_INDEX = 4
-        const val POSITION_Z_INDEX = 5
-
-        fun serverTick(level: Level, pos: BlockPos, state: BlockState, blockEntity: TMMachineBlockEntity) {
-            if (level.isClientSide) return
-
-            // check if the TMM is powered by redstone. For toggling automation
-            val powered = level.hasNeighborSignal(pos)
-            val data = blockEntity.containerData
-
-            // Progress while active
-            if (data.get(BURN_ACTIVE_INDEX) == 1) {
-                val currentProgress = data.get(BURN_PROGRESS_INDEX)
-                if (currentProgress < TOTAL_PROCESS_TIME) {
-                    val progressPerTick = if (currentProgress >= BURN_TOTAL_TIME) 1 else BURN_PROGRESS_PER_TICK
-                    data.set(BURN_PROGRESS_INDEX, currentProgress + progressPerTick)
-
-                    // comparator progress bar updates
-                    level.updateNeighbourForOutputSignal(pos, state.block)
-                }
-            }
-
-            // auto start with batching when powered
-            if (powered && data.get(BURN_ACTIVE_INDEX) == 0) {
-                if (blockEntity.canCraftSelectedTM()) {
-                    data.set(BURN_ACTIVE_INDEX, 1)
-                    data.set(BURN_PROGRESS_INDEX, 0)
-                    blockEntity.setChanged()
-                    level.updateNeighbourForOutputSignal(pos, state.block)
-                }
-            }
-
-            val burnProgressValue = data.get(BURN_PROGRESS_INDEX)
-            val postCraftTicks = if (burnProgressValue >= BURN_TOTAL_TIME) (burnProgressValue - BURN_TOTAL_TIME) else 0
-
-            if (postCraftTicks > 0) {
-                if (postCraftTicks == TMMachineScreen.CRAFT_TICKS) {
-                    blockEntity.craftTM()
-                    level.updateNeighbourForOutputSignal(pos, state.block)
-                }
-
-                if (postCraftTicks >= (TMMachineScreen.CRAFT_TICKS + TMMachineScreen.RESET_DISC_TICKS)) {
-                    data.set(BURN_PROGRESS_INDEX, 0)
-
-                    // use batch processing while powered with redstone
-                    val keepRunning = powered && blockEntity.canCraftSelectedTM()
-                    data.set(BURN_ACTIVE_INDEX, if (keepRunning) 1 else 0)
-
-                    blockEntity.setChanged()
-                    level.updateNeighbourForOutputSignal(pos, state.block)
-                }
-            }
-        }
-    }
-
-    var tmMachineInventory = TMMachineBlockInventory(this)
-    var partialTicks: Float = 0F
-
-    var burnProgress: Int = 0
-    var burnActive: Boolean = false
-    var repeatProcess: Boolean = false
-    var activeMove: String = ""
-
-    var containerData: ContainerData = object : ContainerData {
-        override fun getCount() = 6
-        override fun get(index: Int): Int {
-            return when (index) {
-                BURN_PROGRESS_INDEX -> burnProgress
-                BURN_ACTIVE_INDEX -> if (burnActive) 1 else 0
-                REPEAT_PROCESS_INDEX -> if (repeatProcess) 1 else 0
-                POSITION_X_INDEX -> blockPos.x
-                POSITION_Y_INDEX -> blockPos.y
-                POSITION_Z_INDEX -> blockPos.z
-                else -> 0
-            }
-        }
-
-        override fun set(index: Int, value: Int) {
-            when (index) {
-                BURN_PROGRESS_INDEX -> burnProgress = value
-                BURN_ACTIVE_INDEX -> burnActive = value == 1
-                REPEAT_PROCESS_INDEX -> repeatProcess = value == 1
-            }
-        }
-
-    }
-
-    private fun canCraftSelectedTM(): Boolean {
-        val move = Moves.getByName(activeMove) ?: return false
-        val tm = TechnicalMachines.moveToTM[move] ?: return false
-
-        // We must have the Output be empty or stackable and not full
-        val resultStack = getItem(TMMachineMenu.RESULT_SLOT)
-        val crafted = ItemStack(CobblemonItems.TECHNICAL_MACHINE).also { TMMoveComponent.setTMMove(it, tm.moveName) }
-        val outputOk = resultStack.isEmpty || (
-                resultStack.count < resultStack.maxStackSize &&
-                        ItemStack.isSameItemSameComponents(resultStack, crafted)
-                )
-        if (!outputOk) return false
-
-        // Blank disc slot
-        if (getItem(TMMachineMenu.BLANK_TM_SLOT).item != CobblemonItems.BLANK_TM) return false
-
-        // Ingredient slots
-        val recipes = tm.getClampedRecipe() ?: emptyList()
-        for ((index, recipe) in recipes.withIndex()) {
-            val slot = TMMachineMenu.INGREDIENT_SLOTS.first + index
-            val provided = getItem(slot)
-            if (!recipe.ingredient.test(provided) || provided.count < recipe.count) return false
-        }
-
-        return true
-    }
-
-    private fun craftTM() {
-        if (!(level?.isClientSide ?: true)) {
-            Moves.getByName(activeMove)?.let { move ->
-                TechnicalMachines.moveToTM[move]?.let { tm ->
-                    val resultStack = getItem(TMMachineMenu.RESULT_SLOT)
-                    if (!resultStack.isEmpty && resultStack.count >= resultStack.maxStackSize) return
-
-                    // Craft the TM
-                    val craftedTmStack = ItemStack(CobblemonItems.TECHNICAL_MACHINE)
-                        .also { TMMoveComponent.setTMMove(it, tm.moveName) }
-
-                    if (!resultStack.isEmpty && !ItemStack.isSameItemSameComponents(resultStack, craftedTmStack)) return
-
-                    val blankTmStack = getItem(TMMachineMenu.BLANK_TM_SLOT)
-                    if (blankTmStack.item != CobblemonItems.BLANK_TM) return
-
-                    val recipes = tm.getClampedRecipe() ?: emptyList()
-                    for ((index, recipe) in recipes.withIndex()) {
-                        val slot = TMMachineMenu.INGREDIENT_SLOTS.first + index
-                        val provided = getItem(slot)
-                        if (!recipe.ingredient.test(provided) || provided.count < recipe.count) return
-                    }
-
-                    // Consume ingredients
-                    blankTmStack.shrink(1)
-                    for ((index, ingredient) in recipes.withIndex()) {
-                        getItem(TMMachineMenu.INGREDIENT_SLOTS.first + index).shrink(ingredient.count)
-                    }
-
-                    // Add crafted TM to result slot
-                    if (resultStack.isEmpty) {
-                        setItem(TMMachineMenu.RESULT_SLOT, craftedTmStack)
-                    } else if (resultStack.count < resultStack.maxStackSize) {
-                        resultStack.grow(1)
-                    }
-
-                    tmMachineInventory.setChanged()
-                    setChanged()
-                }
-            }
-        }
-    }
-
-    override fun createMenu(containerId: Int, inventory: Inventory): AbstractContainerMenu {
-        return TMMachineMenu(containerId, inventory, tmMachineInventory, containerData)
-    }
-
-    override fun saveAdditional(compound: CompoundTag, registries: HolderLookup.Provider) {
-        super.saveAdditional(compound, registries)
-        compound.putBoolean(BURN_ACTIVE_TAG, burnActive)
-        compound.putBoolean(REPEAT_PROCESS_TAG, repeatProcess)
-        compound.putInt(BURN_PROGRESS_TAG, burnProgress)
-        compound.putString(ACTIVE_MOVE_TAG, activeMove)
-        ContainerHelper.saveAllItems(compound, tmMachineInventory.items, registries)
-    }
-
-    override fun loadAdditional(compound: CompoundTag, registries: HolderLookup.Provider) {
-        super.loadAdditional(compound, registries)
-        burnActive = compound.getBoolean(BURN_ACTIVE_TAG)
-        repeatProcess = compound.getBoolean(REPEAT_PROCESS_TAG)
-        burnProgress = compound.getInt(BURN_PROGRESS_TAG)
-        activeMove = compound.getString(ACTIVE_MOVE_TAG)
-        ContainerHelper.loadAllItems(compound, tmMachineInventory.items, registries)
-    }
-
-    override fun getDisplayName(): Component = Component.translatable("block.cobblemon.tm_machine")
-
-    override fun getDefaultName(): Component = Component.translatable("cobblemon.container.tm_machine")
-
-    override fun getItems(): NonNullList<ItemStack> = tmMachineInventory.items
-
-    override fun setItems(items: NonNullList<ItemStack>) {
-        for (i in items.indices) {
-            tmMachineInventory.setItem(i, items[i])
-        }
-    }
-
-    override fun getUpdatePacket(): Packet<ClientGamePacketListener> = ClientboundBlockEntityDataPacket.create(this)
-
-    override fun getUpdateTag(registryLookup: HolderLookup.Provider): CompoundTag = saveWithoutMetadata(registryLookup)
-
-    override fun getContainerSize(): Int = tmMachineInventory.containerSize
-
-    override fun isEmpty(): Boolean = tmMachineInventory.isEmpty
-
-    override fun getItem(slot: Int): ItemStack = tmMachineInventory.getItem(slot)
-
-    override fun removeItem(slot: Int, amount: Int): ItemStack = tmMachineInventory.removeItem(slot, amount)
-
-    override fun removeItemNoUpdate(slot: Int): ItemStack = tmMachineInventory.removeItemNoUpdate(slot)
-
-    override fun setItem(slot: Int, stack: ItemStack) = tmMachineInventory.setItem(slot, stack)
-
-    override fun setChanged() {
-        var currentState = blockState
-        level?.getBlockState(worldPosition)?.let { state ->
-            currentState = state
-            var updated = false
-
-            if (state.hasProperty(TMMachineBlock.EMPTY)) {
-                val isEmpty = getItem(TMMachineMenu.BLANK_TM_SLOT).isEmpty
-                if (currentState.getValue(TMMachineBlock.EMPTY) != isEmpty) {
-                    if (!isEmpty) playSound(CobblemonSounds.TM_MACHINE_PLACE_DISC, 0.5F)
-                    currentState = currentState.setValue(TMMachineBlock.EMPTY, isEmpty)
-                    updated = true
-                }
-            }
-            if (state.hasProperty(TMMachineBlock.ACTIVE)) {
-                val isActive = containerData.get(BURN_ACTIVE_INDEX) == 1
-                if (currentState.getValue(TMMachineBlock.ACTIVE) != isActive) {
-                    currentState = currentState.setValue(TMMachineBlock.ACTIVE, isActive)
-                    updated = true
-                }
-            }
-            if (updated) level?.setBlockAndUpdate(worldPosition, currentState)
-        }
-
-        // Notify the block entity's level that this block entity has changed
-        level?.blockEntityChanged(worldPosition)
-
-        // Mark the chunk containing this block entity as dirty, ensuring it is saved
-        level?.getChunkAt(worldPosition)?.isUnsaved = true
-
-        // Update Neighbours
-        level?.updateNeighborsAt(blockPos, currentState.block)
-    }
-
-    override fun stillValid(player: Player): Boolean = tmMachineInventory.stillValid(player)
-
-    override fun canPlaceItem(slot: Int, stack: ItemStack): Boolean = tmMachineInventory.canPlaceItem(slot, stack)
-
-    override fun canTakeItem(target: Container, slot: Int, stack: ItemStack): Boolean =
-        tmMachineInventory.canTakeItem(target, slot, stack)
-
-    fun playSound(soundEvent: SoundEvent, volume: Float = 1F, pitch: Float = 1F) {
-        level?.playSound(null, worldPosition, soundEvent, SoundSource.BLOCKS, volume, pitch)
-    }
-
-    fun isReadyToCraft(): Boolean = canCraftSelectedTM()
-
-    fun isOutputBlocked(): Boolean {
-        val level = level ?: return false
-        val move = Moves.getByName(activeMove) ?: return false
-        val tm = TechnicalMachines.moveToTM[move] ?: return false
-
-        val resultStack = getItem(TMMachineMenu.RESULT_SLOT)
-        if (resultStack.isEmpty) return false
-
-        val crafted = ItemStack(CobblemonItems.TECHNICAL_MACHINE)
-            .also { TMMoveComponent.setTMMove(it, tm.moveName) }
-
-        // If wrong TM in output OR output is full
-        if (!ItemStack.isSameItemSameComponents(resultStack, crafted)) return true
-        return resultStack.count >= resultStack.maxStackSize
-    }
-
-    class TMMachineBlockInventory(val blockEntity: TMMachineBlockEntity) : SimpleContainer(6) {
-        override fun canTakeItem(target: Container, slot: Int, stack: ItemStack) = slot == 0
-        override fun canPlaceItem(slot: Int, stack: ItemStack): Boolean {
-            val powered = blockEntity.level?.hasNeighborSignal(blockEntity.blockPos) == true
-            val allowAutomation = blockEntity.containerData.get(BURN_ACTIVE_INDEX) == 1 || powered
-
-            if (!allowAutomation) return false
-
-            Moves.getByName(blockEntity.activeMove)?.let {
-                val tm = TechnicalMachines.moveToTM[it] ?: return false
-                val item = stack.item
-
-                return when (slot) {
-                    1 -> item == CobblemonItems.BLANK_TM
-                    2, 3, 4 -> {
-                        val recipe = tm.getClampedRecipe()
-                        val recipeIndex = slot - 2
-                        if (recipe == null || recipeIndex >= recipe.size) {
-                            return false
-                        }
-                        recipe[recipeIndex].ingredient.test(stack)
-                    }
-                    else -> false
-                }
-            }
-
-            return false
-        }
-
-        override fun setChanged() {
-            super.setChanged()
-            blockEntity.setChanged()
-
-            val allowAutomation =
-                blockEntity.containerData.get(BURN_ACTIVE_INDEX) == 1 || blockEntity.containerData.get(
-                    REPEAT_PROCESS_INDEX
-                ) == 1
-
-            // force comparators to refresh if inventory changes and batch mode is on
-            if (allowAutomation) {
-                blockEntity.level?.updateNeighbourForOutputSignal(blockEntity.blockPos, blockEntity.blockState.block)
-            }
-        }
-
-        override fun startOpen(player: Player) {
-            blockEntity.startOpen(player)
-        }
-
-        override fun stopOpen(player: Player) {
-            blockEntity.stopOpen(player)
-        }
-    }
-}

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

@@ -1,302 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.block.entity
-
-import com.cobblemon.mod.common.CobblemonBlockEntities
-import com.cobblemon.mod.common.CobblemonItems
-import com.cobblemon.mod.common.block.TMShelfBlock
-import com.cobblemon.mod.common.item.interactive.TechnicalMachineItem
-import net.minecraft.core.BlockPos
-import net.minecraft.core.Direction
-import net.minecraft.core.HolderLookup
-import net.minecraft.core.NonNullList
-import net.minecraft.nbt.CompoundTag
-import net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket
-import net.minecraft.sounds.SoundEvent
-import net.minecraft.sounds.SoundSource
-import net.minecraft.world.ContainerHelper
-import net.minecraft.world.Containers
-import net.minecraft.world.InteractionResult
-import net.minecraft.world.ItemInteractionResult
-import net.minecraft.world.WorldlyContainer
-import net.minecraft.world.entity.player.Player
-import net.minecraft.world.item.ItemStack
-import net.minecraft.world.item.Items
-import net.minecraft.world.level.Level
-import net.minecraft.world.level.block.entity.BlockEntity
-import net.minecraft.world.level.block.state.BlockState
-import net.minecraft.world.phys.BlockHitResult
-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 {
-    val items: NonNullList<ItemStack> = NonNullList.withSize(14, ItemStack.EMPTY)
-    var lastInteractedSlot: Int = -1
-    private val accessibleSlots = IntArray(14) { it }
-    private var lastNotePulseTick: Long = Long.MIN_VALUE
-
-    fun handleUseItem(stack: ItemStack, state: BlockState, level: Level, pos: BlockPos, player: Player, hit: BlockHitResult): ItemInteractionResult {
-        if (stack.isEmpty) return ItemInteractionResult.PASS_TO_DEFAULT_BLOCK_INTERACTION
-        val slot = getHitSlot(hit, state).orElse(-1)
-        if (slot !in 0 until 14) return ItemInteractionResult.SKIP_DEFAULT_BLOCK_INTERACTION
-        if (!isValidItem(stack)) return ItemInteractionResult.PASS_TO_DEFAULT_BLOCK_INTERACTION
-
-        val oldStack = items[slot]
-        if (!oldStack.isEmpty) {
-            if (!player.addItem(oldStack)) {
-                Containers.dropItemStack(level, pos.x + 0.5, pos.y + 0.5, pos.z + 0.5, oldStack)
-            }
-        }
-
-        items[slot] = stack.copyWithCount(1)
-        stack.shrink(1)
-        lastInteractedSlot = slot
-        updateBlockState(level, pos)
-        markUpdated()
-
-        return ItemInteractionResult.sidedSuccess(level.isClientSide)
-    }
-
-    fun handleUseWithoutItem(state: BlockState, level: Level, pos: BlockPos, player: Player, hit: BlockHitResult): InteractionResult {
-        val slot = getHitSlot(hit, state).orElse(-1)
-        if (slot !in 0 until 14 || items[slot].isEmpty) return InteractionResult.PASS
-
-        val removed = items[slot]
-        items[slot] = ItemStack.EMPTY
-        if (!player.addItem(removed)) {
-            Containers.dropItemStack(level, pos.x + 0.5, pos.y + 0.5, pos.z + 0.5, removed)
-        }
-
-        lastInteractedSlot = slot
-        updateBlockState(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 getHitSlot(hit: BlockHitResult, state: BlockState): OptionalInt {
-        val facing = state.getValue(TMShelfBlock.FACING)
-        if (hit.direction != facing) {
-            return OptionalInt.empty()
-        }
-
-        val relative = hit.location.subtract(hit.blockPos.x.toDouble(), hit.blockPos.y.toDouble(), hit.blockPos.z.toDouble())
-
-        val (x, y) = when (facing) {
-            // 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
-            else -> return OptionalInt.empty()
-        }
-
-        // Have interaction segments match the renderer areas visually
-        val leftSlotMinX = 1.0 / 16.0
-        val leftSlotMaxX = 7.0 / 16.0
-        val rightSlotMinX = 9.0 / 16.0
-        val rightSlotMaxX = 15.0 / 16.0
-        val slotMinY = 1.0 / 16.0
-        val slotMaxY = 15.0 / 16.0
-        val slotHeight = 2.0 / 16.0
-
-        val col = when {
-            x in leftSlotMinX..leftSlotMaxX -> 0
-            x in rightSlotMinX..rightSlotMaxX -> 1
-            else -> return OptionalInt.empty()
-        }
-
-        if (y < slotMinY || y > slotMaxY) {
-            return OptionalInt.empty()
-        }
-
-        val rowFromBottom = ((y - slotMinY) / slotHeight).toInt().coerceIn(0, 6)
-        val row = 6 - rowFromBottom
-
-        return OptionalInt.of(row * 2 + col)
-    }
-
-    fun isValidItem(stack: ItemStack): Boolean {
-        return stack.item is TechnicalMachineItem
-                || stack.item == CobblemonItems.UPGRADE
-                || stack.item == CobblemonItems.DUBIOUS_DISC
-                || stack.item == Items.MUSIC_DISC_13
-                || stack.item == Items.MUSIC_DISC_CAT
-                || stack.item == Items.MUSIC_DISC_BLOCKS
-                || stack.item == Items.MUSIC_DISC_CHIRP
-                || stack.item == Items.MUSIC_DISC_FAR
-                || stack.item == Items.MUSIC_DISC_MALL
-                || stack.item == Items.MUSIC_DISC_MELLOHI
-                || stack.item == Items.MUSIC_DISC_STAL
-                || stack.item == Items.MUSIC_DISC_STRAD
-                || stack.item == Items.MUSIC_DISC_WARD
-                || stack.item == Items.MUSIC_DISC_11
-                || stack.item == Items.MUSIC_DISC_WAIT
-                || stack.item == Items.MUSIC_DISC_OTHERSIDE
-                || stack.item == Items.MUSIC_DISC_5
-                || stack.item == Items.MUSIC_DISC_RELIC
-                || stack.item == Items.MUSIC_DISC_PRECIPICE
-                || stack.item == Items.MUSIC_DISC_CREATOR
-                || stack.item == Items.MUSIC_DISC_CREATOR_MUSIC_BOX
-                || stack.item == Items.MUSIC_DISC_PIGSTEP
-    }
-
-    fun onNoteBlockPulse(level: Level, noteBlockPos: BlockPos, soundEvent: SoundEvent) {
-        val gameTime = level.gameTime
-        if (lastNotePulseTick == gameTime) {
-            return
-        }
-        lastNotePulseTick = gameTime
-
-        val octaveUp = !items[1].isEmpty
-        val octaveDown = !items[12].isEmpty
-        val octaveShift = when {
-            octaveUp && !octaveDown -> 12
-            octaveDown && !octaveUp -> -12
-            else -> 0
-        }
-
-        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)
-        }
-    }
-
-    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) {
-            if (!items[index].isEmpty) {
-                items[index] = ItemStack.EMPTY
-                changed = true
-            }
-        }
-        if (changed) {
-            level?.let { updateBlockState(it, blockPos) }
-            markUpdated()
-        }
-    }
-
-    override fun getContainerSize(): Int = items.size
-
-    override fun isEmpty(): Boolean = items.all { it.isEmpty }
-
-    override fun getItem(slot: Int): ItemStack {
-        if (slot !in items.indices) return ItemStack.EMPTY
-        return items[slot]
-    }
-
-    override fun removeItem(slot: Int, amount: Int): ItemStack {
-        val removed = ContainerHelper.removeItem(items, slot, amount)
-        if (!removed.isEmpty) {
-            if (items[slot].isEmpty) {
-                lastInteractedSlot = slot
-            }
-            level?.let { updateBlockState(it, blockPos) }
-            markUpdated()
-        }
-        return removed
-    }
-
-    override fun removeItemNoUpdate(slot: Int): ItemStack {
-        val removed = ContainerHelper.takeItem(items, slot)
-        if (!removed.isEmpty) {
-            level?.let { updateBlockState(it, blockPos) }
-            markUpdated()
-        }
-        return removed
-    }
-
-    override fun setItem(slot: Int, stack: ItemStack) {
-        if (slot !in items.indices) return
-        if (!stack.isEmpty && !isValidItem(stack)) return
-
-        items[slot] = if (stack.isEmpty) ItemStack.EMPTY else stack.copyWithCount(1)
-        lastInteractedSlot = slot
-        level?.let { updateBlockState(it, blockPos) }
-        markUpdated()
-    }
-
-    override fun stillValid(player: Player): Boolean {
-        return level?.getBlockEntity(blockPos) === this &&
-                player.distanceToSqr(blockPos.x + 0.5, blockPos.y + 0.5, blockPos.z + 0.5) <= 64.0
-    }
-
-    override fun getMaxStackSize(): Int = 1
-
-    override fun canPlaceItem(slot: Int, stack: ItemStack): Boolean {
-        return slot in items.indices && items[slot].isEmpty && isValidItem(stack)
-    }
-
-    override fun getSlotsForFace(side: Direction): IntArray = accessibleSlots
-
-    override fun canPlaceItemThroughFace(slot: Int, stack: ItemStack, direction: Direction?): Boolean {
-        return canPlaceItem(slot, stack)
-    }
-
-    override fun canTakeItemThroughFace(slot: Int, stack: ItemStack, direction: Direction): Boolean {
-        return slot in items.indices
-    }
-
-    override fun getUpdateTag(registries: HolderLookup.Provider): CompoundTag {
-        return saveWithoutMetadata(registries)
-    }
-
-    override fun getUpdatePacket(): ClientboundBlockEntityDataPacket {
-        return ClientboundBlockEntityDataPacket.create(this)
-    }
-
-    override fun saveAdditional(tag: CompoundTag, registries: HolderLookup.Provider) {
-        super.saveAdditional(tag, registries)
-        ContainerHelper.saveAllItems(tag, items, true, registries)
-        tag.putInt("LastInteractedSlot", lastInteractedSlot)
-    }
-
-    override fun loadAdditional(tag: CompoundTag, registries: HolderLookup.Provider) {
-        super.loadAdditional(tag, registries)
-        items.clear()
-        ContainerHelper.loadAllItems(tag, items, registries)
-        lastInteractedSlot = tag.getInt("LastInteractedSlot")
-    }
-
-    companion object {
-        // C=0 chromatic semitone mapping.
-        private val NOTE_SLOT_TO_SEMITONE = linkedMapOf(
-            0 to 5,   // F
-            2 to 4,   // E
-            4 to 3,   // D#
-            6 to 2,   // D
-            8 to 1,   // C#
-            10 to 0,  // C
-            3 to 11,  // B
-            5 to 10,  // A#
-            7 to 9,   // A
-            9 to 8,   // G#
-            11 to 7,  // G
-            13 to 6   // F#
-        )
-    }
-
-}

common/src/main/kotlin/com/cobblemon/mod/common/block/multiblock/FossilMultiblockBuilder.kt

@@ -14,9 +14,7 @@ import com.cobblemon.mod.common.CobblemonSounds
 import com.cobblemon.mod.common.api.multiblock.MultiblockEntity
 import com.cobblemon.mod.common.api.multiblock.builder.MultiblockStructureBuilder
 import com.cobblemon.mod.common.api.multiblock.condition.BlockRelativeCondition
-import com.cobblemon.mod.common.block.MonitorBlock
 import com.cobblemon.mod.common.block.RestorationTankBlock
-import com.cobblemon.mod.common.block.entity.FossilMultiblockEntity
 import com.cobblemon.mod.common.util.DataKeys
 import com.cobblemon.mod.common.util.blockPositionsAsList
 import net.minecraft.advancements.critereon.BlockPredicate
@@ -123,13 +121,6 @@ class FossilMultiblockBuilder(val centerPos: BlockPos) : MultiblockStructureBuil
         val analyzerEntity = world.getBlockEntity(fossilAnalyzerPos) as? MultiblockEntity
         val tankBaseEntity = world.getBlockEntity(restorationTankPos) as? MultiblockEntity
         val tankTopEntity = world.getBlockEntity(restorationTankPos.above()) as? MultiblockEntity
-        if (monitorEntity is FossilMultiblockEntity) {
-            val monitorState = world.getBlockState(monitorPos)
-            monitorEntity.dropDisk(world, monitorPos, monitorState)
-            if (monitorState.hasProperty(MonitorBlock.SCREEN)) {
-                world.setBlockAndUpdate(monitorPos, monitorState.setValue(MonitorBlock.SCREEN, MonitorBlock.MonitorScreen.OFF))
-            }
-        }
         val structure = FossilMultiblockStructure(monitorPos, fossilAnalyzerPos, restorationTankPos)
 
         structure.tankConnectorDirection = dirsToCheck.filter {
@@ -177,4 +168,4 @@ class FossilMultiblockBuilder(val centerPos: BlockPos) : MultiblockStructureBuil
         //lol thanks mojang for not allowing nbt puts to be chained
     }
 
-}
+}

common/src/main/kotlin/com/cobblemon/mod/common/block/tmmachine/TMMachineBlock.kt

@@ -1,255 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.block.tmmachine
-
-import com.cobblemon.mod.common.CobblemonBlockEntities
-import com.cobblemon.mod.common.CobblemonSounds
-import com.cobblemon.mod.common.block.entity.TMMachineBlockEntity
-import com.cobblemon.mod.common.util.cobblemonResource
-import com.cobblemon.mod.common.util.playSoundServer
-import com.cobblemon.mod.common.util.toVec3d
-import com.mojang.serialization.MapCodec
-import com.mojang.serialization.codecs.RecordCodecBuilder
-import net.minecraft.core.BlockPos
-import net.minecraft.core.Direction
-import net.minecraft.server.level.ServerPlayer
-import net.minecraft.world.Containers
-import net.minecraft.world.InteractionResult
-import net.minecraft.world.entity.Entity
-import net.minecraft.world.entity.LivingEntity
-import net.minecraft.world.entity.player.Player
-import net.minecraft.world.item.context.BlockPlaceContext
-import net.minecraft.world.level.BlockGetter
-import net.minecraft.world.level.Level
-import net.minecraft.world.level.block.BaseEntityBlock
-import net.minecraft.world.level.block.Block
-import net.minecraft.world.level.block.RenderShape
-import net.minecraft.world.level.block.SimpleWaterloggedBlock
-import net.minecraft.world.level.block.entity.BlockEntity
-import net.minecraft.world.level.block.entity.BlockEntityTicker
-import net.minecraft.world.level.block.entity.BlockEntityType
-import net.minecraft.world.level.block.state.BlockState
-import net.minecraft.world.level.block.state.StateDefinition
-import net.minecraft.world.level.block.state.properties.BlockStateProperties
-import net.minecraft.world.level.block.state.properties.BooleanProperty
-import net.minecraft.world.level.gameevent.GameEvent
-import net.minecraft.world.level.material.FluidState
-import net.minecraft.world.level.material.Fluids
-import net.minecraft.world.phys.BlockHitResult
-import net.minecraft.world.phys.shapes.CollisionContext
-import net.minecraft.world.phys.shapes.Shapes
-import net.minecraft.world.phys.shapes.VoxelShape
-import org.jetbrains.annotations.Nullable
-
-class TMMachineBlock(properties: Properties) : BaseEntityBlock(properties), SimpleWaterloggedBlock {
-
-    companion object {
-        val EMPTY: BooleanProperty = BooleanProperty.create("empty")
-        val FACING = BlockStateProperties.HORIZONTAL_FACING
-        val WATERLOGGED = BlockStateProperties.WATERLOGGED
-        val ACTIVE: BooleanProperty = BooleanProperty.create("active")
-        val OPEN: BooleanProperty = BooleanProperty.create("open")
-
-        private val SHAPE: VoxelShape = Shapes.box(0.0, 0.0, 0.0, 1.0, 0.375, 1.0)
-
-        private val SHAPE_OPEN: VoxelShape = Shapes.box(0.0, 0.0, 0.0, 1.0, 0.3125, 1.0)
-
-        private val SHAPE_OPEN_NORTH: VoxelShape = Shapes.or(
-            Shapes.box(0.0, 0.0, 0.0, 1.0, 0.3125, 1.0),
-            Shapes.box(0.0, 0.3125, 0.8125, 1.0, 0.4375, 0.9375),
-            Shapes.box(0.0, 0.4375, 0.6875, 1.0, 0.5625, 0.8125),
-            Shapes.box(0.0, 0.5625, 0.5625, 1.0, 0.6875, 0.6875),
-            Shapes.box(0.0, 0.6875, 0.4375, 1.0, 0.8125, 0.5625),
-            Shapes.box(0.0, 0.8125, 0.3125, 1.0, 0.9375, 0.4375),
-            Shapes.box(0.0, 0.9375, 0.3125, 1.0, 1.0, 0.375)
-        )
-
-        private val SHAPE_OPEN_SOUTH: VoxelShape = Shapes.or(
-            Shapes.box(0.0, 0.0, 0.0, 1.0, 0.3125, 1.0),
-            Shapes.box(0.0, 0.3125, 0.0625, 1.0, 0.4375, 0.1875),
-            Shapes.box(0.0, 0.4375, 0.1875, 1.0, 0.5625, 0.3125),
-            Shapes.box(0.0, 0.5625, 0.3125, 1.0, 0.6875, 0.4375),
-            Shapes.box(0.0, 0.6875, 0.4375, 1.0, 0.8125, 0.5625),
-            Shapes.box(0.0, 0.8125, 0.5625, 1.0, 0.9375, 0.6875),
-            Shapes.box(0.0, 0.9375, 0.625, 1.0, 1.0, 0.6875)
-        )
-
-        private val SHAPE_OPEN_EAST: VoxelShape = Shapes.or(
-            Shapes.box(0.0, 0.0, 0.0, 1.0, 0.3125, 1.0),
-            Shapes.box(0.0625, 0.3125, 0.0, 0.1875, 0.4375, 1.0),
-            Shapes.box(0.1875, 0.4375, 0.0, 0.3125, 0.5625, 1.0),
-            Shapes.box(0.3125, 0.5625, 0.0, 0.4375, 0.6875, 1.0),
-            Shapes.box(0.4375, 0.6875, 0.0, 0.5625, 0.8125, 1.0),
-            Shapes.box(0.5625, 0.8125, 0.0, 0.6875, 0.9375, 1.0),
-            Shapes.box(0.625, 0.9375, 0.0, 0.6875, 1.0, 1.0)
-        )
-
-        private val SHAPE_OPEN_WEST: VoxelShape = Shapes.or(
-            Shapes.box(0.0, 0.0, 0.0, 1.0, 0.3125, 1.0),
-            Shapes.box(0.8125, 0.3125, 0.0, 0.9375, 0.4375, 1.0),
-            Shapes.box(0.6875, 0.4375, 0.0, 0.8125, 0.5625, 1.0),
-            Shapes.box(0.5625, 0.5625, 0.0, 0.6875, 0.6875, 1.0),
-            Shapes.box(0.4375, 0.6875, 0.0, 0.5625, 0.8125, 1.0),
-            Shapes.box(0.3125, 0.8125, 0.0, 0.4375, 0.9375, 1.0),
-            Shapes.box(0.3125, 0.9375, 0.0, 0.375, 1.0, 1.0)
-        )
-
-        val CODEC: MapCodec<TMMachineBlock> = RecordCodecBuilder.mapCodec { instance ->
-            instance.group(
-                Properties.CODEC.fieldOf("properties").forGetter { it.properties }
-            ).apply(instance, ::TMMachineBlock)
-        }
-    }
-
-    init {
-        registerDefaultState(stateDefinition.any()
-            .setValue(FACING, Direction.NORTH)
-            .setValue(WATERLOGGED, false)
-            .setValue(ACTIVE, false)
-            .setValue(EMPTY, true))
-    }
-
-    override fun <T : BlockEntity> getTicker(level: Level, state: BlockState, blockEntityType: BlockEntityType<T>): BlockEntityTicker<T>? {
-        return createTicker(level, blockEntityType, CobblemonBlockEntities.TM_MACHINE)
-    }
-
-    @Nullable
-    protected fun <T : BlockEntity> createTicker(level: Level, serverType: BlockEntityType<T>, clientType: BlockEntityType<out TMMachineBlockEntity>): BlockEntityTicker<T>? {
-        return if (!level.isClientSide) createTickerHelper(serverType, clientType, TMMachineBlockEntity::serverTick)
-        else null
-    }
-
-    override fun fallOn(level: Level, state: BlockState, pos: BlockPos, entity: Entity, fallDistance: Float) {
-        if (!level.isClientSide && (entity is LivingEntity) &&
-            (entity.bbWidth * entity.bbWidth * entity.bbHeight > 0.512F) &&
-            (entity.y >= (pos.y + 0.55)) &&
-            state.hasProperty(OPEN) && state.getValue(OPEN)
-        ) {
-            level.setBlockAndUpdate(pos, state.setValue(OPEN, false))
-            level.playSoundServer(position = pos.toVec3d(), sound = CobblemonSounds.TM_MACHINE_CLOSE, volume = 1F, pitch = 1F)
-        }
-    }
-
-    override fun newBlockEntity(pos: BlockPos, state: BlockState): BlockEntity = TMMachineBlockEntity(pos, state)
-
-    override fun getStateForPlacement(context: BlockPlaceContext): BlockState {
-        return defaultBlockState()
-                .setValue(FACING, context.horizontalDirection.opposite)
-                .setValue(WATERLOGGED, context.level.getFluidState(context.clickedPos).type == Fluids.WATER)
-                .setValue(EMPTY, true)
-                .setValue(ACTIVE, false)
-                .setValue(OPEN, false)
-    }
-
-    override fun useWithoutItem(state: BlockState, level: Level, pos: BlockPos, player: Player, hit: BlockHitResult): InteractionResult {
-        if (!level.isClientSide) {
-            if (player.isCrouching) {
-                if (state.hasProperty(OPEN)) {
-                    val isOpen = state.getValue(OPEN)
-                    level.setBlockAndUpdate(pos, state.setValue(OPEN, !isOpen))
-                    level.playSoundServer(
-                        position = pos.toVec3d(),
-                        sound = if (!isOpen) CobblemonSounds.TM_MACHINE_CLOSE else CobblemonSounds.TM_MACHINE_OPEN,
-                        volume = 1F,
-                        pitch = 1F
-                    )
-                }
-            } else {
-                val serverPlayer = player as? ServerPlayer
-                if (serverPlayer != null) {
-                    val recipeId = cobblemonResource("tm_machine")
-                    val recipeOpt = level.server?.recipeManager?.byKey(recipeId)
-                    recipeOpt?.ifPresent { recipe ->
-                        if (!serverPlayer.recipeBook.contains(recipe)) {
-                            serverPlayer.awardRecipes(listOf(recipe))
-                        }
-                    }
-                }
-                val blockEntity = level.getBlockEntity(pos)
-                if (blockEntity is TMMachineBlockEntity) {
-                    player.openMenu(blockEntity)
-                    level.playSoundServer(
-                        position = pos.toVec3d(),
-                        sound = CobblemonSounds.TM_MACHINE_ON,
-                        volume = 0.5F,
-                        pitch = 1F
-                    )
-                    level.gameEvent(player, GameEvent.BLOCK_OPEN, pos)
-                }
-            }
-        }
-        return InteractionResult.sidedSuccess(level.isClientSide)
-    }
-
-    override fun createBlockStateDefinition(builder: StateDefinition.Builder<Block, BlockState>) {
-        builder.add(FACING, WATERLOGGED, EMPTY, ACTIVE, OPEN)
-    }
-
-    override fun codec(): MapCodec<TMMachineBlock> = CODEC
-
-    override fun getRenderShape(state: BlockState): RenderShape = RenderShape.MODEL
-
-    override fun getFluidState(state: BlockState): FluidState =
-        if (state.getValue(WATERLOGGED)) Fluids.WATER.defaultFluidState() else super.getFluidState(state)
-
-    override fun getCollisionShape(state: BlockState, level: BlockGetter, pos: BlockPos, context: CollisionContext): VoxelShape {
-        return if (state.getValue(OPEN)) {
-            when (state.getValue(FACING)) {
-                Direction.NORTH -> SHAPE_OPEN_NORTH
-                Direction.SOUTH -> SHAPE_OPEN_SOUTH
-                Direction.WEST -> SHAPE_OPEN_WEST
-                Direction.EAST -> SHAPE_OPEN_EAST
-                else -> Shapes.empty()
-            }
-        } else SHAPE
-    }
-
-    override fun getShape(state: BlockState, getter: BlockGetter, pos: BlockPos, context: CollisionContext): VoxelShape = if (state.getValue(OPEN)) SHAPE_OPEN else SHAPE
-
-    override fun onRemove(state: BlockState, level: Level, pos: BlockPos, newState: BlockState, movedByPiston: Boolean) {
-        Containers.dropContentsOnDestroy(state, newState, level, pos)
-        super.onRemove(state, level, pos, newState, movedByPiston)
-    }
-
-    override fun isSignalSource(state: BlockState): Boolean = false
-
-    override fun getSignal(state: BlockState, level: BlockGetter, pos: BlockPos, direction: Direction): Int = 0
-
-    override fun hasAnalogOutputSignal(state: BlockState): Boolean = true
-
-    /*override fun getAnalogOutputSignal(state: BlockState, level: Level, pos: BlockPos): Int {
-        val be = level.getBlockEntity(pos) as? TMMachineBlockEntity ?: return 0
-
-        // Have comparator output act like a progress bar when burning because that might be super dope to see without going into the menu
-        val scaled = (be.burnProgress.toFloat() / TMMachineBlockEntity.TOTAL_PROCESS_TIME.toFloat() * 15f).toInt()
-        return scaled.coerceIn(0, 15)
-    }*/
-
-    override fun getAnalogOutputSignal(state: BlockState, level: Level, pos: BlockPos): Int {
-        val be = level.getBlockEntity(pos) as? TMMachineBlockEntity ?: return 0
-
-        // Have comparator output act like a progress bar when burning because that might be super dope to see without going into the menu
-        if (be.burnActive) {
-            val scaled = (be.burnProgress.toFloat() / TMMachineBlockEntity.TOTAL_PROCESS_TIME.toFloat() * 15F).toInt()
-            return scaled.coerceIn(0, 15)
-        }
-
-        // if batch mode is off but it is ready to craft then show signal of 15
-        if (!be.repeatProcess) {
-            if (be.isReadyToCraft()) return 15
-            else return 0
-        }
-
-        // When not burning but idling in batch mode maybe show some cool states? Could be nice
-        return when {
-            be.isOutputBlocked() -> 8
-            else -> 4
-        }
-    }
-}