add expand and minimize assets to evolution tree

Merge branch 'main' into evolution-tree
2026-06-11 07:02:27 -03:00 · 2026-06-11 06:29:34 -03:00 · 2026-02-24 21:03:56 -03:00 · 2026-01-27 08:19:06 -03:00 · 2025-11-05 09:38:53 -03:00 · 2025-10-20 17:44:55 -03:00
126 changed files with 2109 additions and 2210 deletions
@@ -300,7 +300,6 @@
 - Regional Foods will now prioritize being eaten instead of used for healing Pokémon, shift clicking will use it as healing
 - Resolved Z-Fighting on Pokédex Models
 - Restored Ninjask's ability to do barrel rolls
- Fixed a crash caused by adding enchanted items to the Resurrection Machine

 ### Fixes
 - Fixed Croagunk's walkspeed
@@ -361,7 +360,6 @@
 - Separated all the functions of MoLangFunctions.kt into their own files.
 - Spawn buckets and their base weights are now provided by the spawner, with different base weights for world, fishing, snack, and habitat spawn buckets.
 - Removed "SpawnBucket" class in favour of just storing maps of bucket names to weights.
- Fixed nicknames not being applied to Pokémon spawned from `spawn_pool_world` files

 ### Molang & Datapacks
 - Added `moveset_builders` datapack folder for different styles of movesets.
@@ -32,6 +32,6 @@ final class ParticleManagerMixin {
    @Inject(at = @At("RETURN"), method = "<clinit>")
    private static void lodestone$addTypes(CallbackInfo ci) {
        RENDER_ORDER = ImmutableList.<ParticleRenderType>builder().addAll(RENDER_ORDER)
-                .add(ParticleMaterials.INSTANCE.getXRAY(), ParticleMaterials.INSTANCE.getADD(), ParticleMaterials.INSTANCE.getALPHA(), ParticleMaterials.INSTANCE.getBLEND(), ParticleMaterials.INSTANCE.getOPAQUE()).build();
+                .add(ParticleMaterials.INSTANCE.getADD(), ParticleMaterials.INSTANCE.getALPHA(), ParticleMaterials.INSTANCE.getBLEND(), ParticleMaterials.INSTANCE.getOPAQUE()).build();
    }
 }
@@ -12,7 +12,6 @@ import com.cobblemon.mod.common.Cobblemon;
 import com.cobblemon.mod.common.OrientationControllable;
 import com.cobblemon.mod.common.api.orientation.OrientationController;
 import com.cobblemon.mod.common.client.CobblemonClient;
-import com.cobblemon.mod.common.client.gui.interact.wheel.InteractWheelGuiFactoryKt;
 import com.cobblemon.mod.common.client.keybind.keybinds.PartySendBinding;
 import com.cobblemon.mod.common.client.keybind.keybinds.RidingFreelookBinding;
 import com.cobblemon.mod.common.duck.RidePassenger;
@@ -68,39 +67,6 @@ public abstract class MouseHandlerMixin {

    @Unique private double cobblemon$timeDelta;

-    @Inject(
-            method = "onPress",
-            at = @At("HEAD"),
-            cancellable = true
-    )
-    public void cobblemon$pokeskillGuiControl(long windowPointer, int button, int action, int modifiers, CallbackInfo ci) {
-        if (button == 0 && action == 1) {
-
-            // Make sure no menus are open already
-            if (this.minecraft.screen == null && this.minecraft.getOverlay() == null) {
-                // Check to see if party key is held
-                if (PartySendBinding.INSTANCE.getWasDown()) {
-
-                    // Don't want to send out a pokemon if we let go of the key
-                    PartySendBinding.INSTANCE.actioned();
-
-                    //Open the actual gui
-                    var player = Minecraft.getInstance().player;
-                    var storage = CobblemonClient.INSTANCE.getStorage();
-                    var selectedPokemon = storage.getParty().get(storage.getSelectedSlot());
-                    if (selectedPokemon != null && player != null) {
-                        //canApplyChange = false
-                        var gui = InteractWheelGuiFactoryKt.createPokeSkillGui(player, selectedPokemon);
-                        Minecraft.getInstance().setScreen(gui);
-                    }
-
-                    // Stop the rest of minecraft click logic like punching and using items
-                    ci.cancel();
-                }
-            }
-        }
-    }
-
    @Inject(
            method = "onScroll",
            at = @At(
@@ -24,13 +24,26 @@ 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.InteractPokemonUIPacketHandler
+import com.cobblemon.mod.common.client.net.gui.PokedexUIPacketHandler
+import com.cobblemon.mod.common.client.net.gui.SetActiveTMPacketHandler
+import com.cobblemon.mod.common.client.net.gui.SetTMMachineContainerDataPacketHandler
+import com.cobblemon.mod.common.client.net.gui.SummaryUIPacketHandler
 import com.cobblemon.mod.common.client.net.habitat.OpenHabitatBlockEditorHandler
 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
-import com.cobblemon.mod.common.client.net.pasture.*
+import com.cobblemon.mod.common.client.net.pasture.ClosePastureHandler
+import com.cobblemon.mod.common.client.net.pasture.OpenPastureHandler
+import com.cobblemon.mod.common.client.net.pasture.PokemonPasturedHandler
+import com.cobblemon.mod.common.client.net.pasture.PokemonUnpasturedHandler
+import com.cobblemon.mod.common.client.net.pasture.UpdatePastureConflictFlagHandler
 import com.cobblemon.mod.common.client.net.pokedex.ServerConfirmedRegisterHandler
 import com.cobblemon.mod.common.client.net.pokemon.update.ClientboundSeatAssignmentPacketHandler
 import com.cobblemon.mod.common.client.net.pokemon.update.ClientboundUpdateRidingStateHandler
@@ -49,7 +62,14 @@ import com.cobblemon.mod.common.client.net.storage.party.SetPartyPokemonHandler
 import com.cobblemon.mod.common.client.net.storage.party.SetPartyReferenceHandler
 import com.cobblemon.mod.common.client.net.storage.pc.*
 import com.cobblemon.mod.common.client.net.toast.ToastPacketHandler
-import com.cobblemon.mod.common.client.net.trade.*
+import com.cobblemon.mod.common.client.net.trade.TradeAcceptanceChangedHandler
+import com.cobblemon.mod.common.client.net.trade.TradeCancelledHandler
+import com.cobblemon.mod.common.client.net.trade.TradeCompletedHandler
+import com.cobblemon.mod.common.client.net.trade.TradeOfferExpiredHandler
+import com.cobblemon.mod.common.client.net.trade.TradeOfferNotificationHandler
+import com.cobblemon.mod.common.client.net.trade.TradeProcessStartedHandler
+import com.cobblemon.mod.common.client.net.trade.TradeStartedHandler
+import com.cobblemon.mod.common.client.net.trade.TradeUpdatedHandler
 import com.cobblemon.mod.common.net.PacketRegisterInfo
 import com.cobblemon.mod.common.net.messages.client.OpenBehaviourEditorPacket
 import com.cobblemon.mod.common.net.messages.client.PlayerInteractOptionsPacket
@@ -65,13 +85,21 @@ import com.cobblemon.mod.common.net.messages.client.data.*
 import com.cobblemon.mod.common.net.messages.client.debug.RequestOpenRidingStatsDebugGUIPacket
 import com.cobblemon.mod.common.net.messages.client.dialogue.DialogueClosedPacket
 import com.cobblemon.mod.common.net.messages.client.dialogue.DialogueOpenedPacket
-import com.cobblemon.mod.common.net.messages.client.effect.*
+import com.cobblemon.mod.common.net.messages.client.effect.PokeSnackBlockParticlesPacket
+import com.cobblemon.mod.common.net.messages.client.effect.RunPosableMoLangPacket
+import com.cobblemon.mod.common.net.messages.client.effect.SaccharineLogBlockParticlesPacket
+import com.cobblemon.mod.common.net.messages.client.effect.SpawnSnowstormEntityParticlePacket
+import com.cobblemon.mod.common.net.messages.client.effect.SpawnSnowstormParticlePacket
 import com.cobblemon.mod.common.net.messages.client.habitat.OpenHabitatBlockEditorPacket
 import com.cobblemon.mod.common.net.messages.client.npc.CloseNPCEditorPacket
 import com.cobblemon.mod.common.net.messages.client.npc.OpenNPCEditorPacket
 import com.cobblemon.mod.common.net.messages.client.orientation.ClientboundUpdateDriverInputPacket
 import com.cobblemon.mod.common.net.messages.client.orientation.ClientboundUpdateOrientationPacket
-import com.cobblemon.mod.common.net.messages.client.pasture.*
+import com.cobblemon.mod.common.net.messages.client.pasture.ClosePasturePacket
+import com.cobblemon.mod.common.net.messages.client.pasture.OpenPasturePacket
+import com.cobblemon.mod.common.net.messages.client.pasture.PokemonPasturedPacket
+import com.cobblemon.mod.common.net.messages.client.pasture.PokemonUnpasturedPacket
+import com.cobblemon.mod.common.net.messages.client.pasture.UpdatePastureConflictFlagPacket
 import com.cobblemon.mod.common.net.messages.client.pokedex.ServerConfirmedRegisterPacket
 import com.cobblemon.mod.common.net.messages.client.pokemon.update.*
 import com.cobblemon.mod.common.net.messages.client.pokemon.update.evolution.AddEvolutionPacket
@@ -92,17 +120,46 @@ import com.cobblemon.mod.common.net.messages.client.storage.party.InitializePart
 import com.cobblemon.mod.common.net.messages.client.storage.party.MoveClientPartyPokemonPacket
 import com.cobblemon.mod.common.net.messages.client.storage.party.SetPartyPokemonPacket
 import com.cobblemon.mod.common.net.messages.client.storage.party.SetPartyReferencePacket
-import com.cobblemon.mod.common.net.messages.client.storage.pc.*
+import com.cobblemon.mod.common.net.messages.client.storage.pc.ClosePCPacket
+import com.cobblemon.mod.common.net.messages.client.storage.pc.InitializePCPacket
+import com.cobblemon.mod.common.net.messages.client.storage.pc.MoveClientPCPokemonPacket
+import com.cobblemon.mod.common.net.messages.client.storage.pc.OpenPCPacket
+import com.cobblemon.mod.common.net.messages.client.storage.pc.RenamePCBoxPacket
+import com.cobblemon.mod.common.net.messages.client.storage.pc.SetPCBoxPacket
+import com.cobblemon.mod.common.net.messages.client.storage.pc.SetPCPokemonPacket
 import com.cobblemon.mod.common.net.messages.client.storage.pc.wallpaper.ChangePCBoxWallpaperPacket
 import com.cobblemon.mod.common.net.messages.client.storage.pc.wallpaper.RequestPCBoxWallpapersPacket
 import com.cobblemon.mod.common.net.messages.client.storage.pc.wallpaper.SetPCBoxWallpapersPacket
 import com.cobblemon.mod.common.net.messages.client.storage.pc.wallpaper.UnlockPCBoxWallpaperPacket
 import com.cobblemon.mod.common.net.messages.client.tms.TechnicalMachineRegistrySyncPacket
 import com.cobblemon.mod.common.net.messages.client.toast.ToastPacket
-import com.cobblemon.mod.common.net.messages.client.trade.*
-import com.cobblemon.mod.common.net.messages.client.ui.*
-import com.cobblemon.mod.common.net.messages.server.*
-import com.cobblemon.mod.common.net.messages.server.battle.*
+import com.cobblemon.mod.common.net.messages.client.trade.TradeAcceptanceChangedPacket
+import com.cobblemon.mod.common.net.messages.client.trade.TradeCancelledPacket
+import com.cobblemon.mod.common.net.messages.client.trade.TradeCompletedPacket
+import com.cobblemon.mod.common.net.messages.client.trade.TradeOfferExpiredPacket
+import com.cobblemon.mod.common.net.messages.client.trade.TradeOfferNotificationPacket
+import com.cobblemon.mod.common.net.messages.client.trade.TradeProcessStartedPacket
+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.InteractPokemonUIPacket
+import com.cobblemon.mod.common.net.messages.client.ui.PokedexUIPacket
+import com.cobblemon.mod.common.net.messages.client.ui.SetActiveTMPacket
+import com.cobblemon.mod.common.net.messages.client.ui.SetTMMachineContainerDataPacket
+import com.cobblemon.mod.common.net.messages.client.ui.SummaryUIPacket
+import com.cobblemon.mod.common.net.messages.server.BattleChallengePacket
+import com.cobblemon.mod.common.net.messages.server.BattleChallengeResponsePacket
+import com.cobblemon.mod.common.net.messages.server.BenchMovePacket
+import com.cobblemon.mod.common.net.messages.server.RequestMoveSwapPacket
+import com.cobblemon.mod.common.net.messages.server.RequestPlayerInteractionsPacket
+import com.cobblemon.mod.common.net.messages.server.SelectStarterPacket
+import com.cobblemon.mod.common.net.messages.server.SendOutPokemonPacket
+import com.cobblemon.mod.common.net.messages.server.battle.BattleSelectActionsPacket
+import com.cobblemon.mod.common.net.messages.server.battle.BattleTeamLeavePacket
+import com.cobblemon.mod.common.net.messages.server.battle.BattleTeamRequestPacket
+import com.cobblemon.mod.common.net.messages.server.battle.BattleTeamResponsePacket
+import com.cobblemon.mod.common.net.messages.server.battle.RemoveSpectatorPacket
+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
@@ -129,7 +186,11 @@ import com.cobblemon.mod.common.net.messages.server.pasture.UnpasturePokemonPack
 import com.cobblemon.mod.common.net.messages.server.pokedex.scanner.FinishScanningPacket
 import com.cobblemon.mod.common.net.messages.server.pokedex.scanner.StartScanningPacket
 import com.cobblemon.mod.common.net.messages.server.pokemon.interact.InteractPokemonPacket
-import com.cobblemon.mod.common.net.messages.server.pokemon.update.*
+import com.cobblemon.mod.common.net.messages.server.pokemon.update.ServerboundUpdateRidingStatePacket
+import com.cobblemon.mod.common.net.messages.server.pokemon.update.SetActiveMarkPacket
+import com.cobblemon.mod.common.net.messages.server.pokemon.update.SetItemHiddenPacket
+import com.cobblemon.mod.common.net.messages.server.pokemon.update.SetMarkingsPacket
+import com.cobblemon.mod.common.net.messages.server.pokemon.update.SetNicknamePacket
 import com.cobblemon.mod.common.net.messages.server.pokemon.update.evolution.AcceptEvolutionPacket
 import com.cobblemon.mod.common.net.messages.server.riding.DismountPokemonPacket
 import com.cobblemon.mod.common.net.messages.server.riding.ServerboundUpdateDriverInputPacket
@@ -142,12 +203,21 @@ import com.cobblemon.mod.common.net.messages.server.storage.party.PartyTutorialP
 import com.cobblemon.mod.common.net.messages.server.storage.party.ReleasePartyPokemonPacket
 import com.cobblemon.mod.common.net.messages.server.storage.party.SwapPartyPokemonPacket
 import com.cobblemon.mod.common.net.messages.server.storage.pc.*
-import com.cobblemon.mod.common.net.messages.server.trade.*
+import com.cobblemon.mod.common.net.messages.server.trade.AcceptTradeRequestPacket
+import com.cobblemon.mod.common.net.messages.server.trade.CancelTradePacket
+import com.cobblemon.mod.common.net.messages.server.trade.ChangeTradeAcceptancePacket
+import com.cobblemon.mod.common.net.messages.server.trade.OfferTradePacket
+import com.cobblemon.mod.common.net.messages.server.trade.PerformTradePacket
+import com.cobblemon.mod.common.net.messages.server.trade.UpdateTradeOfferPacket
 import com.cobblemon.mod.common.net.serverhandling.ChallengeHandler
 import com.cobblemon.mod.common.net.serverhandling.ChallengeResponseHandler
 import com.cobblemon.mod.common.net.serverhandling.RequestInteractionsHandler
-import com.cobblemon.mod.common.net.serverhandling.UsePokeSkillHandler
-import com.cobblemon.mod.common.net.serverhandling.battle.*
+import com.cobblemon.mod.common.net.serverhandling.battle.BattleSelectActionsHandler
+import com.cobblemon.mod.common.net.serverhandling.battle.RemoveSpectatorHandler
+import com.cobblemon.mod.common.net.serverhandling.battle.SpectateBattleHandler
+import com.cobblemon.mod.common.net.serverhandling.battle.TeamLeaveHandler
+import com.cobblemon.mod.common.net.serverhandling.battle.TeamRequestHandler
+import com.cobblemon.mod.common.net.serverhandling.battle.TeamRequestResponseHandler
 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
@@ -175,7 +245,11 @@ 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.ServerboundUpdateRidingStateHandler
+import com.cobblemon.mod.common.net.serverhandling.pokemon.update.SetActiveMarkHandler
+import com.cobblemon.mod.common.net.serverhandling.pokemon.update.SetItemHiddenHandler
+import com.cobblemon.mod.common.net.serverhandling.pokemon.update.SetMarkingsHandler
+import com.cobblemon.mod.common.net.serverhandling.pokemon.update.SetNicknameHandler
 import com.cobblemon.mod.common.net.serverhandling.riding.DismountPokemonPacketHandler
 import com.cobblemon.mod.common.net.serverhandling.riding.DriverInputPacketHandler
 import com.cobblemon.mod.common.net.serverhandling.riding.ServerboundUpdatePassengerPositionHandler
@@ -191,7 +265,12 @@ import com.cobblemon.mod.common.net.serverhandling.storage.party.PartyTutorialPa
 import com.cobblemon.mod.common.net.serverhandling.storage.party.ReleasePCPokemonHandler
 import com.cobblemon.mod.common.net.serverhandling.storage.party.SwapPartyPokemonHandler
 import com.cobblemon.mod.common.net.serverhandling.storage.pc.*
-import com.cobblemon.mod.common.net.serverhandling.trade.*
+import com.cobblemon.mod.common.net.serverhandling.trade.AcceptTradeRequestHandler
+import com.cobblemon.mod.common.net.serverhandling.trade.CancelTradeHandler
+import com.cobblemon.mod.common.net.serverhandling.trade.ChangeTradeAcceptanceHandler
+import com.cobblemon.mod.common.net.serverhandling.trade.OfferTradeHandler
+import com.cobblemon.mod.common.net.serverhandling.trade.PerformTradeHandler
+import com.cobblemon.mod.common.net.serverhandling.trade.UpdateTradeOfferHandler
 import com.cobblemon.mod.common.util.server
 import net.minecraft.server.level.ServerPlayer

@@ -261,7 +340,6 @@ object CobblemonNetwork {
        list.add(PacketRegisterInfo(MarkingsUpdatePacket.ID, MarkingsUpdatePacket::decode, PokemonUpdatePacketHandler()))
        list.add(PacketRegisterInfo(RideBoostsUpdatePacket.ID, RideBoostsUpdatePacket::decode, PokemonUpdatePacketHandler()))
        list.add(PacketRegisterInfo(RideStaminaUpdatePacket.ID, RideStaminaUpdatePacket::decode, PokemonUpdatePacketHandler()))
-        list.add(PacketRegisterInfo(SkillCooldownsUpdatePacket.ID, SkillCooldownsUpdatePacket::decode, PokemonUpdatePacketHandler()))
        list.add(PacketRegisterInfo(AlphaUpdatePacket.ID, AlphaUpdatePacket::decode, PokemonUpdatePacketHandler()))
        list.add(PacketRegisterInfo(ScaleModifierUpdatePacket.ID, ScaleModifierUpdatePacket::decode, PokemonUpdatePacketHandler()))

@@ -362,7 +440,6 @@ object CobblemonNetwork {
        list.add(PacketRegisterInfo(BehaviourSyncPacket.ID, BehaviourSyncPacket::decode, DataRegistrySyncPacketHandler()))
        list.add(PacketRegisterInfo(MarkRegistrySyncPacket.ID, MarkRegistrySyncPacket::decode, DataRegistrySyncPacketHandler()))
        list.add(PacketRegisterInfo(RideSettingsSyncPacket.ID, RideSettingsSyncPacket::decode, RideSettingsSyncHandler))
-        list.add(PacketRegisterInfo(PokeSkillsRegistrySyncPacket.ID, PokeSkillsRegistrySyncPacket::decode, DataRegistrySyncPacketHandler()))
        list.add(PacketRegisterInfo(TechnicalMachineRegistrySyncPacket.ID, TechnicalMachineRegistrySyncPacket::decode, DataRegistrySyncPacketHandler()))

        // Effects
@@ -455,7 +532,6 @@ object CobblemonNetwork {
        // Interaction Packets
        list.add(PacketRegisterInfo(InteractPokemonPacket.ID, InteractPokemonPacket::decode, InteractPokemonHandler))
        list.add(PacketRegisterInfo(RequestPlayerInteractionsPacket.ID, RequestPlayerInteractionsPacket::decode, RequestInteractionsHandler))
-        list.add(PacketRegisterInfo(UsePokeSkillPacket.ID, UsePokeSkillPacket::decode, UsePokeSkillHandler))

        // Storage Packets
        list.add(PacketRegisterInfo(SendOutPokemonPacket.ID, SendOutPokemonPacket::decode, SendOutPokemonHandler))
@@ -1,82 +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.CobblemonNetwork.sendPacket
-import com.cobblemon.mod.common.api.data.JsonDataRegistry
-import com.cobblemon.mod.common.api.molang.ExpressionLike
-import com.cobblemon.mod.common.api.moves.animations.ActionEffectTimeline
-import com.cobblemon.mod.common.api.reactive.SimpleObservable
-import com.cobblemon.mod.common.entity.pokemon.pokeskills.PokeSkill
-import com.cobblemon.mod.common.entity.pokemon.pokeskills.PokeSkillTier
-import com.cobblemon.mod.common.net.messages.client.data.PokeSkillsRegistrySyncPacket
-import com.cobblemon.mod.common.pokemon.Pokemon
-import com.cobblemon.mod.common.util.adapters.ActionEffectTimelineAdapter
-import com.cobblemon.mod.common.util.adapters.ExpressionLikeAdapter
-import com.cobblemon.mod.common.util.adapters.IdentifierAdapter
-import com.cobblemon.mod.common.util.adapters.TextAdapter
-import com.cobblemon.mod.common.util.cobblemonResource
-import com.google.gson.GsonBuilder
-import com.google.gson.reflect.TypeToken
-import net.minecraft.network.chat.Component
-import net.minecraft.resources.ResourceLocation
-import net.minecraft.server.level.ServerPlayer
-import net.minecraft.server.packs.PackType
-import net.minecraft.world.entity.player.Player
-
-/**
- * The JSON data registry for all the possible [PokeSkill]s.
- *
- * @author Hiroku
- * @since August 31st, 2025
- */
-object CobblemonPokeSkills : JsonDataRegistry<PokeSkill> {
-    override val id = cobblemonResource("poke_skills")
-    override val type = PackType.SERVER_DATA
-    override val observable = SimpleObservable<CobblemonPokeSkills>()
-    override val typeToken = TypeToken.get(PokeSkill::class.java)
-    override val resourcePath = "poke_skills"
-    override val gson = GsonBuilder()
-        .setPrettyPrinting()
-        .registerTypeAdapter(ExpressionLike::class.java, ExpressionLikeAdapter)
-        .registerTypeAdapter(ActionEffectTimeline::class.java, ActionEffectTimelineAdapter)
-        .registerTypeAdapter(ResourceLocation::class.java, IdentifierAdapter)
-        .registerTypeAdapter(Component::class.java, TextAdapter)
-        .create()
-
-    var skills = mapOf<ResourceLocation, PokeSkill>()
-
-    fun getAccessiblePokeSkillTiers(player: Player, pokemon: Pokemon): List<PokeSkillTier> {
-        return skills.values.mapNotNull { skill ->
-            skill.tiers.lastOrNull { tier ->
-                tier.canAccess(player, pokemon)
-            }
-        }
-    }
-
-    override fun reload(data: Map<ResourceLocation, PokeSkill>) {
-        data.forEach { (id, skill) -> skill.id = id }
-
-        skills = data
-        skills.values.forEach { skill ->
-            skill.tiers.forEachIndexed { index, tier ->
-                tier.initialize(skill, index + 1)
-            }
-        }
-
-        observable.emit(this)
-
-        val tiersCount = skills.values.sumOf { it.tiers.size }
-        Cobblemon.LOGGER.info("Loaded ${skills.size} PokéSkills with $tiersCount tiers")
-    }
-
-    override fun sync(player: ServerPlayer) {
-        player.sendPacket(PokeSkillsRegistrySyncPacket(skills.values.toList()))
-    }
-}
@@ -10,7 +10,6 @@ package com.cobblemon.mod.common.api.gui

 import com.cobblemon.mod.common.client.gui.CobblemonRenderable
 import net.minecraft.client.gui.components.AbstractWidget
-import net.minecraft.client.gui.components.Renderable
 import net.minecraft.client.gui.components.events.GuiEventListener
 import net.minecraft.client.gui.narration.NarrationElementOutput
 import net.minecraft.network.chat.Component
@@ -55,6 +54,8 @@ abstract class ParentWidget(
    }

    override fun mouseClicked(pMouseX: Double, pMouseY: Double, pButton: Int): Boolean {
+        if (!active) return false
+
        return children.any {
            it.mouseClicked(pMouseX, pMouseY, pButton)
        }
@@ -0,0 +1,116 @@
+/*
+ * 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.gui
+
+import kotlin.math.max
+import kotlin.math.min
+
+interface TreeNode<T> {
+    val children: List<TreeNode<T>>
+}
+
+class TreeDrawingNode<T>(
+    val value: T,
+    val children: List<TreeDrawingNode<T>>,
+) {
+    var x = 0
+    var y = 0
+    var offset = 0
+}
+
+fun <T> createDrawingTree(treeNode: TreeNode<T>): TreeDrawingNode<T> {
+    val root = setup(treeNode, 0, mutableListOf<Int>(), mutableListOf<Int>())
+    addMods(root, 0)
+
+    return root
+}
+
+@Suppress("UNCHECKED_CAST")
+private fun <T> setup(
+    treeNode: TreeNode<T>,
+    depth: Int,
+    nexts: MutableList<Int>,
+    offset: MutableList<Int>,
+): TreeDrawingNode<T> {
+    val children = treeNode.children.map { child ->
+        setup(child, depth + 1, nexts, offset)
+    }
+
+    val treeDrawingNode = TreeDrawingNode<T>(treeNode as T, children)
+    treeDrawingNode.y = depth
+
+    while (nexts.size <= depth) {
+        nexts.add(0)
+    }
+
+    while (offset.size <= depth) {
+        offset.add(0)
+    }
+
+    var place =
+        if (children.isEmpty()) {
+            nexts[depth]
+        } else if (children.size == 1) {
+//            children.first().x - 1
+            children.first().x
+        } else {
+//            (children[0].x + children[1].x) / 2
+            (children.first().x + children.last().x) / 2
+        }
+
+    offset[depth] = max(offset[depth], nexts[depth] - place)
+
+    if (children.isEmpty()) {
+        treeDrawingNode.x = place
+    } else {
+        treeDrawingNode.x = place + offset[depth]
+    }
+
+    nexts[depth] += 2
+    treeDrawingNode.offset = offset[depth]
+
+    return treeDrawingNode
+}
+
+private fun <T> addMods(
+    treeNode: TreeDrawingNode<T>,
+    modSum: Int,
+) {
+    treeNode.x += modSum
+    val newModSum = modSum + treeNode.offset
+
+    treeNode.children.forEach { child ->
+        addMods(child, newModSum)
+    }
+}
+
+data class TreeDrawingBounds(val minX: Int, val maxX: Int, val minY: Int, val maxY: Int) {
+    val width = maxX - minX
+    val height = maxY - minY
+    val xCenter = (maxX + minX) / 2.0
+    val yCenter = (maxY + minY) / 2.0
+}
+
+fun <T> calculateBounds(treeDrawingNode: TreeDrawingNode<T>): TreeDrawingBounds {
+    var minX = treeDrawingNode.x
+    var maxX = treeDrawingNode.x
+    var minY = treeDrawingNode.y
+    var maxY = treeDrawingNode.y
+
+    for (child in treeDrawingNode.children) {
+        val childBounds = calculateBounds(child)
+
+        minX = min(minX, childBounds.minX)
+        maxX = max(maxX, childBounds.maxX)
+        minY = min(minY, childBounds.minY)
+        maxY = max(maxY, childBounds.maxY)
+    }
+
+    return TreeDrawingBounds(minX, maxX, minY, maxY)
+}
@@ -286,15 +286,6 @@ object MoLangFunctions {
        }
    }

-    fun Any.asMostSpecificMoLangValue(): MoValue {
-        return when (this) {
-            is Number -> DoubleValue(this.toDouble())
-            is String -> StringValue(this)
-            is Boolean -> DoubleValue(if (this) 1.0 else 0.0)
-            else -> StringValue(toString())
-        }
-    }
-
    fun <T> Holder<T>.asMoLangValue(key: ResourceKey<Registry<T>>): ObjectValue<Holder<T>> {
        val value = ObjectValue(
            obj = this,
@@ -302,11 +293,11 @@ object MoLangFunctions {
        )
        value.functions["is_in"] = Function put@{ params: MoParams ->
            val tag = TagKey.create(key, ResourceLocation.parse(params.getString(0).replace("#", "")))
-            return@put DoubleValue(value.obj.`is`(tag))
+            return@put DoubleValue(if (value.obj.`is`(tag)) 1.0 else 0.0)
        }
        value.functions["is_of"] = Function put@{ params: MoParams ->
            val identifier = ResourceLocation.parse(params.getString(0))
-            return@put DoubleValue(value.obj.`is`(identifier))
+            return@put DoubleValue(if (value.obj.`is`(identifier)) 1.0 else 0.0)
        }
        return value
    }
@@ -25,7 +25,7 @@ object DropEntryMoLangFunctions : AbstractMoLangFunctionHolder<DropEntry>() {
        map["max_selectable_times"] = { DoubleValue(drop.maxSelectableTimes.toDouble()) }
        map["can_drop"] = { params ->
            val pokemon = params.getOrNull<ObjectValue<Pokemon>>(0)?.obj
-            DoubleValue(drop.canDrop(pokemon))
+            DoubleValue(if (drop.canDrop(pokemon)) 1.0 else 0.0)
        }
        return map
    }
@@ -25,8 +25,22 @@ import com.cobblemon.mod.common.entity.MoLangScriptingEntity
 import com.cobblemon.mod.common.entity.PosableEntity
 import com.cobblemon.mod.common.net.messages.client.animation.PlayPosableAnimationPacket
 import com.cobblemon.mod.common.net.messages.client.effect.SpawnSnowstormEntityParticlePacket
-import com.cobblemon.mod.common.util.*
-import net.minecraft.core.BlockPos
+import com.cobblemon.mod.common.util.asArrayValue
+import com.cobblemon.mod.common.util.asExpressionLike
+import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
+import com.cobblemon.mod.common.util.asResource
+import com.cobblemon.mod.common.util.asUUID
+import com.cobblemon.mod.common.util.cloneFrom
+import com.cobblemon.mod.common.util.effectiveName
+import com.cobblemon.mod.common.util.getBlockStatesWithPos
+import com.cobblemon.mod.common.util.getBooleanOrNull
+import com.cobblemon.mod.common.util.getDoubleOrNull
+import com.cobblemon.mod.common.util.getIsSubmerged
+import com.cobblemon.mod.common.util.getOrNull
+import com.cobblemon.mod.common.util.getStringOrNull
+import com.cobblemon.mod.common.util.isStandingOn
+import com.cobblemon.mod.common.util.resolve
+import com.cobblemon.mod.common.util.worldRegistry
 import net.minecraft.core.registries.Registries
 import net.minecraft.server.level.ServerLevel
 import net.minecraft.server.level.ServerPlayer
@@ -34,13 +48,10 @@ import net.minecraft.tags.TagKey
 import net.minecraft.world.damagesource.DamageSource
 import net.minecraft.world.damagesource.DamageTypes
 import net.minecraft.world.entity.Entity
-import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.TamableAnimal
-import net.minecraft.world.level.block.BonemealableBlock
-import net.minecraft.world.level.block.CropBlock
 import net.minecraft.world.phys.AABB
 import net.minecraft.world.phys.Vec3
-import java.util.*
+import java.util.UUID
 import kotlin.math.sqrt

 object EntityMoLangFunctions : AbstractMoLangFunctionHolder<Entity>() {
@@ -67,13 +78,8 @@ object EntityMoLangFunctions : AbstractMoLangFunctionHolder<Entity>() {
            "vertical_velocity" to { DoubleValue(thisEntity.deltaMovement.y) },
            "is_on_ground" to { _ -> DoubleValue(thisEntity.onGround()) },
            "world" to { _ -> thisEntity.level().worldRegistry.wrapAsHolder(thisEntity.level()).asWorldMoLangValue() },
-            "dimension" to { StringValue(thisEntity.level().dimension().location().toString()) },
            "biome" to { _ -> thisEntity.level().getBiome(thisEntity.blockPosition()).asBiomeMoLangValue() },
            "is_passenger" to { DoubleValue(thisEntity.isPassenger) },
-            "is_passenger" to isPassenger@{ params ->
-                val passengerEntity = (params.get<MoValue>(0) as? ObjectValue<*>)?.obj as? LivingEntity ?: return@isPassenger DoubleValue.ZERO
-                DoubleValue(passengerEntity in thisEntity.passengers)
-            },
            "discard" to { thisEntity.discard() },
            "is_sneaking" to { _ -> DoubleValue(thisEntity.isShiftKeyDown) },
            "is_sprinting" to { _ -> DoubleValue(thisEntity.isSprinting) },
@@ -115,62 +121,6 @@ object EntityMoLangFunctions : AbstractMoLangFunctionHolder<Entity>() {
                listOf(thisEntity.deltaMovement.x, thisEntity.deltaMovement.y, thisEntity.deltaMovement.z)
                    .asArrayValue(::DoubleValue)
            },
-            "set_position" to { params ->
-                val x = params.getDouble(0)
-                val y = params.getDouble(1)
-                val z = params.getDouble(2)
-                thisEntity.setPos(x, y, z)
-                DoubleValue.ONE
-            },
-            "fertilize_nearby_crops" to { params -> //TODO: pretty bespoke. Maybe should be moved or generalized?
-                val radius = params.getIntOrNull(0) ?: 8
-                val maxCrops = params.getIntOrNull(1) ?: 8
-
-                var fertilizedCount = 0
-                val level = thisEntity.level()
-                val centerPos = thisEntity.blockPosition()
-
-                // Find all bonemealable blocks within radius
-                val bonemealableBlocks = mutableListOf<BlockPos>()
-
-                for (x in -radius..radius) {
-                    for (y in -3..3) { // Limited vertical range
-                        for (z in -radius..radius) {
-                            val pos = centerPos.offset(x, y, z)
-                            val blockState = level.getBlockState(pos)
-                            val block = blockState.block
-
-                            // Check if block can be bonemealed
-                            if (block is BonemealableBlock && block is CropBlock && block.isValidBonemealTarget(level, pos, blockState)) {
-                                bonemealableBlocks.add(pos)
-                            }
-                        }
-                    }
-                }
-
-                // Shuffle and take up to maxCrops blocks to fertilize
-                bonemealableBlocks.shuffle()
-                val blocksToFertilize = bonemealableBlocks.take(maxCrops)
-
-                for (pos in blocksToFertilize) {
-                    val blockState = level.getBlockState(pos)
-                    val block = blockState.block
-
-                    if (block is BonemealableBlock && block.isValidBonemealTarget(level, pos, blockState)) {
-                        if (block.isBonemealSuccess(level, level.random, pos, blockState)) {
-                            block.performBonemeal(level as ServerLevel, level.random, pos, blockState)
-
-                            // Add bonemeal particle
-                            val particlePos = block.getParticlePos(pos)
-                            level.levelEvent(1505, particlePos, 15) // Same event used for bonemealing in vanilla
-
-                            fertilizedCount++
-                        }
-                    }
-                }
-
-                DoubleValue(fertilizedCount.toDouble())
-            },
            "tags" to {
                val tags = thisEntity.tags
                val array = ArrayStruct(hashMapOf())
@@ -202,14 +152,12 @@ object EntityMoLangFunctions : AbstractMoLangFunctionHolder<Entity>() {
                    StringValue(it)
                } ?: DoubleValue.ZERO
            },
-            "find_nearby_blocks" to { params ->
+            "find_nearby_block" to findNearbyBlock@{ params ->
                val input = params.getString(0)
                val isTag = input.contains("#")
                val type = input.replace("#", "").asIdentifierDefaultingNamespace(namespace = "minecraft")
-
                val range = params.getDoubleOrNull(1) ?: 10
-
-                val blockPosList = thisEntity.level().getBlockStatesWithPos(
+                val blockPos = thisEntity.level().getBlockStatesWithPos(
                    AABB.ofSize(
                        thisEntity.position(),
                        range.toDouble(),
@@ -217,19 +165,28 @@ object EntityMoLangFunctions : AbstractMoLangFunctionHolder<Entity>() {
                        range.toDouble()
                    )
                )
-                .filter { blockPosPair ->
-                    blockPosPair.first.blockHolder.let {
-                        if (isTag) it.`is`(
-                            TagKey.create(
-                                Registries.BLOCK,
-                                type
-                            )
-                        ) else it.`is`(type)
+                    .filter { blockPosPair ->
+                        blockPosPair.first.blockHolder.let {
+                            if (isTag) it.`is`(
+                                TagKey.create(
+                                    Registries.BLOCK,
+                                    type
+                                )
+                            ) else it.`is`(type)
+                        }
                    }
+                    .minByOrNull { it.second.distSqr(thisEntity.blockPosition()) }
+                    ?.second
+                if (blockPos != null) {
+                    return@findNearbyBlock ArrayStruct(
+                        mapOf(
+                            "0" to DoubleValue(blockPos.x),
+                            "1" to DoubleValue(blockPos.y),
+                            "2" to DoubleValue(blockPos.z)
+                        )
+                    )
                }
-                .map { blockPosPair -> blockPosPair.second }
-
-                blockPosList.map { it.toArrayStruct() }.asArrayValue()
+                return@findNearbyBlock DoubleValue.ZERO
            },
            "get_nearby_entities" to { params ->
                val distance = params.getDouble(0)
@@ -276,7 +233,7 @@ object EntityMoLangFunctions : AbstractMoLangFunctionHolder<Entity>() {
                val intangible = params.getBooleanOrNull(0) ?: true
                thisEntity.noPhysics = intangible
                DoubleValue.ONE
-            },
+            }
        )


@@ -39,7 +39,6 @@ import net.minecraft.world.entity.Mob
 import net.minecraft.world.entity.PathfinderMob
 import net.minecraft.world.entity.TamableAnimal
 import net.minecraft.world.entity.ai.behavior.BlockPosTracker
-import net.minecraft.world.entity.ai.behavior.EntityTracker
 import net.minecraft.world.entity.ai.memory.MemoryModuleType
 import net.minecraft.world.entity.ai.memory.MemoryStatus
 import net.minecraft.world.entity.ai.memory.WalkTarget
@@ -124,23 +123,6 @@ object LivingEntityMoLangFunctions : AbstractMoLangFunctionHolder<LivingEntity>(
                duration.toLong()
            )
        }
-        map["look_at_entity"] = put@{ params ->
-            val targetEntity = params.get<MoValue>(0)
-            val duration = params.getDoubleOrNull(1)?.toInt() ?: 20
-
-            val lookEntity = if (targetEntity is ObjectValue<*> && targetEntity.obj is Entity) {
-                targetEntity.obj as Entity
-            } else {
-                return@put DoubleValue.ZERO
-            }
-
-            // Set the current entity to track the looked for entity
-            val brain = entity.brain
-            val tracker = EntityTracker(lookEntity, true)
-            brain.setMemoryWithExpiry(MemoryModuleType.LOOK_TARGET, tracker, duration.toLong())
-
-            DoubleValue.ONE
-        }
        map["get_wander_control_memory"] = put@{
            val value = entity.brain.getMemorySafely(CobblemonMemories.WANDER_CONTROL).orElse(null)
                ?: CobblemonWanderControl()
@@ -23,7 +23,6 @@ import com.cobblemon.mod.common.api.molang.ObjectValue
 import com.cobblemon.mod.common.api.text.text
 import com.cobblemon.mod.common.battles.BattleBuilder
 import com.cobblemon.mod.common.battles.BattleFormat
-import com.cobblemon.mod.common.client.CobblemonClient
 import com.cobblemon.mod.common.entity.npc.NPCEntity
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.net.messages.client.battle.BattleMusicPacket
@@ -33,7 +32,6 @@ import com.cobblemon.mod.common.util.activeDialogue
 import com.cobblemon.mod.common.util.asBlockPos
 import com.cobblemon.mod.common.util.asResource
 import com.cobblemon.mod.common.util.asUUID
-import com.cobblemon.mod.common.util.blockRegistry
 import com.cobblemon.mod.common.util.getBattleState
 import com.cobblemon.mod.common.util.getBooleanOrNull
 import com.cobblemon.mod.common.util.getDoubleOrNull
@@ -46,19 +44,14 @@ import com.cobblemon.mod.common.util.party
 import com.cobblemon.mod.common.util.pc
 import com.cobblemon.mod.common.util.pokedex
 import com.cobblemon.mod.common.util.server
-import com.cobblemon.mod.common.util.toArrayStruct
-import net.minecraft.client.player.AbstractClientPlayer
 import net.minecraft.core.registries.BuiltInRegistries
 import net.minecraft.core.registries.Registries
 import net.minecraft.resources.ResourceLocation
 import net.minecraft.server.level.ServerPlayer
 import net.minecraft.sounds.SoundSource
-import net.minecraft.world.entity.Entity
 import net.minecraft.world.entity.player.Player
 import net.minecraft.world.item.ItemStack
-import net.minecraft.world.level.ClipContext
 import net.minecraft.world.level.GameType
-import net.minecraft.world.phys.HitResult
 import kotlin.collections.iterator

 object PlayerMoLangFunctions : AbstractMoLangFunctionHolder<Player>() {
@@ -386,61 +379,6 @@ object PlayerMoLangFunctions : AbstractMoLangFunctionHolder<Player>() {
                } ?: DoubleValue.ZERO
            }
            map["has_chosen_starter"] = { _ -> DoubleValue(Cobblemon.playerDataManager.getGenericData(player).starterSelected) }
-            map["ride"] = put@{ params ->
-                val entity = (params.get<MoValue>(0) as? ObjectValue<*>)?.obj as? Entity ?: return@put DoubleValue.ZERO
-                player.startRiding(entity)
-            }
-            map["has_respawn_position"] = {
-                DoubleValue(player.respawnPosition != null)
-            }
-            map["respawn_position"] = {
-                player.respawnPosition?.toArrayStruct() ?: DoubleValue.ZERO
-            }
-            map["respawn_dimension"] = {
-                StringValue(player.respawnDimension.location().toString())
-            }
-            map["teleport_to_respawn"] = put@{
-                val respawnPosition = player.respawnPosition?.center ?: return@put DoubleValue.ZERO
-                player.teleportTo(respawnPosition.x, respawnPosition.y, respawnPosition.z)
-                DoubleValue.ONE
-            }
-            map["get_looked_block"] = put@{ params ->
-                // Get the block the player is looking at 'distance' units away
-                val distance = params.getDoubleOrNull(0) ?: 8.0
-
-                // perform clip
-                val level = player.level()
-                val eye = player.eyePosition
-                val view = player.getViewVector(1.0f)
-                val lookPos = eye.add(view.scale(distance))
-                val hitResult = level.clip(ClipContext(eye, lookPos, ClipContext.Block.COLLIDER, ClipContext.Fluid.NONE, player))
-
-                if (hitResult.type == HitResult.Type.BLOCK) {
-                    // Get base block info
-                    val blockPos = hitResult.blockPos
-                    val blockState = level.getBlockState(blockPos)
-                    val blockHolder = level.blockRegistry.wrapAsHolder(blockState.block)
-                    val blockValue = blockHolder.asMoLangValue(Registries.BLOCK)
-
-                    // Attach the position to the blockValue return
-                    blockValue.addFunction("x") { DoubleValue(blockPos.x.toDouble()) }
-                    blockValue.addFunction("y") { DoubleValue(blockPos.y.toDouble()) }
-                    blockValue.addFunction("z") { DoubleValue(blockPos.z.toDouble()) }
-
-                    return@put blockValue
-                } else {
-                    return@put DoubleValue.ZERO
-                }
-            }
-            map["is_battling"] = {
-                DoubleValue(player.isInBattle())
-            }
-        }
-
-        if (player is AbstractClientPlayer) {
-            map["is_battling"] = {
-                DoubleValue(CobblemonClient.battle?.spectating == false) // Checks not-null and not-spectating at the same time, trust
-            }
        }

        return map
@@ -15,7 +15,6 @@ import com.bedrockk.molang.runtime.value.MoValue
 import com.bedrockk.molang.runtime.value.StringValue
 import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.CobblemonMovesetBuilders
-import com.cobblemon.mod.common.CobblemonPokeSkills
 import com.cobblemon.mod.common.api.mark.Marks
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMoLangValue
 import com.cobblemon.mod.common.api.moves.BenchedMove
@@ -27,9 +26,6 @@ import com.cobblemon.mod.common.api.riding.stats.RidingStat
 import com.cobblemon.mod.common.api.storage.party.PartyStore
 import com.cobblemon.mod.common.pokemon.IVs
 import com.cobblemon.mod.common.pokemon.Pokemon
-import com.cobblemon.mod.common.pokemon.activestate.ActivePokemonState
-import com.cobblemon.mod.common.pokemon.activestate.SentOutState
-import com.cobblemon.mod.common.pokemon.activestate.ShoulderedState
 import com.cobblemon.mod.common.util.asArrayValue
 import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
 import com.cobblemon.mod.common.util.getBooleanOrNull
@@ -451,30 +447,6 @@ object PokemonMoLangFunctions : AbstractMoLangFunctionHolder<Pokemon>() {
            evolution?.forceEvolve(pokemon)
            StringValue(evolution.toString())
        }
-        map["is_sent_out"] = {
-            DoubleValue(pokemon.state is SentOutState)
-        }
-        map["is_shouldered"] = {
-            DoubleValue(pokemon.state is ShoulderedState)
-        }
-        map["entity"] = {
-            (pokemon.state as? ActivePokemonState)?.entity?.struct ?: DoubleValue.ZERO
-        }
-        map["is_rideable"] = put@{
-            return@put DoubleValue(!pokemon.riding.behaviours.isNullOrEmpty())
-        }
-        map["has_status"] = put@{ params ->
-            val status = params.getString(0).asIdentifierDefaultingNamespace()
-            return@put DoubleValue(pokemon.status?.status?.name == status)
-        }
-        // TODO remove this or figure a way to determine which tier of the pokeskill is being used
-        map["add_skill_cooldown"] = put@{ params ->
-            val skillId = params.getString(0).asIdentifierDefaultingNamespace()
-            val cooldownTicks = params.getIntOrNull(1)
-            val skill = CobblemonPokeSkills.skills[skillId] ?: return@put DoubleValue.ZERO
-            pokemon.addSkillCooldown(skillId, cooldownTicks ?: skill.cooldownTicks ?: 0)
-            return@put DoubleValue.ONE
-        }

        map["entity"] = { pokemon.entity?.asMoLangValue() ?: DoubleValue.ZERO }
        map["is_alpha"] = { DoubleValue(pokemon.isAlpha) }
@@ -40,7 +40,6 @@ import net.minecraft.world.level.Level
 import net.minecraft.world.level.Level.ExplosionInteraction
 import net.minecraft.world.level.biome.Biome
 import net.minecraft.world.level.block.Block
-import net.minecraft.world.level.block.entity.AbstractFurnaceBlockEntity
 import net.minecraft.world.level.levelgen.Heightmap
 import net.minecraft.world.level.storage.loot.LootParams
 import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets
@@ -62,26 +61,6 @@ object WorldMoLangFunctions : AbstractMoLangFunctionHolder<Holder<Level>>() {
            val time = world.dayTime % 24000
            return@put DoubleValue(timeOfDay.contains(time.toInt()))
        }
-        map["add_furnace_fuel"] = put@{ params ->
-            val x = params.getInt(0)
-            val y = params.getInt(1)
-            val z = params.getInt(2)
-            val fuelTicks = params.getInt(3)
-
-            val blockEntity = world.getBlockEntity(BlockPos(x, y, z))
-            if (blockEntity is AbstractFurnaceBlockEntity) {
-                // Add fuel time to the furnace
-                blockEntity.litTime += fuelTicks
-
-                // If this exceeds the litDuration then bump it up
-                if (blockEntity.litTime >= blockEntity.litDuration) {
-                    blockEntity.litDuration = blockEntity.litTime
-                }
-                blockEntity.setChanged()
-                return@put DoubleValue.ONE
-            }
-            return@put DoubleValue.ZERO
-        }
        map["game_time"] = { _ -> DoubleValue(world.gameTime.toDouble()) }
        map["time_of_day"] = put@{
            val time = world.dayTime % 24000
@@ -149,13 +128,13 @@ object WorldMoLangFunctions : AbstractMoLangFunctionHolder<Holder<Level>>() {
            val x = params.getDouble(0)
            val y = params.getDouble(1)
            val z = params.getDouble(2)
-            val range = params.getDoubleOrNull(3) ?: 8.0
+            val range = params.getDouble(3).toFloat()
            world.explode(
                null,
                x,
                y,
                z,
-                range.toFloat(),
+                range,
                ExplosionInteraction.valueOf(
                    params.getStringOrNull(4)?.uppercase() ?: ExplosionInteraction.TNT.name
                )
@@ -50,7 +50,7 @@ class ActionEffectTimeline(
    }

    fun chainKeyframes(context: ActionEffectContext, iterator: Iterator<ActionEffectKeyframe>, finalFuture: CompletableFuture<Unit>) {
-        if (!iterator.hasNext() || context.cancelled) {
+        if (!iterator.hasNext()) {
            finalFuture.complete(Unit)
        } else {
            val keyframe = iterator.next()
@@ -70,7 +70,6 @@ class ActionEffectContext(
    val runtime: MoLangRuntime,
    var canBeInterrupted: Boolean = false,
    var interrupted: Boolean = false,
-    var cancelled: Boolean = false,
    var currentKeyframes: MutableList<ActionEffectKeyframe> = mutableListOf(),
    var level: Level? = null
 ) {
@@ -57,7 +57,6 @@ object ActionEffects : JsonDataRegistry<ActionEffectTimeline> {
        ActionEffectKeyframe.register<RunActionEffectKeyframe>("run_action_effect")
        ActionEffectKeyframe.register<EntityParticlesActionEffectKeyframe>("entity_particles")
        ActionEffectKeyframe.register<EntitySoundActionEffectKeyframe>("entity_sound")
-        ActionEffectKeyframe.register<CancelActionEffectKeyframe>("cancel")
    }

    override val gson = GsonBuilder()
@@ -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.moves.animations.keyframes
-
-import com.cobblemon.mod.common.api.moves.animations.ActionEffectContext
-import java.util.concurrent.CompletableFuture
-
-class CancelActionEffectKeyframe : ConditionalActionEffectKeyframe() {
-    override fun playWhenTrue(context: ActionEffectContext): CompletableFuture<Unit> {
-        context.cancelled = true
-        return CompletableFuture.completedFuture(Unit)
-    }
-}
@@ -21,7 +21,6 @@ import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
 import net.minecraft.commands.arguments.EntityArgument.getPlayers
 import java.util.concurrent.CompletableFuture
 import net.minecraft.server.level.ServerLevel
-import net.minecraft.world.phys.Vec3

 /**
 * Spawns particles on the entity based on the given particle effect and locator.
@@ -66,36 +65,15 @@ class EntityParticlesActionEffectKeyframe : ConditionalActionEffectKeyframe(), E
            allEntities.any { player.distanceTo(it) <= visibilityRange }
        }

-        // Try to resolve a world-position target from runtime variables
-        val runtimeTargetPosition: Vec3? = try {
-            val x = "v.target_x".asExpressionLike().resolveDouble(context.runtime)
-            val y = "v.target_y".asExpressionLike().resolveDouble(context.runtime)
-            val z = "v.target_z".asExpressionLike().resolveDouble(context.runtime)
-            if (x != 0.0 || y != 0.0 || z != 0.0) Vec3(x, y, z) else null
-        } catch (e: Exception) {
-            null
-        }
-

        sourceEntities.filter { it is PosableEntity }.forEach { entity ->
-            // If target entities are specified, send the particle using entity locators/position.
-            // If there are no target entities then attempt to send to v.target world position or send without target.
-            if (targetEntities.isNotEmpty()) {
+            if (targetLocators == null) {
+                val packet = SpawnSnowstormEntityParticlePacket(effectIdentifier, entity.id, locators)
+                packet.sendToPlayers(players)
+            }
+            else {
                targetEntities.forEach { targetEntity ->
-                    if (targetLocators != null) {
-                        val packet = SpawnSnowstormEntityParticlePacket(effectIdentifier, entity.id, locators, targetEntity.id, targetLocators!!.toList())
-                        packet.sendToPlayers(players)
-                    } else {
-                        val packet = SpawnSnowstormEntityParticlePacket(effectIdentifier, entity.id, locators, targetEntity.id)
-                        packet.sendToPlayers(players)
-                    }
-                }
-            } else {
-                if (runtimeTargetPosition != null) {
-                    val packet = SpawnSnowstormEntityParticlePacket(effectIdentifier, entity.id, locators, targetPosition = runtimeTargetPosition)
-                    packet.sendToPlayers(players)
-                } else {
-                    val packet = SpawnSnowstormEntityParticlePacket(effectIdentifier, entity.id, locators)
+                    val packet = SpawnSnowstormEntityParticlePacket(effectIdentifier, entity.id, locators, targetEntity.id, targetLocators!!.toList())
                    packet.sendToPlayers(players)
                }
            }
@@ -8,6 +8,8 @@

 package com.cobblemon.mod.common.api.moves.animations.keyframes

+import com.bedrockk.molang.runtime.struct.QueryStruct
+import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.api.molang.ExpressionLike
 import com.cobblemon.mod.common.api.moves.animations.ActionEffectContext
 import com.cobblemon.mod.common.api.scheduling.delayedFuture
@@ -8,8 +8,6 @@

 package com.cobblemon.mod.common.api.moves.animations.keyframes

-import com.cobblemon.mod.common.Cobblemon
-import com.cobblemon.mod.common.api.molang.ExpressionLike
 import com.cobblemon.mod.common.api.moves.animations.ActionEffectContext
 import com.cobblemon.mod.common.api.moves.animations.ActionEffects
 import java.util.concurrent.CompletableFuture
@@ -20,37 +18,16 @@ import net.minecraft.resources.ResourceLocation
 * effect is marked complete only when the action effect it runs is complete unless [waitForActionEffect] is
 * false.
 *
- * If [expression] is set, it will be resolved at runtime to determine the action effect identifier.
- * This allows dynamic delegation based on MoLang variables (e.g. v.granting_move).
- * If [expression] is not set, the static [actionEffect] identifier is used instead.
- *
 * @author Hiroku
 * @since January 21st, 2024
 */
 class RunActionEffectKeyframe : ConditionalActionEffectKeyframe() {
    val actionEffect: ResourceLocation? = null
-    val expression: ExpressionLike? = null
    val waitForActionEffect = true
    override fun playWhenTrue(context: ActionEffectContext): CompletableFuture<Unit> {
-        val effectId = if (expression != null) {
-            val resolved = expression.resolveString(context.runtime)
-            if (resolved == "0" || resolved.isBlank()) {
-                Cobblemon.LOGGER.warn("RunActionEffectKeyframe expression resolved to empty/zero string: $resolved")
-                return skip()
-            }
-            try {
-                ResourceLocation.parse(resolved)
-            } catch (e: Exception) {
-                Cobblemon.LOGGER.warn("RunActionEffectKeyframe expression resolved to invalid resource location: $resolved with exception: $e")
-                return skip()
-            }
+        return if (actionEffect != null) {
+            ActionEffects.actionEffects[actionEffect]?.run(context)?.takeIf { waitForActionEffect } ?: skip()
        } else {
-            actionEffect
-        }
-        return if (effectId != null) {
-            ActionEffects.actionEffects[effectId]?.run(context)?.takeIf { waitForActionEffect } ?: skip()
-        } else {
-            Cobblemon.LOGGER.warn("RunActionEffectKeyframe has no action effect identifier or expression to run")
            skip()
        }
    }
@@ -72,6 +72,40 @@ abstract class AbstractPokedexManager {
        } ?: PokedexEntryProgress.UNREGISTERED
    }

+    fun getHighestKnowledgeFor(entry: PokedexEntry, form: PokedexForm?): PokedexEntryProgress {
+        if (form == null) return getHighestKnowledgeFor(entry)
+
+        val speciesRecord = getSpeciesRecord(entry.speciesId) ?: return PokedexEntryProgress.UNREGISTERED
+        val hasAllAspects = entry.conditionAspects.all(speciesRecord::hasAspect)
+        if (!hasAllAspects) {
+            return PokedexEntryProgress.UNREGISTERED
+        }
+
+        return speciesRecord.getFormRecord(form.displayForm)?.knowledge ?: PokedexEntryProgress.UNREGISTERED
+    }
+
+    fun getHighestKnowledgeFor(entry: PokedexEntry, form: PokedexForm?, aspects: Iterable<String>): PokedexEntryProgress {
+        val formKnowledge = getHighestKnowledgeFor(entry, form)
+
+        if (formKnowledge == PokedexEntryProgress.UNREGISTERED) return PokedexEntryProgress.UNREGISTERED
+
+        val seenAspects = getSeenAspects(entry)
+        val allSeenAspects = aspects
+            // TODO this is ugly
+            .filter { it ->
+                if (Dexes.equivalentFormsLookup[it] != null) return@filter false
+                if (it.uppercase() in setOf(Gender.MALE.name, Gender.FEMALE.name, Gender.GENDERLESS.name)) return@filter false
+                if ("shiny".equals(it, ignoreCase = true)) return@filter false
+
+                return@filter true
+            }
+            .all { it -> seenAspects.contains(it) }
+
+        if (!allSeenAspects) return PokedexEntryProgress.UNREGISTERED
+
+        return formKnowledge
+    }
+
    fun getEncounteredForms(entry: PokedexEntry) : List<PokedexForm> {
        return getFormsWithKnowledge(entry, PokedexEntryProgress.SEEN)
    }
@@ -10,6 +10,9 @@ package com.cobblemon.mod.common.api.pokedex

 import com.cobblemon.mod.common.api.data.JsonDataRegistry
 import com.cobblemon.mod.common.api.pokedex.def.PokedexDef
+import com.cobblemon.mod.common.api.pokedex.entry.PokedexEntry
+import com.cobblemon.mod.common.api.pokedex.entry.PokedexForm
+import com.cobblemon.mod.common.api.pokemon.PokemonSpecies
 import com.cobblemon.mod.common.api.reactive.SimpleObservable
 import com.cobblemon.mod.common.net.messages.client.data.PokedexDexSyncPacket
 import com.cobblemon.mod.common.util.adapters.CodecBackedAdapter
@@ -40,6 +43,17 @@ object Dexes : JsonDataRegistry<PokedexDef> {
    //Maps a dex id to its PokedexDef
    val dexEntryMap = linkedMapOf<ResourceLocation, PokedexDef>()

+    val equivalentForms = mapOf(
+        "galar" to listOf("region-bias-galar", "bias-galar", "galar-bias", "galarian", "galar"),
+        "alola" to listOf("region-bias-alola", "bias-alola", "alola-bias", "alolan", "alola"),
+        "hisui" to listOf("region-bias-hisui", "bias-hisui", "hisui-bias", "hisuian", "hisui"),
+        "paldea" to listOf("region-bias-paldea", "bias-paldea", "paldea-bias", "paldean", "paldea"),
+    )
+
+    val equivalentFormsLookup = equivalentForms.flatMap { (key, values) ->
+        values.map { it to key }
+    }.toMap()
+
    override fun reload(data: Map<ResourceLocation, PokedexDef>) {
        dexEntryMap.clear()
        data.entries.sortedBy { it.value.sortOrder }.forEach { (id, def) -> dexEntryMap[id] = def }
@@ -49,4 +63,34 @@ object Dexes : JsonDataRegistry<PokedexDef> {
    override fun sync(player: ServerPlayer) {
        PokedexDexSyncPacket(dexEntryMap.values).sendToPlayer(player)
    }
+
+    fun findDexEntryBySpeciesId(regionId: ResourceLocation, speciesId: ResourceLocation): PokedexEntry? {
+        return dexEntryMap[regionId]?.getEntries()?.firstOrNull { it -> it.speciesId == speciesId }
+    }
+
+    fun findDexEntryBySpeciesId(speciesId: ResourceLocation): PokedexEntry? {
+        return findDexEntryBySpeciesId(cobblemonResource("national"), speciesId)
+    }
+
+    fun findRootDexEntryBySpeciesId(speciesId: ResourceLocation, formName: String): Pair<PokedexEntry, PokedexForm> {
+        var rootSpecies = speciesId.let { PokemonSpecies.getByIdentifier(it) }!!
+        while (rootSpecies.preEvolution != null) {
+            rootSpecies = rootSpecies.preEvolution!!.species
+        }
+
+        val entry = findDexEntryBySpeciesId(rootSpecies.resourceIdentifier)
+            ?: throw RuntimeException("Root dex entry not found")
+
+        val formEquivalents = getFormEquivalents(formName)
+        val form =
+            entry.forms.firstOrNull { formEquivalents.contains(it.displayForm.lowercase()) } ?:
+            entry.forms.first { it.displayForm.equals("Normal", ignoreCase = true) }
+
+        return entry to form
+    }
+
+    fun getFormEquivalents(formName: String): List<String> {
+        val key = equivalentFormsLookup[formName.lowercase()]
+        return equivalentForms[key] ?: listOf(formName.lowercase())
+    }
 }
@@ -759,7 +759,6 @@ open class PokemonProperties {
        shiny?.let { json.addProperty(DataKeys.POKEMON_SHINY, it) }
        gender?.let { json.addProperty(DataKeys.POKEMON_GENDER, it.name) }
        species?.let { json.addProperty(DataKeys.POKEMON_SPECIES_TEXT, it) }
-        nickname?.let { json.addProperty(DataKeys.POKEMON_NICKNAME, it.string) }
        form?.let { json.addProperty(DataKeys.POKEMON_FORM_ID, it) }
        friendship?.let { json.addProperty(DataKeys.POKEMON_FRIENDSHIP, it) }
        fullness?.let { json.addProperty(DataKeys.POKEMON_FULLNESS, it) }
@@ -796,7 +795,6 @@ open class PokemonProperties {
        shiny = json.get(DataKeys.POKEMON_SHINY)?.asBoolean
        gender = json.get(DataKeys.POKEMON_GENDER)?.asString?.let { Gender.valueOf(it) }
        species = json.get(DataKeys.POKEMON_SPECIES_TEXT)?.asString
-        nickname = json.get(DataKeys.POKEMON_NICKNAME)?.asString?.let(Component::literal)
        form = json.get(DataKeys.POKEMON_FORM_ID)?.asString
        friendship = json.get(DataKeys.POKEMON_FRIENDSHIP)?.asInt
        fullness = json.get(DataKeys.POKEMON_FULLNESS)?.asInt
@@ -0,0 +1,30 @@
+/*
+ * 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.pokemon.evolution
+
+import com.cobblemon.mod.common.pokemon.evolution.variants.*
+
+interface EvolutionVisitor<R> {
+    fun visit(evolution: Evolution): R? {
+        return when (evolution) {
+            is BlockClickEvolution -> visitBlockClickEvolution(evolution)
+            is DummyEvolution -> visitDummyEvolution(evolution)
+            is ItemInteractionEvolution -> visitItemInteractionEvolution(evolution)
+            is LevelUpEvolution -> visitLevelUpEvolution(evolution)
+            is TradeEvolution -> visitTradeEvolution(evolution)
+            else -> null
+        }
+    }
+
+    fun visitBlockClickEvolution(blockClickEvolution: BlockClickEvolution): R
+    fun visitDummyEvolution(evolution: Evolution): R // TODO: Use dummyEvolution?
+    fun visitItemInteractionEvolution(itemInteractionEvolution: ItemInteractionEvolution): R
+    fun visitLevelUpEvolution(levelUpEvolution: LevelUpEvolution): R
+    fun visitTradeEvolution(tradeEvolution: TradeEvolution): R
+}
@@ -21,7 +21,7 @@ import net.minecraft.world.entity.LivingEntity
 * @author Licious
 * @since March 21st, 2022
 */
-interface EntityQueryRequirement : Requirement {
+abstract class EntityQueryRequirement : Requirement() {
    override fun check(pokemon: Pokemon): Boolean {
        val queriedEntity = pokemon.entity ?: pokemon.getOwnerPlayer() ?: return false
        return this.check(pokemon, queriedEntity)
@@ -34,5 +34,5 @@ interface EntityQueryRequirement : Requirement {
     * @param queriedEntity The [LivingEntity] that can be compared in context of a [Level].
     * @return If the requirement was satisfied.
     */
-    fun check(pokemon: Pokemon, queriedEntity: LivingEntity): Boolean
+    abstract fun check(pokemon: Pokemon, queriedEntity: LivingEntity): Boolean
 }
@@ -23,7 +23,7 @@ import net.minecraft.world.entity.player.Player
 * @author Polymeta
 * @since May 6th, 2025
 */
-interface OwnerQueryRequirement : Requirement {
+abstract class OwnerQueryRequirement : Requirement() {
    override fun check(pokemon: Pokemon): Boolean {
        val owner = pokemon.getOwnerEntity() ?: return false
        return when (owner) {
@@ -44,7 +44,7 @@ interface OwnerQueryRequirement : Requirement {
     * @param owner The [Player] that owns this [Pokemon].
     * @return If the requirement was satisfied.
     */
-    fun checkPlayer(pokemon: Pokemon, owner: Player): Boolean
+    abstract fun checkPlayer(pokemon: Pokemon, owner: Player): Boolean

    /**
     * Checks if the given [Pokemon] & [NPCEntity] satisfies the requirement.
@@ -55,5 +55,5 @@ interface OwnerQueryRequirement : Requirement {
     * @param owner The [NPCEntity] that owns this [Pokemon].
     * @return If the requirement was satisfied.
     */
-    fun checkNPC(pokemon: Pokemon, owner: NPCEntity): Boolean
+    abstract fun checkNPC(pokemon: Pokemon, owner: NPCEntity): Boolean
 }
@@ -11,6 +11,7 @@ package com.cobblemon.mod.common.api.pokemon.requirement
 import com.cobblemon.mod.common.api.pokemon.evolution.ContextEvolution
 import com.cobblemon.mod.common.api.pokemon.evolution.Evolution
 import com.cobblemon.mod.common.pokemon.Pokemon
+import net.minecraft.resources.ResourceLocation

 /**
 * Represents a universal requirement suitable for various checks on pokemon..
@@ -22,7 +23,7 @@ import com.cobblemon.mod.common.pokemon.Pokemon
 * @author Licious
 * @since March 19th, 2022
 */
-fun interface Requirement {
+abstract class Requirement {

    /**
     * Checks if the given [Pokemon] satisfies the requirement.
@@ -30,6 +31,8 @@ fun interface Requirement {
     * @param pokemon The [Pokemon] being queried.
     * @return If the requirement was satisfied.
     */
-    fun check(pokemon: Pokemon): Boolean
+    abstract fun check(pokemon: Pokemon): Boolean

+    val pokedexIcon: ResourceLocation? = null
+    val pokedexTooltip: String? = null
 }
@@ -0,0 +1,74 @@
+/*
+ * 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.pokemon.requirement
+
+import com.cobblemon.mod.common.pokemon.requirements.*
+
+interface RequirementVisitor<R> {
+    fun visit(requirement: Requirement): R? {
+        return when (requirement) {
+            is AdvancementRequirement -> visitAdvancementRequirement(requirement)
+            is AnyRequirement -> visitAnyRequirement(requirement)
+            is AreaRequirement -> visitAreaRequirement(requirement)
+            is AttackDefenceRatioRequirement -> visitAttackDefenceRatioRequirement(requirement)
+            is BattleCriticalHitsRequirement -> visitBattleCriticalHitsRequirement(requirement)
+            is BiomeRequirement -> visitBiomeRequirement(requirement)
+            is BlocksTraveledRequirement -> visitBlocksTraveledRequirement(requirement)
+            is DamageTakenRequirement -> visitDamageTakenRequirement(requirement)
+            is DefeatRequirement -> visitDefeatRequirement(requirement)
+            is FriendshipRequirement -> visitFriendshipRequirement(requirement)
+            is HeldItemRequirement -> visitHeldItemRequirement(requirement)
+            is LevelRequirement -> visitLevelRequirement(requirement)
+            is MoonPhaseRequirement -> visitMoonPhaseRequirement(requirement)
+            is MoveSetRequirement -> visitMoveSetRequirement(requirement)
+            is MoveTypeRequirement -> visitMoveTypeRequirement(requirement)
+            is OwnerHoldsItemRequirement -> visitOwnerHoldsItemRequirement(requirement)
+            is PartyMemberRequirement -> visitPartyMemberRequirement(requirement)
+            is PokemonPropertiesRequirement -> visitPokemonPropertiesRequirement(requirement)
+            is PropertyRangeRequirement -> visitPropertyRangeRequirement(requirement)
+            is RecoilRequirement -> visitRecoilRequirement(requirement)
+            is StatCompareRequirement -> visitStatCompareRequirement(requirement)
+            is StatEqualRequirement -> visitStatEqualRequirement(requirement)
+            is StructureRequirement -> visitStructureRequirement(requirement)
+            is TimeRangeRequirement -> visitTimeRangeRequirement(requirement)
+            is UseMoveRequirement -> visitUseMoveRequirement(requirement)
+            is WeatherRequirement -> visitWeatherRequirement(requirement)
+            is WorldRequirement -> visitWorldRequirement(requirement)
+            else -> null
+        }
+    }
+
+    fun visitAdvancementRequirement(advancementRequirement: AdvancementRequirement): R
+    fun visitAnyRequirement(anyRequirement: AnyRequirement): R
+    fun visitAreaRequirement(areaRequirement: AreaRequirement): R
+    fun visitAttackDefenceRatioRequirement(attackDefenceRatioRequirement: AttackDefenceRatioRequirement): R
+    fun visitBattleCriticalHitsRequirement(battleCriticalHitsRequirement: BattleCriticalHitsRequirement): R
+    fun visitBiomeRequirement(biomeRequirement: BiomeRequirement): R
+    fun visitBlocksTraveledRequirement(blocksTraveledRequirement: BlocksTraveledRequirement): R
+    fun visitDamageTakenRequirement(damageTakenRequirement: DamageTakenRequirement): R
+    fun visitDefeatRequirement(defeatRequirement: DefeatRequirement): R
+    fun visitFriendshipRequirement(friendshipRequirement: FriendshipRequirement): R
+    fun visitHeldItemRequirement(heldItemRequirement: HeldItemRequirement): R
+    fun visitLevelRequirement(levelRequirement: LevelRequirement): R
+    fun visitMoonPhaseRequirement(moonPhaseRequirement: MoonPhaseRequirement): R
+    fun visitMoveSetRequirement(moveSetRequirement: MoveSetRequirement): R
+    fun visitMoveTypeRequirement(moveTypeRequirement: MoveTypeRequirement): R
+    fun visitOwnerHoldsItemRequirement(ownerHoldsItemRequirement: OwnerHoldsItemRequirement): R
+    fun visitPartyMemberRequirement(partyMemberRequirement: PartyMemberRequirement): R
+    fun visitPokemonPropertiesRequirement(pokemonPropertiesRequirement: PokemonPropertiesRequirement): R
+    fun visitPropertyRangeRequirement(propertyRangeRequirement: PropertyRangeRequirement): R
+    fun visitRecoilRequirement(recoilRequirement: RecoilRequirement): R
+    fun visitStatCompareRequirement(statCompareRequirement: StatCompareRequirement): R
+    fun visitStatEqualRequirement(statEqualRequirement: StatEqualRequirement): R
+    fun visitStructureRequirement(structureRequirement: StructureRequirement): R
+    fun visitTimeRangeRequirement(timeRangeRequirement: TimeRangeRequirement): R
+    fun visitUseMoveRequirement(useMoveRequirement: UseMoveRequirement): R
+    fun visitWeatherRequirement(weatherRequirement: WeatherRequirement): R
+    fun visitWorldRequirement(worldRequirement: WorldRequirement): R
+}
@@ -12,6 +12,5 @@ enum class ParticleMaterial {
    ALPHA,
    OPAQUE,
    BLEND,
-    ADD,
-    XRAY,
+    ADD
 }
@@ -24,7 +24,6 @@ object ParticleMaterials {
        override fun begin(tessellator: Tesselator, textureManager: TextureManager): BufferBuilder {
            RenderSystem.enableBlend()
            RenderSystem.enableCull()
-            RenderSystem.enableDepthTest()
            RenderSystem.depthMask(true)
            RenderSystem.setShader { GameRenderer.getParticleShader() }
            RenderSystem.setShaderTexture(0, TextureAtlas.LOCATION_PARTICLES)
@@ -39,7 +38,6 @@ object ParticleMaterials {
        override fun begin(tessellator: Tesselator, textureManager: TextureManager): BufferBuilder {
            RenderSystem.enableBlend()
            RenderSystem.disableCull()
-            RenderSystem.enableDepthTest()
            RenderSystem.depthMask(true)
            RenderSystem.setShader { GameRenderer.getParticleShader() }
            RenderSystem.setShaderTexture(0, TextureAtlas.LOCATION_PARTICLES)
@@ -54,7 +52,6 @@ object ParticleMaterials {
        override fun begin(tessellator: Tesselator, textureManager: TextureManager): BufferBuilder {
            RenderSystem.enableBlend()
            RenderSystem.disableCull()
-            RenderSystem.enableDepthTest()
            RenderSystem.depthMask(true)
            RenderSystem.setShader { GameRenderer.getParticleShader() }
            RenderSystem.setShaderTexture(0, TextureAtlas.LOCATION_PARTICLES)
@@ -69,7 +66,6 @@ object ParticleMaterials {
        override fun begin(tessellator: Tesselator, textureManager: TextureManager): BufferBuilder {
            RenderSystem.enableBlend()
            RenderSystem.enableCull()
-            RenderSystem.enableDepthTest()
            RenderSystem.depthMask(true)
            RenderSystem.setShader { GameRenderer.getParticleShader() }
            RenderSystem.setShaderTexture(0, TextureAtlas.LOCATION_PARTICLES)
@@ -77,21 +73,6 @@ object ParticleMaterials {
            return tessellator.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.PARTICLE)
        }

-        override fun toString() = "OPAQUE"
-    }
-
-    val XRAY = object : ParticleRenderType {
-        override fun begin(tessellator: Tesselator, textureManager: TextureManager): BufferBuilder {
-            RenderSystem.enableBlend()
-            RenderSystem.disableCull()
-            RenderSystem.disableDepthTest()
-            RenderSystem.depthMask(false)
-            RenderSystem.setShader { GameRenderer.getParticleShader() }
-            RenderSystem.setShaderTexture(0, TextureAtlas.LOCATION_PARTICLES)
-            RenderSystem.blendFunc(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA)
-            return tessellator.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.PARTICLE)
-        }
-
-        override fun toString() = "XRAY"
+        override fun toString() =  "OPAQUE"
    }
 }
@@ -10,6 +10,8 @@ package com.cobblemon.mod.common.api.spawning

 import com.cobblemon.mod.common.api.spawning.TimeRange.Companion.timeRanges
 import com.cobblemon.mod.common.api.spawning.condition.SpawningCondition
+import com.cobblemon.mod.common.util.lang
+import net.minecraft.network.chat.MutableComponent
 import com.cobblemon.mod.common.util.adapters.IntRangesAdapter

 /**
@@ -49,4 +51,25 @@ class TimeRange : IntRanges {

    constructor() : super()
    constructor(vararg ranges: IntRange) : super(*ranges)
+
+    fun displayName(): MutableComponent? {
+        val key = timeRanges.entries.firstOrNull { entry -> this == entry.value }?.key ?: return null
+        return lang("ui.time_range.$key")
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (other !is TimeRange) return false
+
+        if (other.ranges.size != this.ranges.size) return false
+        other.ranges.forEachIndexed { index, otherRange ->
+            if (this.ranges[index] != otherRange) return false
+        }
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        return ranges.hashCode()
+    }
 }
@@ -8,6 +8,8 @@

 package com.cobblemon.mod.common.api.spawning.condition

+import com.cobblemon.mod.common.util.lang
+import net.minecraft.network.chat.MutableComponent
 import net.minecraft.world.level.Level

 /**
@@ -42,4 +44,7 @@ enum class MoonPhase {
        fun ofWorld(world: Level): MoonPhase = VALUES[world.moonPhase]
    }

+    fun displayName(): MutableComponent {
+        return lang("ui.moon_phase.${this.name.lowercase()}")
+    }
 }
@@ -102,7 +102,7 @@ open class PlayerPartyStore(
            for (pokemon in this) {
                // Awake from fainted
                if (pokemon.isFainted()) {
-                    // Skip awaken logic check if config value is 0
+                    //Skip awaken logic check if config value is 0
                    if (Cobblemon.config.faintAwakenHealthPercent > 0) {
                        pokemon.faintedTimer -= 1
                        if (pokemon.faintedTimer <= -1) {
@@ -119,7 +119,7 @@ open class PlayerPartyStore(
                }
                // Passive healing while less than full health
                else if (pokemon.currentHealth < pokemon.maxHealth) {
-                    // Skip passive healing logic check if config value is 0
+                    //Skip passive healing logic check if config value is 0
                    if (Cobblemon.config.healPercent > 0) {
                        pokemon.healTimer--
                        if (pokemon.healTimer <= -1) {
@@ -16,20 +16,24 @@ import net.minecraft.core.BlockPos
 import net.minecraft.core.Direction
 import net.minecraft.core.HolderLookup
 import net.minecraft.core.NonNullList
-import net.minecraft.core.component.DataComponents
 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.*
+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.level.gameevent.GameEvent
 import net.minecraft.world.phys.BlockHitResult
-import java.util.*
+import net.minecraft.world.level.gameevent.GameEvent
+import java.util.OptionalInt
 import kotlin.math.pow

 class DiscShelfBlockEntity(pos: BlockPos, state: BlockState) : BlockEntity(CobblemonBlockEntities.DISC_SHELF, pos, state), WorldlyContainer {
@@ -130,7 +134,25 @@ class DiscShelfBlockEntity(pos: BlockPos, state: BlockState) : BlockEntity(Cobbl
        return stack.item is TechnicalMachineItem
                || stack.item == CobblemonItems.UPGRADE
                || stack.item == CobblemonItems.DUBIOUS_DISC
-                || stack.has(DataComponents.JUKEBOX_PLAYABLE)
+                || 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) {
@@ -630,8 +630,7 @@ class FossilMultiblockStructure (
        result.putInt(DataKeys.ORGANIC_MATERIAL, organicMaterialInside)
        val fossilInv = ListTag()

-        val ops = registryLookup.createSerializationContext(NbtOps.INSTANCE)
-        fossilInventory.forEach { fossilInv.add(ItemStack.CODEC.encodeStart(ops, it).getOrThrow()) }
+        fossilInventory.forEach { fossilInv.add(ItemStack.CODEC.encodeStart(NbtOps.INSTANCE, it).orThrow) }
        result.put(DataKeys.FOSSIL_INVENTORY, fossilInv)
        result.putString(DataKeys.CONNECTOR_DIRECTION, tankConnectorDirection?.toString())

@@ -653,9 +652,9 @@ class FossilMultiblockStructure (

        const val TICKS_PER_MINUTE = 1200
        const val MATERIAL_TO_START = 128
-        const val TIME_TO_TAKE = TICKS_PER_MINUTE * 12
-        const val TIME_PER_STAGE = TIME_TO_TAKE / 8
-        const val PROTECTION_TIME = TICKS_PER_MINUTE * 5
+        const val TIME_TO_TAKE = 100
+        const val TIME_PER_STAGE = 100 / 8
+        const val PROTECTION_TIME = 100

        fun fromNbt(nbt: CompoundTag, registryLookup: HolderLookup.Provider, animAge: Int = -1, partialTicks: Float = 0f): FossilMultiblockStructure {
            val monitorPos =  NbtUtils.readBlockPos(nbt, DataKeys.MONITOR_POS).get()
@@ -670,10 +669,7 @@ class FossilMultiblockStructure (

            val fossilInv = if (nbt.contains(DataKeys.FOSSIL_INVENTORY)) { (nbt.get(DataKeys.FOSSIL_INVENTORY) as ListTag) } else ListTag()
            val actualFossilList = mutableListOf<ItemStack>()
-
-            val ops = registryLookup.createSerializationContext(NbtOps.INSTANCE)
-            fossilInv.forEach { ItemStack.CODEC.parse(ops, it).result().ifPresent(actualFossilList::add) }
-
+            fossilInv.forEach { ItemStack.parse(registryLookup, it).ifPresent(actualFossilList::add) }
            result.fossilInventory = actualFossilList
            result.tankConnectorDirection = Direction.byName(nbt.getString(DataKeys.CONNECTOR_DIRECTION))

@@ -179,8 +179,6 @@ object CobblemonClient {
                    return@subscribe
                }

-                storage.party.forEach { it?.tickSkillCooldowns() }
-
                val nearbyPokemon = player.level().getEntities(
                    player,
                    AABB.ofSize(player.position(), 16.0, 16.0, 16.0)
@@ -28,7 +28,7 @@ class InteractWheelButton(
    private val tooltipText: String?,
    x: Int,
    y: Int,
-    private val isEnabled: () -> Boolean,
+    private val isEnabled: Boolean,
    private val colour: () -> Vector3f?,
    onPress: OnPress,
    private val canHover: (Double, Double) -> Boolean
@@ -74,12 +74,12 @@ class InteractWheelButton(
            y = y,
            width = width,
            height = height,
-            vOffset = if (isHovered(mouseX.toFloat(), mouseY.toFloat()) && isEnabled()) height else 0,
+            vOffset = if (isHovered(mouseX.toFloat(), mouseY.toFloat()) && isEnabled) height else 0,
            textureHeight = height * 2,
-            alpha = if (isEnabled()) 1f else 0.4F
+            alpha = if (isEnabled) 1f else 0.4F
        )

-        if (isEnabled() && isHovered(mouseX.toFloat(), mouseY.toFloat())){
+        if(isEnabled && isHovered(mouseX.toFloat(), mouseY.toFloat())){
            tooltipText?.let {
                context.renderTooltip(Minecraft.getInstance().font, Component.translatable(it), mouseX, mouseY)
            }
@@ -95,7 +95,7 @@ class InteractWheelButton(
                y = iconY,
                width = ICON_SIZE,
                height = ICON_SIZE,
-                alpha = if (isEnabled()) 1F else 0.2F,
+                alpha = if (isEnabled) 1F else 0.2F,
                red = colour.x,
                green = colour.y,
                blue = colour.z,
@@ -114,7 +114,7 @@ class InteractWheelButton(
                    y = iconY - ICON_SIZE,
                    width = ICON_SIZE,
                    height = ICON_SIZE,
-                    alpha = if (isEnabled()) 1F else 0.4F,
+                    alpha = if (isEnabled) 1F else 0.4F,
                    red = colour.x,
                    green = colour.y,
                    blue = colour.z,
@@ -18,7 +18,7 @@ import net.minecraft.client.gui.screens.Screen
 import net.minecraft.network.chat.Component
 import kotlin.math.max

-open class InteractWheelGUI(private val options: Multimap<Orientation, InteractWheelOption>, title: Component) : Screen(title), CobblemonRenderable {
+class InteractWheelGUI(private val options: Multimap<Orientation, InteractWheelOption>, title: Component) : Screen(title), CobblemonRenderable {
    companion object {
        const val SIZE = 170
        private val backgroundResource = cobblemonResource("textures/gui/interact/interact_wheel_base.png")
@@ -32,7 +32,7 @@ open class InteractWheelGUI(private val options: Multimap<Orientation, InteractW
        return super.keyPressed(keyCode, scanCode, modifiers)
    }

-    protected val buttons = mutableListOf<InteractWheelButton>()
+    private val buttons = mutableListOf<InteractWheelButton>()
    private var maxPage = 1
    private var currentPage = 0
    override fun renderBlurredBackground(delta: Float) { }
@@ -104,7 +104,7 @@ open class InteractWheelGUI(private val options: Multimap<Orientation, InteractW
                    tooltipText = option?.tooltipText,
                    x = x,
                    y = y,
-                    isEnabled = { option != null && option.enabled() },
+                    isEnabled = option != null && option.enabled,
                    colour = option?.colour ?: { null },
                    onPress = { option?.onPress?.invoke() },
                    canHover = { a: Double, b: Double -> !isMouseInCenter(a, b)}
@@ -9,25 +9,20 @@
 package com.cobblemon.mod.common.client.gui.interact.wheel

 import com.cobblemon.mod.common.CobblemonNetwork
-import com.cobblemon.mod.common.CobblemonPokeSkills
 import com.cobblemon.mod.common.api.events.CobblemonEvents
 import com.cobblemon.mod.common.api.events.pokemon.interaction.PokemonInteractionGUICreationEvent
 import com.cobblemon.mod.common.client.CobblemonClient
 import com.cobblemon.mod.common.client.gui.interact.battleRequest.BattleConfigureGUI
 import com.cobblemon.mod.common.net.messages.client.PlayerInteractOptionsPacket
-import com.cobblemon.mod.common.net.messages.server.UsePokeSkillPacket
 import com.cobblemon.mod.common.net.messages.server.battle.SpectateBattlePacket
 import com.cobblemon.mod.common.net.messages.server.pokemon.interact.InteractPokemonPacket
 import com.cobblemon.mod.common.net.messages.server.trade.AcceptTradeRequestPacket
 import com.cobblemon.mod.common.net.messages.server.trade.OfferTradePacket
-import com.cobblemon.mod.common.pokemon.Pokemon
-import com.cobblemon.mod.common.util.asTranslated
 import com.cobblemon.mod.common.util.cobblemonResource
 import com.google.common.collect.ArrayListMultimap
 import com.google.common.collect.Multimap
 import java.util.UUID
 import net.minecraft.client.Minecraft
-import net.minecraft.client.player.AbstractClientPlayer
 import net.minecraft.network.chat.Component
 import org.joml.Vector3f

@@ -35,7 +30,7 @@ fun createPokemonInteractGui(pokemonID: UUID, canMountShoulder: Boolean, canGive
    val mountShoulder = InteractWheelOption(
        iconResource = cobblemonResource("textures/gui/interact/interact_wheel_icon_shoulder.png"),
        tooltipText = "cobblemon.ui.interact.mount.shoulder",
-        enabled = { canMountShoulder },
+        enabled = canMountShoulder,
        onPress = {
            if (canMountShoulder) {
                InteractPokemonPacket(pokemonID, InteractTypePokemon.SHOULDER).sendToServer()
@@ -46,7 +41,7 @@ fun createPokemonInteractGui(pokemonID: UUID, canMountShoulder: Boolean, canGive
    val giveHeldItem = InteractWheelOption(
        iconResource = cobblemonResource("textures/gui/interact/interact_wheel_icon_held_item.png"),
        tooltipText = "cobblemon.ui.interact.give.item",
-        enabled = { canGiveHeld },
+        enabled = canGiveHeld,
        onPress = {
            if (canGiveHeld) {
                InteractPokemonPacket(pokemonID, InteractTypePokemon.HELD_ITEM).sendToServer()
@@ -57,7 +52,7 @@ fun createPokemonInteractGui(pokemonID: UUID, canMountShoulder: Boolean, canGive
    val giveCosmeticItem = InteractWheelOption(
        iconResource = cobblemonResource("textures/gui/interact/interact_wheel_icon_cosmetic_item.png"),
        tooltipText = "cobblemon.ui.interact.give.cosmetic_item",
-        enabled = { canGiveCosmetic },
+        enabled = canGiveCosmetic,
        onPress = {
            if (canGiveCosmetic) {
                InteractPokemonPacket(pokemonID, InteractTypePokemon.COSMETIC_ITEM).sendToServer()
@@ -69,7 +64,7 @@ fun createPokemonInteractGui(pokemonID: UUID, canMountShoulder: Boolean, canGive
    val ride = InteractWheelOption(
        iconResource = cobblemonResource("textures/gui/interact/interact_wheel_icon_ride.png"),
        tooltipText = "cobblemon.ui.interact.ride",
-        enabled = { canRide },
+        enabled = canRide,
        onPress = {
            if (canRide) {
                InteractPokemonPacket(pokemonID, InteractTypePokemon.RIDE).sendToServer()
@@ -182,68 +177,6 @@ fun createPlayerInteractGui(optionsPacket: PlayerInteractOptionsPacket): Interac
    return InteractWheelGUI(options, Component.translatable("cobblemon.ui.interact.player"))
 }

-fun createPokeSkillGui(player: AbstractClientPlayer, pokemon: Pokemon): InteractWheelGUI {
-    val accessibleSkills = CobblemonPokeSkills.getAccessiblePokeSkillTiers(player, pokemon)
-    val options: Multimap<Orientation, InteractWheelOption> = ArrayListMultimap.create()
-    for (skill in accessibleSkills) {
-        val skillOption = InteractWheelOption(
-            iconResource = skill.icon,
-            enabled = { skill.id !in pokemon.skillCooldownsTicks },
-            tooltipText = "${skill.name.asTranslated().string} ${getRomanNumeral(skill.tier)}",
-            onPress = {
-                CobblemonNetwork.sendToServer(UsePokeSkillPacket(skillId = skill.id, pokemonId = pokemon.uuid))
-                closeGUI()
-            }
-        )
-
-        when (options.size()) {
-            0 -> options.put(Orientation.NORTH, skillOption)
-            1 -> options.put(Orientation.NORTHEAST, skillOption)
-            2 -> options.put(Orientation.SOUTHEAST, skillOption)
-            3 -> options.put(Orientation.SOUTH, skillOption)
-            4 -> options.put(Orientation.SOUTHWEST, skillOption)
-            5 -> options.put(Orientation.NORTHWEST, skillOption)
-            6 -> options.put(Orientation.WEST, skillOption)
-            7 -> options.put(Orientation.EAST, skillOption)
-            else -> break // We only have 8 slots
-        }
-    }
-
-    return PokeSkillWheelGUI(options, Component.translatable("cobblemon.ui.interact.poke_skill"))
-}
-
-private fun getRomanNumeral(number: Int): String {
-    if (number <= 0) return number.toString()
-
-    val numerals = listOf(
-        1000 to "M",
-        900 to "CM",
-        500 to "D",
-        400 to "CD",
-        100 to "C",
-        90 to "XC",
-        50 to "L",
-        40 to "XL",
-        10 to "X",
-        9 to "IX",
-        5 to "V",
-        4 to "IV",
-        1 to "I"
-    )
-
-    var remaining = number
-    val result = StringBuilder()
-
-    for ((value, numeral) in numerals) {
-        while (remaining >= value) {
-            result.append(numeral)
-            remaining -= value
-        }
-    }
-
-    return result.toString()
-}
-
 private fun getLangKey(status: PlayerInteractOptionsPacket.OptionStatus) : String {
     return when (status) {
        PlayerInteractOptionsPacket.OptionStatus.TOO_FAR -> "cobblemon.ui.interact.too_far"
@@ -12,9 +12,9 @@ import net.minecraft.resources.ResourceLocation
 import org.joml.Vector3f

 data class InteractWheelOption(
-    val iconResource: ResourceLocation? = null,
+    val iconResource: ResourceLocation,
    val secondaryIconResource: ResourceLocation? = null,
-    val enabled: () -> Boolean = { true },
+    val enabled: Boolean = true,
    val tooltipText: String?,
    val colour: () -> Vector3f? = { null },
    val onPress: () -> Unit
@@ -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.client.gui.interact.wheel
-
-import com.google.common.collect.Multimap
-import net.minecraft.client.Minecraft
-import net.minecraft.network.chat.Component
-
-class PokeSkillWheelGUI(
-    private val options: Multimap<Orientation, InteractWheelOption>,
-    title: Component
-) : InteractWheelGUI(options, title) {
-
-    /**
-     * Due to the button being held swallow the event
-     */
-    override fun mouseClicked(mouseX: Double, mouseY: Double, button: Int): Boolean {
-        if (button == 0) return false
-        return super.mouseClicked(mouseX, mouseY, button)
-    }
-
-    /**
-     * On release will close the wheel and trigger the button press of the hovered button
-     * TODO: make this wheel choose more like pizza slices.
-     */
-    override fun mouseReleased(mouseX: Double, mouseY: Double, button: Int): Boolean {
-        if (button == 0) {
-            // Manually trigger the hovered button's press
-            buttons.forEach { btn ->
-                if (btn.isMouseOver(mouseX, mouseY)) {
-                    btn.onClick(mouseX, mouseY)
-                    return true
-                }
-            }
-            Minecraft.getInstance().setScreen(null)
-            return true
-        }
-        return super.mouseReleased(mouseX, mouseY, button)
-    }
-
-}
@@ -34,28 +34,27 @@ import com.cobblemon.mod.common.client.CobblemonResources
 import com.cobblemon.mod.common.client.gui.CobblemonRenderable
 import com.cobblemon.mod.common.client.gui.pokedex.PokedexGUIConstants.BASE_HEIGHT
 import com.cobblemon.mod.common.client.gui.pokedex.PokedexGUIConstants.BASE_WIDTH
+import com.cobblemon.mod.common.client.gui.pokedex.PokedexGUIConstants.HALF_OVERLAY_HEIGHT
+import com.cobblemon.mod.common.client.gui.pokedex.PokedexGUIConstants.HALF_OVERLAY_WIDTH
 import com.cobblemon.mod.common.client.gui.pokedex.PokedexGUIConstants.HALF_OVERLAY_WIDTH
 import com.cobblemon.mod.common.client.gui.pokedex.PokedexGUIConstants.HEADER_BAR_HEIGHT
+import com.cobblemon.mod.common.client.gui.pokedex.PokedexGUIConstants.ICONS_ARROW_PADDING_AROUND
+import com.cobblemon.mod.common.client.gui.pokedex.PokedexGUIConstants.ICONS_PADDING_AROUND
 import com.cobblemon.mod.common.client.gui.pokedex.PokedexGUIConstants.SCALE
 import com.cobblemon.mod.common.client.gui.pokedex.PokedexGUIConstants.TAB_ABILITIES
 import com.cobblemon.mod.common.client.gui.pokedex.PokedexGUIConstants.TAB_DESCRIPTION
 import com.cobblemon.mod.common.client.gui.pokedex.PokedexGUIConstants.TAB_DROPS
+import com.cobblemon.mod.common.client.gui.pokedex.PokedexGUIConstants.TAB_EVOLUTION_TREE
 import com.cobblemon.mod.common.client.gui.pokedex.PokedexGUIConstants.TAB_ICON_SIZE
 import com.cobblemon.mod.common.client.gui.pokedex.PokedexGUIConstants.TAB_MOVES
 import com.cobblemon.mod.common.client.gui.pokedex.PokedexGUIConstants.TAB_SIZE
 import com.cobblemon.mod.common.client.gui.pokedex.PokedexGUIConstants.TAB_STATS
-import com.cobblemon.mod.common.client.gui.pokedex.widgets.AbilitiesWidget
-import com.cobblemon.mod.common.client.gui.pokedex.widgets.DescriptionWidget
-import com.cobblemon.mod.common.client.gui.pokedex.widgets.DropsScrollingWidget
-import com.cobblemon.mod.common.client.gui.pokedex.widgets.EntriesScrollingWidget
-import com.cobblemon.mod.common.client.gui.pokedex.widgets.MovesLearnsetWidget
-import com.cobblemon.mod.common.client.gui.pokedex.widgets.PokemonInfoWidget
-import com.cobblemon.mod.common.client.gui.pokedex.widgets.SearchWidget
-import com.cobblemon.mod.common.client.gui.pokedex.widgets.SizeWidget
-import com.cobblemon.mod.common.client.gui.pokedex.widgets.StatsWidget
+import com.cobblemon.mod.common.client.gui.pokedex.widgets.*
+import com.cobblemon.mod.common.client.gui.pokedex.widgets.evolutiontree.EvolutionTreeWidget
 import com.cobblemon.mod.common.client.pokedex.PokedexType
 import com.cobblemon.mod.common.client.render.drawScaledText
 import com.cobblemon.mod.common.net.messages.server.block.AdjustBlockEntityViewerCountPacket
+import com.cobblemon.mod.common.pokemon.Gender
 import com.cobblemon.mod.common.pokemon.abilities.HiddenAbility
 import com.cobblemon.mod.common.util.cobblemonResource
 import com.cobblemon.mod.common.util.isInventoryKeyPressed
@@ -92,6 +91,10 @@ class PokedexGUI private constructor(

        private val categoryBarOverlay = cobblemonResource("textures/gui/pokedex/pokedex_screen_bar_category.png")

+        // TODO: separate into smaller components / widgets?
+        private val backgroundOverlay = cobblemonResource("textures/gui/pokedex/pokedex_screen_info_overlay.png")
+        private val expandedBackgroundOverlay = cobblemonResource("textures/gui/pokedex/pokedex_screen_info_overlay_expanded.png")
+
        private val tabSelectArrow = cobblemonResource("textures/gui/pokedex/select_arrow.png")
        private val tabIcons = arrayOf(
            cobblemonResource("textures/gui/pokedex/tab_info.png"),
@@ -99,7 +102,8 @@ class PokedexGUI private constructor(
            cobblemonResource("textures/gui/pokedex/tab_size.png"),
            cobblemonResource("textures/gui/pokedex/tab_stats.png"),
            cobblemonResource("textures/gui/pokedex/tab_drops.png"),
-            cobblemonResource("textures/gui/pokedex/tab_moves.png")
+            cobblemonResource("textures/gui/pokedex/tab_moves.png"),
+            cobblemonResource("textures/gui/pokedex/tab_evolution_tree.png"),
        )

        val arrowUpIcon = cobblemonResource("textures/gui/pokedex/arrow_up.png")
@@ -112,6 +116,8 @@ class PokedexGUI private constructor(
            TAB_MOVES
        )

+        private val ICONS_PADDING_BETWEEN = (BASE_WIDTH / 2 - ICONS_PADDING_AROUND * 2) / tabIcons.size
+
        /**
         * Attempts to open this screen for a client.
         */
@@ -130,6 +136,7 @@ class PokedexGUI private constructor(

    var oldDragPosX = 0.0
    var canDragRender = false
+    private var activeDragableElement: GuiEventListener? = null

    private var filteredPokedex: Collection<PokedexDef> = mutableListOf()
    private var seenCount = "0000"
@@ -153,13 +160,29 @@ class PokedexGUI private constructor(
    private lateinit var scrollScreen: EntriesScrollingWidget
    private lateinit var pokemonInfoWidget: PokemonInfoWidget
    private lateinit var searchWidget: SearchWidget
+    private lateinit var pokemonNameWidget: PokemonNameWidget

    private var selectedSearchByType: SearchByType = SearchByType.SPECIES
    private var selectedCategoryFilter: PokedexCategoryFilterType = PokedexCategoryFilterType.ALL
    private val tabButtons: MutableList<ScaledButton> = mutableListOf()

+    var seenShinyStates = setOf<String>()
+    var shiny = false
+    var maleRatio = -1F
+    var gender = Gender.GENDERLESS
+    var aspects = mutableSetOf<String>()
+
    lateinit var tabInfoElement: GuiEventListener
    var tabInfoIndex = TAB_DESCRIPTION
+    var evolutionTreeExpanded = false
+        set(value) {
+            field = value
+
+            if (::pokemonInfoWidget.isInitialized) {
+                pokemonInfoWidget.active = !value
+                pokemonInfoWidget.visible = !value
+            }
+        }

    override fun renderBlurredBackground(delta: Float) {}
    override fun renderMenuBackground(context: GuiGraphics) {}
@@ -178,7 +201,7 @@ class PokedexGUI private constructor(

        //Info Widget
        if (::pokemonInfoWidget.isInitialized) removeWidget(pokemonInfoWidget)
-        pokemonInfoWidget = PokemonInfoWidget(x + 180, y + 28) { newForm -> updateSelectedForm(newForm) }
+        pokemonInfoWidget = PokemonInfoWidget(this, x + 180, y + 28) { newForm -> updateSelectedForm(newForm) }
        addRenderableWidget(pokemonInfoWidget)

        setUpTabs()
@@ -190,6 +213,10 @@ class PokedexGUI private constructor(
        searchWidget = SearchWidget(x + 26, y + 28, 120, HEADER_BAR_HEIGHT, update = ::updateFilters)
        addRenderableWidget(searchWidget)

+        if (::pokemonNameWidget.isInitialized) removeWidget(pokemonNameWidget)
+        pokemonNameWidget = PokemonNameWidget(this, x + 180, y + 28)
+        addRenderableWidget(pokemonNameWidget)
+
        if (::regionSelectWidgetUp.isInitialized) removeWidget(regionSelectWidgetUp)
        regionSelectWidgetUp = ScaledButton(
            buttonX = (x + 95).toFloat(),
@@ -365,6 +392,14 @@ class PokedexGUI private constructor(
            shadow = true
        )

+        blitk(
+            matrixStack = matrices,
+            texture = if (evolutionTreeExpanded) expandedBackgroundOverlay else backgroundOverlay,
+            x = pokemonInfoWidget.x, y = pokemonInfoWidget.y,
+            width = HALF_OVERLAY_WIDTH,
+            height = HALF_OVERLAY_HEIGHT
+        )
+
        // Category filter
        blitk(
            matrixStack = matrices,
@@ -400,7 +435,7 @@ class PokedexGUI private constructor(
            blitk(
                matrixStack = matrices,
                texture = tabSelectArrow,
-                x = (x + 191.5F + (22F * tabInfoIndex)) / SCALE,
+                x = (x + BASE_WIDTH / 2 + ICONS_ARROW_PADDING_AROUND + tabInfoIndex * ICONS_PADDING_BETWEEN) / SCALE,
                y = (y + 177) / SCALE,
                width = 12,
                height = 6,
@@ -434,6 +469,7 @@ class PokedexGUI private constructor(
        val canDisplayEntry = true //selectedForm?.unlockForms

        if (::pokemonInfoWidget.isInitialized
+            && pokemonInfoWidget.active
            && !pokemonInfoWidget.suppressViewport
            && pokemonInfoWidget.isWithinPortraitSpace(mouseX, mouseY)
            && canDisplayEntry == true
@@ -442,6 +478,12 @@ class PokedexGUI private constructor(
            isDragging = true
            oldDragPosX = mouseX
            playSound(CobblemonSounds.POKEDEX_CLICK_SHORT)
+            activeDragableElement = pokemonInfoWidget
+        } else if (tabInfoIndex == TAB_EVOLUTION_TREE &&
+            ::tabInfoElement.isInitialized &&
+            (tabInfoElement as EvolutionTreeWidget).isHovered(mouseX, mouseY)
+        ) {
+            activeDragableElement = tabInfoElement
        }
        return try {
            super.mouseClicked(mouseX, mouseY, button)
@@ -453,14 +495,18 @@ class PokedexGUI private constructor(
    override fun mouseReleased(pMouseX: Double, pMouseY: Double, pButton: Int): Boolean {
        if (canDragRender) canDragRender = false
        if (isDragging) isDragging = false
+        activeDragableElement = null
        return super.mouseReleased(pMouseX, pMouseY, pButton)
    }

    override fun mouseDragged(mouseX: Double, mouseY: Double, button: Int, deltaX: Double, deltaY: Double): Boolean {
-        if (isDragging && canDragRender) {
+        if (isDragging && canDragRender && activeDragableElement == pokemonInfoWidget) {
            val dragOffsetY = (oldDragPosX - mouseX).toFloat()
            pokemonInfoWidget.rotationY = (((pokemonInfoWidget.rotationY + dragOffsetY) % 360 + 360) % 360)
+        } else if (activeDragableElement == tabInfoElement) {
+            tabInfoElement.mouseDragged(mouseX, mouseY, button, deltaX, deltaY)
        }
+
        oldDragPosX = mouseX
        return super.mouseDragged(mouseX, mouseY, button, deltaX, deltaY)
    }
@@ -551,6 +597,8 @@ class PokedexGUI private constructor(
        selectedForm = CobblemonClient.clientPokedexData.getEncounteredForms(newSelectedEntry).firstOrNull()

        pokemonInfoWidget.setDexEntry(selectedEntry!!)
+        pokemonNameWidget.update(selectedEntry!!)
+
        displaytabInfoElement(tabInfoIndex)
    }

@@ -562,7 +610,7 @@ class PokedexGUI private constructor(

        for (i in tabIcons.indices) {
            tabButtons.add(ScaledButton(
-                x + 190.5F + (i * 22F),
+                x + BASE_WIDTH / 2 + ICONS_PADDING_AROUND + i * ICONS_PADDING_BETWEEN,
                y + 181.5F,
                TAB_ICON_SIZE,
                TAB_ICON_SIZE,
@@ -575,6 +623,8 @@ class PokedexGUI private constructor(
    }

    fun displaytabInfoElement(tabIndex: Int, update: Boolean = true) {
+        if (tabIndex != TAB_EVOLUTION_TREE) evolutionTreeExpanded = false
+
        val showActiveTab = selectedEntry?.let { selectedForm in getSufficientlyKnownForms(it, tabIndex) } == true
        var statSubIndex = 0

@@ -626,6 +676,9 @@ class PokedexGUI private constructor(
            TAB_MOVES -> {
                tabInfoElement = MovesLearnsetWidget(x + 180, y + 28)
            }
+            TAB_EVOLUTION_TREE -> {
+                tabInfoElement = EvolutionTreeWidget(this, x, y)
+            }
        }
        val element = tabInfoElement
        if (element is Renderable && element is NarratableEntry) {
@@ -700,6 +753,9 @@ class PokedexGUI private constructor(
                        selectedForm = fallbackForm
                    ) { next -> cycleSelectedForm(next) }
                }
+                TAB_EVOLUTION_TREE -> {
+                    (tabInfoElement as EvolutionTreeWidget).setup(selectedEntry, selectedForm)
+                }
            }
        } else {
            if (tabInfoIndex != TAB_DESCRIPTION) displaytabInfoElement(TAB_DESCRIPTION)
@@ -16,6 +16,8 @@ object PokedexGUIConstants {
    const val HEADER_BAR_HEIGHT = 11
    const val POKEMON_DESCRIPTION_HEIGHT = 42
    const val POKEMON_DESCRIPTION_PADDING = 9
+    const val ICONS_PADDING_AROUND = 18.5f
+    const val ICONS_ARROW_PADDING_AROUND = ICONS_PADDING_AROUND + 1

    const val TAB_ICON_SIZE = 16

@@ -36,6 +38,7 @@ object PokedexGUIConstants {
    const val TAB_STATS = 3
    const val TAB_DROPS = 4
    const val TAB_MOVES = 5
+    const val TAB_EVOLUTION_TREE = 6

    // RowScrollingWidget
    const val SCROLL_BASE_HEIGHT = 141
@@ -20,31 +20,95 @@ import net.minecraft.network.chat.MutableComponent
 private val tooltipEdge = cobblemonResource("textures/gui/pokedex/tooltip_edge.png")
 private val tooltipBackground = cobblemonResource("textures/gui/pokedex/tooltip_background.png")

-fun renderTooltip(context: GuiGraphics, text: MutableComponent, posX: Int, posY: Int, delta: Float, offsetY: Int = 0) {
+fun renderTooltip(
+    context: GuiGraphics,
+    text: MutableComponent,
+    posX: Int,
+    posY: Int,
+    delta: Float,
+    offsetY: Int = 0,
+) {
+    renderTooltip(
+        context,
+        listOf(text),
+        posX,
+        posY,
+        delta,
+        offsetY,
+    )
+}
+
+fun renderTooltip(
+    context: GuiGraphics,
+    text: List<MutableComponent>,
+    posX: Int,
+    posY: Int,
+    delta: Float,
+    offsetY: Int = 0,
+) {
    val poseStack = context.pose()
-    val textWidth = Minecraft.getInstance().font.width(text.font(CobblemonResources.DEFAULT_LARGE))
-    val tooltipWidth = textWidth + 6
+    val textWidth = text.maxOf { Minecraft.getInstance().font.width(it.font(CobblemonResources.DEFAULT_LARGE)) }
+    val tooltipPadding = 6
+    val tooltipWidth = textWidth + tooltipPadding
    val tooltipHeight = 11
    val tooltipTop = posY + offsetY

    poseStack.pushPose()
    poseStack.translate(0.0, 0.0, 1000.0)
+
    Minecraft.getInstance().let {
        it.mainRenderTarget.bindWrite(false)
        context.enableScissor(
            posX - (tooltipWidth / 2),
            tooltipTop + 1,
            (posX - (tooltipWidth / 2)) + tooltipWidth,
-            tooltipTop + 10
+            tooltipTop + tooltipHeight * text.size - 1
        )
        it.gameRenderer.processBlurEffect(delta)
        context.disableScissor()
        it.mainRenderTarget.bindWrite(true)
    }

-    blitk(matrixStack = poseStack, texture = tooltipEdge, x = posX - (tooltipWidth / 2) - 1, y = tooltipTop, width = 1, height = tooltipHeight)
-    blitk(matrixStack = poseStack, texture = tooltipBackground, x = posX - (tooltipWidth / 2), y = tooltipTop, width = tooltipWidth, height = tooltipHeight)
-    blitk(matrixStack = poseStack, texture = tooltipEdge, x = posX + (tooltipWidth / 2), y = tooltipTop, width = 1, height = tooltipHeight)
-    drawScaledText(context = context, font = CobblemonResources.DEFAULT_LARGE, text = text, x = posX, y = tooltipTop + 1, shadow = true, centered = true)
+    blitk(
+        matrixStack = poseStack,
+        texture = tooltipEdge,
+        x = posX - (tooltipWidth / 2) - 1,
+        y = tooltipTop,
+        width = 1,
+        height = tooltipHeight * text.size
+    )
+
+    blitk(
+        matrixStack = poseStack,
+        texture = tooltipBackground,
+        x = posX - (tooltipWidth / 2),
+        y = tooltipTop,
+        width = tooltipWidth,
+        height = tooltipHeight * text.size
+    )
+
+    blitk(
+        matrixStack = poseStack,
+        texture = tooltipEdge,
+        x = posX + (tooltipWidth / 2),
+        y = tooltipTop,
+        width = 1,
+        height = tooltipHeight * text.size
+    )
+
+    val centered = text.size == 1
+
+    text.forEachIndexed { index, it ->
+        drawScaledText(
+            context = context,
+            font = CobblemonResources.DEFAULT_LARGE,
+            text = it,
+            x = if (centered) posX else posX - tooltipWidth / 2 + tooltipPadding / 2,
+            y = tooltipTop + 1 + (tooltipHeight - 2) * index,
+            shadow = true,
+            centered = centered
+        )
+    }
+
    poseStack.popPose()
 }
@@ -20,8 +20,8 @@ import net.minecraft.client.sounds.SoundManager
 import net.minecraft.resources.ResourceLocation

 class ScaledButton(
-    var buttonX: Float,
-    var buttonY: Float,
+    buttonX: Float,
+    buttonY: Float,
    val buttonWidth: Number,
    val buttonHeight: Number,
    var resource: ResourceLocation? = null,
@@ -30,6 +30,18 @@ class ScaledButton(
    val clickAction: Button.OnPress
 ): Button(buttonX.toInt(), buttonY.toInt(), buttonWidth.toInt(), buttonHeight.toInt(), "".text(), clickAction, DEFAULT_NARRATION), CobblemonRenderable {

+    var buttonX: Float = buttonX
+        set(value) {
+            field = value
+            this.x = value.toInt()
+        }
+
+    var buttonY: Float = buttonY
+        set(value) {
+            field = value
+            this.y = value.toInt()
+        }
+
    var isWidgetActive = false
    var isVisible = true

@@ -12,14 +12,13 @@ import com.bedrockk.molang.runtime.MoLangRuntime
 import com.cobblemon.mod.common.CobblemonSounds
 import com.cobblemon.mod.common.api.gui.blitk
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.setup
-import com.cobblemon.mod.common.api.pokedex.entry.PokedexEntry
 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.text.text
 import com.cobblemon.mod.common.client.ClientMoLangFunctions.setupClient
 import com.cobblemon.mod.common.client.CobblemonClient
 import com.cobblemon.mod.common.client.gui.ScrollingWidget
-import com.cobblemon.mod.common.client.gui.drawProfilePokemon
 import com.cobblemon.mod.common.client.gui.pokedex.PokedexGUIConstants
 import com.cobblemon.mod.common.client.gui.pokedex.PokedexGUIConstants.SCALE
 import com.cobblemon.mod.common.client.gui.pokedex.PokedexGUIConstants.SCROLL_BAR_WIDTH
@@ -27,19 +26,14 @@ import com.cobblemon.mod.common.client.gui.pokedex.PokedexGUIConstants.SCROLL_BA
 import com.cobblemon.mod.common.client.gui.pokedex.PokedexGUIConstants.SCROLL_SLOT_SIZE
 import com.cobblemon.mod.common.client.gui.pokedex.PokedexGUIConstants.SCROLL_SLOT_SPACING
 import com.cobblemon.mod.common.client.gui.pokedex.widgets.EntriesScrollingWidget.PokemonScrollSlotRow
-import com.cobblemon.mod.common.client.render.drawScaledText
-import com.cobblemon.mod.common.client.render.models.blockbench.FloatingState
 import com.cobblemon.mod.common.pokemon.Gender
 import com.cobblemon.mod.common.pokemon.RenderablePokemon
 import com.cobblemon.mod.common.util.cobblemonResource
-import com.cobblemon.mod.common.util.math.fromEulerXYZDegrees
 import net.minecraft.client.Minecraft
 import net.minecraft.client.gui.GuiGraphics
 import net.minecraft.client.resources.sounds.SimpleSoundInstance
 import net.minecraft.network.chat.Component
 import net.minecraft.util.Mth
-import org.joml.Quaternionf
-import org.joml.Vector3f

 class EntriesScrollingWidget(val pX: Int, val pY: Int, val setPokedexEntry: (PokedexEntry) -> (Unit)): ScrollingWidget<PokemonScrollSlotRow>(
    width = PokedexGUIConstants.HALF_OVERLAY_WIDTH,
@@ -135,13 +129,6 @@ class EntriesScrollingWidget(val pX: Int, val pY: Int, val setPokedexEntry: (Pok
        val discoveryLevelList: MutableList<PokedexEntryProgress>,
        val setPokedexEntry : (PokedexEntry) -> (Unit)
    ): Slot<PokemonScrollSlotRow>() {
-        companion object {
-            private val slotResource = cobblemonResource("textures/gui/pokedex/pokedex_slot.png")
-            private val slotHighlight = cobblemonResource("textures/gui/pokedex/slot_select.png")
-            private val caughtIcon = cobblemonResource("textures/gui/pokedex/caught_icon_small.png")
-            private val unknownIcon = cobblemonResource("textures/gui/pokedex/pokedex_slot_unknown.png")
-            private val unimplementedIcon = cobblemonResource("textures/gui/pokedex/pokedex_slot_unimplemented.png")
-        }
        val runtime = MoLangRuntime().setupClient().setup().also {
            it.environment.query.addFunction("get_pokedex") { CobblemonClient.clientPokedexData.struct }
        }
@@ -161,128 +148,42 @@ class EntriesScrollingWidget(val pX: Int, val pY: Int, val setPokedexEntry: (Pok
            hovered: Boolean,
            tickDelta: Float
        ) {
-            dexDataList.forEachIndexed { index, dexData ->
-                val state = FloatingState()
-                val species = PokemonSpecies.getByIdentifier(dexData.speciesId)
-                //FIXME: This may not work properly when accounting for custom pokemon with the same dex number
-                val pokemonNumber = (species?.nationalPokedexNumber?.toString() ?: "0").padStart(4, '0')
-
-                val speciesNumber = pokemonNumber.text()
+            dexDataList.forEachIndexed { index, pokedexEntry ->
+                val species = PokemonSpecies.getByIdentifier(pokedexEntry.speciesId)
                val discoveryLevel = discoveryLevelList[index]
-                val firstVisibleForm = CobblemonClient.clientPokedexData.getEncounteredForms(dexData).firstOrNull()
-                val shouldDrawMon = firstVisibleForm != null
+                val firstVisibleForm = CobblemonClient.clientPokedexData.getEncounteredForms(pokedexEntry).firstOrNull()

                if (species == null) {
                    return@forEachIndexed
                }

-                val matrices = context.pose()
+                val renderablePokemon =
+                    if (firstVisibleForm != null) {
+                        val firstVisibleGender = CobblemonClient.clientPokedexData.getSeenGenders(pokedexEntry, firstVisibleForm).firstOrNull()
+                        val shinyStates = CobblemonClient.clientPokedexData.getSeenShinyStates(pokedexEntry, firstVisibleForm)
+                        val firstVisibleShiny = shinyStates.count() == 1 && shinyStates.first() == "shiny"
+                        val formAspects = species.forms.firstOrNull { it.name.equals(firstVisibleForm.displayForm, ignoreCase = true) }?.aspects ?: species.standardForm.aspects
+                        val seenAspects = CobblemonClient.clientPokedexData.getSeenAspects(pokedexEntry)
+                        val variationAspects = pokedexEntry.variations.mapNotNull { it.aspects.firstOrNull { it in seenAspects } }
+                        val aspectsToDraw = (pokedexEntry.displayAspects + variationAspects + formAspects + (firstVisibleGender ?: Gender.GENDERLESS).name.lowercase()).toMutableSet()
+                        if (firstVisibleShiny) {
+                            aspectsToDraw.add("shiny")
+                        }

-                val startPosX = x + ((SCROLL_SLOT_SPACING + SCROLL_SLOT_SIZE) * index)
-                val startPosY = y + SCROLL_SLOT_SPACING + 1
-
-                blitk(
-                    matrixStack = matrices,
-                    texture = slotResource,
-                    x = startPosX,
-                    y = startPosY,
-                    width = SCROLL_SLOT_SIZE,
-                    height = SCROLL_SLOT_SIZE
-                )
-
-                if (getHoveredSlotIndex(mouseX, mouseY) == index) {
-                    blitk(
-                        matrixStack = matrices,
-                        texture = slotHighlight,
-                        x = startPosX,
-                        y = startPosY,
-                        width = SCROLL_SLOT_SIZE,
-                        height = SCROLL_SLOT_SIZE,
-                        vOffset = SCROLL_SLOT_SIZE,
-                        textureHeight = SCROLL_SLOT_SIZE * 2
-                    )
-                }
-
-                if (shouldDrawMon) {
-                    val firstVisibleGender = CobblemonClient.clientPokedexData.getSeenGenders(dexData, firstVisibleForm).firstOrNull()
-                    val shinyStates = CobblemonClient.clientPokedexData.getSeenShinyStates(dexData, firstVisibleForm)
-                    val firstVisibleShiny = shinyStates.count() == 1 && shinyStates.first() == "shiny"
-                    val formAspects = species.forms.firstOrNull { it.name.equals(firstVisibleForm.displayForm, ignoreCase = true) }?.aspects ?: species.standardForm.aspects
-                    val seenAspects = CobblemonClient.clientPokedexData.getSeenAspects(dexData)
-                    val variationAspects = dexData.variations.mapNotNull { it.aspects.firstOrNull { it in seenAspects } }
-                    context.enableScissor(
-                        startPosX + 1,
-                        startPosY + 1,
-                        startPosX + SCROLL_SLOT_SIZE - 1,
-                        startPosY + SCROLL_SLOT_SIZE - 2
-                    )
-                    val aspectsToDraw = (dexData.displayAspects + variationAspects + formAspects + (firstVisibleGender ?: Gender.GENDERLESS).name.lowercase()).toMutableSet()
-                    if (firstVisibleShiny) {
-                        aspectsToDraw.add("shiny")
+                        RenderablePokemon(species, aspectsToDraw)
+                    } else {
+                        null
                    }
-                    state.currentAspects = aspectsToDraw
-                    matrices.pushPose()
-                    matrices.translate(startPosX + (SCROLL_SLOT_SIZE / 2.0), startPosY + 1.0, 0.0)
-                    matrices.scale(2.5F, 2.5F, 1F)
-                    drawProfilePokemon(
-                        renderablePokemon = RenderablePokemon(species, aspectsToDraw),
-                        matrixStack = matrices,
-                        rotation = Quaternionf().fromEulerXYZDegrees(Vector3f(13F, 35F, 0F)),
-                        state = state,
-                        partialTicks = 0F,
-                        scale = 4.5F
-                    )
-                    matrices.popPose()
-                    context.disableScissor()
-                } else {
-                    blitk(
-                        matrixStack = matrices,
-                        texture = unknownIcon,
-                        x = startPosX + 8.5,
-                        y = startPosY + 9,
-                        width = 8,
-                        height = 10
-                    )

-                    if (!species.implemented) {
-                        blitk(
-                            matrixStack = matrices,
-                            texture = unimplementedIcon,
-                            x = (startPosX + 14) / SCALE,
-                            y = (startPosY + 15.5) / SCALE,
-                            width = 7,
-                            height = 7,
-                            scale = SCALE
-                        )
-                    }
-                }
-
-                // Ensure elements are not hidden behind Pokémon render
-                matrices.pushPose()
-                matrices.translate(0.0, 0.0, 100.0)
-
-                drawScaledText(
-                    context = context,
-                    text = speciesNumber,
-                    x = startPosX + 1.5,//2,
-                    y = startPosY + 2.5,//2
-                    shadow = true,
-                    scale = SCALE
+                PokemonSlotWidget.render(
+                    context,
+                    x = x + (SCROLL_SLOT_SPACING + SCROLL_SLOT_SIZE) * index,
+                    y = y + SCROLL_SLOT_SPACING + 1,
+                    getHoveredSlotIndex(mouseX, mouseY) == index,
+                    species,
+                    renderablePokemon,
+                    discoveryLevel,
                )
-
-                if (discoveryLevel == PokedexEntryProgress.OWNED) {
-                    blitk(
-                        matrixStack = matrices,
-                        texture = caughtIcon,
-                        x = (startPosX + 18) / SCALE,
-                        y = (startPosY + 1.5) / SCALE,
-                        width = 11,
-                        height = 11,
-                        scale = SCALE
-                    )
-                }
-
-                matrices.popPose()
            }
        }

@@ -10,10 +10,10 @@ package com.cobblemon.mod.common.client.gui.pokedex.widgets

 import com.bedrockk.molang.runtime.MoLangRuntime
 import com.cobblemon.mod.common.api.gui.blitk
-import com.cobblemon.mod.common.api.pokedex.entry.PokedexEntry
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.setup
 import com.cobblemon.mod.common.api.pokedex.PokedexEntryProgress
 import com.cobblemon.mod.common.api.pokedex.entry.PokedexCosmeticVariation
+import com.cobblemon.mod.common.api.pokedex.entry.PokedexEntry
 import com.cobblemon.mod.common.api.pokedex.entry.PokedexForm
 import com.cobblemon.mod.common.api.pokemon.PokemonSpecies
 import com.cobblemon.mod.common.api.text.bold
@@ -24,8 +24,9 @@ import com.cobblemon.mod.common.client.CobblemonClient
 import com.cobblemon.mod.common.client.CobblemonResources
 import com.cobblemon.mod.common.client.gui.TypeIcon
 import com.cobblemon.mod.common.client.gui.drawProfilePokemon
-import com.cobblemon.mod.common.client.gui.pokedex.PokedexGUIConstants.HALF_OVERLAY_HEIGHT
+import com.cobblemon.mod.common.client.gui.pokedex.PokedexGUI
 import com.cobblemon.mod.common.client.gui.pokedex.PokedexGUIConstants.HALF_OVERLAY_WIDTH
+import com.cobblemon.mod.common.client.gui.pokedex.PokedexGUIConstants.HALF_OVERLAY_HEIGHT
 import com.cobblemon.mod.common.client.gui.pokedex.PokedexGUIConstants.POKEMON_PORTRAIT_HEIGHT
 import com.cobblemon.mod.common.client.gui.pokedex.PokedexGUIConstants.POKEMON_PORTRAIT_WIDTH
 import com.cobblemon.mod.common.client.gui.pokedex.PokedexGUIConstants.PORTRAIT_POKE_BALL_HEIGHT
@@ -51,15 +52,13 @@ import com.cobblemon.mod.common.util.math.fromEulerXYZDegrees
 import net.minecraft.client.Minecraft
 import net.minecraft.client.gui.GuiGraphics
 import net.minecraft.client.resources.sounds.SimpleSoundInstance
-import net.minecraft.network.chat.Component
-import net.minecraft.network.chat.MutableComponent
 import net.minecraft.resources.ResourceLocation
 import net.minecraft.sounds.SoundEvent
 import org.joml.Quaternionf
 import org.joml.Vector3f
 import java.io.FileNotFoundException

-class PokemonInfoWidget(val pX: Int, val pY: Int, val updateForm: (PokedexForm) -> (Unit)) : SoundlessWidget(
+class PokemonInfoWidget(val parent: PokedexGUI, val pX: Int, val pY: Int, val updateForm: (PokedexForm) -> (Unit)) : SoundlessWidget(
    pX,
    pY,
    POKEMON_PORTRAIT_WIDTH,
@@ -81,7 +80,6 @@ class PokemonInfoWidget(val pX: Int, val pY: Int, val updateForm: (PokedexForm)
        private val arrowFormLeft = cobblemonResource("textures/gui/pokedex/forms_arrow_left.png")
        private val arrowFormRight = cobblemonResource("textures/gui/pokedex/forms_arrow_right.png")

-        private val caughtIcon = cobblemonResource("textures/gui/pokedex/caught_icon.png")
        private val typeBar = cobblemonResource("textures/gui/pokedex/type_bar.png")
        private val typeBarDouble = cobblemonResource("textures/gui/pokedex/type_bar_double.png")

@@ -99,9 +97,6 @@ class PokemonInfoWidget(val pX: Int, val pY: Int, val updateForm: (PokedexForm)

    var currentEntry : PokedexEntry? = null

-    var speciesName: MutableComponent = Component.translatable("")
-    var speciesNumber: MutableComponent = "0000".text()
-
    val runtime = MoLangRuntime().setupClient().setup().also {
        it.environment.query.addFunction("get_pokedex") { CobblemonClient.clientPokedexData.struct }
    }
@@ -110,10 +105,6 @@ class PokemonInfoWidget(val pX: Int, val pY: Int, val updateForm: (PokedexForm)
    var selectedFormIndex: Int = 0

    var type: Array<ElementalType?> = arrayOf(null, null)
-    var seenShinyStates: Set<String> = setOf()
-    var shiny = false
-    var maleRatio = -1F
-    var gender: Gender = Gender.GENDERLESS

    var renderablePokemon : RenderablePokemon? = null

@@ -194,7 +185,10 @@ class PokemonInfoWidget(val pX: Int, val pY: Int, val updateForm: (PokedexForm)
        20,
        resource = buttonGenderMale,
        clickAction = {
-            if (maleRatio > 0 && maleRatio < 1) gender = if (gender == Gender.MALE) Gender.FEMALE else Gender.MALE
+            val maleRatio = parent.maleRatio
+            if (maleRatio > 0 && maleRatio < 1) {
+                parent.gender = if (parent.gender == Gender.MALE) Gender.FEMALE else Gender.MALE
+            }
            updateAspects()
        }
    ).apply { addWidget(this) }
@@ -206,8 +200,8 @@ class PokemonInfoWidget(val pX: Int, val pY: Int, val updateForm: (PokedexForm)
        20,
        buttonNone,
        clickAction = {
-            if (seenShinyStates.size > 1) {
-                shiny = !shiny
+            if (parent.seenShinyStates.size > 1) {
+                parent.shiny = !parent.shiny
                updateAspects()
            }
        }
@@ -262,8 +256,7 @@ class PokemonInfoWidget(val pX: Int, val pY: Int, val updateForm: (PokedexForm)
    override fun renderWidget(context: GuiGraphics, mouseX: Int, mouseY: Int, delta: Float) {
        val currentEntry = this.currentEntry ?: return

-        val hasKnowledge =
-            CobblemonClient.clientPokedexData.getKnowledgeForSpecies(currentEntry.speciesId) != PokedexEntryProgress.UNREGISTERED
+        val hasKnowledge = CobblemonClient.clientPokedexData.getKnowledgeForSpecies(currentEntry.speciesId) != PokedexEntryProgress.UNREGISTERED
        val species = currentEntry.speciesId.let { PokemonSpecies.getByIdentifier(it) } ?: return

        val matrices = context.pose()
@@ -276,37 +269,6 @@ class PokemonInfoWidget(val pX: Int, val pY: Int, val updateForm: (PokedexForm)
            height = HALF_OVERLAY_HEIGHT
        )

-        drawScaledText(
-            context = context,
-            font = CobblemonResources.DEFAULT_LARGE,
-            text = speciesNumber.bold(),
-            x = pX + 3,
-            y = pY + 1,
-            shadow = true
-        )
-
-        drawScaledText(
-            context = context,
-            font = CobblemonResources.DEFAULT_LARGE,
-            text = (if (hasKnowledge) speciesName else lang("ui.generic.question_marks")).bold(),
-            x = pX + 26,
-            y = pY + 1,
-            colour = 0x606B6E
-        )
-
-        // Caught icon
-        if (isSelectedPokemonOwned()) {
-            blitk(
-                matrixStack = matrices,
-                texture = caughtIcon,
-                x = (pX + 129) / SCALE,
-                y = (pY + 2) / SCALE,
-                width = 14,
-                height = 14,
-                scale = SCALE
-            )
-        }
-
        if (!suppressViewport) {
            blitk(
                matrixStack = matrices,
@@ -569,8 +531,6 @@ class PokemonInfoWidget(val pX: Int, val pY: Int, val updateForm: (PokedexForm)

        if (species != null) {
            this.visibleForms = CobblemonClient.clientPokedexData.getEncounteredForms(pokedexEntry).toMutableList()
-            this.speciesNumber = species.nationalPokedexNumber.toString().padStart(4, '0').text()
-            this.speciesName = species.translatedName

            if (forms.isNotEmpty()) {
                formLeftButton.active = true
@@ -596,23 +556,23 @@ class PokemonInfoWidget(val pX: Int, val pY: Int, val updateForm: (PokedexForm)
        variationButtons.forEach { removeWidget(it.getWidget()) }
        variationButtons.clear()

-        seenShinyStates = CobblemonClient.clientPokedexData.getSeenShinyStates(pokedexEntry, pokedexForm)
-        shiny = seenShinyStates.count() == 1 && seenShinyStates.first() == "shiny"
-        shinyButton.resource = if (shiny) buttonShiny else buttonNone
-        shinyButton.visible = shiny || seenShinyStates.size > 1
-        shinyButton.active = seenShinyStates.size > 1
+        parent.seenShinyStates = CobblemonClient.clientPokedexData.getSeenShinyStates(pokedexEntry, pokedexForm)
+        parent.shiny = parent.seenShinyStates.count() == 1 && parent.seenShinyStates.first() == "shiny"
+        shinyButton.resource = if (parent.shiny) buttonShiny else buttonNone
+        shinyButton.visible = parent.shiny || parent.seenShinyStates.size > 1
+        shinyButton.active = parent.seenShinyStates.size > 1

        val form = species.forms.find { it.name.equals(pokedexForm.displayForm, ignoreCase = true) } ?: species.standardForm
-        maleRatio = form.maleRatio
+        parent.maleRatio = form.maleRatio

        val seenGenders = CobblemonClient.clientPokedexData.getSeenGenders(pokedexEntry, pokedexForm)
        val visibleGenders = seenGenders.filter { it != Gender.GENDERLESS }
        if (visibleGenders.isEmpty()) {
-            gender = Gender.GENDERLESS
+            parent.gender = Gender.GENDERLESS
            genderButton.visible = false
            genderButton.active = false
        } else {
-            gender = visibleGenders.first()
+            parent.gender = visibleGenders.first()
            genderButton.visible = true
            genderButton.active = visibleGenders.size > 1
        }
@@ -691,8 +651,8 @@ class PokemonInfoWidget(val pX: Int, val pY: Int, val updateForm: (PokedexForm)
            return
        }

-        genderButton.resource = if (gender == Gender.FEMALE) buttonGenderFemale else buttonGenderMale
-        shinyButton.resource = if (shiny) buttonShiny else buttonNone
+        genderButton.resource = if (parent.gender == Gender.FEMALE) buttonGenderFemale else buttonGenderMale
+        shinyButton.resource = if (parent.shiny) buttonShiny else buttonNone

        val species = currentEntry?.speciesId?.let { PokemonSpecies.getByIdentifier(it) }
        if (species != null) {
@@ -701,12 +661,14 @@ class PokemonInfoWidget(val pX: Int, val pY: Int, val updateForm: (PokedexForm)

            updateType(species, form)

-            val aspects = mutableSetOf<String>()
-            if (shiny) aspects.add(SHINY_ASPECT.aspect)
+            val aspects = parent.aspects
+            aspects.clear()

-            if (gender == Gender.FEMALE) {
+            if (parent.shiny) aspects.add(SHINY_ASPECT.aspect)
+
+            if (parent.gender == Gender.FEMALE) {
                aspects.add("female")
-            } else if (gender == Gender.MALE) {
+            } else if (parent.gender == Gender.MALE) {
                aspects.add("male")
            }

@@ -0,0 +1,100 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.client.gui.pokedex.widgets
+
+import com.cobblemon.mod.common.api.gui.blitk
+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.text.bold
+import com.cobblemon.mod.common.api.text.text
+import com.cobblemon.mod.common.client.CobblemonClient
+import com.cobblemon.mod.common.client.CobblemonResources
+import com.cobblemon.mod.common.client.gui.pokedex.PokedexGUI
+import com.cobblemon.mod.common.client.gui.pokedex.PokedexGUIConstants.POKEMON_PORTRAIT_HEIGHT
+import com.cobblemon.mod.common.client.gui.pokedex.PokedexGUIConstants.POKEMON_PORTRAIT_WIDTH
+import com.cobblemon.mod.common.client.gui.pokedex.PokedexGUIConstants.SCALE
+import com.cobblemon.mod.common.client.gui.summary.widgets.SoundlessWidget
+import com.cobblemon.mod.common.client.render.drawScaledText
+import com.cobblemon.mod.common.util.cobblemonResource
+import com.cobblemon.mod.common.util.lang
+import net.minecraft.client.gui.GuiGraphics
+import net.minecraft.network.chat.Component
+import net.minecraft.network.chat.MutableComponent
+
+class PokemonNameWidget(
+    val parent: PokedexGUI,
+    val pX: Int,
+    val pY: Int,
+) : SoundlessWidget(
+    pX,
+    pY,
+    POKEMON_PORTRAIT_WIDTH,
+    POKEMON_PORTRAIT_HEIGHT,
+    lang("ui.pokedex.pokemon_name"),
+) {
+
+    companion object {
+        private val caughtIcon = cobblemonResource("textures/gui/pokedex/caught_icon.png")
+    }
+
+    var hasKnowledge: Boolean = false
+    var isOwned: Boolean = false
+    var speciesName: MutableComponent = Component.translatable("")
+    var speciesNumber: MutableComponent = "0000".text()
+
+    override fun renderWidget(
+        context: GuiGraphics,
+        mouseX: Int,
+        mouseY: Int,
+        partialTick: Float
+    ) {
+        drawScaledText(
+            context = context,
+            font = CobblemonResources.DEFAULT_LARGE,
+            text = speciesNumber.bold(),
+            x = pX + 3,
+            y = pY + 1,
+            shadow = true
+        )
+
+        if (hasKnowledge) {
+            drawScaledText(
+                context = context,
+                font = CobblemonResources.DEFAULT_LARGE,
+                text = speciesName.bold(),
+                x = pX + 26,
+                y = pY + 1,
+                colour = 0x606B6E
+            )
+        }
+
+        if (isOwned) {
+            blitk(
+                matrixStack = context.pose(),
+                texture = caughtIcon,
+                x = (pX + 129) / SCALE,
+                y = (pY + 2) / SCALE,
+                width = 14,
+                height = 14,
+                scale = SCALE
+            )
+        }
+    }
+
+    fun update(pokedexEntry: PokedexEntry) {
+        val species = PokemonSpecies.getByIdentifier(pokedexEntry.speciesId) ?: return
+
+        val progress = CobblemonClient.clientPokedexData.getKnowledgeForSpecies(pokedexEntry.speciesId)
+        this.hasKnowledge =  progress != PokedexEntryProgress.UNREGISTERED
+        this.isOwned = progress == PokedexEntryProgress.OWNED
+        this.speciesNumber = species.nationalPokedexNumber.toString().padStart(4, '0').text()
+        this.speciesName = species.translatedName
+    }
+}
@@ -0,0 +1,151 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.client.gui.pokedex.widgets
+
+import com.cobblemon.mod.common.api.gui.blitk
+import com.cobblemon.mod.common.api.pokedex.PokedexEntryProgress
+import com.cobblemon.mod.common.api.text.text
+import com.cobblemon.mod.common.client.gui.drawProfilePokemon
+import com.cobblemon.mod.common.client.gui.pokedex.PokedexGUIConstants.SCALE
+import com.cobblemon.mod.common.client.gui.pokedex.PokedexGUIConstants.SCROLL_SLOT_SIZE
+import com.cobblemon.mod.common.client.render.drawScaledText
+import com.cobblemon.mod.common.client.render.models.blockbench.FloatingState
+import com.cobblemon.mod.common.pokemon.RenderablePokemon
+import com.cobblemon.mod.common.pokemon.Species
+import com.cobblemon.mod.common.util.cobblemonResource
+import com.cobblemon.mod.common.util.math.fromEulerXYZDegrees
+import net.minecraft.client.gui.GuiGraphics
+import org.joml.Quaternionf
+import org.joml.Vector3f
+
+abstract class PokemonSlotWidget {
+    companion object {
+        private val slotResource = cobblemonResource("textures/gui/pokedex/pokedex_slot.png")
+        private val slotHighlight = cobblemonResource("textures/gui/pokedex/slot_select.png")
+        private val caughtIcon = cobblemonResource("textures/gui/pokedex/caught_icon_small.png")
+        private val unknownIcon = cobblemonResource("textures/gui/pokedex/pokedex_slot_unknown.png")
+        private val unimplementedIcon = cobblemonResource("textures/gui/pokedex/pokedex_slot_unimplemented.png")
+
+        fun render(
+            context: GuiGraphics,
+            x: Int,
+            y: Int,
+            isHovered: Boolean,
+            species: Species,
+            renderablePokemon: RenderablePokemon?,
+            discoveryLevel: PokedexEntryProgress,
+        ) {
+            val shouldDrawMon = renderablePokemon != null
+
+            // FIXME: This may not work properly when accounting for custom pokemon with the same dex number
+            val pokemonNumber = species.nationalPokedexNumber.toString().padStart(4, '0')
+            val speciesNumber = pokemonNumber.text()
+
+            val matrices = context.pose()
+
+            blitk(
+                matrixStack = matrices,
+                texture = slotResource,
+                x = x,
+                y = y,
+                width = SCROLL_SLOT_SIZE,
+                height = SCROLL_SLOT_SIZE,
+            )
+
+            if (isHovered) {
+                blitk(
+                    matrixStack = matrices,
+                    texture = slotHighlight,
+                    x = x,
+                    y = y,
+                    width = SCROLL_SLOT_SIZE,
+                    height = SCROLL_SLOT_SIZE,
+                    vOffset = SCROLL_SLOT_SIZE,
+                    textureHeight = SCROLL_SLOT_SIZE * 2,
+                )
+            }
+
+            if (shouldDrawMon && discoveryLevel != PokedexEntryProgress.UNREGISTERED) {
+                context.enableScissor(
+                    x + 1,
+                    y + 1,
+                    x + SCROLL_SLOT_SIZE - 1,
+                    y + SCROLL_SLOT_SIZE - 2,
+                )
+
+                matrices.pushPose()
+                matrices.translate(x + SCROLL_SLOT_SIZE / 2.0, y + 1.0, 0.0)
+                matrices.scale(2.5F, 2.5F, 1F)
+
+                val state = FloatingState()
+                state.currentAspects = renderablePokemon.aspects
+
+                drawProfilePokemon(
+                    renderablePokemon = renderablePokemon,
+                    matrixStack = matrices,
+                    rotation = Quaternionf().fromEulerXYZDegrees(Vector3f(13F, 35F, 0F)),
+                    state = state,
+                    partialTicks = 0F,
+                    scale = 4.5F
+                )
+
+                matrices.popPose()
+                context.disableScissor()
+            } else {
+                blitk(
+                    matrixStack = matrices,
+                    texture = unknownIcon,
+                    x = x + 8.5,
+                    y = y + 9,
+                    width = 8,
+                    height = 10
+                )
+
+                if (!species.implemented) {
+                    blitk(
+                        matrixStack = matrices,
+                        texture = unimplementedIcon,
+                        x = (x + 14) / SCALE,
+                        y = (y + 15.5) / SCALE,
+                        width = 7,
+                        height = 7,
+                        scale = SCALE
+                    )
+                }
+            }
+
+            // Ensure elements are not hidden behind Pokémon render
+            matrices.pushPose()
+            matrices.translate(0.0, 0.0, 100.0)
+
+            drawScaledText(
+                context = context,
+                text = speciesNumber,
+                x = x + 1.5,
+                y = y + 2.5,
+                shadow = true,
+                scale = SCALE
+            )
+
+            if (discoveryLevel == PokedexEntryProgress.OWNED) {
+                blitk(
+                    matrixStack = matrices,
+                    texture = caughtIcon,
+                    x = (x + 18) / SCALE,
+                    y = (y + 1.5) / SCALE,
+                    width = 11,
+                    height = 11,
+                    scale = SCALE
+                )
+            }
+
+            matrices.popPose()
+        }
+    }
+}
@@ -0,0 +1,124 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.client.gui.pokedex.widgets.evolutiontree
+
+import com.cobblemon.mod.common.CobblemonItems
+import com.cobblemon.mod.common.api.pokemon.PokemonSpecies
+import com.cobblemon.mod.common.api.pokemon.evolution.Evolution
+import com.cobblemon.mod.common.api.pokemon.evolution.EvolutionVisitor
+import com.cobblemon.mod.common.api.pokemon.requirement.Requirement
+import com.cobblemon.mod.common.api.text.bold
+import com.cobblemon.mod.common.api.text.green
+import com.cobblemon.mod.common.client.gui.pokedex.widgets.evolutiontree.EvolutionTreeEvolutionVisitor.RenderEvolutionData
+import com.cobblemon.mod.common.client.gui.pokedex.widgets.evolutiontree.EvolutionTreeRequirementVisitor.RenderRequirementData
+import com.cobblemon.mod.common.pokemon.evolution.variants.BlockClickEvolution
+import com.cobblemon.mod.common.pokemon.evolution.variants.ItemInteractionEvolution
+import com.cobblemon.mod.common.pokemon.evolution.variants.LevelUpEvolution
+import com.cobblemon.mod.common.pokemon.evolution.variants.TradeEvolution
+import com.cobblemon.mod.common.util.cobblemonResource
+import com.cobblemon.mod.common.util.itemRegistry
+import com.cobblemon.mod.common.util.lang
+import net.minecraft.client.Minecraft
+import net.minecraft.network.chat.Component
+import net.minecraft.network.chat.MutableComponent
+import net.minecraft.resources.ResourceLocation
+import net.minecraft.world.item.Item
+import net.minecraft.world.item.ItemStack
+
+class EvolutionTreeEvolutionVisitor : EvolutionVisitor<RenderEvolutionData?> {
+
+    data class RenderEvolutionData(
+        val label: MutableComponent,
+        val icons: List<Item>,
+        val tooltips: List<MutableComponent>,
+    )
+
+    private val requirementVisitor = EvolutionTreeRequirementVisitor()
+
+    private fun visitRequirement(requirement: Requirement): RenderRequirementData? {
+        val icon = requirement.pokedexIcon?.let {
+            Minecraft.getInstance()?.player?.level()?.itemRegistry?.get(it)
+        }
+
+        val tooltip = requirement.pokedexTooltip?.let {
+            Component.translatable(it)
+        }
+
+        if (icon != null && tooltip != null) {
+            return RenderRequirementData(icon, tooltip)
+        }
+
+        return requirementVisitor.visit(requirement)
+    }
+
+    override fun visitBlockClickEvolution(blockClickEvolution: BlockClickEvolution): RenderEvolutionData? {
+        return null
+    }
+
+    override fun visitDummyEvolution(evolution: Evolution): RenderEvolutionData? {
+        return null
+    }
+
+    override fun visitItemInteractionEvolution(itemInteractionEvolution: ItemInteractionEvolution): RenderEvolutionData? {
+        val label = lang("ui.pokedex.evolution.item_interact.label").bold()
+        val item = itemInteractionEvolution.requiredContext.items.get().first().value()
+        val icons = mutableListOf(item)
+        val tooltips =
+            mutableListOf(lang("ui.pokedex.evolution.item_interact.tooltip", item.description.plainCopy().green()))
+
+        val requirementsDataList = itemInteractionEvolution.requirements.mapNotNull { requirement ->
+            visitRequirement(requirement)
+        }
+
+        requirementsDataList.forEach { requirement ->
+            icons.add(requirement.icon)
+            tooltips.add(requirement.tooltip)
+        }
+
+        return RenderEvolutionData(label, icons, tooltips)
+    }
+
+    override fun visitLevelUpEvolution(levelUpEvolution: LevelUpEvolution): RenderEvolutionData? {
+        val requirementsDataList = levelUpEvolution.requirements.map { requirement ->
+            visitRequirement(requirement)
+        }
+
+        val label = requirementsDataList.firstNotNullOfOrNull { requirement -> requirement?.label }
+        val icons = requirementsDataList.mapNotNull { requirementData -> requirementData?.icon }
+        val tooltips = requirementsDataList.mapNotNull { requirementData -> requirementData?.tooltip }
+
+        return RenderEvolutionData(label ?: Component.literal(""), icons, tooltips)
+    }
+
+    override fun visitTradeEvolution(tradeEvolution: TradeEvolution): RenderEvolutionData? {
+        val label = lang("ui.pokedex.evolution.trade.label")
+        val icons = mutableListOf<Item>(CobblemonItems.LINK_CABLE)
+        val tooltips = mutableListOf<MutableComponent>()
+
+        val species = tradeEvolution.requiredContext.species
+        if (species == null) {
+            tooltips.add(lang("ui.pokedex.evolution.trade.tooltip.with_any_species"))
+        } else {
+            PokemonSpecies.getByIdentifier(cobblemonResource(species))?.let {
+                tooltips.add(lang("ui.pokedex.evolution.trade.tooltip.with_species", it.translatedName.green()))
+            }
+        }
+
+        val requirementsDataList = tradeEvolution.requirements.mapNotNull { requirement ->
+            visitRequirement(requirement)
+        }
+
+        requirementsDataList.forEach { requirement ->
+            icons.add(requirement.icon)
+            tooltips.add(requirement.tooltip)
+        }
+
+        return RenderEvolutionData(label, icons, tooltips)
+    }
+}
@@ -0,0 +1,271 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.client.gui.pokedex.widgets.evolutiontree
+
+import com.cobblemon.mod.common.client.gui.pokedex.widgets.evolutiontree.EvolutionTreeRequirementVisitor.RenderRequirementData
+import com.cobblemon.mod.common.CobblemonItems
+import com.cobblemon.mod.common.api.pokemon.PokemonSpecies
+import com.cobblemon.mod.common.api.pokemon.requirement.RequirementVisitor
+import com.cobblemon.mod.common.api.pokemon.stats.Stats
+import com.cobblemon.mod.common.api.text.add
+import com.cobblemon.mod.common.api.text.green
+import com.cobblemon.mod.common.api.types.ElementalTypes
+import com.cobblemon.mod.common.pokemon.requirements.*
+import com.cobblemon.mod.common.util.cobblemonResource
+import com.cobblemon.mod.common.util.lang
+import net.minecraft.network.chat.Component
+import net.minecraft.network.chat.MutableComponent
+import net.minecraft.world.item.Item
+import net.minecraft.world.item.Items
+
+class EvolutionTreeRequirementVisitor : RequirementVisitor<RenderRequirementData?> {
+    data class RenderRequirementData(
+        val icon: Item,
+        val tooltip: MutableComponent,
+        val label: MutableComponent? = null,
+    )
+
+    override fun visitAdvancementRequirement(advancementRequirement: AdvancementRequirement): RenderRequirementData? {
+        val icon = Items.BOOK
+        val advancementLanguageKey = advancementRequirement.requiredAdvancement.toLanguageKey()
+        val advancementComponent = Component.translatable("advancements.$advancementLanguageKey").green()
+        val tooltip = lang("ui.pokedex.requirement.advancement.tooltip", advancementComponent)
+
+        return RenderRequirementData(icon, tooltip)
+    }
+
+    override fun visitAnyRequirement(anyRequirement: AnyRequirement): RenderRequirementData? {
+        return null
+    }
+
+    override fun visitAreaRequirement(areaRequirement: AreaRequirement): RenderRequirementData? {
+        return null
+    }
+
+    override fun visitAttackDefenceRatioRequirement(attackDefenceRatioRequirement: AttackDefenceRatioRequirement): RenderRequirementData? {
+        return null
+    }
+
+    override fun visitBattleCriticalHitsRequirement(battleCriticalHitsRequirement: BattleCriticalHitsRequirement): RenderRequirementData? {
+        val icon = CobblemonItems.MEDICINAL_LEEK
+        val criticalsComponent = Component.literal(battleCriticalHitsRequirement.amount.toString()).green()
+        val tooltip = lang("ui.pokedex.requirement.battle_critical_hits.tooltip", criticalsComponent)
+
+        return RenderRequirementData(icon, tooltip)
+    }
+
+    override fun visitBiomeRequirement(biomeRequirement: BiomeRequirement): RenderRequirementData? {
+        return null
+    }
+
+    override fun visitBlocksTraveledRequirement(blocksTraveledRequirement: BlocksTraveledRequirement): RenderRequirementData? {
+        val icon = Items.LEATHER_BOOTS
+        val blocksComponent = Component.literal(blocksTraveledRequirement.amount.toString()).green()
+        val tooltip = lang("ui.pokedex.requirement.blocks_traveled.tooltip", blocksComponent)
+
+        return RenderRequirementData(icon, tooltip)
+    }
+
+    override fun visitDamageTakenRequirement(damageTakenRequirement: DamageTakenRequirement): RenderRequirementData? {
+        val icon = CobblemonItems.PUNCHING_GLOVE
+        val blocksComponent = Component.literal(damageTakenRequirement.amount.toString()).green()
+        val tooltip = lang("ui.pokedex.requirement.damage_taken.tooltip", blocksComponent)
+
+        return RenderRequirementData(icon, tooltip)
+    }
+
+    override fun visitDefeatRequirement(defeatRequirement: DefeatRequirement): RenderRequirementData? {
+        val species = defeatRequirement.target.species?.let { PokemonSpecies.getByIdentifier(cobblemonResource(it)) } ?: return null
+        val icon = CobblemonItems.PUNCHING_GLOVE
+        val defeatedAmount = defeatRequirement.amount
+
+        val descriptionComponent = Component.literal(defeatedAmount.toString()).plainCopy().add(" ").add(species.translatedName).green()
+        val tooltip = lang("ui.pokedex.requirement.defeat.tooltip", descriptionComponent)
+
+        return RenderRequirementData(icon, tooltip)
+    }
+
+    override fun visitFriendshipRequirement(friendshipRequirement: FriendshipRequirement): RenderRequirementData? {
+        val icon = CobblemonItems.SOOTHE_BELL
+        val friendshipAmountComponent = Component.literal(friendshipRequirement.amount.toString()).green()
+        val tooltip = lang("ui.pokedex.requirement.friendship.tooltip", friendshipAmountComponent)
+        val label = lang("ui.pokedex.requirement.friendship.label")
+
+        return RenderRequirementData(icon, tooltip, label)
+    }
+
+    override fun visitHeldItemRequirement(heldItemRequirement: HeldItemRequirement): RenderRequirementData? {
+        val item = heldItemRequirement.itemCondition.items.get().first().value()
+        val tooltip = lang("ui.pokedex.requirement.held_item.tooltip", item.description.plainCopy().green())
+
+        return RenderRequirementData(item, tooltip)
+    }
+
+    override fun visitLevelRequirement(levelRequirement: LevelRequirement): RenderRequirementData? {
+        val minLevel = levelRequirement.minLevel
+        val maxLevel = levelRequirement.maxLevel
+
+        val icon = CobblemonItems.RARE_CANDY
+        val tooltip =
+            if (minLevel == maxLevel || maxLevel == Int.MAX_VALUE)
+                lang("ui.pokedex.requirement.level.tooltip.min", Component.literal(minLevel.toString()).green())
+            else
+                lang("ui.pokedex.requirement.level.tooltip.between", Component.literal(minLevel.toString()).green(), Component.literal(maxLevel.toString()).green())
+
+        val label = lang("ui.pokedex.requirement.level.label", minLevel)
+
+        return RenderRequirementData(icon, tooltip, label)
+    }
+
+    override fun visitMoonPhaseRequirement(moonPhaseRequirement: MoonPhaseRequirement): RenderRequirementData? {
+        val icon = Items.CLOCK
+        val moonPhaseComponent = moonPhaseRequirement.moonPhase.displayName().green()
+        val tooltip = lang("ui.pokedex.requirement.moon_phase.tooltip", moonPhaseComponent)
+
+        return RenderRequirementData(icon, tooltip)
+    }
+
+    override fun visitMoveSetRequirement(moveSetRequirement: MoveSetRequirement): RenderRequirementData? {
+        val icon = CobblemonItems.PP_MAX
+        val tooltip = lang("ui.pokedex.requirement.has_move.tooltip", moveSetRequirement.move.displayName.green())
+
+        return RenderRequirementData(icon, tooltip)
+    }
+
+    override fun visitMoveTypeRequirement(moveTypeRequirement: MoveTypeRequirement): RenderRequirementData? {
+        val type = ElementalTypes.get(moveTypeRequirement.type.name)
+        val icon = when (type) {
+            ElementalTypes.NORMAL -> CobblemonItems.NORMAL_GEM
+            ElementalTypes.FIRE -> CobblemonItems.FIRE_GEM
+            ElementalTypes.WATER -> CobblemonItems.WATER_GEM
+            ElementalTypes.GRASS -> CobblemonItems.GRASS_GEM
+            ElementalTypes.ELECTRIC -> CobblemonItems.ELECTRIC_GEM
+            ElementalTypes.ICE -> CobblemonItems.ICE_GEM
+            ElementalTypes.FIGHTING -> CobblemonItems.FIGHTING_GEM
+            ElementalTypes.POISON -> CobblemonItems.POISON_GEM
+            ElementalTypes.GROUND -> CobblemonItems.GROUND_GEM
+            ElementalTypes.FLYING -> CobblemonItems.FLYING_GEM
+            ElementalTypes.PSYCHIC -> CobblemonItems.PSYCHIC_GEM
+            ElementalTypes.BUG -> CobblemonItems.BUG_GEM
+            ElementalTypes.ROCK -> CobblemonItems.ROCK_GEM
+            ElementalTypes.GHOST -> CobblemonItems.GHOST_GEM
+            ElementalTypes.DRAGON -> CobblemonItems.DRAGON_GEM
+            ElementalTypes.DARK -> CobblemonItems.DARK_GEM
+            ElementalTypes.STEEL -> CobblemonItems.STEEL_GEM
+            ElementalTypes.FAIRY -> CobblemonItems.FAIRY_GEM
+            else -> CobblemonItems.NORMAL_GEM
+        }
+
+        val tooltip = lang("ui.pokedex.requirement.has_move_type.tooltip", moveTypeRequirement.type.displayName.green())
+        val label = lang("ui.pokedex.requirement.has_move_type.label")
+
+        return RenderRequirementData(icon, tooltip, label)
+    }
+
+    // TODO test
+    override fun visitOwnerHoldsItemRequirement(ownerHoldsItemRequirement: OwnerHoldsItemRequirement): RenderRequirementData? {
+        val item = ownerHoldsItemRequirement.itemCondition.items.get().first().value()
+        val tooltip = lang("ui.pokedex.requirement.owner_held_item.tooltip", item.description.plainCopy().green())
+
+        return RenderRequirementData(item, tooltip)
+    }
+
+    override fun visitPartyMemberRequirement(partyMemberRequirement: PartyMemberRequirement): RenderRequirementData? {
+        return null
+    }
+
+    override fun visitPokemonPropertiesRequirement(pokemonPropertiesRequirement: PokemonPropertiesRequirement): RenderRequirementData? {
+        return null
+    }
+
+    override fun visitPropertyRangeRequirement(propertyRangeRequirement: PropertyRangeRequirement): RenderRequirementData? {
+        return null
+    }
+
+    override fun visitRecoilRequirement(recoilRequirement: RecoilRequirement): RenderRequirementData? {
+        val icon = CobblemonItems.LIFE_ORB
+        val recoilComponent = Component.literal(recoilRequirement.amount.toString()).green()
+        val tooltip = lang("ui.pokedex.requirement.recoil.tooltip", recoilComponent)
+
+        return RenderRequirementData(icon, tooltip)
+    }
+
+    override fun visitStatCompareRequirement(statCompareRequirement: StatCompareRequirement): RenderRequirementData? {
+        val highStat = Stats.getStat(statCompareRequirement.highStat)
+        val lowStat = Stats.getStat(statCompareRequirement.lowStat)
+
+        val icon = when (highStat) {
+            Stats.HP, Stats.EVASION, Stats.ACCURACY -> CobblemonItems.HEALTH_MOCHI
+            Stats.ATTACK -> CobblemonItems.MUSCLE_MOCHI
+            Stats.DEFENCE -> CobblemonItems.RESIST_MOCHI
+            Stats.SPECIAL_ATTACK -> CobblemonItems.GENIUS_MOCHI
+            Stats.SPECIAL_DEFENCE -> CobblemonItems.CLEVER_MOCHI
+            Stats.SPEED -> CobblemonItems.SWIFT_MOCHI
+        }
+
+        val highStatComponent = highStat.displayName.plainCopy().green()
+        val lowStatComponent = lowStat.displayName.plainCopy().green()
+        val tooltip = lang("ui.pokedex.requirement.stat_compare.tooltip", highStatComponent, lowStatComponent)
+
+        return RenderRequirementData(icon, tooltip)
+    }
+
+    override fun visitStatEqualRequirement(statEqualRequirement: StatEqualRequirement): RenderRequirementData? {
+        val statOne = Stats.getStat(statEqualRequirement.statOne)
+        val statTwo = Stats.getStat(statEqualRequirement.statTwo)
+
+        val statOneComponent = statOne.displayName.plainCopy().green()
+        val statTwoComponent = statTwo.displayName.plainCopy().green()
+
+        val icon = CobblemonItems.FRESH_START_MOCHI
+        val tooltip = lang("ui.pokedex.requirement.stat_equal.tooltip", statOneComponent, statTwoComponent)
+
+        return RenderRequirementData(icon, tooltip)
+    }
+
+    override fun visitStructureRequirement(structureRequirement: StructureRequirement): RenderRequirementData? {
+        return null
+    }
+
+    override fun visitTimeRangeRequirement(timeRangeRequirement: TimeRangeRequirement): RenderRequirementData? {
+        val icon = Items.CLOCK
+        val timeRangeComponent = timeRangeRequirement.range.displayName() ?: return null
+        val tooltip = lang("ui.pokedex.requirement.time_range.tooltip", timeRangeComponent.green())
+
+        return RenderRequirementData(icon, tooltip)
+    }
+
+    override fun visitUseMoveRequirement(useMoveRequirement: UseMoveRequirement): RenderRequirementData? {
+        val icon = CobblemonItems.CHOICE_BAND
+        val tooltip = lang("ui.pokedex.requirement.use_move.tooltip", useMoveRequirement.move.displayName.green())
+
+        return RenderRequirementData(icon, tooltip)
+
+        return null
+    }
+
+    override fun visitWeatherRequirement(weatherRequirement: WeatherRequirement): RenderRequirementData? {
+        var icon: Item
+        var tooltip: MutableComponent
+
+        if (weatherRequirement.isThundering == true) {
+            icon = Items.LIGHTNING_ROD
+            tooltip = lang("ui.pokedex.requirement.weather.tooltip.thundering")
+        } else {
+            icon = Items.WATER_BUCKET
+            tooltip = lang("ui.pokedex.requirement.weather.tooltip.raining")
+        }
+
+        return RenderRequirementData(icon, tooltip)
+    }
+
+    override fun visitWorldRequirement(worldRequirement: WorldRequirement): RenderRequirementData? {
+        return null
+    }
+}
@@ -0,0 +1,552 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.client.gui.pokedex.widgets.evolutiontree
+
+import com.cobblemon.mod.common.Cobblemon
+import com.cobblemon.mod.common.api.gui.*
+import com.cobblemon.mod.common.api.pokedex.Dexes
+import com.cobblemon.mod.common.api.pokedex.PokedexEntryProgress
+import com.cobblemon.mod.common.api.pokedex.entry.PokedexEntry
+import com.cobblemon.mod.common.api.pokedex.entry.PokedexForm
+import com.cobblemon.mod.common.api.pokemon.PokemonSpecies
+import com.cobblemon.mod.common.api.pokemon.evolution.Evolution
+import com.cobblemon.mod.common.api.text.add
+import com.cobblemon.mod.common.api.text.bold
+import com.cobblemon.mod.common.client.CobblemonClient
+import com.cobblemon.mod.common.client.CobblemonResources
+import com.cobblemon.mod.common.client.gui.pokedex.PokedexGUI
+import com.cobblemon.mod.common.client.gui.pokedex.PokedexGUIConstants
+import com.cobblemon.mod.common.client.gui.pokedex.PokedexGUIConstants.HALF_OVERLAY_WIDTH
+import com.cobblemon.mod.common.client.gui.pokedex.PokedexGUIConstants.POKEMON_DESCRIPTION_HEIGHT
+import com.cobblemon.mod.common.client.gui.pokedex.PokedexGUIConstants.SCROLL_SLOT_SIZE
+import com.cobblemon.mod.common.client.gui.pokedex.ScaledButton
+import com.cobblemon.mod.common.client.gui.pokedex.renderTooltip
+import com.cobblemon.mod.common.client.gui.pokedex.widgets.PokemonSlotWidget
+import com.cobblemon.mod.common.client.gui.pokedex.widgets.evolutiontree.EvolutionTreeEvolutionVisitor.RenderEvolutionData
+import com.cobblemon.mod.common.client.gui.summary.widgets.SoundlessWidget
+import com.cobblemon.mod.common.client.render.drawScaledText
+import com.cobblemon.mod.common.client.render.renderScaledGuiItemIcon
+import com.cobblemon.mod.common.pokemon.Gender
+import com.cobblemon.mod.common.pokemon.RenderablePokemon
+import com.cobblemon.mod.common.util.cobblemonResource
+import com.cobblemon.mod.common.util.lang
+import net.minecraft.client.gui.GuiGraphics
+import net.minecraft.network.chat.Component
+import net.minecraft.network.chat.MutableComponent
+
+class EvolutionTreeWidget(
+    val parent: PokedexGUI,
+    val pX: Int,
+    val pY: Int,
+) : SoundlessWidget(
+    pX, pY,
+    HALF_OVERLAY_WIDTH,
+    POKEMON_DESCRIPTION_HEIGHT,
+    lang("ui.pokedex.pokemon_info")
+) {
+    companion object {
+        private val slotResource = cobblemonResource("textures/gui/pokedex/pokedex_slot.png")
+        private val expandResource = cobblemonResource("textures/gui/pokedex/expand.png")
+        private val minimizeResource = cobblemonResource("textures/gui/pokedex/minimize.png")
+
+        const val X_MARGIN = 180
+        const val Y_MARGIN_MINIMIZED = 135
+        const val Y_MARGIN_EXPANDED = 53
+        const val EXPANDED_HEIGHT = 125
+
+        const val HORIZONTAL_PADDING = 38
+        const val VERTICAL_PADDING = 2
+        const val TREE_FORK_LENGTH = 4
+
+        const val ICON_X_PADDING = -4.0
+        const val ICON_Y_PADDING = -4.0
+        const val MILLIS_BETWEEN_ICONS_CYCLE = 1000
+
+        const val ICON_SLOT_BACKGROUND_SIZE = 8
+        const val ICON_SLOT_PADDING = 4
+        const val ICON_SLOT_HALF_PADDING = ICON_SLOT_PADDING / 2
+
+        const val LINE_COLOR = 0xff1d6b85.toInt()
+
+        const val EXPAND_BUTTON_X_MARGIN = 127f
+        const val EXPAND_BUTTON_Y_MARGIN = -10.5f
+        const val EXPAND_BUTTON_SIZE = 20
+
+        private var previousRootPokedexEntry: PokedexEntry? = null
+        private var previousRootPokedexForm: PokedexForm? = null
+
+        private val evolutionVisitor = EvolutionTreeEvolutionVisitor()
+    }
+
+    private var rootTreeDrawingNode: TreeDrawingNode<EvolutionNode>? = null
+    private var treeDrawingBounds: TreeDrawingBounds? = null
+    private var zoomLevel: Double = 0.0
+    private var panningX: Double = 0.0
+    private var panningY: Double = 0.0
+
+    private var hoveredTooltips: List<MutableComponent>? = null
+
+    private val expandButton: ScaledButton = ScaledButton(
+        0f,
+        0f,
+        EXPAND_BUTTON_SIZE,
+        EXPAND_BUTTON_SIZE,
+        resource = expandResource,
+        clickAction = {
+            parent.evolutionTreeExpanded = !parent.evolutionTreeExpanded
+            expandButton.resource = if (parent.evolutionTreeExpanded) minimizeResource else expandResource
+            updatePositioning()
+        }
+    ).apply { addWidget(this) }
+
+    override fun renderWidget(
+        guiGraphics: GuiGraphics,
+        mouseX: Int,
+        mouseY: Int,
+        partialTick: Float,
+    ) {
+        drawScaledText(
+            context = guiGraphics,
+            font = CobblemonResources.DEFAULT_LARGE,
+            text = Component.translatable("cobblemon.ui.pokedex.info.evolution_tree").bold(),
+            x = x + 9,
+            y = y - 10,
+            shadow = true
+        )
+
+        expandButton.render(guiGraphics, mouseX, mouseY, partialTick)
+
+        rootTreeDrawingNode?.let {
+            enableScissors(guiGraphics)
+            renderTreeDrawingNode(guiGraphics, it, mouseX, mouseY, partialTick)
+            guiGraphics.disableScissor()
+
+            hoveredTooltips?.let { tooltips ->
+                renderTooltip(
+                    guiGraphics,
+                    tooltips,
+                    mouseX,
+                    mouseY,
+                    partialTick,
+                    4,
+                )
+            }
+
+            hoveredTooltips = null
+        }
+    }
+
+    fun setup(pokedexEntry: PokedexEntry?, pokedexForm: PokedexForm?) {
+        if (pokedexEntry == null || pokedexForm == null) return
+
+        updatePositioning()
+
+        val (rootPokedexEntry, rootPokedexForm) = Dexes.findRootDexEntryBySpeciesId(pokedexEntry.speciesId, pokedexForm.displayForm)
+        val rootEvolutionNode = buildEvolutionTree(rootPokedexEntry, rootPokedexForm, null)
+
+//        val isSameEntry = previousRootPokedexEntry != null && pokedexEntry?.id == previousRootPokedexEntry?.id
+//        val isSameForm =
+//            previousRootPokedexForm != null && pokedexForm?.displayForm == previousRootPokedexForm?.displayForm
+
+        // TODO: figure out how to prevent pokedex from resetting all the widgets state
+        // if (isSameEntry && isSameForm) {
+        //    return
+        // }
+
+        previousRootPokedexEntry = pokedexEntry
+        previousRootPokedexForm = pokedexForm
+
+        createDrawingTree(rootEvolutionNode).also {
+            rootTreeDrawingNode = it
+            treeDrawingBounds = calculateBounds<EvolutionNode>(it)
+        }
+
+        zoomLevel = 0.0
+        panningX = 0.0
+        panningY = 0.0
+    }
+
+    fun updatePositioning() {
+        x = pX + X_MARGIN
+        y = pY + if (parent.evolutionTreeExpanded) Y_MARGIN_EXPANDED else Y_MARGIN_MINIMIZED
+        height = if (parent.evolutionTreeExpanded) EXPANDED_HEIGHT else POKEMON_DESCRIPTION_HEIGHT
+
+        panningX = 0.0
+        panningY = 0.0
+
+        expandButton.buttonX = x + EXPAND_BUTTON_X_MARGIN
+        expandButton.buttonY = y + EXPAND_BUTTON_Y_MARGIN
+    }
+
+    private fun buildEvolutionTree(
+        pokedexEntry: PokedexEntry,
+        pokedexForm: PokedexForm,
+        evolution: Evolution? = null
+    ): EvolutionNode {
+        val species = PokemonSpecies.getByIdentifier(pokedexEntry.speciesId)!!
+
+        val formEquivalents = Dexes.getFormEquivalents(pokedexForm.displayForm)
+        val form = species.forms.firstOrNull { formEquivalents.contains(it.name.lowercase()) }
+        val parentSpecies = Dexes.findDexEntryBySpeciesId(species.resourceIdentifier)!!
+        val parentPokedexForm = parentSpecies.forms.first { formEquivalents.contains(it.displayForm.lowercase()) }
+
+        val aspects = evolution?.result?.aspects?.toMutableSet() ?: mutableSetOf()
+        form?.aspects?.let { aspects.addAll(it) }
+
+        val discoveryLevel = CobblemonClient.clientPokedexData.getHighestKnowledgeFor(pokedexEntry, pokedexForm, aspects)
+
+        val evolutions = form?.evolutions ?: species.evolutions
+        val drawData = evolution?.let { evolutionVisitor.visit(evolution) }
+
+        // TODO: figure out if this works for fakemon
+        val children = evolutions.mapNotNull { evolution ->
+            val speciesId = cobblemonResource(evolution.result.species!!)
+            val childPokedexEntry =
+                Dexes.findDexEntryBySpeciesId(speciesId)
+
+            if (childPokedexEntry == null) {
+                Cobblemon.LOGGER.warn("Dex entry not found for species: $speciesId")
+                return@mapNotNull null
+            }
+
+            val evolutionResult = evolution.result.create()
+            val formEquivalents = Dexes.getFormEquivalents(evolutionResult.form.name.lowercase())
+            val childPokedexForm = childPokedexEntry.forms.first { formEquivalents.contains(it.displayForm.lowercase()) }
+
+            return@mapNotNull buildEvolutionTree(childPokedexEntry, childPokedexForm, evolution)
+        }
+
+        return EvolutionNode(pokedexEntry, parentPokedexForm, aspects, discoveryLevel, children, drawData)
+    }
+
+    private fun renderTreeDrawingNode(
+        guiGraphics: GuiGraphics,
+        treeDrawingNode: TreeDrawingNode<EvolutionNode>,
+        mouseX: Int,
+        mouseY: Int,
+        delta: Float,
+    ) {
+        val (treeX, treeY) = getDrawingCoordinates(treeDrawingNode)
+
+        if (treeDrawingNode.children.size == 1) {
+            val child = treeDrawingNode.children.first()
+            val (childX, _) = getDrawingCoordinates(child)
+
+            val lineStartX = treeX + SCROLL_SLOT_SIZE
+            val lineEndX = childX
+            val lineY = treeY + SCROLL_SLOT_SIZE / 2
+
+            child.value.renderData?.let { renderData ->
+                drawEvolutionInfo(
+                    guiGraphics,
+                    renderData,
+                    lineStartX,
+                    lineEndX,
+                    lineY,
+                    mouseX,
+                    mouseY,
+                    delta,
+                )
+            }
+        } else if (treeDrawingNode.children.size > 1) {
+            val treeForkStart = treeX + SCROLL_SLOT_SIZE
+            val treeForkEnd = treeX + SCROLL_SLOT_SIZE + TREE_FORK_LENGTH
+            val middleStart = treeY + SCROLL_SLOT_SIZE / 2
+
+            val (_, firstChildY) = getDrawingCoordinates(treeDrawingNode.children.first())
+            val (_, lastChildY) = getDrawingCoordinates(treeDrawingNode.children.last())
+
+            guiGraphics.hLine(
+                treeForkStart,
+                treeForkEnd,
+                middleStart,
+                LINE_COLOR,
+            )
+
+            guiGraphics.vLine(
+                treeForkEnd,
+                firstChildY + SCROLL_SLOT_SIZE / 2,
+                lastChildY + SCROLL_SLOT_SIZE / 2,
+                LINE_COLOR,
+            )
+
+            treeDrawingNode.children.forEach { child ->
+                val (childX, childY) = getDrawingCoordinates(child)
+
+                val lineStartX = treeForkEnd
+                val lineEndX = childX
+                val lineY = childY + SCROLL_SLOT_SIZE / 2
+
+                child.value.renderData?.let { renderData ->
+                    drawEvolutionInfo(
+                        guiGraphics,
+                        renderData,
+                        lineStartX,
+                        lineEndX,
+                        lineY,
+                        mouseX,
+                        mouseY,
+                        delta,
+                    )
+                }
+            }
+        }
+
+        treeDrawingNode.children.forEach { child ->
+            renderTreeDrawingNode(guiGraphics, child, mouseX, mouseY, delta)
+        }
+
+        val isVisible =
+            treeX >= x - SCROLL_SLOT_SIZE &&
+                    treeX <= x + width &&
+                    treeY >= y - SCROLL_SLOT_SIZE &&
+                    treeY <= y + height
+
+        if (!isVisible) return
+
+        val evolutionNode = treeDrawingNode.value
+        val isSlotHovered =
+            isElementHovered(mouseX, mouseY, treeX, treeX + SCROLL_SLOT_SIZE, treeY, treeY + SCROLL_SLOT_SIZE)
+
+        val discoveryLevel = evolutionNode.pokedexEntryProgress
+        if (isSlotHovered) {
+            val text =
+                if (discoveryLevel == PokedexEntryProgress.UNREGISTERED) {
+                    lang("ui.pokedex.unknown")
+                } else {
+                    val species = PokemonSpecies.getByIdentifier(evolutionNode.pokedexEntry.speciesId)!!
+                    val speciesComponent = species.translatedName
+                    val formName = evolutionNode.pokedexForm.displayForm.lowercase()
+                    val formComponent =
+                        if (formName == "normal") null
+                        else lang("ui.pokedex.info.form.${species}-${formName.replace("-", "")}")
+
+                    formComponent?.add(" ")?.add(speciesComponent) ?: speciesComponent
+                }
+
+            guiGraphics.disableScissor()
+            renderTooltip(
+                context = guiGraphics,
+                text = text,
+                posX = mouseX,
+                posY = mouseY,
+                delta,
+                4,
+            )
+            enableScissors(guiGraphics)
+        }
+
+
+        val pokedexEntry = evolutionNode.pokedexEntry
+        val pokedexForm = evolutionNode.pokedexForm
+        val species = PokemonSpecies.getByIdentifier(evolutionNode.pokedexEntry.speciesId)!!
+        val encounteredForms = CobblemonClient.clientPokedexData.getEncounteredForms(pokedexEntry)
+        val formToRender = encounteredForms.firstOrNull { it.displayForm.equals(pokedexForm.displayForm, ignoreCase = true) }
+
+        val renderablePokemon =
+            if (formToRender != null) {
+                val seenGenders = CobblemonClient.clientPokedexData.getSeenGenders(pokedexEntry, formToRender)
+                val seenShinyStates = CobblemonClient.clientPokedexData.getSeenShinyStates(pokedexEntry, formToRender)
+
+                val aspectsToDraw = (pokedexEntry.displayAspects + evolutionNode.aspects).toMutableSet()
+
+                val formAspects = species.forms.firstOrNull { it.name.equals(formToRender.displayForm, ignoreCase = true) }?.aspects
+                if (formAspects != null) {
+                    aspectsToDraw.addAll(formAspects)
+                }
+
+                if (seenGenders.contains(parent.gender)) {
+                    aspectsToDraw.add(parent.gender.name.lowercase())
+                } else {
+                    aspectsToDraw.add((seenGenders.firstOrNull() ?: Gender.GENDERLESS).name.lowercase())
+                }
+
+                if (parent.shiny && seenShinyStates.contains("shiny")) {
+                    aspectsToDraw.add("shiny")
+                }
+
+                RenderablePokemon(species, aspectsToDraw)
+            } else {
+                null
+            }
+
+        PokemonSlotWidget.render(
+            context = guiGraphics,
+            x = treeX,
+            y = treeY,
+            isHovered = isSlotHovered,
+            species = species,
+            renderablePokemon = renderablePokemon,
+            discoveryLevel = discoveryLevel,
+        )
+    }
+
+    private fun drawEvolutionInfo(
+        guiGraphics: GuiGraphics,
+        renderData: RenderEvolutionData,
+        lineStartX: Int,
+        lineEndX: Int,
+        lineY: Int,
+        mouseX: Int,
+        mouseY: Int,
+        delta: Float,
+    ) {
+        val lineXMiddle = (lineStartX + lineEndX) / 2
+        val iconX = (lineXMiddle + ICON_X_PADDING - ICON_SLOT_HALF_PADDING).toInt()
+        val iconY = (lineY + ICON_Y_PADDING - ICON_SLOT_HALF_PADDING).toInt()
+        val iconSize = ICON_SLOT_BACKGROUND_SIZE + ICON_SLOT_PADDING
+
+        val isVisible =
+            iconX >= x - iconSize &&
+            iconX <= x + width &&
+            iconY >= y - iconSize &&
+            iconY <= y + height
+
+        if (!isVisible) {
+            return
+        }
+
+        if (renderData.icons.isEmpty()) {
+            guiGraphics.hLine(
+                lineStartX,
+                lineEndX,
+                lineY,
+                LINE_COLOR,
+            )
+        } else {
+            guiGraphics.hLine(
+                lineStartX,
+                iconX - 1,
+                lineY,
+                LINE_COLOR,
+            )
+
+            guiGraphics.hLine(
+                iconX + iconSize,
+                lineEndX,
+                lineY,
+                LINE_COLOR,
+            )
+
+            blitk(
+                matrixStack = guiGraphics.pose(),
+                texture = slotResource,
+                x = iconX,
+                y = iconY,
+                width = iconSize,
+                height = iconSize,
+            )
+
+            val index = (System.currentTimeMillis() / MILLIS_BETWEEN_ICONS_CYCLE) % renderData.icons.size
+            val item = renderData.icons[index.toInt()]
+
+            renderScaledGuiItemIcon(
+                itemStack = item.defaultInstance,
+                x = lineXMiddle + ICON_X_PADDING,
+                y = lineY + ICON_Y_PADDING,
+                matrixStack = guiGraphics.pose(),
+                scale = PokedexGUIConstants.SCALE.toDouble(),
+            )
+        }
+
+        val isLineHovered = isElementHovered(mouseX, mouseY, lineStartX, lineEndX, lineY - 1, lineY + 1)
+        val isIconHovered = isElementHovered(
+            mouseX,
+            mouseY,
+            iconX.toInt(),
+            iconX.toInt() + iconSize,
+            iconY.toInt(),
+            iconY.toInt() + iconSize,
+        )
+
+        if (renderData.tooltips.isNotEmpty() &&
+            (isLineHovered || isIconHovered) &&
+            this.isHovered(mouseX.toDouble(), mouseY.toDouble())
+        ) {
+            hoveredTooltips = renderData.tooltips
+        }
+    }
+
+    private fun getDrawingCoordinates(node: TreeDrawingNode<EvolutionNode>): Pair<Int, Int> {
+        val halfSlot = SCROLL_SLOT_SIZE / 2f
+
+        val xStep = halfSlot + HORIZONTAL_PADDING
+        val yStep = halfSlot + VERTICAL_PADDING
+
+        // Swaps the x and y to draw the tree horizontally
+        val xDislocation = (node.y - treeDrawingBounds!!.yCenter) * xStep
+        val yDislocation = (node.x - treeDrawingBounds!!.xCenter) * yStep
+
+        val xCenter = width / 2f - halfSlot
+        val yCenter = height / 2f - halfSlot
+
+        val screenX = (xCenter.toInt() + xDislocation.toInt() + panningX.toInt() + x)
+        val screenY = (yCenter.toInt() + yDislocation.toInt() + panningY.toInt() + y)
+
+        return screenX to screenY
+    }
+
+    private fun isElementHovered(
+        mouseX: Int,
+        mouseY: Int,
+        startX: Int,
+        endX: Int,
+        startY: Int,
+        endY: Int,
+    ): Boolean {
+        return mouseX >= startX && mouseX <= endX && mouseY >= startY && mouseY <= endY
+    }
+
+    override fun mouseDragged(
+        mouseX: Double,
+        mouseY: Double,
+        button: Int,
+        deltaX: Double,
+        deltaY: Double
+    ): Boolean {
+        panningX += deltaX
+        panningY += deltaY
+
+        val bounds = treeDrawingBounds ?: return super.mouseDragged(mouseX, mouseY, button, deltaX, deltaY)
+        val treeHeight = bounds.height.coerceAtLeast(1)
+        val treeWidth = bounds.width.coerceAtLeast(1)
+
+        val xStep = HORIZONTAL_PADDING + SCROLL_SLOT_SIZE / 2.0
+        val yStep = VERTICAL_PADDING + SCROLL_SLOT_SIZE / 2.0
+
+        val minPanningX = (treeHeight - 1) * -xStep / 2.0 - (width + SCROLL_SLOT_SIZE) / 2.0
+        val maxPanningX = (treeHeight - 1) * xStep / 2.0 + (width + SCROLL_SLOT_SIZE) / 2.0
+
+        val divideBy = if (treeWidth % 2 == 0) 4.0 else 2.0
+        val minPanningY = (treeWidth - 1) * -yStep / 2.0 - height / 2.0 + SCROLL_SLOT_SIZE / divideBy
+        val maxPanningY = (treeWidth - 1) * yStep / 2.0 + height / 2.0 - SCROLL_SLOT_SIZE / divideBy
+
+        panningX = panningX.coerceIn(minPanningX, maxPanningX)
+        panningY = panningY.coerceIn(minPanningY, maxPanningY)
+
+        return super.mouseDragged(mouseX, mouseY, button, deltaX, deltaY)
+    }
+
+    fun isHovered(mouseX: Double, mouseY: Double): Boolean {
+        return mouseX.toInt() in x..(x + width) && mouseY.toInt() in y..(y + height)
+    }
+
+    fun enableScissors(guiGraphics: GuiGraphics) {
+        guiGraphics.enableScissor(x + 1, y, x + width - 1, y + height)
+    }
+
+    private class EvolutionNode(
+        val pokedexEntry: PokedexEntry,
+        val pokedexForm: PokedexForm,
+        val aspects: Set<String>,
+        val pokedexEntryProgress: PokedexEntryProgress,
+        override val children: List<EvolutionNode>,
+        val renderData: RenderEvolutionData?,
+    ) : TreeNode<EvolutionNode>
+}
@@ -15,7 +15,6 @@ import com.cobblemon.mod.common.battles.BattleFormat
 import com.cobblemon.mod.common.client.CobblemonClient
 import com.cobblemon.mod.common.client.battle.ClientBattle
 import com.cobblemon.mod.common.client.gui.battle.BattleGUI
-import com.cobblemon.mod.common.client.gui.interact.wheel.createPokeSkillGui
 import com.cobblemon.mod.common.client.keybind.CobblemonBlockingKeyBinding
 import com.cobblemon.mod.common.client.keybind.KeybindCategories
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
@@ -27,12 +26,12 @@ import com.cobblemon.mod.common.pokemon.Pokemon
 import com.cobblemon.mod.common.util.isUsingPokedex
 import com.cobblemon.mod.common.util.traceFirstEntityCollision
 import com.mojang.blaze3d.platform.InputConstants
-import kotlin.math.pow
 import net.minecraft.client.Minecraft
 import net.minecraft.client.player.LocalPlayer
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.player.Player
 import net.minecraft.world.level.ClipContext
+import kotlin.math.pow

 object PartySendBinding : CobblemonBlockingKeyBinding(
    "key.cobblemon.throwpartypokemon",
@@ -40,17 +39,32 @@ object PartySendBinding : CobblemonBlockingKeyBinding(
    InputConstants.KEY_R,
    KeybindCategories.COBBLEMON_CATEGORY
 ) {
-    const val POKE_SKILL_TIME = 0.7F
    var canApplyChange = true
+    var heldDownSeconds = 0F

    fun actioned() {
        canApplyChange = false
+        wasDown = true
+        heldDownSeconds = 0F
    }

    fun canAction() = canApplyChange && Minecraft.getInstance().player?.isUsingPokedex() == false

+    override fun onTick() {
+        if (wasDown) {
+            if (heldDownSeconds < 100) {
+                heldDownSeconds += Minecraft.getInstance().timer.getGameTimeDeltaPartialTick(false)
+            }
+        } else {
+            heldDownSeconds = 0F
+        }
+
+        super.onTick()
+    }
+
    override fun onRelease() {
        val canAction = canAction()
+        wasDown = false
        canApplyChange = true
        if (!canAction) {
            return
@@ -91,8 +105,7 @@ object PartySendBinding : CobblemonBlockingKeyBinding(
            entityClass = LivingEntity::class.java,
            ignoreEntity = player,
            maxDistance = Cobblemon.config.battleSpectateMaxDistance,
-            collideBlock = ClipContext.Fluid.NONE
-        )
+            collideBlock = ClipContext.Fluid.NONE)
        if (canSendOutPokemon(player, targetEntity)) {
            sendToServer(SendOutPokemonPacket(CobblemonClient.storage.selectedSlot))
        } else {
@@ -114,13 +127,10 @@ object PartySendBinding : CobblemonBlockingKeyBinding(
                //The server sends a packet back that opens the player interaction menu with the proper options
                sendToServer(RequestPlayerInteractionsPacket(entity.uuid, entity.id, pokemon.uuid))
            }
-
            is PokemonEntity -> {
-                if (!entity.canBattle(player) || entity.position()
-                        .distanceToSqr(player.position()) > Cobblemon.config.battleWildMaxDistance.pow(2)
-                ) return
-                sendToServer(BattleChallengePacket(entity.id, pokemon.uuid, BattleFormat.GEN_9_SINGLES))
-            }
+                if (!entity.canBattle(player) || entity.position().distanceToSqr(player.position()) > Cobblemon.config.battleWildMaxDistance.pow(2)) return
+                    sendToServer(BattleChallengePacket(entity.id,  pokemon.uuid, BattleFormat.GEN_9_SINGLES))
+                }
        }
    }

@@ -19,7 +19,6 @@ import com.cobblemon.mod.common.entity.PosableEntity
 import com.cobblemon.mod.common.net.messages.client.effect.SpawnSnowstormEntityParticlePacket
 import net.minecraft.client.Minecraft
 import net.minecraft.world.entity.Entity
-import net.minecraft.world.phys.Vec3

 object SpawnSnowstormEntityParticleHandler : ClientNetworkPacketHandler<SpawnSnowstormEntityParticlePacket> {
    override fun handle(packet: SpawnSnowstormEntityParticlePacket, client: Minecraft) {
@@ -32,7 +31,6 @@ object SpawnSnowstormEntityParticleHandler : ClientNetworkPacketHandler<SpawnSno
        val targetState = (targetedEntity as? PosableEntity)?.delegate as? PosableState
        val sourceLocators = packet.sourceLocators.firstNotNullOfOrNull { sourceState.getMatchingLocators(it).takeIf { it.isNotEmpty() } } ?: return
        val targetedLocator = packet.targetLocators?.firstOrNull { targetState?.getMatchingLocators(it)?.isNotEmpty() == true }
-        val targetPosition = packet.targetPosition
        val rootMatrix = sourceState.locatorStates["root"]!!

        sourceLocators.forEach { locator ->
@@ -42,16 +40,6 @@ object SpawnSnowstormEntityParticleHandler : ClientNetworkPacketHandler<SpawnSno
            val particleRuntime = MoLangRuntime().setup().setupClient()
            particleRuntime.environment.query.addFunction("entity") { sourceState.runtime.environment.query }

-            // Target resolution priority: entity+locator > world position > none
-            val targetPos: (() -> Vec3)? = if (targetedEntity != null) {
-                { targetedLocator?.let { targetState?.locatorStates?.get(it) }?.getOrigin() ?: targetedEntity.position() }
-            } else if (targetPosition != null) {
-                val pos = packet.targetPosition
-                { pos }
-            } else {
-                null
-            }
-
            val storm = ParticleStorm(
                effect = effect,
                emitterSpaceMatrix = particleMatrix,
@@ -61,7 +49,7 @@ object SpawnSnowstormEntityParticleHandler : ClientNetworkPacketHandler<SpawnSno
                sourceVelocity = { sourceEntity.deltaMovement },
                sourceAlive = { !sourceEntity.isRemoved },
                sourceVisible = { !sourceEntity.isInvisible },
-                targetPos = targetPos,
+                targetPos =  if (targetedEntity != null) { { targetedLocator?.let { targetState?.locatorStates?.get(it) }?.getOrigin() ?: targetedEntity.position() } } else null,
                entity = sourceEntity
            )

@@ -124,7 +124,6 @@ class SnowstormParticle(
                ParticleMaterial.OPAQUE -> ParticleMaterials.OPAQUE
                ParticleMaterial.BLEND -> ParticleMaterials.BLEND
                ParticleMaterial.ADD -> ParticleMaterials.ADD
-                ParticleMaterial.XRAY -> ParticleMaterials.XRAY
            }
        }
        storm.effect.particle.creationEvents.forEach { it.trigger(storm, this) }
@@ -15,7 +15,6 @@ import com.cobblemon.mod.common.util.cobblemonResource
 import com.mojang.blaze3d.vertex.PoseStack
 import com.mojang.blaze3d.vertex.VertexConsumer
 import com.mojang.math.Axis
-import net.minecraft.client.Minecraft
 import net.minecraft.client.renderer.LevelRenderer
 import net.minecraft.client.renderer.MultiBufferSource
 import net.minecraft.client.renderer.RenderType
@@ -40,13 +39,13 @@ class DiscShelfBlockEntityRenderer(ctx: BlockEntityRendererProvider.Context) :
    private val leftMargin = 1f
    private val rightMargin = 1f
    private val topMargin = 1f
+    private val bottomMargin = 1f
    private val interRowSpacing = 0f
    private val tmOverlayDepthOffset = -0.0002f
    private val slotBrightnessMultiplier = 0.65f

    private val tmBaseTexture = cobblemonResource("textures/block/disc_shelf/technical_machine_base.png")
    private val tmOverlayTexture = cobblemonResource("textures/block/disc_shelf/technical_machine_overlay.png")
-    private val musicDiscUnknownTexture = cobblemonResource("textures/block/disc_shelf/music_disc_unknown.png")

    override fun render(
        entity: DiscShelfBlockEntity,
@@ -78,6 +77,7 @@ class DiscShelfBlockEntityRenderer(ctx: BlockEntityRendererProvider.Context) :
        val slotWidth = slotWidthPixels / textureSize
        val slotHeight = slotHeightPixels / textureSize
        val verticalSpacing = (slotHeightPixels + interRowSpacing) / textureSize
+        val totalHeight = slotHeight * 7 + interRowSpacing * 6 / textureSize
        val startY = topMargin / textureSize

        for ((index, item) in entity.items.withIndex()) {
@@ -188,13 +188,6 @@ class DiscShelfBlockEntityRenderer(ctx: BlockEntityRendererProvider.Context) :

    private fun getItemTexture(itemStack: ItemStack): ResourceLocation {
        val id = BuiltInRegistries.ITEM.getKey(itemStack.item)
-        val resource = cobblemonResource("textures/block/disc_shelf/${id.path}.png")
-
-        val resourceManager = Minecraft.getInstance().resourceManager
-        if (resourceManager.getResource(resource).isEmpty) {
-            return musicDiscUnknownTexture
-        }
-
-        return resource
+        return cobblemonResource("textures/block/disc_shelf/${id.path}.png")
    }
 }
@@ -219,4 +219,36 @@ fun generateAdditionalRideBoostsTooltip(stack: ItemStack): MutableList<Component
    }

    return resultLines
+}
+
+private fun getRomanNumeral(number: Int): String {
+    if (number <= 0) return number.toString()
+
+    val numerals = listOf(
+            1000 to "M",
+            900 to "CM",
+            500 to "D",
+            400 to "CD",
+            100 to "C",
+            90 to "XC",
+            50 to "L",
+            40 to "XL",
+            10 to "X",
+            9 to "IX",
+            5 to "V",
+            4 to "IV",
+            1 to "I"
+    )
+
+    var remaining = number
+    val result = StringBuilder()
+
+    for ((value, numeral) in numerals) {
+        while (remaining >= value) {
+            result.append(numeral)
+            remaining -= value
+        }
+    }
+
+    return result.toString()
 }
@@ -10,13 +10,6 @@ package com.cobblemon.mod.common.data

 import com.cobblemon.mod.common.*
 import com.cobblemon.mod.common.Cobblemon.LOGGER
-import com.cobblemon.mod.common.CobblemonBehaviours
-import com.cobblemon.mod.common.CobblemonCallbacks
-import com.cobblemon.mod.common.CobblemonCosmeticItems
-import com.cobblemon.mod.common.CobblemonMechanics
-import com.cobblemon.mod.common.CobblemonPokeSkills
-import com.cobblemon.mod.common.CobblemonRideSettings
-import com.cobblemon.mod.common.CobblemonUnlockableWallpapers
 import com.cobblemon.mod.common.api.abilities.Abilities
 import com.cobblemon.mod.common.api.berry.Berries
 import com.cobblemon.mod.common.api.cooking.Seasonings
@@ -80,7 +73,6 @@ object CobblemonDataProvider : DataProvider {
        this.register(GlobalSpeciesFeatures, reloadable = false)
        this.register(SpeciesFeatureAssignments, reloadable = false)
        this.register(ActionEffects, reloadable = true)
-        this.register(CobblemonPokeSkills, reloadable = true)
        this.register(Moves, reloadable = false)
        this.register(CobblemonMovesetBuilders, reloadable = false)
        this.register(Abilities, reloadable = false)
@@ -1,116 +0,0 @@
-package com.cobblemon.mod.common.entity.pokemon.pokeskills
-
-import com.bedrockk.molang.runtime.MoLangRuntime
-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.molang.ExpressionLike
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMoLangValue
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.setup
-import com.cobblemon.mod.common.api.moves.animations.ActionEffectContext
-import com.cobblemon.mod.common.api.moves.animations.ActionEffectTimeline
-import com.cobblemon.mod.common.api.moves.animations.ActionEffects
-import com.cobblemon.mod.common.api.moves.animations.UsersProvider
-import com.cobblemon.mod.common.api.pokemon.status.Statuses
-import com.cobblemon.mod.common.pokemon.Pokemon
-import com.cobblemon.mod.common.util.asExpressionLike
-import com.cobblemon.mod.common.util.blockRegistry
-import com.cobblemon.mod.common.util.cobblemonResource
-import com.cobblemon.mod.common.util.codec.EXPRESSION_LIKE_CODEC
-import com.cobblemon.mod.common.util.isInBattle
-import com.cobblemon.mod.common.util.resolveBoolean
-import com.cobblemon.mod.common.util.withQueryValue
-import com.mojang.serialization.Codec
-import com.mojang.serialization.codecs.RecordCodecBuilder
-import net.minecraft.core.registries.Registries
-import net.minecraft.network.codec.ByteBufCodecs
-import net.minecraft.resources.ResourceLocation
-import net.minecraft.server.level.ServerLevel
-import net.minecraft.server.level.ServerPlayer
-import net.minecraft.world.entity.Entity
-import net.minecraft.world.entity.player.Player
-import net.minecraft.world.entity.projectile.ProjectileUtil
-import net.minecraft.world.phys.BlockHitResult
-import net.minecraft.world.phys.HitResult
-
-/**
- * The reference object for a skill that a Pokémon can use in the overworld.
- *
- * Most skills are "wrapper" skills that play a move's action effect at a target and run
- * some MoLang on impact. Custom skills can define a full action effect timeline.
- *
- * Access is auto-derived from requiredMoves/Abilities/Types/Species lists. If none are
- * populated, accessCondition is used as a fallback.
- *
- * @author Hiroku
- * @since August 31st, 2025
- */
-class PokeSkill(
-    val name: String,
-    val enabled: Boolean? = null,
-    val actionEffect: ActionEffectTimeline? = null,
-    val icon: ResourceLocation? = null,
-    val cooldownTicks: Int? = null,
-    val accessCondition: ExpressionLike? = null,
-    val useCondition: ExpressionLike? = null,
-
-    val targetType: PokeSkillTargetType? = null,
-    val range: Double? = null,
-    val targetCondition: ExpressionLike? = null,
-
-    val requiredMoves: List<String>? = null,
-    val requiredAbilities: List<String>? = null,
-    val requiredTypes: List<String>? = null,
-    val requiredSpecies: List<String>? = null,
-
-    val hitDelay: ExpressionLike? = null,
-    val hitEffect: ResourceLocation? = null,
-    val fallbackActionEffect: ResourceLocation? = null,
-
-    val variables: Map<String, Any>? = null,
-
-    val tiers: List<PokeSkillTier>,
-) {
-    companion object {
-        val runtime = MoLangRuntime().setup()
-        // TODO add all fields to codec
-        val CODEC = RecordCodecBuilder.create<PokeSkill> { instance ->
-            instance.group(
-                Codec.STRING.fieldOf("name").forGetter { it.name },
-                Codec.BOOL.fieldOf("enabled").forGetter { it.enabled },
-                Codec.unit<ActionEffectTimeline> { ActionEffectTimeline.NONE }.fieldOf("actionEffect").forGetter { it.actionEffect },
-                ResourceLocation.CODEC.fieldOf("icon").forGetter { it.icon },
-                Codec.INT.fieldOf("cooldownTicks").forGetter { it.cooldownTicks },
-                EXPRESSION_LIKE_CODEC.fieldOf("accessCondition").forGetter { it.accessCondition },
-                EXPRESSION_LIKE_CODEC.fieldOf("useCondition").forGetter { it.useCondition }
-            ).apply(instance) { name, enabled, actionEffect, icon, cooldownTicks, accessCondition, useCondition ->
-                PokeSkill(
-                    name = name,
-                    enabled = enabled,
-                    actionEffect = actionEffect,
-                    icon = icon,
-                    cooldownTicks = cooldownTicks,
-                    accessCondition = accessCondition,
-                    useCondition = useCondition,
-                    targetType = null,
-                    range = null,
-                    targetCondition = null,
-                    requiredMoves = null,
-                    requiredAbilities = null,
-                    requiredTypes = null,
-                    requiredSpecies = null,
-                    hitDelay = null,
-                    hitEffect = null,
-                    fallbackActionEffect = null,
-                    tiers = emptyList()
-                )
-            }
-        }
-
-        val PACKET_CODEC = ByteBufCodecs.fromCodecWithRegistries(CODEC)
-    }
-
-    @Transient
-    lateinit var id: ResourceLocation
-}
@@ -1,5 +0,0 @@
-package com.cobblemon.mod.common.entity.pokemon.pokeskills
-
-enum class PokeSkillTargetType {
-    NONE, SELF, BLOCK, ENTITY, BOTH
-}
@@ -1,400 +0,0 @@
-package com.cobblemon.mod.common.entity.pokemon.pokeskills
-
-import com.bedrockk.molang.runtime.MoLangRuntime
-import com.bedrockk.molang.runtime.value.DoubleValue
-import com.bedrockk.molang.runtime.value.MoValue
-import com.bedrockk.molang.runtime.value.StringValue
-import com.cobblemon.mod.common.Cobblemon
-import com.cobblemon.mod.common.api.molang.ExpressionLike
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMoLangValue
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
-import com.cobblemon.mod.common.api.molang.MoLangFunctions.setup
-import com.cobblemon.mod.common.api.moves.animations.ActionEffectContext
-import com.cobblemon.mod.common.api.moves.animations.ActionEffectTimeline
-import com.cobblemon.mod.common.api.moves.animations.ActionEffects
-import com.cobblemon.mod.common.api.moves.animations.UsersProvider
-import com.cobblemon.mod.common.api.pokemon.status.Statuses
-import com.cobblemon.mod.common.entity.pokemon.pokeskills.PokeSkill.Companion.runtime
-import com.cobblemon.mod.common.pokemon.Pokemon
-import com.cobblemon.mod.common.util.asExpressionLike
-import com.cobblemon.mod.common.util.blockRegistry
-import com.cobblemon.mod.common.util.cobblemonResource
-import com.cobblemon.mod.common.util.isInBattle
-import com.cobblemon.mod.common.util.resolveBoolean
-import com.cobblemon.mod.common.util.withQueryValue
-import com.google.gson.annotations.SerializedName
-import net.minecraft.core.registries.Registries
-import net.minecraft.resources.ResourceLocation
-import net.minecraft.server.level.ServerLevel
-import net.minecraft.server.level.ServerPlayer
-import net.minecraft.world.entity.Entity
-import net.minecraft.world.entity.player.Player
-import net.minecraft.world.entity.projectile.ProjectileUtil
-import net.minecraft.world.phys.BlockHitResult
-import net.minecraft.world.phys.HitResult
-import kotlin.collections.set
-
-class PokeSkillTier(
-    @SerializedName("enabled")
-    private val _enabled: Boolean? = null,
-    @SerializedName("actionEffect")
-    private val _actionEffect: ActionEffectTimeline? = null,
-    @SerializedName("icon")
-    private val _icon: ResourceLocation? = null,
-    @SerializedName("cooldownTicks")
-    private val _cooldownTicks: Int? = null,
-    @SerializedName("accessCondition")
-    private val _accessCondition: ExpressionLike? = null,
-    @SerializedName("useCondition")
-    private val _useCondition: ExpressionLike? = null,
-
-    @SerializedName("targetType")
-    private val _targetType: PokeSkillTargetType? = null,
-    @SerializedName("range")
-    private val _range: Double? = null,
-    @SerializedName("targetCondition")
-    private val _targetCondition: ExpressionLike? = null,
-
-    @SerializedName("requiredMoves")
-    private val _requiredMoves: List<String>? = null,
-    @SerializedName("requiredAbilities")
-    private val _requiredAbilities: List<String>? = null,
-    @SerializedName("requiredTypes")
-    private val _requiredTypes: List<String>? = null,
-    @SerializedName("requiredSpecies")
-    private val _requiredSpecies: List<String>? = null,
-
-    @SerializedName("hitDelay")
-    private val _hitDelay: ExpressionLike? = null,
-    @SerializedName("hitEffect")
-    private val _hitEffect: ResourceLocation? = null,
-    @SerializedName("fallbackActionEffect")
-    private val _fallbackActionEffect: ResourceLocation? = null,
-
-    @SerializedName("variables")
-    private val _variables: Map<String, Any>? = null,
-) {
-
-    @Transient
-    lateinit var pokeSkill: PokeSkill
-
-    @Transient
-    var tier: Int = -1
-
-    fun initialize(skill: PokeSkill, tier: Int): PokeSkillTier {
-        this.pokeSkill = skill
-        this.tier = tier
-        return this
-    }
-
-    companion object {
-        private val DEFAULT_ACTION_EFFECT = cobblemonResource("default_poke_skill")
-    }
-
-    val id: ResourceLocation
-        get() = pokeSkill.id
-    val name: String
-        get() = pokeSkill.name
-
-    val enabled: Boolean
-        get() = _enabled ?: pokeSkill.enabled ?: true
-    val actionEffect: ActionEffectTimeline?
-        get() = _actionEffect ?: pokeSkill.actionEffect
-    val icon: ResourceLocation?
-        get() = _icon ?: pokeSkill.icon
-    val cooldownTicks: Int
-        get() = _cooldownTicks ?: pokeSkill.cooldownTicks ?: 0
-    val accessCondition: ExpressionLike
-        get() = _accessCondition ?: pokeSkill.accessCondition ?: "true".asExpressionLike()
-    val useCondition: ExpressionLike
-        get() = _useCondition ?: pokeSkill.useCondition ?: "true".asExpressionLike()
-
-    val targetType: PokeSkillTargetType?
-        get() = _targetType ?: pokeSkill.targetType
-    val range: Double?
-        get() = _range ?: pokeSkill.range
-    val targetCondition: ExpressionLike?
-        get() = _targetCondition ?: pokeSkill.targetCondition
-
-    val requiredMoves: List<String>?
-        get() = _requiredMoves ?: pokeSkill.requiredMoves
-    val requiredAbilities: List<String>?
-        get() = _requiredAbilities ?: pokeSkill.requiredAbilities
-    val requiredTypes: List<String>?
-        get() = _requiredTypes ?: pokeSkill.requiredTypes
-    val requiredSpecies: List<String>?
-        get() = _requiredSpecies ?: pokeSkill.requiredSpecies
-
-    val hitDelay: ExpressionLike?
-        get() = _hitDelay ?: pokeSkill.hitDelay
-    val hitEffect: ResourceLocation?
-        get() = _hitEffect ?: pokeSkill.hitEffect
-    val fallbackActionEffect: ResourceLocation?
-        get() = _fallbackActionEffect ?: pokeSkill.fallbackActionEffect
-
-    val variables: Map<String, Any>?
-        get() = _variables ?: pokeSkill.variables
-
-    /**
-     * Determines access by checking the pokemons data against the granting lists.
-     * If no granting lists are populated, accessCondition is used as a fallback.
-     */
-    fun canAccess(player: Player, pokemon: Pokemon): Boolean {
-        if (!enabled) {
-            return false
-        }
-
-        val requiredMoves = requiredMoves
-        val requiredAbilities = requiredAbilities
-        val requiredTypes = requiredTypes
-        val requiredSpecies = requiredSpecies
-
-        // Check granting lists — if any are populated, check if the player has any of the listed moves/abilities/types/species
-        val hasGrantingLists = !requiredMoves.isNullOrEmpty() || !requiredAbilities.isNullOrEmpty() ||
-                !requiredTypes.isNullOrEmpty() || !requiredSpecies.isNullOrEmpty()
-
-        if (hasGrantingLists) {
-            val moveMatch = !requiredMoves.isNullOrEmpty() && requiredMoves.any { moveName ->
-                pokemon.moveSet.any { it.template.name == moveName }
-            }
-
-            val abilityMatch = !requiredAbilities.isNullOrEmpty() && requiredAbilities.any { abilityName ->
-                pokemon.ability.name == abilityName
-            }
-
-            val typeMatch = !requiredTypes.isNullOrEmpty() && requiredTypes.any { typeName ->
-                pokemon.types.any { it.name.equals(typeName, ignoreCase = true) }
-            }
-
-            val speciesMatch = !requiredSpecies.isNullOrEmpty() && requiredSpecies.any { speciesName ->
-                pokemon.species.name.equals(speciesName, ignoreCase = true)
-            }
-
-            if (!(moveMatch || abilityMatch || typeMatch || speciesMatch)) return false
-        }
-
-        // Always evaluate accessCondition — acts as additional gate when granting lists are present,
-        // or as the sole gate when no granting lists are populated
-        runtime.withQueryValue("player", player.asMostSpecificMoLangValue())
-        runtime.withQueryValue("pokemon", pokemon.struct)
-        pokemon.entity?.let { runtime.withQueryValue("entity", it.asMostSpecificMoLangValue()) }
-        return runtime.resolveBoolean(accessCondition)
-    }
-
-    fun canUse(player: Player, pokemon: Pokemon): Boolean {
-        val status = pokemon.status?.status
-        if (id in pokemon.skillCooldownsTicks || player.isInBattle() || status == Statuses.SLEEP || status == Statuses.FROZEN) {
-            return false
-        }
-        runtime.withQueryValue("player", player.asMostSpecificMoLangValue())
-        runtime.withQueryValue("pokemon", pokemon.struct)
-        val canUse = runtime.resolveBoolean(useCondition)
-        return canUse
-    }
-
-    /**
-     * Resolves which move from the pokemon's moveset grants this skill.
-     * Returns the first matching move name from requiredMoves, or null if none match.
-     */
-    fun resolveGrantingMove(pokemon: Pokemon): String? {
-        val requiredMoves = requiredMoves
-        if (requiredMoves.isNullOrEmpty()) return null  // need this guard
-        return requiredMoves.firstOrNull { moveName ->
-            pokemon.moveSet.any { it.template.name == moveName }
-        }
-    }
-
-    /**
-     * Resolves the action effect to use for the move visual.
-     * Priority: granting move's action effect > fallbackActionEffect > null
-     */
-    fun resolveVisualEffect(pokemon: Pokemon): ResourceLocation? {
-        val grantingMove = resolveGrantingMove(pokemon)
-        if (grantingMove != null) {
-            val effectId = cobblemonResource(grantingMove)
-            if (ActionEffects.actionEffects.containsKey(effectId)) return effectId
-            Cobblemon.LOGGER.warn("PokeSkill '$id': granting move '$grantingMove' has no action effect at '$effectId'")
-        }
-        return fallbackActionEffect
-    }
-
-    /**
-     * Runs the skill on the given pokemon.
-     * Populates context and runs targeting logic.
-     */
-    fun use(
-        player: ServerPlayer,
-        pokemon: Pokemon,
-        // context information!!!
-    ): Boolean {
-        if (!canUse(player, pokemon)) return false
-        val entity = pokemon.entity ?: return false
-        val level = player.level() as? ServerLevel ?: return false
-
-        // I think these should be defaulted but making them nullable means I don't have to adjust the
-        // other jsons that don't populate them yet...
-        val effectiveTargetType = targetType ?: PokeSkillTargetType.NONE
-        val effectiveRange = range ?: 8.0
-
-        // Resolve the action effect to run
-        val actionEffect = actionEffect
-        val effectTimeline = if (actionEffect != null && actionEffect != ActionEffectTimeline.NONE) {
-            actionEffect
-        } else {
-            ActionEffects.actionEffects[DEFAULT_ACTION_EFFECT] ?: run {
-                Cobblemon.LOGGER.warn("PokeSkill '$id': default_poke_skill action effect not found")
-                return false
-            }
-        }
-
-        // Set up runtime
-        val skillRuntime = MoLangRuntime().setup()
-        skillRuntime.withQueryValue("player", player.asMostSpecificMoLangValue())
-        skillRuntime.withQueryValue("pokemon", pokemon.struct)
-        skillRuntime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
-        skillRuntime.environment.setSimpleVariable("skill_id", StringValue(id.toString()))
-        skillRuntime.environment.setSimpleVariable("target_type", StringValue(effectiveTargetType.name.lowercase()))
-        skillRuntime.environment.query.addFunction("missed") { DoubleValue(0.0) } // move action effects use this to determine if the target particles should play. We want them to always play for skills I believe
-        injectVariables(skillRuntime)
-
-        // Targeting — raycast based on targetType
-        when (effectiveTargetType) {
-            PokeSkillTargetType.SELF -> {
-                injectEntityTarget(skillRuntime, player)
-                skillRuntime.environment.setSimpleVariable("target_is_entity", DoubleValue(1.0))
-            }
-            PokeSkillTargetType.BLOCK -> {
-                val blockHit = getPlayerLookedBlock(player, effectiveRange) ?: return false
-                injectBlockTarget(skillRuntime, blockHit, level)
-                skillRuntime.environment.setSimpleVariable("target_is_entity", DoubleValue(0.0))
-            }
-            PokeSkillTargetType.ENTITY -> {
-                val entityHit = getPlayerLookedEntity(player, effectiveRange) ?: return false
-                injectEntityTarget(skillRuntime, entityHit)
-                skillRuntime.environment.setSimpleVariable("target_is_entity", DoubleValue(1.0))
-            }
-            PokeSkillTargetType.BOTH -> {
-                val entityHit = getPlayerLookedEntity(player, effectiveRange)
-                if (entityHit != null) {
-                    injectEntityTarget(skillRuntime, entityHit)
-                    skillRuntime.environment.setSimpleVariable("target_is_entity", DoubleValue(1.0))
-                } else {
-                    val blockHit = getPlayerLookedBlock(player, effectiveRange) ?: return false
-                    injectBlockTarget(skillRuntime, blockHit, level)
-                    skillRuntime.environment.setSimpleVariable("target_is_entity", DoubleValue(0.0))
-                }
-            }
-            PokeSkillTargetType.NONE -> {}
-        }
-
-        // Evaluate target condition
-        val targetCondition = targetCondition
-        if (targetCondition != null && !skillRuntime.resolveBoolean(targetCondition)) return false
-
-        // Inject wrapper skill variables
-        val visualEffect = resolveVisualEffect(pokemon)
-        if (visualEffect != null) {
-            skillRuntime.environment.setSimpleVariable("granting_move", StringValue(visualEffect.toString()))
-        }
-
-        if (hitEffect != null) {
-            skillRuntime.environment.setSimpleVariable("hit_effect", StringValue(hitEffect.toString()))
-        }
-
-        val hitDelay = hitDelay
-        if (hitDelay != null) {
-            skillRuntime.environment.setSimpleVariable("hit_delay", hitDelay.resolve(skillRuntime))
-        }
-
-        // Build providers
-        val providers = mutableListOf<Any>(
-            UsersProvider(entity)
-        )
-
-        // Build and run context
-        val context = ActionEffectContext(
-            actionEffect = effectTimeline,
-            runtime = skillRuntime,
-            providers = providers,
-            level = level
-        )
-
-        effectTimeline.run(context).thenRun {
-            // Auto-apply cooldown after effect completes
-            pokemon.skillCooldownsTicks[id] = cooldownTicks
-        }
-
-        return true
-    }
-
-    /**
-     * Utility functions for setting up the runtime for a skill.
-     */
-    private fun injectBlockTarget(runtime: MoLangRuntime, blockHit: BlockHitResult, level: ServerLevel) {
-        val pos = blockHit.blockPos
-        runtime.environment.setSimpleVariable("target_x", DoubleValue(pos.x + 0.5))
-        runtime.environment.setSimpleVariable("target_y", DoubleValue(pos.y + 0.5))
-        runtime.environment.setSimpleVariable("target_z", DoubleValue(pos.z + 0.5))
-        runtime.environment.setSimpleVariable("target_block_x", DoubleValue(pos.x.toDouble()))
-        runtime.environment.setSimpleVariable("target_block_y", DoubleValue(pos.y.toDouble()))
-        runtime.environment.setSimpleVariable("target_block_z", DoubleValue(pos.z.toDouble()))
-
-        val blockState = level.getBlockState(pos)
-        val blockHolder = level.blockRegistry.wrapAsHolder(blockState.block)
-        val blockValue = blockHolder.asMoLangValue(Registries.BLOCK)
-
-        blockValue.addFunction("x") { DoubleValue(pos.x.toDouble()) }
-        blockValue.addFunction("y") { DoubleValue(pos.y.toDouble()) }
-        blockValue.addFunction("z") { DoubleValue(pos.z.toDouble()) }
-
-        runtime.environment.setSimpleVariable("target_block", blockValue)
-    }
-
-    private fun injectEntityTarget(runtime: MoLangRuntime, entityHit: Entity) {
-        runtime.environment.setSimpleVariable("target_x", DoubleValue(entityHit.x))
-        runtime.environment.setSimpleVariable("target_y", DoubleValue(entityHit.y + entityHit.bbHeight / 2.0))
-        runtime.environment.setSimpleVariable("target_z", DoubleValue(entityHit.z))
-        runtime.environment.setSimpleVariable("target_entity", entityHit.asMostSpecificMoLangValue())
-    }
-
-    private fun injectVariables(runtime: MoLangRuntime) {
-        variables?.forEach { (key, value) ->
-            runtime.environment.setSimpleVariable(
-                key,
-                value.asMostSpecificMoLangValue()
-            )
-        }
-    }
-
-    /**
-     * simple raycast to get the block the player is looking at.
-     */
-    private fun getPlayerLookedBlock(player: ServerPlayer, range: Double): BlockHitResult? {
-        val hitResult = player.pick(range, 0f, true)
-        return if (hitResult.type == HitResult.Type.BLOCK) hitResult as BlockHitResult else null
-    }
-
-    /**
-     * Raycast to determine the entity the player is looking at
-     */
-    private fun getPlayerLookedEntity(player: ServerPlayer, range: Double): Entity? {
-        val eyePosition = player.getEyePosition(1.0f)
-        val lookVector = player.getViewVector(1.0f)
-        val reachVector = eyePosition.add(lookVector.x * range, lookVector.y * range, lookVector.z * range)
-
-        // Create an outer bounding box to find potential candidates
-        val searchBox = player.boundingBox.expandTowards(lookVector.scale(range)).inflate(1.0, 1.0, 1.0)
-
-        // Filter entities within the search box
-        val entityHitResult = ProjectileUtil.getEntityHitResult(
-            player,
-            eyePosition,
-            reachVector,
-            searchBox,
-            { entity -> !entity.isSpectator && entity.isPickable },
-            range * range
-        )
-
-        return entityHitResult?.entity
-    }
-}
@@ -20,13 +20,12 @@ object ServerTickHandler {

        secondsTick++

-        // Party tick
-        for (player in server.playerList.players) {
-            val party = player.party()
-            party.forEach { it.tickSkillCooldowns() }
-            if (secondsTick == 20) {
-                secondsTick = 0
-                party.onSecondPassed(player)
+        if (secondsTick == 20) {
+            secondsTick = 0
+
+            // Party tick
+            for (player in server.playerList.players) {
+                player.party().onSecondPassed(player)
            }
        }
    }
@@ -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.net.messages.client.data
-
-import com.cobblemon.mod.common.CobblemonPokeSkills
-import com.cobblemon.mod.common.entity.pokemon.pokeskills.PokeSkill
-import com.cobblemon.mod.common.util.cobblemonResource
-import net.minecraft.network.RegistryFriendlyByteBuf
-
-class PokeSkillsRegistrySyncPacket(
-    pokeSkills: Collection<PokeSkill>
-) : DataRegistrySyncPacket<PokeSkill, PokeSkillsRegistrySyncPacket>(pokeSkills) {
-
-    override val id = ID
-
-    override fun encodeEntry(buffer: RegistryFriendlyByteBuf, entry: PokeSkill) {
-        PokeSkill.PACKET_CODEC.encode(buffer, entry)
-    }
-
-    override fun decodeEntry(buffer: RegistryFriendlyByteBuf): PokeSkill? {
-        return PokeSkill.PACKET_CODEC.decode(buffer)
-    }
-
-    override fun synchronizeDecoded(entries: Collection<PokeSkill>) {
-        CobblemonPokeSkills.reload(entries.associateBy { it.id })
-    }
-
-    companion object {
-        val ID = cobblemonResource("poke_skill_sync")
-        fun decode(buffer: RegistryFriendlyByteBuf) = PokeSkillsRegistrySyncPacket(emptyList()).apply { decodeBuffer(buffer) }
-    }
-}
@@ -13,15 +13,10 @@ import com.cobblemon.mod.common.client.net.effect.SpawnSnowstormEntityParticleHa
 import com.cobblemon.mod.common.util.*
 import net.minecraft.network.RegistryFriendlyByteBuf
 import net.minecraft.resources.ResourceLocation
-import net.minecraft.world.phys.Vec3

 /**
 * Packet that spawns a snowstorm particle effect on a specified entity and specified locator.
 * Can specify an optional target+locator to pass through to the spawned particle
- * Can alternatively specify a [targetPosition] for entity-to-world-position targeting
- * (e.g. a Pokémon firing particles at a block).
- *
- * Target resolution priority: targetedEntityId + targetLocators > targetPosition > no target
 *
 * Handled by [SpawnSnowstormEntityParticleHandler]
 *
@@ -33,8 +28,7 @@ class SpawnSnowstormEntityParticlePacket(
    val sourceEntityId: Int,
    val sourceLocators: List<String> = listOf("root"),
    val targetedEntityId: Int? = null,
-    val targetLocators: List<String>? = null,
-    val targetPosition: Vec3? = null
+    val targetLocators: List<String>? = null
 ) : NetworkPacket<SpawnSnowstormEntityParticlePacket> {
    companion object {
        val ID = cobblemonResource("spawn_snowstorm_entity_particle")
@@ -45,8 +39,7 @@ class SpawnSnowstormEntityParticlePacket(
            val sourceLocators = buffer.readList { buffer.readString() }
            val targetedEntityId = buffer.readNullable { it.readInt() }
            val targetLocators = buffer.readNullable { buffer.readList { buffer.readString() }}
-            val targetPosition = buffer.readNullable { Vec3(it.readDouble(), it.readDouble(), it.readDouble()) }
-            return SpawnSnowstormEntityParticlePacket(effectId, sourceEntityId, sourceLocators, targetedEntityId, targetLocators, targetPosition)
+            return SpawnSnowstormEntityParticlePacket(effectId, sourceEntityId, sourceLocators, targetedEntityId, targetLocators)
        }
    }

@@ -62,10 +55,5 @@ class SpawnSnowstormEntityParticlePacket(
                buffer.writeString(locator)
            }
        }
-        buffer.writeNullable(targetPosition) { _, value ->
-            buffer.writeDouble(value.x)
-            buffer.writeDouble(value.y)
-            buffer.writeDouble(value.z)
-        }
    }
 }
@@ -1,51 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.net.messages.client.pokemon.update
-
-import com.cobblemon.mod.common.net.IntSize
-import com.cobblemon.mod.common.pokemon.Pokemon
-import com.cobblemon.mod.common.util.cobblemonResource
-import com.cobblemon.mod.common.util.readSizedInt
-import com.cobblemon.mod.common.util.writeSizedInt
-import net.minecraft.network.RegistryFriendlyByteBuf
-import net.minecraft.resources.ResourceLocation
-
-/**
- * Packet that adds a single skill cooldown to a Pokémon's skill cooldowns map.
- *
- * @author Hiroku
- * @since August 31st, 2025
- */
-class SkillCooldownsUpdatePacket(
-    pokemon: () -> Pokemon?,
-    val skillId: ResourceLocation,
-    val cooldownTicks: Int
-) : SingleUpdatePacket<Pair<ResourceLocation, Int>, SkillCooldownsUpdatePacket>(pokemon, skillId to cooldownTicks) {
-    override val id: ResourceLocation = ID
-
-    override fun encodeValue(buffer: RegistryFriendlyByteBuf) {
-        buffer.writeResourceLocation(skillId)
-        buffer.writeSizedInt(IntSize.U_SHORT, cooldownTicks)
-    }
-
-    override fun set(pokemon: Pokemon, value: Pair<ResourceLocation, Int>) {
-        val (skillId, cooldownTicks) = value
-        pokemon.skillCooldownsTicks[skillId] = cooldownTicks
-    }
-
-    companion object {
-        val ID = cobblemonResource("skill_cooldowns_update")
-        fun decode(buffer: RegistryFriendlyByteBuf): SkillCooldownsUpdatePacket {
-            val pokemon = decodePokemon(buffer)
-            val skillId = buffer.readResourceLocation()
-            val cooldownTicks = buffer.readSizedInt(IntSize.U_SHORT)
-            return SkillCooldownsUpdatePacket(pokemon, skillId, cooldownTicks)
-        }
-    }
-}
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.net.messages.server
-
-import com.cobblemon.mod.common.api.net.NetworkPacket
-import java.util.UUID
-import net.minecraft.network.RegistryFriendlyByteBuf
-import net.minecraft.resources.ResourceLocation
-
-/**
- * Packet sent by the client to the server to indicate that it wants to use a Poké Skill.
- *
- * The server will validate if the skill can be used, and if so, will execute it.
- *
- * @param skillId The ID of the skill to use.
- * @param pokemonId The UUID of the Pokémon using the skill.
- *
- * @author Hiroku
- * @since August 31st, 2025
- */
-class UsePokeSkillPacket(
-    val skillId: ResourceLocation,
-    val pokemonId: UUID,
-) : NetworkPacket<UsePokeSkillPacket> {
-    override val id: ResourceLocation = ID
-
-    override fun encode(buffer: RegistryFriendlyByteBuf) {
-        buffer.writeResourceLocation(skillId)
-        buffer.writeUUID(pokemonId)
-    }
-
-    companion object {
-        val ID = ResourceLocation("cobblemon", "use_poke_skill")
-        fun decode(buffer: RegistryFriendlyByteBuf): UsePokeSkillPacket {
-            return UsePokeSkillPacket(
-                buffer.readResourceLocation(),
-                buffer.readUUID()
-            )
-        }
-    }
-}
@@ -1,27 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.net.serverhandling
-
-import com.cobblemon.mod.common.CobblemonPokeSkills
-import com.cobblemon.mod.common.api.net.ServerNetworkPacketHandler
-import com.cobblemon.mod.common.net.messages.server.UsePokeSkillPacket
-import com.cobblemon.mod.common.util.party
-import net.minecraft.server.MinecraftServer
-import net.minecraft.server.level.ServerPlayer
-
-object UsePokeSkillHandler : ServerNetworkPacketHandler<UsePokeSkillPacket> {
-    override fun handle(packet: UsePokeSkillPacket, server: MinecraftServer, player: ServerPlayer) {
-        val party = player.party()
-        val pokemon = party[packet.pokemonId] ?: return // Who?
-        val skill = CobblemonPokeSkills.getAccessiblePokeSkillTiers(player, pokemon).firstOrNull { it.id == packet.skillId } ?: return // What skill?
-        if (skill.canUse(player, pokemon)) {
-            skill.use(player, pokemon)
-        }
-    }
-}
@@ -767,8 +767,6 @@ open class Pokemon : ShowdownIdentifiable {
    val riding: RidingProperties
        get() = this.form.riding

-    var skillCooldownsTicks: MutableMap<ResourceLocation, Int> = mutableMapOf()
-
    init {
        storeCoordinates.subscribe { if (it != null && it.store !is PCStore && this.tetheringId != null) afterOnServer(seconds = 0.05F) { this.tetheringId = null } }
        storeCoordinates.subscribe {
@@ -1143,21 +1141,6 @@ open class Pokemon : ShowdownIdentifiable {
        }
    }

-    fun tickSkillCooldowns() {
-        val iterator = skillCooldownsTicks.entries.iterator()
-
-        while (iterator.hasNext()) {
-            val entry = iterator.next()
-            val newValue = entry.value - 1
-
-            if (newValue <= 0) {
-                iterator.remove()
-            } else {
-                entry.setValue(newValue)
-            }
-        }
-    }
-
    fun isOnInteractionCooldown(group: ResourceLocation): Boolean {
        return this.interactionCooldowns.getOrDefault(group, 0) > 0
    }
@@ -2246,11 +2229,6 @@ open class Pokemon : ShowdownIdentifiable {
        return true
    }

-    fun addSkillCooldown(skillId: ResourceLocation, cooldownTicks: Int) {
-        skillCooldownsTicks[skillId] = cooldownTicks
-        onChange(SkillCooldownsUpdatePacket({ this }, skillId, cooldownTicks))
-    }
-
    fun notify(packet: PokemonUpdatePacket<*>) {
        storeCoordinates.get()?.run { sendPacketToPlayers(store.getObservingPlayers(), packet) }
    }
@@ -22,7 +22,7 @@ import net.minecraft.world.entity.player.Player
 *
 * @author whatsy
 */
-class AdvancementRequirement(val requiredAdvancement: ResourceLocation) : OwnerQueryRequirement {
+class AdvancementRequirement(val requiredAdvancement: ResourceLocation) : OwnerQueryRequirement() {

    override fun checkPlayer(
        pokemon: Pokemon,
@@ -16,7 +16,7 @@ import com.cobblemon.mod.common.pokemon.Pokemon
 *
 * @property possibilities A collection of possible [Requirement]s that can allow this requirement to be valid.
 */
-class AnyRequirement(val possibilities: Collection<Requirement>) : Requirement {
+class AnyRequirement(val possibilities: Collection<Requirement>) : Requirement() {
    override fun check(pokemon: Pokemon) = this.possibilities.any { it.check(pokemon) }
    companion object {
        const val ADAPTER_VARIANT = "any"
@@ -21,7 +21,7 @@ import net.minecraft.world.phys.Vec3
 * @author Licious
 * @since March 21st, 2022
 */
-class AreaRequirement : EntityQueryRequirement {
+class AreaRequirement : EntityQueryRequirement() {
    companion object {
        const val ADAPTER_VARIANT = "area"
    }
@@ -11,7 +11,7 @@ package com.cobblemon.mod.common.pokemon.requirements
 import com.cobblemon.mod.common.api.pokemon.requirement.Requirement
 import com.cobblemon.mod.common.pokemon.Pokemon

-class AttackDefenceRatioRequirement : Requirement {
+class AttackDefenceRatioRequirement : Requirement() {
    companion object {
        const val ADAPTER_VARIANT = "attack_defence_ratio"
    }
@@ -21,7 +21,7 @@ import com.cobblemon.mod.common.pokemon.evolution.progress.LastBattleCriticalHit
 * @since October 2nd, 2022
 */
@Suppress("unused", "CanBePrimaryConstructorProperty")
-class BattleCriticalHitsRequirement(amount: Int) : Requirement {
+class BattleCriticalHitsRequirement(amount: Int) : Requirement() {

    constructor() : this(0)

@@ -24,7 +24,7 @@ import net.minecraft.world.level.biome.Biome
 * @author Licious
 * @since March 21st, 2022
 */
-class BiomeRequirement : EntityQueryRequirement {
+class BiomeRequirement : EntityQueryRequirement() {
    val biomeCondition: RegistryLikeCondition<Biome>? = null
    val biomeAnticondition: RegistryLikeCondition<Biome>? = null
    override fun check(pokemon: Pokemon, queriedEntity: LivingEntity): Boolean {
@@ -20,7 +20,7 @@ import com.cobblemon.mod.common.pokemon.Pokemon
 * @author Licious
 * @since January 28th, 2023
 */
-class BlocksTraveledRequirement(amount: Int) : Requirement {
+class BlocksTraveledRequirement(amount: Int) : Requirement() {

    constructor() : this(0)

@@ -22,7 +22,7 @@ import kotlin.random.Random
 * @author Hiroku
 * @since January 30th, 2026
 */
-class ChanceRequirement : Requirement {
+class ChanceRequirement : Requirement() {
    companion object {
        const val ADAPTER_VARIANT = "chance"
    }
@@ -21,7 +21,7 @@ import com.cobblemon.mod.common.pokemon.evolution.progress.DamageTakenEvolutionP
 * @author Licious
 * @since January 27th, 2022
 */
-class DamageTakenRequirement(amount: Int) : Requirement {
+class DamageTakenRequirement(amount: Int) : Requirement() {

    constructor() : this(0)

@@ -22,7 +22,7 @@ import com.cobblemon.mod.common.pokemon.evolution.progress.DefeatEvolutionProgre
 * @author Licious
 * @since January 28th, 2022
 */
-class DefeatRequirement(target: PokemonProperties, amount: Int) : Requirement {
+class DefeatRequirement(target: PokemonProperties, amount: Int) : Requirement() {

    constructor() : this(PokemonProperties(), 0)

@@ -18,7 +18,7 @@ import com.cobblemon.mod.common.pokemon.Pokemon
 * @author Licious
 * @since March 21st, 2022
 */
-class FriendshipRequirement : Requirement {
+class FriendshipRequirement : Requirement() {
    val amount = 0
    override fun check(pokemon: Pokemon) = pokemon.friendship >= this.amount

@@ -20,7 +20,7 @@ import net.minecraft.world.item.Items
 * @author Licious
 * @since March 21st, 2022
 */
-class HeldItemRequirement(val itemCondition: ItemPredicate) : Requirement {
+class HeldItemRequirement(val itemCondition: ItemPredicate) : Requirement() {

    constructor() : this(ItemPredicate.Builder.item().of(Items.EGG).build())

@@ -11,7 +11,7 @@ package com.cobblemon.mod.common.pokemon.requirements
 import com.cobblemon.mod.common.api.pokemon.requirement.Requirement
 import com.cobblemon.mod.common.pokemon.Pokemon

-class LevelRequirement : Requirement {
+class LevelRequirement : Requirement() {
    companion object {
        const val ADAPTER_VARIANT = "level"
    }
@@ -22,7 +22,7 @@ import net.minecraft.world.entity.LivingEntity
 * @author Licious
 * @since January 25th, 2023
 */
-class MoonPhaseRequirement(moonPhase: MoonPhase) : EntityQueryRequirement {
+class MoonPhaseRequirement(moonPhase: MoonPhase) : EntityQueryRequirement() {

    constructor() : this(MoonPhase.FULL_MOON)

@@ -20,7 +20,7 @@ import com.cobblemon.mod.common.pokemon.Pokemon
 * @author Licious
 * @since March 21st, 2022
 */
-class MoveSetRequirement : Requirement {
+class MoveSetRequirement : Requirement() {
    val move: MoveTemplate = Moves.getByNameOrDummy("tackle")
    override fun check(pokemon: Pokemon) = pokemon.moveSet.getMoves().any { move -> move.name.equals(this.move.name, true) }
    companion object {
@@ -13,7 +13,7 @@ import com.cobblemon.mod.common.api.types.ElementalType
 import com.cobblemon.mod.common.api.types.ElementalTypes
 import com.cobblemon.mod.common.pokemon.Pokemon

-class MoveTypeRequirement : Requirement {
+class MoveTypeRequirement : Requirement() {
    val type: ElementalType = ElementalTypes.NORMAL
    override fun check(pokemon: Pokemon) = pokemon.moveSet.getMoves().any { move -> move.type == type }
    companion object {
@@ -24,7 +24,7 @@ import net.minecraft.world.entity.player.Player
 * @author Polymeta
 */
 class OwnerHoldsItemRequirement(val itemCondition: ItemPredicate)
-    : OwnerQueryRequirement {
+    : OwnerQueryRequirement() {

    override fun checkPlayer(
        pokemon: Pokemon,
@@ -21,7 +21,7 @@ import com.cobblemon.mod.common.pokemon.Pokemon
 * @author Licious
 * @since March 21st, 2022
 */
-class PartyMemberRequirement : Requirement {
+class PartyMemberRequirement : Requirement() {
    companion object {
        const val ADAPTER_VARIANT = "party_member"
    }
@@ -19,7 +19,7 @@ import com.cobblemon.mod.common.pokemon.Pokemon
 * @author Licious
 * @since March 26th, 2022
 */
-class PokemonPropertiesRequirement : Requirement {
+class PokemonPropertiesRequirement : Requirement() {
    val target = PokemonProperties()
    override fun check(pokemon: Pokemon) = this.target.matches(pokemon)

@@ -12,7 +12,7 @@ import com.cobblemon.mod.common.api.pokemon.feature.IntSpeciesFeature
 import com.cobblemon.mod.common.api.pokemon.requirement.Requirement
 import com.cobblemon.mod.common.pokemon.Pokemon

-class PropertyRangeRequirement : Requirement {
+class PropertyRangeRequirement : Requirement() {
    val range = IntRange(0, 256)
    val feature: String = ""

@@ -21,7 +21,7 @@ import com.cobblemon.mod.common.pokemon.evolution.progress.RecoilEvolutionProgre
 * @author Licious
 * @since January 27th, 2022
 */
-class RecoilRequirement(amount: Int) : Requirement {
+class RecoilRequirement(amount: Int) : Requirement() {

    constructor() : this(0)

@@ -12,7 +12,7 @@ import com.cobblemon.mod.common.api.pokemon.requirement.Requirement
 import com.cobblemon.mod.common.api.pokemon.stats.Stats
 import com.cobblemon.mod.common.pokemon.Pokemon

-class StatCompareRequirement : Requirement {
+class StatCompareRequirement : Requirement() {
    companion object {
        const val ADAPTER_VARIANT = "stat_compare"
    }
@@ -12,7 +12,7 @@ import com.cobblemon.mod.common.api.pokemon.requirement.Requirement
 import com.cobblemon.mod.common.api.pokemon.stats.Stats
 import com.cobblemon.mod.common.pokemon.Pokemon

-class StatEqualRequirement : Requirement {
+class StatEqualRequirement : Requirement() {
    companion object {
        const val ADAPTER_VARIANT = "stat_equal"
    }
@@ -22,7 +22,7 @@ import net.minecraft.world.level.levelgen.structure.Structure
 * @author whatsy
 * @since December 5th, 2023
 */
-class StructureRequirement : EntityQueryRequirement {
+class StructureRequirement : EntityQueryRequirement() {
    val structureCondition: RegistryLikeCondition<Structure>? = null
    val structureAnticondition: RegistryLikeCondition<Structure>? = null
    override fun check(pokemon: Pokemon, queriedEntity: LivingEntity): Boolean {
@@ -20,7 +20,7 @@ import net.minecraft.world.entity.LivingEntity
 * @author Licious
 * @since March 26th, 2022
 */
-class TimeRangeRequirement : EntityQueryRequirement {
+class TimeRangeRequirement : EntityQueryRequirement() {
    val range = TimeRange(0..23999)
    override fun check(pokemon: Pokemon, queriedEntity: LivingEntity) = this.range.contains((queriedEntity.level().dayTime() % DAY_DURATION).toInt())
    companion object {
@@ -23,7 +23,7 @@ import com.cobblemon.mod.common.pokemon.evolution.progress.UseMoveEvolutionProgr
 * @author Licious
 * @since January 25th, 2023
 */
-class UseMoveRequirement(move: MoveTemplate, amount: Int) : Requirement {
+class UseMoveRequirement(move: MoveTemplate, amount: Int) : Requirement() {

    constructor() : this(Moves.getByNameOrDummy(""), 1)

@@ -12,7 +12,7 @@ import com.cobblemon.mod.common.api.pokemon.requirement.EntityQueryRequirement
 import com.cobblemon.mod.common.pokemon.Pokemon
 import net.minecraft.world.entity.LivingEntity

-class WeatherRequirement : EntityQueryRequirement {
+class WeatherRequirement : EntityQueryRequirement() {
    companion object {
        const val ADAPTER_VARIANT = "weather"
    }
@@ -21,7 +21,7 @@ import net.minecraft.world.level.Level
 * @author Licious
 * @since March 21st, 2022
 */
-class WorldRequirement : EntityQueryRequirement {
+class WorldRequirement : EntityQueryRequirement() {
    companion object {
        const val ADAPTER_VARIANT = "world"
    }
@@ -10,7 +10,6 @@ package com.cobblemon.mod.common.pokemon.status.statuses.persistent

 import com.cobblemon.mod.common.pokemon.status.PersistentStatus
 import com.cobblemon.mod.common.util.cobblemonResource
-
 class FrozenStatus : PersistentStatus(
    name = cobblemonResource("frozen"),
    showdownName = "frz",
@@ -20,7 +20,6 @@ object DataKeys {
    const val POKEMON_FRIENDSHIP = "Friendship"
    const val POKEMON_FULLNESS = "Fullness"
    const val POKEMON_INTERACTION_COOLDOWN = "InteractionCooldown"
-    const val POKEMON_SKILL_COOLDOWNS = "SkillCooldowns"
    const val POKEMON_ALPHA = "Alpha"

    const val POKEMON_IVS = "IVs"
@@ -100,16 +100,10 @@ fun ServerPlayer.didSleep(): Boolean {
    return true
 }

-fun Player.isInBattle() = if (this is ServerPlayer) {
-    BattleRegistry.getBattleByParticipatingPlayer(this) != null
-} else {
-    CobblemonClient.battle?.spectating == false
-}
-
+fun ServerPlayer.isInBattle() = BattleRegistry.getBattleByParticipatingPlayer(this) != null
 var ServerPlayer.spawner: PlayerSpawner
    get() = (this as PlayerSpawnerAccessor).getPlayerSpawner()
    set(value) = (this as PlayerSpawnerAccessor).setPlayerSpawner(value)
-
 fun ServerPlayer.getBattleState(): Pair<PokemonBattle, BattleActor>? {
    val battle = BattleRegistry.getBattleByParticipatingPlayer(this)
    if (battle != null) {
@@ -1,31 +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.util.adapters
-
-import com.cobblemon.mod.common.api.moves.animations.ActionEffectTimeline
-import com.cobblemon.mod.common.api.moves.animations.ActionEffects
-import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
-import com.google.gson.JsonDeserializationContext
-import com.google.gson.JsonDeserializer
-import com.google.gson.JsonElement
-import java.lang.reflect.Type
-
-/**
- * Adapter for deserializing a reference to an [ActionEffectTimeline] from its identifier.
- *
- * @author Hiroku
- * @since August 31st, 2025
- */
-object ActionEffectTimelineAdapter : JsonDeserializer<ActionEffectTimeline> {
-    override fun deserialize(json: JsonElement, type: Type, ctx: JsonDeserializationContext): ActionEffectTimeline {
-        val identifier = json.asString.asIdentifierDefaultingNamespace()
-        val timeline = ActionEffects.actionEffects[identifier]
-        return timeline ?: throw IllegalArgumentException("No ActionEffectTimeline found for id $identifier")
-    }
-}
Author	SHA1	Message	Date
Guilherme Pereira	7dd92ca351	add expand and minimize assets to evolution tree	2026-06-11 07:02:27 -03:00
Guilherme Pereira	5359cc6c21	Merge branch 'main' into evolution-tree	2026-06-11 06:29:34 -03:00
Guilherme Pereira	4421303d3b	Merge branch 'main' into evolution-tree	2026-02-24 21:03:56 -03:00
Guilherme Pereira	5b62f608da	Merge branch 'main' into evolution-tree	2026-01-27 08:19:06 -03:00
Guilherme Pereira	3840e9cdec	Merge branch 'main' into evolution-tree	2025-11-05 09:38:53 -03:00
Guilherme Pereira	5a2ac22bc2	attempt 3 to hide unknown pokemon from evolution tree	2025-10-20 17:44:55 -03:00
Guilherme Pereira	7991662be6	hide name from unknown pokemon in the evolution tree	2025-10-20 15:25:23 -03:00
Guilherme Pereira	8d41c7ae41	evolution tree refactoring	2025-10-20 14:53:17 -03:00
Guilherme Pereira	7768969186	attempt 2 to hide unknow pokemon from evolution tree	2025-10-16 16:54:35 -03:00
Guilherme Pereira	0720ec3565	attempt to hide unknown pokemon from evolution tree	2025-10-15 15:00:36 -03:00
Guilherme Pereira	5d89d9beb6	add support for custom icons and tooltips to the dex evolution tree	2025-10-14 00:02:04 -03:00
Guilherme Pereira	8ee737ae53	Merge branch 'main' into evolution-tree	2025-10-13 22:41:47 -03:00
Guilherme Pereira	886b960572	more requirements	2025-10-13 21:06:03 -03:00
Guilherme Pereira	2d23e88ff3	prevent pcs from exploding	2025-10-12 09:53:52 -03:00
Guilherme Pereira	aaa63ebc8a	fix wonkiness	2025-10-11 14:44:12 -03:00
Guilherme Pereira	b35a82d89e	update licenses	2025-10-11 14:32:56 -03:00
Guilherme Pereira	8662d954e3	add expand evolution tree button	2025-10-11 14:30:13 -03:00
Guilherme Pereira	94ddfc8720	add proper handling of variations, shiny and gender to evolution tree	2025-10-10 23:06:53 -03:00
Guilherme Pereira	b9fcae2131	add some new requirements to evolution screen	2025-10-10 22:17:32 -03:00
Guilherme Pereira	b848f2be3e	add some new requirements to evolution screen	2025-10-10 02:00:36 -03:00
Guilherme Pereira	f7019c943b	add proper handling of mon forms to evolution tree	2025-10-10 00:12:56 -03:00
Guilherme Pereira	c933eb2d71	make evolution icon be drawn on top of lines	2025-10-09 02:02:55 -03:00
Guilherme Pereira	09e9946eac	add has move type and has friendship to dex evolution tree	2025-10-08 16:16:00 -03:00
Guilherme Pereira	082fcab8b0	add item evolution info to evolution tree	2025-10-08 10:42:45 -03:00
Guilherme Pereira	7bdc8d03b1	add panning to evolution tree	2025-10-07 15:48:27 -03:00
Guilherme Pereira	485e4cfb22	add evolution icon and tooltip for level up evolutions	2025-10-07 10:07:25 -03:00
Guilherme Pereira	4cd69c1b30	center evolution tree based on evolution tree size	2025-10-06 15:52:47 -03:00
Guilherme Pereira	00148452aa	implement simple tree drawing algorithm for drawing evolution trees	2025-10-06 11:31:27 -03:00
Guilherme Pereira	598e08b8e6	add pokemon evolution tree page to pokedex	2025-10-03 10:20:13 -03:00