Add placeholder type gem blocks (regular and budding) for testing

Ability Patch fix

See merge request cable-mc/cobblemon!1342

CHANGELOG.md

@@ -1,15 +1,14 @@
 # Changelog
-## [1.6.0 - The Bass Pro Fishing Update (Month Xth, 2024)](#1-6-0)
+## [1.6.0 - The Record Catch Update (Month Xth, 2024)](#1-6-0)
 #### "Now that there's a fishing mechanic, the mod is actually good!"
 
 ### Additions
-- Added the Poké Dex as a craftable item.
-- Poké Dexes can be placed on lecterns.
+- Added the Pokédex as a craftable item that can be placed on lecterns.
 - Added Pokémon (and item) fishing using modified fishing rods - Poké Rods! You'll need a Poké Rod smithing template, a fishing rod, and some type of Poké Ball. Each Poké Ball makes a differently themed rod. Why not?
 - Added Lure Ball functionality, increasing the catch rate of Pokémon that were caught on a fishing rod.
 - Added Repeat Ball functionality, increasing the catch rate of Pokémon that are already registered as caught in a player's Pokédex.
 - Added property chaining support for duplicate CustomPokemonPropertyType elements.
-- Added flat level battling with options to set all Pokemon to level 50, 100, or 5 for the duration of a battle. No experience or EVs are granted for a flat battle.
+- Added flat level battling with options to set all Pokémon to level 50, 100, or 5 for the duration of a battle. No experience or EVs are granted for a flat battle.
 - Added `aspect` and `unaspect` PokemonProperty arguments (which also includes commands such as `/pokemonedit`, `/spawnpokemon`, and `/givepokemon`) to allow forcing or un-forcing an aspect on a Pokémon.
 - Added `type` alternatively `elemental_type` PokemonProperty argument, this is only used for filtering and is not applied to Pokémon. Example `type=fire` would be true for Charmander but false for Squirtle.
 - Added support for Double Battles, Triple Battles, and Multi-battles.
@@ -27,7 +26,7 @@
 - Added battle log messages for switching out Pokémon.
 - Added Evolution particles and sounds for Pokémon that are sent out when evolution is started.
 - Added a Nurse profession that can be unlocked by having villagers claim a healing machine block.
-- Added pokecenters to all 5 village types.
+- Added Pokémon Centers to all 5 village types.
 - Added a `natural` block state property for the healing machine block; when property is set to true, the block will have a different texture and drop an iron ingot instead of itself.
 - New config setting `displayEntityNameLabel` and `displayEntityLabelsWhenCrouchingOnly` to control what and when is displayed for the pokemon label
 - `/freezepokemon` command to pause a Pokémon's animation at a specific point in time.
@@ -35,20 +34,24 @@
 - Added shiny Pokémon effects.
 - Added effects for the burn status effect.
 - Added effects for the moves: Psychic, Water Sport, and Mud Sport.
-- Added a new universal locator called "top".
+- Added a new universal locator called `top`.
 - Added `moves` option to Pokémon properties, allowing you to set the moves of a Pokémon in commands and spawn files using comma-separated move names.
 - Added shiny Pokémon effects.
 - Added effects for the burn status effect.
 - Added effects for the moves: Seismic Toss, Withdraw, Bite, Crunch, Super Fang, Hyper Fang, Pursuit, Mist, Haze, Lick, Kinesis, Psychic, Water Sport, and Mud Sport.
 - Added a new universal locator called `top`.
 - Added shiny Pokémon particles with sound effects.
-- Added animation for trading.
+- Added animation and sounds for trading.
 - Added icons for pending trade, team-up, and battle requests from other players.
 - Added `/spawnnpc` and `/spawnnpcat` commands.
 - Pokémon are now animated when seen in any GUI that isn't the party GUI.
 - Quirk animations can now occur for Pokémon that are shoulder mounted.
-- Added `fishing boat` structures that contain a map to a shipwreck cove and a pokerod smithing template.
+- Added `fishing boat` structures that contain an Explorer Map leading to a shipwreck cove and a Poké Rod Smithing Template.
 - Added `submerged_shipwreck_cove` and `lush_shipwreck_cove` structures.
+- Added new sounds for Poké Balls bouncing off of Pokémon and landing on the ground during capture.
+- Added a unique set of sounds for Ancient Poké Balls.
+- Added a sound for using Exp Candy and Rare Candy items.
+- Added raft platforms for non-swimming, non-flying Pokémon to stand on during battles that take place on the water's surface. (Flying Pokémon will fly over water in battle, and water breathing Pokémon will swim in water during battle.)
 
 ### Pokémon Added
 #### Gen 1
@@ -325,8 +328,24 @@
 - Updated particles on Gastly.
 - Revamped stat buff and de-buff particles.
 - Improved the performance of display cases that contain Pokémon photos.
+- Updated sounds for Poké Balls.
+- Updated the Poké Ball animation for Pokémon breaking out.
+- Improved the performance of display cases that contain Pokémon Model items.
+- Removed species Base Stats from the summary interface as it is now viewable within the Pokédex.
+- Changed summary tab text labels to icons.
+- Clicking the summary interface exit button while the swap moves or evolve screen is open will cause the interface to switch back to the party screen. The button will exit the interface otherwise.
+- Ancient Poke Balls now jump once rather than shaking 3 times when capturing Pokémon.
+  - The jump height indicate the number of shakes that would have occurred.
+    - A high wobbly jump indicates 1 shake.
+    - A high jump indicates 2 shakes.
+    - A medium jump indicates 3 shakes.
+    - A short jump indicates that you caught the Pokémon.
+- Pokémon sent out during battle will spawn facing their opponent.
+- Pokémon sent out outside a battle will spawn facing their trainer.
 
 ### Fixes
+- Fixed Ability Patches not reverting Hidden Abilities back to Normal Abilities.
+- Fixed awarding Pokémon experience upon forfeiting battles.
 - Scaled down Amaura's fetus model to avoid clipping through the tank while animating.
 - Fixed Cubone's cry not having a sound.
 - Fixed the sendout sound erroneously playing when a wild Pokémon breaks out of a Poké ball.
@@ -376,6 +395,7 @@
 - Fixed Grafaiai's walk speed to prevent model sliding. 
 - Fixed Alolan Exeggutor's tail not showing in the party UI. It will now also stand in front of all Pokémon in the party menu :)
 - Fixed Timburr duplicating its log while fainting.
+- Fixed hitbox sizes for Grotle and Torterra being set to default values.
 - Fixed reviving items throwing an exception when used in battle.
 - Fixed messages for Focus Sash, Confusion, Mummy, Ice Face, Own Tempo, and Revive.
 - Improve error handling when loading spawn-sets to ensure invalid configurations don't crash the server.
@@ -402,6 +422,10 @@
 - Fixed top black border rendering in scroll interfaces in summary UI.
 - Fixed aspect tracking for Advancements.
 - Fixed illusion not copying aspects or caught ball.
+- Delay when successfully catching a Pokémon in an Ancient Poké Ball has been increased to account for the new sounds and particles.
+- Prevent summary stats tab from making sounds when clicking on an already open tab.
+- Fixed display case not being able to be fed items from underneath.
+- Fixed Pokémon battling in water continuously sinking to the bottom.
 
 ### Developer
 - `SpawnCause` is now an implementation of `SpawningInfluence`.
@@ -438,6 +462,7 @@
 - Renamed StatelessAnimation to PoseAnimation.
 - Renamed StatefulAnimation to ActiveAnimation.
 - Documented the animation system.
+- Allowed for SpawnSnowstormEntityParticleHandler to handle non-posable entities (due to being non-posable, locators are useless, to set the offset use the settings in the particle itself)
 
 ### Data Pack & Resource Pack Creators
 - Added support for "shedders" similar to Shedinja's evolution logic.
@@ -454,6 +479,7 @@
 - Sound events for all blocks now start with "block."
 - Gimmighoul chest and item interaction sounds have been moved to where its cry is.
 - Unused sound files and sound events have been removed.
+- Poké Ball sounds are now in their animation files, making them more flexible to edit.
 - Added MoLang compatibility in the isVisible property for transformed parts.
 - Added q.has_aspect('some_aspect') function to animations, posers, and entity particle effects.
 - Added support for conditional pose animations.

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

@@ -45,21 +45,4 @@ public class ChunkStorageMixin {
         int curVersion = vanillaFixed.contains(VERSION_KEY) ? vanillaFixed.getInt(VERSION_KEY) : 0;
         return DataFixTypes.CHUNK.update(CobblemonSchemas.getDATA_FIXER(), vanillaFixed, curVersion, CobblemonSchemas.DATA_VERSION);
     }
-
-    @Inject(
-        method = "upgradeChunkTag(Lnet/minecraft/resources/ResourceKey;Ljava/util/function/Supplier;Lnet/minecraft/nbt/CompoundTag;Ljava/util/Optional;)Lnet/minecraft/nbt/CompoundTag;",
-        at = @At(
-            value = "INVOKE",
-            target = "Lnet/minecraft/nbt/NbtUtils;addCurrentDataVersion(Lnet/minecraft/nbt/CompoundTag;)Lnet/minecraft/nbt/CompoundTag;"
-        )
-    )
-    public void cobblemon$addChunkVersion(
-        ResourceKey<Level> resourceKey,
-        Supplier<DimensionDataStorage> supplier,
-        CompoundTag compoundTag,
-        Optional<ResourceKey<MapCodec<? extends ChunkGenerator>>> optional,
-        CallbackInfoReturnable<CompoundTag> cir
-    ) {
-        compoundTag.put(VERSION_KEY, IntTag.valueOf(CobblemonSchemas.DATA_VERSION));
-    }
 }

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

@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.mixin;
+
+import com.cobblemon.mod.common.entity.fishing.PokeRodFishingBobberEntity;
+import net.minecraft.client.multiplayer.ClientLevel;
+import net.minecraft.client.renderer.item.ItemProperties;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.item.ItemStack;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+@Mixin(ItemProperties.class)
+public class ItemPropertiesMixin {
+
+    // Mixins into the fishing rod's register() lambda expression
+    // Without this, the fishing rod item model appears cast when using a PokeRod in the other hand
+    @Inject(method = "method_27883", at = @At(value = "RETURN", ordinal = 1), cancellable = true)
+    private static void cobblemon$preventRodMixup(ItemStack itemStack, ClientLevel clientLevel, LivingEntity livingEntity, int i, CallbackInfoReturnable<Float> cir) {
+        if (!(livingEntity instanceof Player) || ((Player) livingEntity).fishing instanceof PokeRodFishingBobberEntity) {
+            cir.setReturnValue(0.0f);
+        }
+    }
+}

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

@@ -10,7 +10,6 @@ package com.cobblemon.mod.common.mixin;
 
 import com.cobblemon.mod.common.Cobblemon;
 import com.cobblemon.mod.common.ModAPI;
-import com.cobblemon.mod.common.client.CobblemonBakingOverrides;
 import com.cobblemon.mod.common.item.PokeBallItem;
 import com.cobblemon.mod.common.item.PokedexItem;
 import com.mojang.blaze3d.vertex.PoseStack;
@@ -20,7 +19,9 @@ import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.entity.ItemRenderer;
 import net.minecraft.client.resources.model.BakedModel;
 import net.minecraft.client.resources.model.ModelResourceLocation;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemDisplayContext;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.Level;
@@ -52,25 +53,33 @@ public abstract class ItemRendererMixin {
     )
     private void cobblemon$overrideItemModel(ItemStack stack, ItemDisplayContext renderMode, boolean leftHanded, PoseStack matrices, MultiBufferSource multiBufferSource, int light, int overlay, BakedModel model, CallbackInfo ci) {
         boolean shouldBe2d = renderMode == ItemDisplayContext.GUI || renderMode == ItemDisplayContext.FIXED;
-        if (!shouldBe2d && stack.getItem() instanceof PokedexItem) {
-            BakedModel replacementModel = CobblemonBakingOverrides.INSTANCE.getPokedexOverride(((PokedexItem) stack.getItem()).getType()).getModel();
-            if (!cobblemon$isSameModel(model, replacementModel)) {
-                ci.cancel();
-                render(stack, renderMode, leftHanded, matrices, multiBufferSource, light, overlay, replacementModel);
-            }
-        } else if (shouldBe2d && stack.getItem() instanceof PokeBallItem pokeBallItem) {
-            BakedModel replacementModel = this.itemModelShaper.getModelManager().getModel(new ModelResourceLocation(pokeBallItem.getPokeBall().getModel2d(), "inventory"));
-            if (!cobblemon$isSameModel(model, replacementModel)) {
-                ci.cancel();
-                render(stack, renderMode, leftHanded, matrices, multiBufferSource, light, overlay, replacementModel);
+        if (shouldBe2d) {
+            ResourceLocation resourceLocation = null;
+            if (stack.getItem() instanceof PokeBallItem pokeBallItem) resourceLocation = pokeBallItem.getPokeBall().getModel2d();
+            else if (stack.getItem() instanceof PokedexItem pokedexItem) resourceLocation = pokedexItem.getType().getItemSpritePath();
+
+            if (resourceLocation != null) {
+                BakedModel replacementModel = this.itemModelShaper.getModelManager().getModel(new ModelResourceLocation(resourceLocation, "inventory"));
+                if (!cobblemon$isSameModel(model, replacementModel)) {
+                    ci.cancel();
+                    render(stack, renderMode, leftHanded, matrices, multiBufferSource, light, overlay, replacementModel);
+                }
             }
         }
     }
 
     @Inject(method = "getModel", at = @At("HEAD"), cancellable = true)
-    private void cobblemon$bakePokeballModel(ItemStack stack, Level world, LivingEntity entity, int seed, CallbackInfoReturnable<BakedModel> cir) {
-        if (stack.getItem() instanceof PokeBallItem pokeBallItem) {
-            BakedModel model = this.itemModelShaper.getModelManager().getModel(new ModelResourceLocation(pokeBallItem.getPokeBall().getModel3d(), MODEL_PATH));
+    private void cobblemon$getItemModel(ItemStack stack, Level world, LivingEntity entity, int seed, CallbackInfoReturnable<BakedModel> cir) {
+        ResourceLocation resourceLocation = null;
+        if (stack.getItem() instanceof PokeBallItem pokeBallItem) resourceLocation = pokeBallItem.getPokeBall().getModel3d();
+        else if (stack.getItem() instanceof PokedexItem pokedexItem) {
+            boolean isScanModel = entity instanceof Player && entity.getUseItem() == stack && entity.isUsingItem();
+            boolean canOpenScreen = entity != null && ((entity.getOffhandItem() == stack && !(entity.getMainHandItem().getItem() instanceof PokedexItem)) || entity.getMainHandItem() == stack);
+            resourceLocation = pokedexItem.getType().getItemModelPath(isScanModel ? "scanning" : (canOpenScreen ? null : "off"));
+        }
+
+        if (resourceLocation != null) {
+            BakedModel model = this.itemModelShaper.getModelManager().getModel(new ModelResourceLocation(resourceLocation, MODEL_PATH));
             ClientLevel clientWorld = world instanceof ClientLevel ? (ClientLevel) world : null;
             BakedModel overriddenModel = model.getOverrides().resolve(model, stack, clientWorld, entity, seed);
             cir.setReturnValue(overriddenModel == null ? this.itemModelShaper.getModelManager().getMissingModel() : overriddenModel);

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

@@ -52,10 +52,11 @@ public abstract class LecternBlockMixin {
 
                 if (lecternEntity instanceof LecternBlockEntity) {
                     ((LecternBlockEntity) lecternEntity).setItemStack((pokedexItemStack));
+                    world.playSound(null, blockPos, CobblemonSounds.POKEDEX_CLOSE, SoundSource.BLOCKS, 0.5F, 1.25F);
+                    cir.setReturnValue(ItemInteractionResult.SUCCESS);
+                } else {
+                    cir.setReturnValue(itemStack.isEmpty() && interactionHand == InteractionHand.MAIN_HAND ? ItemInteractionResult.SKIP_DEFAULT_BLOCK_INTERACTION : ItemInteractionResult.PASS_TO_DEFAULT_BLOCK_INTERACTION);
                 }
-
-                world.playSound(null, blockPos, CobblemonSounds.POKEDEX_CLOSE, SoundSource.BLOCKS, 0.5F, 1.25F);
-                cir.setReturnValue(itemStack.isEmpty() && interactionHand == InteractionHand.MAIN_HAND ? ItemInteractionResult.SKIP_DEFAULT_BLOCK_INTERACTION : ItemInteractionResult.PASS_TO_DEFAULT_BLOCK_INTERACTION);
             }
         }
     }

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

@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.mixin;
+
+import static com.cobblemon.mod.common.datafixer.CobblemonSchemas.VERSION_KEY;
+
+import com.cobblemon.mod.common.datafixer.CobblemonSchemas;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.nbt.NbtUtils;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+@Mixin(NbtUtils.class)
+public class NbtUtilsMixin {
+    @Inject(
+        method = "addCurrentDataVersion(Lnet/minecraft/nbt/CompoundTag;)Lnet/minecraft/nbt/CompoundTag;",
+        at = @At("TAIL")
+    )
+    private static void addCobblemonDataVersion(
+        CompoundTag tag,
+        CallbackInfoReturnable<CompoundTag> cir
+    ) {
+        tag.putInt(VERSION_KEY, CobblemonSchemas.DATA_VERSION);
+    }
+}

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

@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.mixin.client;
-
-import com.cobblemon.mod.common.client.CobblemonClient;
-import net.minecraft.client.DeltaTracker;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.Gui;
-import net.minecraft.client.gui.GuiGraphics;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.Redirect;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-
-/**
- * Mixin to give us a hook to render the PartyOverlay below the Chat
- *
- * @author Qu
- * @since 2022-02-22
- */
-@Mixin(Gui.class)
-public class GuiMixin {
-    //This injects into the actual BooleanSupplier lambda for the "this.layers.add(layeredDraw, () -> !minecraft.options.hideGui)" call
-    // sus af. You have to get the method name by looking at the bytecode of the class. Can do in intellij By clicking View -> Show Bytecode (top left)
-    @Inject(method = "method_55797", at = @At("HEAD"), cancellable = true)
-    private static void cobblemon$dontRenderUiInPokedex(Minecraft minecraft, CallbackInfoReturnable<Boolean> cir) {
-        if (CobblemonClient.INSTANCE.getPokedexUsageContext().getScanningGuiOpen() && minecraft.options.getCameraType().isFirstPerson()) {
-            cir.setReturnValue(false);
-        }
-    }
-}

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

@@ -286,7 +286,7 @@ object Cobblemon {
         CustomPokemonProperty.register(FreezeFrameProperty)
         CustomPokemonProperty.register(NoAIProperty)
 
-        CobblemonEvents.POKEMON_PROPERTY_INITIALISED.emit()
+        CobblemonEvents.POKEMON_PROPERTY_INITIALISED.emit(Unit)
 
         ifDedicatedServer {
             isDedicatedServer = true
@@ -389,7 +389,7 @@ object Cobblemon {
 
         registerEventHandlers()
 
-        CobblemonEvents.COBBLEMON_INITIALISED.emit()
+        CobblemonEvents.COBBLEMON_INITIALISED.emit(Unit)
 
     }
 

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

@@ -12,9 +12,8 @@ import net.minecraft.world.entity.schedule.Activity
 
 object CobblemonActivities {
     val activities = mutableListOf<Activity>()
-    val BATTLING_ACTIVITY = register(Activity("pokemon_battling"))
-    val NPC_BATTLING = register(Activity("npc_battling"))
-    val NPC_ACTION_EFFECT = register(Activity("npc_action_effect"))
+    val BATTLING = register(Activity("battling"))
+    val ACTION_EFFECT = register(Activity("action_effect"))
     val NPC_CHATTING = register(Activity("npc_chatting"))
 
     fun register(activity: Activity): Activity {

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

@@ -276,6 +276,81 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<
     @JvmField
     val CHISELED_BLACK_TUMBLESTONE_BRICKS = this.create("chiseled_black_tumblestone_bricks", Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BLACK).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
 
+    @JvmField
+    val GEM_BUG_BLOCK = this.create("gem_bug_block", Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BLACK).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
+    @JvmField
+    val GEM_DARK_BLOCK = this.create("gem_dark_block", Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BLACK).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
+    @JvmField
+    val GEM_DRAGON_BLOCK = this.create("gem_dragon_block", Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BLACK).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
+    @JvmField
+    val GEM_ELECTRIC_BLOCK = this.create("gem_electric_block", Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BLACK).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
+    @JvmField
+    val GEM_FAIRY_BLOCK = this.create("gem_fairy_block", Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BLACK).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
+    @JvmField
+    val GEM_FIGHTING_BLOCK = this.create("gem_fighting_block", Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BLACK).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
+    @JvmField
+    val GEM_FIRE_BLOCK = this.create("gem_fire_block", Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BLACK).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
+    @JvmField
+    val GEM_FLYING_BLOCK = this.create("gem_flying_block", Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BLACK).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
+    @JvmField
+    val GEM_GHOST_BLOCK = this.create("gem_ghost_block", Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BLACK).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
+    @JvmField
+    val GEM_GRASS_BLOCK = this.create("gem_grass_block", Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BLACK).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
+    @JvmField
+    val GEM_GROUND_BLOCK = this.create("gem_ground_block", Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BLACK).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
+    @JvmField
+    val GEM_ICE_BLOCK = this.create("gem_ice_block", Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BLACK).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
+    @JvmField
+    val GEM_NORMAL_BLOCK = this.create("gem_normal_block", Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BLACK).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
+    @JvmField
+    val GEM_POISON_BLOCK = this.create("gem_poison_block", Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BLACK).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
+    @JvmField
+    val GEM_PSYCHIC_BLOCK = this.create("gem_psychic_block", Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BLACK).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
+    @JvmField
+    val GEM_ROCK_BLOCK = this.create("gem_rock_block", Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BLACK).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
+    @JvmField
+    val GEM_STEEL_BLOCK = this.create("gem_steel_block", Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BLACK).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
+    @JvmField
+    val GEM_WATER_BLOCK = this.create("gem_water_block", Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BLACK).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
+
+    @JvmField
+    val GEM_BUG_BUDDING = this.create("gem_bug_budding", Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BLACK).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
+    @JvmField
+    val GEM_DARK_BUDDING = this.create("gem_dark_budding", Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BLACK).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
+    @JvmField
+    val GEM_DRAGON_BUDDING = this.create("gem_dragon_budding", Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BLACK).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
+    @JvmField
+    val GEM_ELECTRIC_BUDDING = this.create("gem_electric_budding", Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BLACK).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
+    @JvmField
+    val GEM_FAIRY_BUDDING = this.create("gem_fairy_budding", Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BLACK).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
+    @JvmField
+    val GEM_FIGHTING_BUDDING = this.create("gem_fighting_budding", Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BLACK).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
+    @JvmField
+    val GEM_FIRE_BUDDING = this.create("gem_fire_budding", Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BLACK).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
+    @JvmField
+    val GEM_FLYING_BUDDING = this.create("gem_flying_budding", Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BLACK).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
+    @JvmField
+    val GEM_GHOST_BUDDING = this.create("gem_ghost_budding", Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BLACK).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
+    @JvmField
+    val GEM_GRASS_BUDDING = this.create("gem_grass_budding", Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BLACK).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
+    @JvmField
+    val GEM_GROUND_BUDDING = this.create("gem_ground_budding", Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BLACK).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
+    @JvmField
+    val GEM_ICE_BUDDING = this.create("gem_ice_budding", Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BLACK).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
+    @JvmField
+    val GEM_NORMAL_BUDDING = this.create("gem_normal_budding", Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BLACK).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
+    @JvmField
+    val GEM_POISON_BUDDING = this.create("gem_poison_budding", Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BLACK).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
+    @JvmField
+    val GEM_PSYCHIC_BUDDING = this.create("gem_psychic_budding", Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BLACK).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
+    @JvmField
+    val GEM_ROCK_BUDDING = this.create("gem_rock_budding", Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BLACK).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
+    @JvmField
+    val GEM_STEEL_BUDDING = this.create("gem_steel_budding", Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BLACK).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
+    @JvmField
+    val GEM_WATER_BUDDING = this.create("gem_water_budding", Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BLACK).strength(1.0F).sound(CobblemonSounds.TUMBLESTONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BASEDRUM)))
+
+
     @JvmField
     val FIRE_STONE_BLOCK = this.create("fire_stone_block", Block(BlockBehaviour.Properties.of().mapColor(MapColor.FIRE).strength(1.0F).sound(CobblemonSounds.EVOLUTION_STONE_BLOCK_SOUNDS).requiresCorrectToolForDrops().instrument(NoteBlockInstrument.BIT).lightLevel{13}))
     @JvmField

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

@@ -52,6 +52,7 @@ object CobblemonCommands {
         BedrockParticleCommand.register(dispatcher)
         OpenDialogueCommand.register(dispatcher)
         NPCEditCommand.register(dispatcher)
+        NPCDeleteCommand.register(dispatcher)
         AbandonMultiTeam.register(dispatcher)
         FreezePokemonCommand.register(dispatcher)
         ApplyPlayerTextureCommand.register(dispatcher)

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

@@ -19,7 +19,7 @@ import com.cobblemon.mod.common.api.text.gray
 import com.cobblemon.mod.common.block.BerryBlock
 import com.cobblemon.mod.common.block.MintBlock
 import com.cobblemon.mod.common.block.MintBlock.MintType
-import com.cobblemon.mod.common.client.pokedex.PokedexTypes
+import com.cobblemon.mod.common.client.pokedex.PokedexType
 import com.cobblemon.mod.common.entity.boat.CobblemonBoatType
 import com.cobblemon.mod.common.item.*
 import com.cobblemon.mod.common.item.armor.CobblemonArmorTrims
@@ -155,19 +155,19 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
 
     val pokedexes = mutableListOf<PokedexItem>()
     @JvmField
-    val POKEDEX_RED = pokedexItem(PokedexTypes.RED)
+    val POKEDEX_RED = pokedexItem(PokedexType.RED)
     @JvmField
-    val POKEDEX_YELLOW = pokedexItem(PokedexTypes.YELLOW)
+    val POKEDEX_YELLOW = pokedexItem(PokedexType.YELLOW)
     @JvmField
-    val POKEDEX_GREEN = pokedexItem(PokedexTypes.GREEN)
+    val POKEDEX_GREEN = pokedexItem(PokedexType.GREEN)
     @JvmField
-    val POKEDEX_BLUE = pokedexItem(PokedexTypes.BLUE)
+    val POKEDEX_BLUE = pokedexItem(PokedexType.BLUE)
     @JvmField
-    val POKEDEX_PINK = pokedexItem(PokedexTypes.PINK)
+    val POKEDEX_PINK = pokedexItem(PokedexType.PINK)
     @JvmField
-    val POKEDEX_BLACK = pokedexItem(PokedexTypes.BLACK)
+    val POKEDEX_BLACK = pokedexItem(PokedexType.BLACK)
     @JvmField
-    val POKEDEX_WHITE = pokedexItem(PokedexTypes.WHITE)
+    val POKEDEX_WHITE = pokedexItem(PokedexType.WHITE)
 
     @JvmField
     val VIVICHOKE = compostableItem("vivichoke")
@@ -1224,6 +1224,80 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
     //@JvmField
     //val BINDING_SOIL = blockItem("binding_soil", CobblemonBlocks.BINDING_SOIL)
 
+    @JvmField
+    val GEM_BUG_BLOCK = blockItem("gem_bug_block", CobblemonBlocks.GEM_BUG_BLOCK)
+    @JvmField
+    val GEM_DARK_BLOCK = blockItem("gem_dark_block", CobblemonBlocks.GEM_DARK_BLOCK)
+    @JvmField
+    val GEM_DRAGON_BLOCK = blockItem("gem_dragon_block", CobblemonBlocks.GEM_DRAGON_BLOCK)
+    @JvmField
+    val GEM_ELECTRIC_BLOCK = blockItem("gem_electric_block", CobblemonBlocks.GEM_ELECTRIC_BLOCK)
+    @JvmField
+    val GEM_FAIRY_BLOCK = blockItem("gem_fairy_block", CobblemonBlocks.GEM_FAIRY_BLOCK)
+    @JvmField
+    val GEM_FIGHTING_BLOCK = blockItem("gem_fighting_block", CobblemonBlocks.GEM_FIGHTING_BLOCK)
+    @JvmField
+    val GEM_FIRE_BLOCK = blockItem("gem_fire_block", CobblemonBlocks.GEM_FIRE_BLOCK)
+    @JvmField
+    val GEM_FLYING_BLOCK = blockItem("gem_flying_block", CobblemonBlocks.GEM_FLYING_BLOCK)
+    @JvmField
+    val GEM_GHOST_BLOCK = blockItem("gem_ghost_block", CobblemonBlocks.GEM_GHOST_BLOCK)
+    @JvmField
+    val GEM_GRASS_BLOCK = blockItem("gem_grass_block", CobblemonBlocks.GEM_GRASS_BLOCK)
+    @JvmField
+    val GEM_GROUND_BLOCK = blockItem("gem_ground_block", CobblemonBlocks.GEM_GROUND_BLOCK)
+    @JvmField
+    val GEM_ICE_BLOCK = blockItem("gem_ice_block", CobblemonBlocks.GEM_ICE_BLOCK)
+    @JvmField
+    val GEM_NORMAL_BLOCK = blockItem("gem_normal_block", CobblemonBlocks.GEM_NORMAL_BLOCK)
+    @JvmField
+    val GEM_POISON_BLOCK = blockItem("gem_poison_block", CobblemonBlocks.GEM_POISON_BLOCK)
+    @JvmField
+    val GEM_PSYCHIC_BLOCK = blockItem("gem_psychic_block", CobblemonBlocks.GEM_PSYCHIC_BLOCK)
+    @JvmField
+    val GEM_ROCK_BLOCK = blockItem("gem_rock_block", CobblemonBlocks.GEM_ROCK_BLOCK)
+    @JvmField
+    val GEM_STEEL_BLOCK = blockItem("gem_steel_block", CobblemonBlocks.GEM_STEEL_BLOCK)
+    @JvmField
+    val GEM_WATER_BLOCK = blockItem("gem_water_block", CobblemonBlocks.GEM_WATER_BLOCK)
+
+    @JvmField
+    val GEM_BUG_BUDDING = blockItem("gem_bug_budding", CobblemonBlocks.GEM_BUG_BUDDING)
+    @JvmField
+    val GEM_DARK_BUDDING = blockItem("gem_dark_budding", CobblemonBlocks.GEM_DARK_BUDDING)
+    @JvmField
+    val GEM_DRAGON_BUDDING = blockItem("gem_dragon_budding", CobblemonBlocks.GEM_DRAGON_BUDDING)
+    @JvmField
+    val GEM_ELECTRIC_BUDDING = blockItem("gem_electric_budding", CobblemonBlocks.GEM_ELECTRIC_BUDDING)
+    @JvmField
+    val GEM_FAIRY_BUDDING = blockItem("gem_fairy_budding", CobblemonBlocks.GEM_FAIRY_BUDDING)
+    @JvmField
+    val GEM_FIGHTING_BUDDING = blockItem("gem_fighting_budding", CobblemonBlocks.GEM_FIGHTING_BUDDING)
+    @JvmField
+    val GEM_FIRE_BUDDING = blockItem("gem_fire_budding", CobblemonBlocks.GEM_FIRE_BUDDING)
+    @JvmField
+    val GEM_FLYING_BUDDING = blockItem("gem_flying_budding", CobblemonBlocks.GEM_FLYING_BUDDING)
+    @JvmField
+    val GEM_GHOST_BUDDING = blockItem("gem_ghost_budding", CobblemonBlocks.GEM_GHOST_BUDDING)
+    @JvmField
+    val GEM_GRASS_BUDDING = blockItem("gem_grass_budding", CobblemonBlocks.GEM_GRASS_BUDDING)
+    @JvmField
+    val GEM_GROUND_BUDDING = blockItem("gem_ground_budding", CobblemonBlocks.GEM_GROUND_BUDDING)
+    @JvmField
+    val GEM_ICE_BUDDING = blockItem("gem_ice_budding", CobblemonBlocks.GEM_ICE_BUDDING)
+    @JvmField
+    val GEM_NORMAL_BUDDING = blockItem("gem_normal_budding", CobblemonBlocks.GEM_NORMAL_BUDDING)
+    @JvmField
+    val GEM_POISON_BUDDING = blockItem("gem_poison_budding", CobblemonBlocks.GEM_POISON_BUDDING)
+    @JvmField
+    val GEM_PSYCHIC_BUDDING = blockItem("gem_psychic_budding", CobblemonBlocks.GEM_PSYCHIC_BUDDING)
+    @JvmField
+    val GEM_ROCK_BUDDING = blockItem("gem_rock_budding", CobblemonBlocks.GEM_ROCK_BUDDING)
+    @JvmField
+    val GEM_STEEL_BUDDING = blockItem("gem_steel_budding", CobblemonBlocks.GEM_STEEL_BUDDING)
+    @JvmField
+    val GEM_WATER_BUDDING = blockItem("gem_water_budding", CobblemonBlocks.GEM_WATER_BUDDING)
+
     private fun blockItem(name: String, block: Block): BlockItem = this.create(name, BlockItem(block, Item.Properties()))
 
     private fun noSettingsItem(name: String): CobblemonItem = this.create(name, CobblemonItem(Item.Properties()))
@@ -1242,13 +1316,13 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
     private fun candyItem(name: String, calculator: CandyItem.Calculator): CandyItem  = this.create(name, CandyItem(calculator))
 
     private fun pokerodItem(pokeRodId: ResourceLocation): PokerodItem {
-        val settings = Item.Properties().stacksTo(1).durability(Items.FISHING_ROD.components().get(DataComponents.MAX_DAMAGE)!!)
+        val settings = Item.Properties().stacksTo(1).durability(256)
         val item = create(pokeRodId.path, PokerodItem(pokeRodId, settings))
         pokeRods.add(item)
         return item
     }
 
-    private fun pokedexItem(type: PokedexTypes): PokedexItem {
+    private fun pokedexItem(type: PokedexType): PokedexItem {
         val item = create("pokedex_${type.name.lowercase()}", PokedexItem(type))
         pokedexes.add(item)
         return item

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

@@ -165,8 +165,10 @@ import com.cobblemon.mod.common.net.messages.server.battle.*
 import com.cobblemon.mod.common.net.serverhandling.battle.*
 import com.cobblemon.mod.common.net.messages.client.pokedex.ServerConfirmedRegisterPacket
 import com.cobblemon.mod.common.net.messages.client.trade.*
+import com.cobblemon.mod.common.net.messages.server.block.AdjustBlockEntityViewerCountPacket
 import com.cobblemon.mod.common.net.messages.server.pokedex.scanner.FinishScanningPacket
 import com.cobblemon.mod.common.net.messages.server.trade.*
+import com.cobblemon.mod.common.net.serverhandling.block.AdjustBlockEntityViewerCountHandler
 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.trade.*
@@ -356,7 +358,7 @@ object CobblemonNetwork {
         list.add(PacketRegisterInfo(CloseNPCEditorPacket.ID, CloseNPCEditorPacket::decode, CloseNPCEditorHandler))
         list.add(PacketRegisterInfo(OpenNPCEditorPacket.ID, OpenNPCEditorPacket::decode, OpenNPCEditorHandler))
 
-        //Pokedex scanning
+        // Pokédex scanning
         list.add(PacketRegisterInfo(ServerConfirmedRegisterPacket.ID, ServerConfirmedRegisterPacket::decode, ServerConfirmedRegisterHandler))
         return list
     }
@@ -414,7 +416,7 @@ object CobblemonNetwork {
         list.add(PacketRegisterInfo(OfferTradePacket.ID, OfferTradePacket::decode, OfferTradeHandler))
         list.add(PacketRegisterInfo(UpdateTradeOfferPacket.ID, UpdateTradeOfferPacket::decode, UpdateTradeOfferHandler))
 
-        // Pokedex scanning
+        // Pokédex scanning
         list.add(PacketRegisterInfo(StartScanningPacket.ID, StartScanningPacket::decode, StartScanningHandler))
         list.add(PacketRegisterInfo(FinishScanningPacket.ID, FinishScanningPacket::decode, FinishScanningHandler))
 
@@ -423,6 +425,9 @@ object CobblemonNetwork {
         list.add(PacketRegisterInfo(UnpasturePokemonPacket.ID, UnpasturePokemonPacket::decode, UnpasturePokemonHandler))
         list.add(PacketRegisterInfo(UnpastureAllPokemonPacket.ID, UnpastureAllPokemonPacket::decode, UnpastureAllPokemonHandler))
 
+        // Block entity
+        list.add(PacketRegisterInfo(AdjustBlockEntityViewerCountPacket.ID, AdjustBlockEntityViewerCountPacket::decode, AdjustBlockEntityViewerCountHandler))
+
         // Move select packets
         list.add(PacketRegisterInfo(MoveSelectedPacket.ID, MoveSelectedPacket::decode, MoveSelectedHandler))
         list.add(PacketRegisterInfo(MoveSelectCancelledPacket.ID, MoveSelectCancelledPacket::decode, MoveSelectCancelledHandler))

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

@@ -46,16 +46,6 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, ResourceKey<Regi
     @JvmField
     val HEALING_MACHINE_ACTIVE = this.create("block.healing_machine.active")
 
-    @JvmField
-    val POKE_BALL_CAPTURE_STARTED = this.create("poke_ball.capture_started")
-    @JvmField
-    val POKE_BALL_CAPTURE_SUCCEEDED = this.create("poke_ball.capture_succeeded")
-    @JvmField
-    val POKE_BALL_SHAKE = this.create("poke_ball.shake")
-    @JvmField
-    val POKE_BALL_OPEN = this.create("poke_ball.open")
-    @JvmField
-    val POKE_BALL_SHINY_OPEN = this.create("poke_ball.shiny_open")
     @JvmField
     val POKE_BALL_HIT = this.create("poke_ball.hit")
     @JvmField
@@ -108,6 +98,8 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, ResourceKey<Regi
     @JvmField
     val PVW_BATTLE = this.create("battle.pvw.default")
 
+    @JvmField
+    val MEDICINE_CANDY_USE = this.create("item.medicine.candy.use")
     @JvmField
     val MEDICINE_HERB_USE = this.create("item.medicine.herb.use")
     @JvmField
@@ -266,6 +258,9 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, ResourceKey<Regi
         RELIC_COIN_SACK_STEP
     )
 
+    @JvmField
+    val MOVE_QUICKATTACK_TARGET = this.create("move.quickattack.target")
+
     @JvmField
     val IMPACT_NORMAL = this.create("impact.normal")
     @JvmField

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

@@ -77,7 +77,7 @@ object CobblemonTradeOffers {
         )
         VillagerProfession.FISHERMAN -> listOf(
             VillagerTradeOffer(VillagerProfession.FISHERMAN, 5, listOf(
-                VillagerTrades.ItemsForEmeralds(CobblemonItems.POKEROD_SMITHING_TEMPLATE, 12, 3, 30)
+                VillagerTrades.ItemsForEmeralds(CobblemonItems.POKEROD_SMITHING_TEMPLATE, 12, 1, 3, 30)
             ))
         )
         else -> emptyList()

common/src/main/kotlin/com/cobblemon/mod/common/api/ai/config/README.md

@@ -0,0 +1,119 @@
+# Brain Configuration
+
+A "Brain" is a Java Edition AI concept for more modern entities. It has tasks that are listed inside of 'activities',
+and in some cases a schedule which determines which activities will occur during different times of the day. There is
+also a set of core activities, and a default activity. In Minecraft, the most complex usage of the Brain AI system 
+is on villagers which have schedules that control their behaviour during the day and night as well as child villager play behaviours.
+
+Cobblemon's NPCs use the Brain AI system. As part of that, Cobblemon added the concept of a Brain Configuration
+that allows Java Edition brains to be configured in a more data-driven way. 
+
+By default, without any brain configuration, the default activity will be `minecraft:idle` and the core activities will be `[minecraft:core]`.
+The activities would not have any tasks though.
+
+## Possible Activities
+The activities that can be used in brains is determined by code and cannot be added to using datapacks. Note that except for
+when used as defaults and core activities, these are purely names and what you use them for is entirely up to you.
+
+The activities that exist in Minecraft are:
+- `minecraft:core`: The core activity intended to be used for fundamental actions like floating in water and looking at look targets.
+- `minecraft:idle`: The idle activity is used when the entity is not doing anything else. This is typically used for things like wandering and other random actions.
+- `minecraft:work`: The work activity is used for actions that are related to the entity's job. For villagers, this is things like farming, smithing, and other job-related tasks.
+- `minecraft:play`
+- `minecraft:rest`: The rest activity is used in villagers for the activity that moves them to a bed and hops into it.
+- `minecraft:meet`: The meet activity is used in villagers for going to the meeting place and gossipping with other NPCs.
+- `minecraft:panic`: The panic activity is used in villagers for when they are panicking and fleeing, usually from an attacker.
+- `minecraft:raid`
+- `minecraft:pre_raid`: The raid activity is used in villagers for what they do when a raid is about to start, like running to a safe location during a raid.
+- `minecraft:hide`
+- `minecraft:fight`: Intended to be used when engaging in combat.
+- `minecraft:celebrate`
+- `minecraft:admire_item`
+- `minecraft:avoid`
+- `minecraft:ride`
+- `minecraft:play_dead`
+- `minecraft:long_jump`
+- `minecraft:ram`
+- `minecraft:tongue`
+- `minecraft:swim`
+- `minecraft:lay_spawn`
+- `minecraft:sniff`
+- `minecraft:investigate`
+- `minecraft:roar`
+- `minecraft:emerge`
+- `minecraft:dig`
+
+The activities that were added by Cobblemon are:
+- `cobblemon:battling`: For when the entity is in a Pokémon battle.
+- `cobblemon:action_effect`: For when the entity is performing an action effect. Usually registered as an almost empty activity that simply prevents the entity from doing other things.
+- `cobblemon:npc_chatting`: Intended for NPC entities using dialogue so that they look at their chat partner and do nothing else.
+
+## Brain Configuration Format
+A brain is configured using a series of "Brain Configurations". Each configuration is a JSON object that contains
+a "type" field which determines the action to perform when configuring a brain. Many different types are available.
+
+### script
+The `script` type executes a MoLang script which will apply some changes to the brain.
+- `script`: The MoLang script to execute. This will be a resource location for the `molang` datapack folder. Something like `cobblemon:some_script`.
+- `condition`: A MoLang expression (with `q.entity` as the entity) that determines if the script should be executed. Defaults to `"true"`.
+
+### add_tasks_to_activity
+The 'add_tasks_to_activity' type adds a list of tasks to an activity.
+- `activity`: The activity to add the tasks to. This must be a pre-existing activity - a brain configuration cannot
+    create new activities. 
+- `condition`: A MoLang expression (with `q.entity` as the entity) that determines if the tasks should be added. If this
+    is not present, the tasks will always be added.
+- `tasksByPriority`: A map of task priorities to lists of tasks to add to the activity. Each task is a JSON object with a "type" field that determines the
+    task to add or in simple cases can just be the type as a simple JSON primitive to use default properties. Many different types of task config are available. See [Task Configuration](./task/README.md).
+    The priority of the task is used to determine the execution order each tick. This usually does not matter, but in some cases
+    where the execution of one task will move to a different activity or otherwise prevent another task, the priority matters a lot.
+    As an example, a task that moves to nearby healing machines will set a walk target which prevents the use of the healing machine,
+    so the use task would need to have a lower priority or be earlier in the list so that it runs sooner.
+
+Example, making sure `heal_using_healing_machine` comes before `go_to_healing_machine`:
+```json
+{
+  "type": "add_tasks_to_activity",
+  "activity": "minecraft:idle",
+  "tasksByPriority": {
+    "1": [
+      {
+        "type": "cobblemon:heal_using_healing_machine",
+        "horizontalUseRange": "2"
+      },
+      "cobblemon:go_to_healing_machine"
+    ]
+  }
+}
+```
+
+Note that when specifying tasks, you can either use an object format with the "type" property, or if you want to use only
+default parameters for the task you can simply state the type as a string. The above example uses both formats.
+
+### set_core_activities
+The `set_core_activities` type sets the core activities of the brain. It has only one property, `activities`, which is a list of activities.
+
+### set_default_activity
+The `set_default_activity` type sets the default activity of the brain. It has only one property, `activity`, which is the activity to set as the default.
+
+### apply_preset
+The `apply_preset` type applies a preset to the brain. Brain presets are JSON arrays under the `brain_presets` datapack folder. 
+This is a way to apply a set of configurations to the brain.
+- `preset`: The name of the preset to apply. This is the name of the file in the `brain_presets` folder without the `.json` extension.
+- `condition`: A MoLang expression (with `q.entity` as the entity) that determines if the preset should be applied. Defaults to `"true"`.
+
+Example brain preset (`uses_healing_machine.json`):
+```json
+[
+  {
+    "type": "add_tasks_to_activity",
+    "activity": "idle",
+    "tasksByPriority": {
+      "1": [
+        "heal_using_healing_machine",
+        "go_to_healing_machine"
+      ]
+    }
+  }
+]
+```

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

@@ -0,0 +1,31 @@
+/*
+ * 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.ai.config.task
+
+import com.bedrockk.molang.runtime.struct.QueryStruct
+import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
+import com.cobblemon.mod.common.entity.PosableEntity
+import com.cobblemon.mod.common.util.asExpression
+import com.cobblemon.mod.common.util.resolveBoolean
+import com.cobblemon.mod.common.util.withQueryValue
+import net.minecraft.world.entity.LivingEntity
+import net.minecraft.world.entity.ai.behavior.BehaviorControl
+import net.minecraft.world.entity.ai.behavior.VillagerCalmDown
+
+class CalmDownTaskConfig : SingleTaskConfig {
+    var condition = "true".asExpression()
+    override fun createTask(
+        entity: LivingEntity,
+        brainConfigurationContext: BrainConfigurationContext
+    ): BehaviorControl<in LivingEntity>? {
+        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
+        if (!runtime.resolveBoolean(condition)) return null
+        return VillagerCalmDown.create()
+    }
+}

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

@@ -0,0 +1,75 @@
+/*
+ * 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.ai.config.task
+
+import com.bedrockk.molang.runtime.struct.QueryStruct
+import com.cobblemon.mod.common.CobblemonMemories
+import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
+import com.cobblemon.mod.common.battles.BattleRegistry
+import com.cobblemon.mod.common.entity.PosableEntity
+import com.cobblemon.mod.common.entity.npc.NPCEntity
+import com.cobblemon.mod.common.util.asExpression
+import com.cobblemon.mod.common.util.resolveBoolean
+import com.cobblemon.mod.common.util.withQueryValue
+import net.minecraft.world.entity.LivingEntity
+import net.minecraft.world.entity.ai.behavior.BehaviorControl
+import net.minecraft.world.entity.ai.behavior.declarative.BehaviorBuilder
+import net.minecraft.world.entity.ai.behavior.declarative.Trigger
+import net.minecraft.world.entity.ai.memory.MemoryModuleType
+
+class ExitBattleWhenHurtTaskConfig : SingleTaskConfig {
+    var condition = "true".asExpression()
+    var includePassiveDamage = true
+
+    override fun createTask(
+        entity: LivingEntity,
+        brainConfigurationContext: BrainConfigurationContext
+    ): BehaviorControl<in LivingEntity>? {
+        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
+        if (!runtime.resolveBoolean(condition)) return null
+
+        if (entity is NPCEntity) {
+            fun cancelNPCBattles(npcEntity: NPCEntity): Boolean {
+                val battles = npcEntity.battleIds.mapNotNull(BattleRegistry::getBattle)
+                battles.forEach { it.end() }
+                return battles.isNotEmpty()
+            }
+
+            return if (includePassiveDamage) {
+                 BehaviorBuilder.create {
+                    it.group(it.present(MemoryModuleType.HURT_BY), it.present(CobblemonMemories.NPC_BATTLING))
+                        .apply(it) { _, _ -> Trigger { world, entity, _ -> return@Trigger cancelNPCBattles(entity as NPCEntity) } }
+                }
+            } else {
+                BehaviorBuilder.create {
+                    it.group(it.present(MemoryModuleType.HURT_BY_ENTITY), it.present(CobblemonMemories.NPC_BATTLING))
+                        .apply(it) { _, _ -> Trigger { world, entity, _ -> return@Trigger cancelNPCBattles(entity as NPCEntity) } }
+                }
+            }
+        } else { return null }/* else if (entity is PokemonEntity) { TODO uncomment when pokemon have brain :)
+            fun cancelPokemonBattle(pokemonEntity: PokemonEntity): Boolean {
+                val battle = BattleRegistry.getBattle(pokemonEntity.battleId ?: return false)
+                battle?.end()
+                return battle != null
+            }
+
+            return if (includePassiveDamage) {
+                BehaviorBuilder.create {
+                    it.group(it.present(MemoryModuleType.HURT_BY), it.present(CobblemonMemories.POKEMON_BATTLING))
+                        .apply(it) { _, _ -> Trigger { world, entity, _ -> return@Trigger cancelPokemonBattle(entity as PokemonEntity) } }
+                }
+            } else {
+                BehaviorBuilder.create {
+                    it.group(it.present(MemoryModuleType.HURT_BY_ENTITY), it.present(CobblemonMemories.POKEMON_BATTLING))
+                        .apply(it) { _, _ -> Trigger { world, entity, _ -> return@Trigger cancelPokemonBattle(entity as PokemonEntity) } }
+                }
+            }
+        }*/
+    }
+}

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

@@ -0,0 +1,44 @@
+/*
+ * 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.ai.config.task
+
+import com.bedrockk.molang.runtime.struct.QueryStruct
+import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
+import com.cobblemon.mod.common.api.ai.WrapperLivingEntityTask
+import com.cobblemon.mod.common.entity.PosableEntity
+import com.cobblemon.mod.common.util.asExpression
+import com.cobblemon.mod.common.util.resolveBoolean
+import com.cobblemon.mod.common.util.resolveFloat
+import com.cobblemon.mod.common.util.resolveInt
+import com.cobblemon.mod.common.util.withQueryValue
+import net.minecraft.world.entity.LivingEntity
+import net.minecraft.world.entity.PathfinderMob
+import net.minecraft.world.entity.ai.behavior.BehaviorControl
+import net.minecraft.world.entity.ai.behavior.SetWalkTargetAwayFrom
+import net.minecraft.world.entity.ai.memory.MemoryModuleType
+
+class FleeAttackerTaskConfig : SingleTaskConfig {
+    var condition = "true".asExpression()
+    var speedMultiplier = "0.5".asExpression()
+    var desiredDistance = "9".asExpression()
+
+    override fun createTask(
+        entity: LivingEntity,
+        brainConfigurationContext: BrainConfigurationContext
+    ): BehaviorControl<in LivingEntity>? {
+        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
+        if (!runtime.resolveBoolean(condition) || entity !is PathfinderMob) return null
+        val speedMultiplier = runtime.resolveFloat(speedMultiplier)
+        val desiredDistance = runtime.resolveInt(desiredDistance)
+        return WrapperLivingEntityTask(
+            SetWalkTargetAwayFrom.entity(MemoryModuleType.HURT_BY_ENTITY, speedMultiplier, desiredDistance, false),
+            PathfinderMob::class.java
+        )
+    }
+}

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

@@ -0,0 +1,44 @@
+/*
+ * 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.ai.config.task
+
+import com.bedrockk.molang.runtime.struct.QueryStruct
+import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
+import com.cobblemon.mod.common.api.ai.WrapperLivingEntityTask
+import com.cobblemon.mod.common.entity.PosableEntity
+import com.cobblemon.mod.common.util.asExpression
+import com.cobblemon.mod.common.util.resolveBoolean
+import com.cobblemon.mod.common.util.resolveFloat
+import com.cobblemon.mod.common.util.resolveInt
+import com.cobblemon.mod.common.util.withQueryValue
+import net.minecraft.world.entity.LivingEntity
+import net.minecraft.world.entity.PathfinderMob
+import net.minecraft.world.entity.ai.behavior.BehaviorControl
+import net.minecraft.world.entity.ai.behavior.SetWalkTargetAwayFrom
+import net.minecraft.world.entity.ai.memory.MemoryModuleType
+
+class FleeNearestHostileTaskConfig : SingleTaskConfig {
+    var condition = "true".asExpression()
+    var speedMultiplier = "0.5".asExpression()
+    var desiredDistance = "9".asExpression()
+
+    override fun createTask(
+        entity: LivingEntity,
+        brainConfigurationContext: BrainConfigurationContext
+    ): BehaviorControl<in LivingEntity>? {
+        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
+        if (!runtime.resolveBoolean(condition) || entity !is PathfinderMob) return null
+        val speedMultiplier = runtime.resolveFloat(speedMultiplier)
+        val desiredDistance = runtime.resolveInt(desiredDistance)
+        return WrapperLivingEntityTask(
+            SetWalkTargetAwayFrom.entity(MemoryModuleType.NEAREST_HOSTILE, speedMultiplier, desiredDistance, false),
+            PathfinderMob::class.java
+        )
+    }
+}

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

@@ -26,14 +26,14 @@ import net.minecraft.world.entity.ai.behavior.BehaviorControl
 
 class FollowWalkTargetTaskConfig : SingleTaskConfig {
     val condition: ExpressionLike = "true".asExpressionLike()
-    val minRunTime: Expression = "150".asExpression()
-    val maxRunTime: Expression = "250".asExpression()
+    val minRunTicks: Expression = "150".asExpression()
+    val maxRunTicks: Expression = "250".asExpression()
 
     override fun createTask(entity: LivingEntity, brainConfigurationContext: BrainConfigurationContext): BehaviorControl<LivingEntity>? {
         runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
         if (!runtime.resolveBoolean(condition)) return null
         return WrapperLivingEntityTask(
-            FollowWalkTargetTask(runtime.resolveInt(minRunTime), runtime.resolveInt(maxRunTime)),
+            FollowWalkTargetTask(runtime.resolveInt(minRunTicks), runtime.resolveInt(maxRunTicks)),
             PathfinderMob::class.java
         )
     }

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

@@ -25,7 +25,7 @@ class GoToHealingMachineTaskConfig(
     val condition: ExpressionLike = "true".asExpressionLike(),
     val horizontalSearchRange: Expression = "10".asExpression(),
     val verticalSearchRange: Expression = "5".asExpression(),
-    val speedMultiplier: Expression = "0.33".asExpression(),
+    val speedMultiplier: Expression = "0.35".asExpression(),
     val completionRange: Expression = "1".asExpression()
 ) : SingleTaskConfig {
     override fun createTask(

common/src/main/kotlin/com/cobblemon/mod/common/api/ai/config/task/README.md

@@ -0,0 +1,175 @@
+# Task Configuration
+
+A task configuration is responsible for producing one or multiple tasks as part of a
+[BrainConfiguration](../README.md). Tasks are the smallest unit of behaviour in a brain and are executed
+as part of an activity.
+
+A task configuration can be a simple string that represents the type of task to create, or a JSON object
+which a `type` property that describes what type of task is being created and other properties that configure it.
+
+### one_of
+The 'one_of' type creates a task that randomly selects one of the tasks in the list to execute each tick.
+- `condition`: A MoLang expression (with `q.entity` as the entity) that determines if this entire task should exist on the entity or not. This runs at the time of entity creation, not on tick.
+- `options`: A list of objects representing the different tasks that could run for a tick. Each object must have a `task`
+    which is a task configuration. Optionally, you can also specify a `weight` which is a number that determines the 
+    probability of the task being selected. If no weight is specified, the task will have a weight of 1.
+
+### all_of
+The 'all_of' type creates a task that executes all of the tasks in the list each tick.
+- `condition`: A MoLang expression (with `q.entity` as the entity) that determines if this entire task should exist on the entity or not. This runs at the time of entity creation, not on tick.
+- `tasks`: A list of task configurations to execute each tick.
+
+### do_nothing
+The 'do_nothing' type creates a task that does nothing for some period of time.
+- `condition`: A MoLang expression (with `q.entity` as the entity) that determines if this entire task should exist on the entity or not. This runs at the time of entity creation, not on tick.
+- `minDurationTicks`: A MoLang expression that determines the minimum number of ticks to do nothing. Defaults to 40. Has `q.entity` as the entity.
+- `maxDurationTicks`: A MoLang expression that determines the maximum number of ticks to do nothing. Defaults to 80. Has `q.entity` as the entity.
+
+### random
+The 'random' type creates a task that chooses one of the contained tasks when the entity is spawned. Note that this does not save forever,
+so if the entity is reloaded, it will choose a new task. To make persisting randomization you have to use MoLang conditions on other task
+configurations that use `q.entity.id_modulo(some_number)` to apply randomization based on the entity UUID.
+For example, `q.entity.id_modulo(2)` will return 0 or 1 for an entity but will always be the same for the same entity,
+so using `q.entity.id_modulo(2) == 0` as a task condition will make it occur for 50% of entities and remain after reloads.
+`q.entity.id_modulo(3)` will return 0 or 1 or 2, and so on.
+
+### follow_walk_target
+The 'follow_walk_target' type creates a task that makes the entity follow a walk target. This does not choose the walk target,
+it is only responsible for ensuring the entity will follow a path to whatever the current walk target is. Note that the target
+does not necessarily need to be a land target.
+- `condition`: A MoLang expression (with `q.entity` as the entity) that determines if this entire task should exist on the entity or not. This runs at the time of entity creation, not on tick.
+- `minRunTicks`: A MoLang expression that determines the minimum number of ticks to run to the target before stopping. Defaults to 150.
+- `maxRunTicks`: A MoLang expression that determines the maximum number of ticks to run to the target before giving up. Defaults to 250.
+
+### look_at_target
+The 'look_at_target' type creates a task that makes the entity look at a target. This does not choose the target, it is only
+responsible for ensuring the entity will look at the target position.
+- `condition`: A MoLang expression (with `q.entity` as the entity) that determines if this entire task should exist on the entity or not. This runs at the time of entity creation, not on tick.
+- `minDurationTicks`: A MoLang expression that determines the minimum number of ticks that the entity will look at the target. Defaults to 40.
+- `maxDurationTicks`: A MoLang expression that determines the maximum number of ticks that the entity will look at the target. Defaults to 80.
+
+### stay_afloat
+The 'stay_afloat' type creates a task that makes the entity stay afloat in water instead of quietly sinking and drowning.
+- `condition`: A MoLang expression (with `q.entity` as the entity) that determines if this entire task should exist on the entity or not. This runs at the time of entity creation, not on tick.
+- `chance`: A MoLang expression that determines the chance of the entity trying to stay afloat. The higher it is, the more desperately it stays above the water. Defaults to 0.01. You don't need to change this, honestly.
+
+### wander
+The 'wander' type creates a task that makes the entity wander around randomly.
+- `condition`: A MoLang expression (with `q.entity` as the entity) that determines if this entire task should exist on the entity or not. This runs at the time of entity creation, not on tick.
+- `shouldWander`: A MoLang expression that determines if the entity should wander. Defaults to `math.random(0, 20*8) <= 1`, which makes it wander approximately once every 8 seconds.
+- `horizontalRange`: A MoLang expression that determines the maximum distance the entity will wander in a single path. Defaults to 10.
+- `verticalRange`: A MoLang expression that determines the maximum vertical distance the entity will wander from its starting position. Defaults to 5.
+- `speedMultiplier`: A MoLang expression that determines the speed multiplier for wandering. Defaults to 0.35 which is a standard walk speed.
+- `completionRange`: A MoLang expression that determines the distance from the target location that the entity needs to be for the path to be considered complete. Defaults to 1.
+- `lookTargetYOffset`: A MoLang expression that determines the vertical offset of the look target from the target walk position. Defaults to 1.5. You probably don't need to change this.
+
+### look_at_entities
+The 'look_at_entities' type creates a task that will randomly set the entity's look target to a nearby entity.
+- `condition`: A MoLang expression (with `q.entity` as the entity) that determines if this entire task should exist on the entity or not. This runs at the time of entity creation, not on tick.
+- `maxDistance`: A MoLang expression that determines the maximum distance for an entity to be from this entity and be looked at.
+
+### go_to_healing_machine
+The 'go_to_healing_machine' type creates a task that makes the entity go to a nearby healing machine when they have a static NPC party that could be healed.
+- `condition`: A MoLang expression (with `q.entity` as the entity) that determines if this entire task should exist on the entity or not. This runs at the time of entity creation, not on tick.
+- `horizontalSearchRange`: A MoLang expression that determines the maximum distance to search for a healing machine. Defaults to 10.
+- `verticalSearchRange`: A MoLang expression that determines the maximum vertical distance to search for a healing machine. Defaults to 5.
+- `speedMultiplier`: A MoLang expression that determines the speed multiplier for walking to the healing machine. Defaults to 0.35 which is a standard walk speed.
+- `completionRange`: A MoLang expression that determines the distance from the target location that the entity needs to be for the path to be considered complete. Defaults to 1.
+
+### heal_using_healing_machine
+The 'heal_using_healing_machine' type creates a task that makes the entity heal its static NPC party using a healing machine if one is right next to the NPC.
+- `condition`: A MoLang expression (with `q.entity` as the entity) that determines if this entire task should exist on the entity or not. This runs at the time of entity creation, not on tick.
+- `horizontalUseRange`: A MoLang expression that determines the maximum distance to a healing machine from which the NPC can use it. Defaults to 3.
+- `verticalUseRange`: A MoLang expression that determines the maximum vertical distance to a healing machine from which the NPC can use it. Defaults to 2.
+
+### switch_npc_to_battle
+The 'switch_npc_to_battle' type creates a task that will switch NPC entities to the battle activity when it is in a battle. You'd generally put this 
+on the idle activity so that it automatically transitions activities when a battle starts.
+
+### switch_npc_from_battle
+The 'switch_npc_from_battle' type creates a task that will switch NPC entities from the battle activity when it is no longer in a battle. You should
+put this in the battle activity so that it automatically transitions activities when a battle ends. If the NPC is in multiple battles, this
+will only activate when no battles remain. It will rely on the brain schedule to decide what activity to switch back to (usually idle).
+
+### look_at_battling_pokemon
+The 'look_at_battling_pokemon' type creates a task that will set the entity's look target to switch between the battling Pokémon.
+- `minDurationTicks`: A MoLang expression that determines the minimum number of ticks that the entity will look at a specific battling Pokémon. Defaults to 40.
+- `maxDurationTicks`: A MoLang expression that determines the maximum number of ticks that the entity will look at a specific battling Pokémon. Defaults to 80.
+
+### exit_battle_when_hurt
+The 'exit_battle_when_hurt' type creates a task that will make the entity exit the battle when it is hurt.
+- `condition`: A MoLang expression (with `q.entity` as the entity) that determines if this entire task should exist on the entity or not. This runs at the time of entity creation, not on tick.
+- `includePassiveDamage`: A boolean that determines if passive damage (like poison or cacti) should trigger this task. Defaults to true.
+
+### switch_to_chatting
+The 'switch_to_chatting' type creates a task that will switch the entity to the chatting activity when a dialogue has been opened with that NPC.
+
+### switch_from_chatting
+The 'switch_from_chatting' type creates a task that will switch the entity from the chatting activity when the dialogue has been closed with that NPC.
+It will rely on the brain schedule to decide what activity to switch back to (usually idle).
+
+### look_at_speaker
+The 'look_at_speaker' type creates a task that will set the entity's look target to the speaker of the dialogue.
+
+### switch_to_action_effect
+The 'switch_to_action_effect' type creates a task that will switch the entity to the action effect activity when it is performing an action effect.
+
+### switch_from_action_effect
+The 'switch_from_action_effect' type creates a task that will switch the entity from the action effect activity when it is no longer performing an action effect.
+It will rely on the brain schedule to decide what activity to switch back to (usually idle).
+
+### switch_to_fight
+The 'switch_to_fight' type creates a task that will switch the entity to the fight activity when it has an attack target.
+- `condition`: A MoLang expression (with `q.entity` as the entity) that determines if this entire task should exist on the entity or not. This runs at the time of entity creation, not on tick.
+- `activity`: The activity to switch to when the NPC is in a fight. Defaults to `minecraft:fight`.
+
+### switch_from_fight
+The 'switch_from_fight' type creates a task that will switch the entity from the fight activity when it no longer has an attack target. It will rely on the brain schedule to decide what activity to switch back to (usually idle).
+
+### get_angry_at_attacker
+The 'get_angry_at_attacker' type creates a task that will make the entity get angry at the attacker when it is attacked.
+- `condition`: A MoLang expression (with `q.entity` as the entity) that determines if this entire task should exist on the entity or not. This runs at the time of entity creation, not on tick.
+
+### stop_being_angry_if_attacker_dead
+The 'stop_being_angry_if_attacker_dead' type creates a task that will make the entity stop being angry at the attacker when the attacker is dead.
+
+### attack_angry_at
+The 'attack_angry_at' type creates a task that will make the entity choose the entity that it is angry at to be its attack target.
+- `condition`: A MoLang expression (with `q.entity` as the entity) that determines if this entire task should exist on the entity or not. This runs at the time of entity creation, not on tick.
+
+### move_to_attack_target
+The 'move_to_attack_target' type creates a task that will make the entity move to its attack target.
+- `speedMultiplier`: A MoLang expression that determines the speed multiplier for moving to the attack target. Defaults to 0.5 which is an elevated speed to usual.
+- `closeEnoughDistance`: A MoLang expression that determines the distance from the attack target that the entity needs to be for the path to be considered complete. Defaults to 1.
+
+### melee_attack
+The 'melee_attack' type creates a task that will make the entity perform a melee attack on its attack target when it is close enough. The damage dealt is determined by entity properties, which cannot be easily configured at time of writing.
+- `condition`: A MoLang expression (with `q.entity` as the entity) that determines if this entire task should exist on the entity or not. This runs at the time of entity creation, not on tick.
+- `range`: A MoLang expression that determines the maximum distance from the attack target that the entity can be to perform the attack. Defaults to 1.5.
+- `cooldownTicks`: A MoLang expression that determines the number of ticks to wait before performing another attack. Defaults to 30.
+
+### switch_to_panic_when_hurt
+The 'switch_to_panic_when_hurt' type creates a task that will switch the entity to the panic activity when it is hurt.
+- `condition`: A MoLang expression (with `q.entity` as the entity) that determines if this entire task should exist on the entity or not. This runs at the time of entity creation, not on tick.
+- `includePassiveDamage`: A boolean that determines if passive damage (like poison or cacti) should trigger this task. Defaults to false.
+
+### switch_to_panic_when_hostiles_nearby
+The 'switch_to_panic_when_hostiles_nearby' type creates a task that will switch the entity to the panic activity when hostiles are nearby. The definition of nearby depends
+on the entity type and this piggy-backs off the Minecraft list of aggressive mobs and the right distances.
+- `condition`: A MoLang expression (with `q.entity` as the entity) that determines if this entire task should exist on the entity or not. This runs at the time of entity creation, not on tick.
+
+### calm_down
+The 'calm_down' type creates a task that will make the entity calm down when it is no longer being hurt and is far from hostiles and its attacker.
+- `condition`: A MoLang expression (with `q.entity` as the entity) that determines if this entire task should exist on the entity or not. This runs at the time of entity creation, not on tick.
+
+### flee_attacker
+The 'flee_attacker' type creates a task that will make the entity flee from its attacker when it is hurt.
+- `condition`: A MoLang expression (with `q.entity` as the entity) that determines if this entire task should exist on the entity or not. This runs at the time of entity creation, not on tick.
+- `speedMultiplier`: A MoLang expression that determines the speed multiplier for fleeing from the attacker. Defaults to 0.5 which is an elevated speed to usual.
+- `desiredDistance`: A MoLang expression that determines the distance from the attacker that the entity should try to maintain. Defaults to 9.
+
+### flee_nearest_hostile
+The 'flee_nearest_hostile' type creates a task that will make the entity flee from the nearest hostile entity when it is hurt.
+- `condition`: A MoLang expression (with `q.entity` as the entity) that determines if this entire task should exist on the entity or not. This runs at the time of entity creation, not on tick.
+- `speedMultiplier`: A MoLang expression that determines the speed multiplier for fleeing from the nearest hostile. Defaults to 0.5 which is an elevated speed to usual.
+- `desiredDistance`: A MoLang expression that determines the distance from the nearest hostile that the entity should try to maintain. Defaults to 9.

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

@@ -8,15 +8,24 @@
 
 package com.cobblemon.mod.common.api.ai.config.task
 
+import com.cobblemon.mod.common.CobblemonMemories
 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import com.cobblemon.mod.common.entity.npc.ai.SwitchFromActionEffectTask
 import net.minecraft.world.entity.LivingEntity
-import net.minecraft.world.entity.schedule.Activity
+import net.minecraft.world.entity.ai.behavior.declarative.BehaviorBuilder
+import net.minecraft.world.entity.ai.behavior.declarative.Trigger
 
 class SwitchFromActionEffectTaskConfig : SingleTaskConfig {
-    val activity = Activity.IDLE
     override fun createTask(
         entity: LivingEntity,
         brainConfigurationContext: BrainConfigurationContext
-    ) = SwitchFromActionEffectTask.create(activity)
+    ) = BehaviorBuilder.create {
+        it.group(
+            it.absent(CobblemonMemories.ACTIVE_ACTION_EFFECT)
+        ).apply(it) { _ ->
+            Trigger { level, entity, _ ->
+                entity.brain.updateActivityFromSchedule(level.dayTime, level.gameTime)
+                return@Trigger true
+            }
+        }
+    }
 }

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

@@ -13,10 +13,8 @@ import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.declarative.BehaviorBuilder
 import net.minecraft.world.entity.ai.behavior.declarative.Trigger
-import net.minecraft.world.entity.schedule.Activity
 
 class SwitchFromChattingTaskConfig : SingleTaskConfig {
-    val activity = Activity.IDLE
     override fun createTask(
         entity: LivingEntity,
         brainConfigurationContext: BrainConfigurationContext
@@ -24,8 +22,8 @@ class SwitchFromChattingTaskConfig : SingleTaskConfig {
         it.group(
             it.absent(CobblemonMemories.DIALOGUES)
         ).apply(it) { _ ->
-            Trigger { world, entity, _ ->
-                entity.brain.setActiveActivityIfPossible(activity)
+            Trigger { level, entity, _ ->
+                entity.brain.updateActivityFromSchedule(level.dayTime, level.gameTime)
                 return@Trigger true
             }
         }

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

@@ -13,10 +13,8 @@ import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.declarative.BehaviorBuilder
 import net.minecraft.world.entity.ai.behavior.declarative.Trigger
 import net.minecraft.world.entity.ai.memory.MemoryModuleType
-import net.minecraft.world.entity.schedule.Activity
 
 class SwitchFromFightTaskConfig : SingleTaskConfig {
-    val activity = Activity.IDLE
     override fun createTask(
         entity: LivingEntity,
         brainConfigurationContext: BrainConfigurationContext
@@ -24,8 +22,8 @@ class SwitchFromFightTaskConfig : SingleTaskConfig {
         it.group(
             it.absent(MemoryModuleType.ATTACK_TARGET)
         ).apply(it) { _ ->
-            Trigger { world, entity, _ ->
-                entity.brain.setActiveActivityIfPossible(activity)
+            Trigger { level, entity, _ ->
+                entity.brain.updateActivityFromSchedule(level.dayTime, level.gameTime)
                 return@Trigger true
             }
         }

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

@@ -8,18 +8,25 @@
 
 package com.cobblemon.mod.common.api.ai.config.task
 
+import com.cobblemon.mod.common.CobblemonMemories
 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import com.cobblemon.mod.common.entity.npc.ai.SwitchFromBattleTask
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.BehaviorControl
-import net.minecraft.world.entity.schedule.Activity
+import net.minecraft.world.entity.ai.behavior.declarative.BehaviorBuilder
+import net.minecraft.world.entity.ai.behavior.declarative.Trigger
 
 class SwitchFromNPCBattleTaskConfig : SingleTaskConfig {
-    val activity: Activity = Activity.IDLE
     override fun createTask(
         entity: LivingEntity,
         brainConfigurationContext: BrainConfigurationContext
     ): BehaviorControl<in LivingEntity>? {
-        return SwitchFromBattleTask.create(activity)
+        return BehaviorBuilder.create {
+            it.group(it.absent(CobblemonMemories.NPC_BATTLING)).apply(it) { _ ->
+                Trigger { level, entity, _ ->
+                    entity.brain.updateActivityFromSchedule(level.dayTime, level.gameTime)
+                    true
+                }
+            }
+        }
     }
 }

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

@@ -26,7 +26,7 @@ class SwitchToActionEffectTaskConfig : SingleTaskConfig {
                 it.absent(CobblemonMemories.ACTIVE_ACTION_EFFECT)
             ).apply(it) { _ ->
                 Trigger { world, entity, time ->
-                    entity.brain.setActiveActivityIfPossible(CobblemonActivities.NPC_ACTION_EFFECT)
+                    entity.brain.setActiveActivityIfPossible(CobblemonActivities.ACTION_EFFECT)
                     return@Trigger true
                 }
             }

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

@@ -8,21 +8,15 @@
 
 package com.cobblemon.mod.common.api.ai.config.task
 
-import com.bedrockk.molang.runtime.struct.QueryStruct
 import com.cobblemon.mod.common.CobblemonActivities
 import com.cobblemon.mod.common.CobblemonMemories
 import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
-import com.cobblemon.mod.common.entity.PosableEntity
-import com.cobblemon.mod.common.util.asExpressionLike
-import com.cobblemon.mod.common.util.resolveBoolean
-import com.cobblemon.mod.common.util.withQueryValue
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.declarative.BehaviorBuilder
 import net.minecraft.world.entity.ai.behavior.declarative.Trigger
 import net.minecraft.world.entity.ai.memory.MemoryModuleType
 
 class SwitchToChattingTaskConfig : SingleTaskConfig {
-    val condition = "true".asExpressionLike()
     override fun createTask(
         entity: LivingEntity,
         brainConfigurationContext: BrainConfigurationContext
@@ -32,8 +26,6 @@ class SwitchToChattingTaskConfig : SingleTaskConfig {
             it.registered(MemoryModuleType.WALK_TARGET)
         ).apply(it) { _, walkTarget ->
             Trigger { world, entity, _ ->
-                runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
-                if (!runtime.resolveBoolean(condition)) return@Trigger false
                 walkTarget.erase()
                 entity.brain.setActiveActivityIfPossible(CobblemonActivities.NPC_CHATTING)
                 return@Trigger true

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

@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.ai.config.task
+
+import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
+import com.cobblemon.mod.common.util.asExpression
+import net.minecraft.world.entity.LivingEntity
+import net.minecraft.world.entity.PathfinderMob
+import net.minecraft.world.entity.ai.behavior.declarative.BehaviorBuilder
+import net.minecraft.world.entity.ai.behavior.declarative.Trigger
+import net.minecraft.world.entity.ai.memory.MemoryModuleType
+import net.minecraft.world.entity.schedule.Activity
+
+class SwitchToPanicWhenHostilesNearbyTaskConfig : SingleTaskConfig {
+    var condition = "true".asExpression()
+    override fun createTask(
+        entity: LivingEntity,
+        brainConfigurationContext: BrainConfigurationContext
+    ) = BehaviorBuilder.create {
+        it.group(it.present(MemoryModuleType.NEAREST_HOSTILE))
+            .apply(it) { nearestHostile ->
+                Trigger { world, entity, _ ->
+                    (entity as? PathfinderMob)?.navigation?.stop()
+                    entity.brain.setActiveActivityIfPossible(Activity.PANIC)
+                    return@Trigger true
+                }
+            }
+    }
+}

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

@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.ai.config.task
+
+import com.bedrockk.molang.runtime.struct.QueryStruct
+import com.cobblemon.mod.common.api.ai.BrainConfigurationContext
+import com.cobblemon.mod.common.entity.PosableEntity
+import com.cobblemon.mod.common.util.asExpression
+import com.cobblemon.mod.common.util.resolveBoolean
+import com.cobblemon.mod.common.util.withQueryValue
+import net.minecraft.world.entity.LivingEntity
+import net.minecraft.world.entity.PathfinderMob
+import net.minecraft.world.entity.ai.behavior.BehaviorControl
+import net.minecraft.world.entity.ai.behavior.declarative.BehaviorBuilder
+import net.minecraft.world.entity.ai.behavior.declarative.Trigger
+import net.minecraft.world.entity.ai.memory.MemoryModuleType
+import net.minecraft.world.entity.schedule.Activity
+
+class SwitchToPanicWhenHurtTaskConfig : SingleTaskConfig {
+    var condition = "true".asExpression()
+    var includePassiveDamage = false
+
+    override fun createTask(
+        entity: LivingEntity,
+        brainConfigurationContext: BrainConfigurationContext
+    ): BehaviorControl<in LivingEntity>? {
+        runtime.withQueryValue("entity", (entity as? PosableEntity)?.struct ?: QueryStruct(hashMapOf()))
+        if (!runtime.resolveBoolean(condition)) return null
+        return if (includePassiveDamage) {
+            BehaviorBuilder.create {
+                it.group(it.present(MemoryModuleType.HURT_BY))
+                    .apply(it) { _ ->
+                        Trigger { world, entity, _ ->
+                            (entity as? PathfinderMob)?.navigation?.stop()
+                            entity.brain.setActiveActivityIfPossible(Activity.PANIC)
+                            return@Trigger true
+                        }
+                    }
+            }
+        } else {
+            BehaviorBuilder.create {
+                it.group(it.present(MemoryModuleType.HURT_BY_ENTITY))
+                    .apply(it) { _ ->
+                        Trigger { world, entity, _ ->
+                            (entity as? PathfinderMob)?.navigation?.stop()
+                            entity.brain.setActiveActivityIfPossible(Activity.PANIC)
+                            return@Trigger true
+                        }
+                    }
+            }
+        }
+    }
+}

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

@@ -52,6 +52,12 @@ fun interface TaskConfig {
             "look_at_speaker" to LookAtSpeakerTaskConfig::class.java,
             "switch_to_action_effect" to SwitchToActionEffectTaskConfig::class.java,
             "switch_from_action_effect" to SwitchFromActionEffectTaskConfig::class.java,
+            "exit_battle_when_hurt" to ExitBattleWhenHurtTaskConfig::class.java,
+            "switch_to_panic_when_hurt" to SwitchToPanicWhenHurtTaskConfig::class.java,
+            "switch_to_panic_when_hostiles_nearby" to SwitchToPanicWhenHostilesNearbyTaskConfig::class.java,
+            "calm_down" to CalmDownTaskConfig::class.java,
+            "flee_attacker" to FleeAttackerTaskConfig::class.java,
+            "flee_nearest_hostile" to FleeNearestHostileTaskConfig::class.java,
         )
 
         val runtime = MoLangRuntime().setup()

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

@@ -11,7 +11,6 @@ package com.cobblemon.mod.common.api.battles.model
 import com.bedrockk.molang.runtime.MoLangRuntime
 import com.bedrockk.molang.runtime.struct.QueryStruct
 import com.bedrockk.molang.runtime.value.DoubleValue
-import com.bedrockk.molang.runtime.value.MoValue
 import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.Cobblemon.LOGGER
 import com.cobblemon.mod.common.CobblemonNetwork
@@ -22,7 +21,6 @@ import com.cobblemon.mod.common.api.battles.model.actor.EntityBackedBattleActor
 import com.cobblemon.mod.common.api.battles.model.actor.FleeableBattleActor
 import com.cobblemon.mod.common.api.events.CobblemonEvents
 import com.cobblemon.mod.common.api.events.battles.BattleFledEvent
-import com.cobblemon.mod.common.api.moves.Moves
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMoLangValue
 import com.cobblemon.mod.common.api.net.NetworkPacket
 import com.cobblemon.mod.common.api.storage.party.PlayerPartyStore
@@ -43,6 +41,7 @@ import com.cobblemon.mod.common.battles.dispatch.WaitDispatch
 import com.cobblemon.mod.common.battles.interpreter.ContextManager
 import com.cobblemon.mod.common.battles.pokemon.BattlePokemon
 import com.cobblemon.mod.common.battles.runner.ShowdownService
+import com.cobblemon.mod.common.entity.PlatformType
 import com.cobblemon.mod.common.entity.npc.NPCBattleActor
 import com.cobblemon.mod.common.entity.npc.NPCEntity
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
@@ -51,17 +50,16 @@ import com.cobblemon.mod.common.net.messages.client.battle.BattleMessagePacket
 import com.cobblemon.mod.common.pokemon.evolution.progress.DefeatEvolutionProgress
 import com.cobblemon.mod.common.pokemon.evolution.progress.LastBattleCriticalHitsEvolutionProgress
 import com.cobblemon.mod.common.pokemon.evolution.requirements.DefeatRequirement
-import com.cobblemon.mod.common.pokemon.helditem.CobblemonHeldItemManager
 import com.cobblemon.mod.common.util.battleLang
 import com.cobblemon.mod.common.util.getPlayer
-import net.minecraft.network.chat.Component
 import com.cobblemon.mod.common.util.giveOrDropItemStack
 import com.cobblemon.mod.common.util.itemRegistry
-import net.minecraft.resources.ResourceLocation
 import java.io.File
 import java.util.UUID
 import java.util.concurrent.CompletableFuture
 import java.util.concurrent.ConcurrentLinkedDeque
+import net.minecraft.network.chat.Component
+import net.minecraft.resources.ResourceLocation
 import net.minecraft.server.level.ServerPlayer
 import net.minecraft.world.item.ItemStack
 
@@ -271,22 +269,31 @@ open class PokemonBattle(
                             else -> continue
                         }
                         val experience = Cobblemon.experienceCalculator.calculate(opponentPokemon, faintedPokemon, multiplier)
-                        if (experience > 0) {
+                        if (experience > 0 && actor.pokemonList.all { it.health <= 0 }) {
                             opponent.awardExperience(opponentPokemon, experience)
                         }
                         Cobblemon.evYieldCalculator.calculate(opponentPokemon, faintedPokemon).forEach { (stat, amount) ->
                             pokemon.evs.add(stat, amount)
                         }
+
                     }
                 }
             }
-            if(actor.itemsUsed.isNotEmpty() && actor.getPlayerUUIDs().count() > 0) {
+            if (actor.itemsUsed.isNotEmpty() && actor.getPlayerUUIDs().count() > 0) {
                 val player = actor.getPlayerUUIDs().first().getPlayer()
                 player?.level()?.itemRegistry.let { registry ->
                     actor.itemsUsed.mapNotNull { registry?.get(ResourceLocation.tryBySeparator(it.itemName.substringAfter('.'), '.')) }
                             .forEach { player?.giveOrDropItemStack(ItemStack(it))}
                 }
             }
+
+            // Heal NPC's team if enabled
+            if (actor is NPCBattleActor) {
+                if (actor.npc.npc.autoHealParty) {
+                    actor.npc.party?.heal()
+                }
+            }
+
         }
         // Heal Mon if wild
         actors.filter { it.type == ActorType.WILD }
@@ -297,6 +304,11 @@ open class PokemonBattle(
         actors.forEach { actor ->
             actor.pokemonList.forEach { battlePokemon ->
                 battlePokemon.entity?.let { entity -> battlePokemon.postBattleEntityOperation(entity) }
+                if (battlePokemon.effectedPokemon.entity != null
+                        && battlePokemon.effectedPokemon.entity?.beamMode == 0
+                        && battlePokemon.effectedPokemon.entity?.platform != PlatformType.NONE) {
+                    battlePokemon.effectedPokemon.tryRecallWithAnimation()
+                }
             }
         }
         sendUpdate(BattleEndPacket())

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

@@ -40,6 +40,7 @@ abstract class BattleActor(
 
     lateinit var showdownId: String
     lateinit var battle: PokemonBattle
+    fun isInitialized() = this::battle.isInitialized && this::showdownId.isInitialized
 
     val activePokemon = mutableListOf<ActiveBattlePokemon>()
     var canDynamax = false

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

@@ -100,7 +100,7 @@ object CobblemonEvents {
 
     // instructions
     @JvmField
-    val MEGA_EVOLUTON = EventObservable<MegaEvolutionEvent>()
+    val MEGA_EVOLUTION = EventObservable<MegaEvolutionEvent>()
     @JvmField
     val TERASTALLIZATION = EventObservable<TerastallizationEvent>()
     @JvmField

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

@@ -13,12 +13,12 @@ import com.cobblemon.mod.common.api.events.fishing.BaitEffectFunctionRegistryEve
 import com.cobblemon.mod.common.api.spawning.fishing.FishingSpawnCause
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.util.cobblemonResource
+import com.mojang.serialization.Codec
+import com.mojang.serialization.codecs.RecordCodecBuilder
+import java.util.Optional
 import net.minecraft.core.Registry
-import net.minecraft.nbt.CompoundTag
-import net.minecraft.nbt.ListTag
-import net.minecraft.nbt.StringTag
+import net.minecraft.network.codec.ByteBufCodecs
 import net.minecraft.resources.ResourceLocation
-import net.minecraft.world.entity.Entity
 import net.minecraft.world.item.Item
 import net.minecraft.world.item.ItemStack
 
@@ -34,46 +34,30 @@ data class FishingBait(
         val chance: Double = 0.0,
         val value: Double = 0.0
     ) {
-        fun toNbt(): CompoundTag {
-            val nbt = CompoundTag()
-            nbt.putString("Type", type.toString())
-            subcategory?.let { nbt.putString("Subcategory", it.toString()) }
-            nbt.putDouble("Chance", chance)
-            nbt.putDouble("Value", value)
-            return nbt
-        }
+        constructor(type: ResourceLocation, subcategory: Optional<ResourceLocation>, chance: Double, value: Double) : this(type, subcategory.orElse(null), chance, value)
 
         companion object {
-            fun fromNbt(nbt: CompoundTag): Effect {
-                val type = ResourceLocation.parse(nbt.getString("Type"))
-                val subcategory = if (nbt.contains("Subcategory")) ResourceLocation.parse(nbt.getString("Subcategory")) else null
-                val chance = nbt.getDouble("Chance")
-                val value = nbt.getDouble("Value")
-                return Effect(type, subcategory, chance, value)
+            val CODEC = RecordCodecBuilder.create<Effect> { instance ->
+                instance.group(
+                    ResourceLocation.CODEC.fieldOf("type").forGetter { it.type },
+                    ResourceLocation.CODEC.optionalFieldOf("subcategory").forGetter { Optional.ofNullable(it.subcategory) },
+                    Codec.DOUBLE.fieldOf("chance").forGetter { it.chance },
+                    Codec.DOUBLE.fieldOf("value").forGetter { it.value }
+                ).apply(instance, ::Effect)
             }
         }
     }
 
-    fun toNbt(): CompoundTag {
-        val nbt = CompoundTag()
-        nbt.putString("Item", item.toString())
-        val effectsList = ListTag()
-        effects.forEach { effectsList.add(it.toNbt()) }
-        nbt.put("Effects", effectsList)
-        return nbt
-    }
-
     companion object {
-        fun fromNbt(nbt: CompoundTag): FishingBait {
-            val item = ResourceLocation.parse(nbt.getString("Item"))
-            val effectsList = nbt.getList("Effects", 10) // 10 is the type for NbtCompound
-            val effects = mutableListOf<Effect>()
-            for (i in 0 until effectsList.size) {
-                effects.add(Effect.fromNbt(effectsList.getCompound(i)))
-            }
-            return FishingBait(item, effects)
+        val CODEC = RecordCodecBuilder.create<FishingBait> { instance ->
+            instance.group(
+                ResourceLocation.CODEC.fieldOf("item").forGetter { it.item },
+                Effect.CODEC.listOf().fieldOf("effects").forGetter {it.effects}
+            ).apply(instance, ::FishingBait)
         }
 
+        val STREAM_CODEC = ByteBufCodecs.fromCodec(CODEC)
+
         val BLANK_BAIT = FishingBait(
             cobblemonResource("blank"),
             emptyList()

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

@@ -27,9 +27,16 @@ import com.cobblemon.mod.common.api.dialogue.ReferenceDialogueFaceProvider
 import com.cobblemon.mod.common.api.moves.animations.ActionEffectContext
 import com.cobblemon.mod.common.api.moves.animations.ActionEffects
 import com.cobblemon.mod.common.api.moves.animations.NPCProvider
+import com.cobblemon.mod.common.api.pokemon.stats.Stats
 import com.cobblemon.mod.common.api.scripting.CobblemonScripts
+import com.cobblemon.mod.common.api.spawning.context.SpawningContext
+import com.cobblemon.mod.common.api.storage.PokemonStore
 import com.cobblemon.mod.common.api.storage.party.PartyStore
+import com.cobblemon.mod.common.api.storage.party.PlayerPartyStore
+import com.cobblemon.mod.common.api.storage.pc.PCPosition
+import com.cobblemon.mod.common.api.storage.pc.PCStore
 import com.cobblemon.mod.common.api.text.text
+import com.cobblemon.mod.common.battles.BattleRegistry
 import com.cobblemon.mod.common.client.render.models.blockbench.wavefunction.WaveFunctions
 import com.cobblemon.mod.common.entity.npc.NPCEntity
 import com.cobblemon.mod.common.entity.pokemon.PokemonBehaviourFlag
@@ -43,6 +50,7 @@ import java.util.UUID
 import net.minecraft.commands.arguments.EntityAnchorArgument
 import net.minecraft.core.Holder
 import net.minecraft.core.Registry
+import net.minecraft.core.registries.BuiltInRegistries
 import net.minecraft.core.registries.Registries
 import net.minecraft.nbt.CompoundTag
 import net.minecraft.nbt.DoubleTag
@@ -56,7 +64,6 @@ import net.minecraft.server.level.ServerPlayer
 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.player.Player
 import net.minecraft.world.level.Level
@@ -126,15 +133,12 @@ object MoLangFunctions {
             val map = hashMapOf<String, java.util.function.Function<MoParams, Any>>()
             map.put("username") { _ -> StringValue(player.gameProfile.name) }
             map.put("uuid") { _ -> StringValue(player.gameProfile.id.toString()) }
-            map.put("data") { _ -> return@put if (player is ServerPlayer) Cobblemon.molangData.load(player.uuid) else DoubleValue(0) }
-            map.put("save_data") { _ -> if (player is ServerPlayer) Cobblemon.molangData.save(player.uuid) else DoubleValue(0) }
             map.put("main_held_item") { _ -> player.level().itemRegistry.wrapAsHolder(player.mainHandItem.item).asMoLangValue(Registries.ITEM) }
             map.put("off_held_item") { _ -> player.level().itemRegistry.wrapAsHolder(player.offhandItem.item).asMoLangValue(Registries.ITEM) }
             map.put("face") { params -> ObjectValue(PlayerDialogueFaceProvider(player.uuid, params.getBooleanOrNull(0) != false)) }
             map.put("swing_hand") { _ -> player.swing(player.usedItemHand) }
             map.put("food_level") { _ -> DoubleValue(player.foodData.foodLevel) }
             map.put("saturation_level") { _ -> DoubleValue(player.foodData.saturationLevel) }
-//            map.put("has_permission") { params -> DoubleValue(Cobblemon.permissionValidator.hasPermission(player, Permission)) }
             map.put("tell") { params ->
                 val message = params.getString(0).text()
                 val overlay = params.getBooleanOrNull(1) ?: false
@@ -177,6 +181,13 @@ object MoLangFunctions {
                         return@put DoubleValue.ZERO
                     }
                 }
+                map.put("party") { player.party().struct }
+                map.put("pc") { player.pc().struct }
+                map.put("has_permission") { params -> DoubleValue(Cobblemon.permissionValidator.hasPermission(player, params.getString(0), params.getIntOrNull(1) ?: 4)) }
+                map.put("data") { _ -> Cobblemon.molangData.load(player.uuid) }
+                map.put("save_data") { _ -> Cobblemon.molangData.save(player.uuid) }
+                map.put("in_battle") { DoubleValue(player.isInBattle()) }
+                map.put("battle") { player.getBattleState()?.first?.struct ?: DoubleValue.ZERO }
             }
             map
         }
@@ -218,7 +229,7 @@ object MoLangFunctions {
             map.put("entity_size") { DoubleValue(entity.boundingBox.run { if (xsize > ysize) xsize else ysize }) }
             map.put("entity_width") { DoubleValue(entity.boundingBox.xsize) }
             map.put("entity_height") { DoubleValue(entity.boundingBox.ysize) }
-
+            map.put("id_modulo") { params -> DoubleValue(entity.uuid.hashCode() % params.getDouble(0)) }
             map.put("horizontal_velocity") { _ -> DoubleValue(entity.deltaMovement.horizontalDistance()) }
             map.put("vertical_velocity") { DoubleValue(entity.deltaMovement.y) }
             map.put("is_on_ground") { _ -> DoubleValue(entity.onGround()) }
@@ -256,6 +267,17 @@ object MoLangFunctions {
             map.put("has_aspect") { params -> DoubleValue(npc.aspects.contains(params.getString(0))) }
             map.put("face") { params -> ObjectValue(ReferenceDialogueFaceProvider(npc.id, params.getBooleanOrNull(0) != false)) }
             map.put("in_battle") { DoubleValue(npc.isInBattle()) }
+            map.put("battles") { ArrayStruct(npc.battleIds.mapNotNull { BattleRegistry.getBattle(it)?.struct }.mapIndexed { index, value -> "$index" to value }.toMap()) }
+            map.put("stop_battles") { _ -> npc.battleIds.forEach { BattleRegistry.getBattle(it)?.stop() } }
+            map.put("is_doing_activity") { params ->
+                val identifiers = params.params.map { it.asString().asIdentifierDefaultingNamespace(namespace = "minecraft") }
+                val activities = identifiers.mapNotNull { identifier -> BuiltInRegistries.ACTIVITY.get(identifier) }
+                if (activities.isNotEmpty()) {
+                    return@put DoubleValue(activities.any { activity -> npc.brain.isActive(activity) })
+                } else {
+                    return@put DoubleValue.ZERO
+                }
+            }
             map.put("run_script_on_client") { params ->
                 val world = npc.level()
                 if (world is ServerLevel) {
@@ -284,10 +306,10 @@ object MoLangFunctions {
                     )
                     npc.actionEffect = context
                     npc.brain.setMemory(CobblemonMemories.ACTIVE_ACTION_EFFECT, context)
-                    npc.brain.setActiveActivityIfPossible(CobblemonActivities.NPC_ACTION_EFFECT)
+                    npc.brain.setActiveActivityIfPossible(CobblemonActivities.ACTION_EFFECT)
                     actionEffect.run(context).thenRun {
                         val npcActionEffect = npc.brain.getMemory(CobblemonMemories.ACTIVE_ACTION_EFFECT).orElse(null)
-                        if (npcActionEffect == context && npc.brain.isActive(CobblemonActivities.NPC_ACTION_EFFECT)) {
+                        if (npcActionEffect == context && npc.brain.isActive(CobblemonActivities.ACTION_EFFECT)) {
                             npc.brain.eraseMemory(CobblemonMemories.ACTIVE_ACTION_EFFECT)
                             npc.actionEffect = null
                         }
@@ -312,6 +334,8 @@ object MoLangFunctions {
                 npc.lookAt(EntityAnchorArgument.Anchor.EYES, pos)
             }
             map.put("environment") { _ -> npc.runtime.environment }
+            map.put("party") { npc.party?.struct ?: DoubleValue.ZERO }
+            map.put("has_party") { DoubleValue(npc.party != null) }
             map
         }
     )
@@ -330,6 +354,7 @@ object MoLangFunctions {
                 val actor = battle.actors.find { it.uuid == uuid } ?: return@put DoubleValue.ZERO
                 return@put actor.struct
             }
+            map.put("stop") { _ -> battle.stop() }
             map
         }
     )
@@ -337,10 +362,30 @@ object MoLangFunctions {
     val pokemonFunctions = mutableListOf<(Pokemon) -> HashMap<String, java.util.function.Function<MoParams, Any>>>(
         { pokemon ->
             val map = hashMapOf<String, java.util.function.Function<MoParams, Any>>()
+            map.put("id") { StringValue(pokemon.uuid.toString()) }
+            map.put("level") { DoubleValue(pokemon.level.toDouble()) }
+            map.put("max_hp") { DoubleValue(pokemon.maxHealth.toDouble()) }
+            map.put("current_hp") { DoubleValue(pokemon.currentHealth.toDouble()) }
+            map.put("friendship") { DoubleValue(pokemon.friendship.toDouble()) }
+            map.put("evs") {
+                val struct = QueryStruct(hashMapOf())
+                for (stat in Stats.PERMANENT) {
+                    struct.addFunction(stat.showdownId) { DoubleValue(pokemon.evs.getOrDefault(stat).toDouble()) }
+                }
+                struct
+            }
+            map.put("ivs") {
+                val struct = QueryStruct(hashMapOf())
+                for (stat in Stats.PERMANENT) {
+                    struct.addFunction(stat.showdownId) { DoubleValue(pokemon.ivs.getOrDefault(stat).toDouble()) }
+                }
+                struct
+            }
             map.put("is_wild") { DoubleValue(pokemon.entity?.let { it.ownerUUID == null } == true) }
             map.put("is_shiny") { DoubleValue(pokemon.shiny) }
             map.put("form") { StringValue(pokemon.form.name) }
             map.put("weight") { DoubleValue(pokemon.species.weight.toDouble()) }
+            map.put("matches") { params -> DoubleValue(params.getString(0).toProperties().matches(pokemon)) }
             map
         }
     )
@@ -356,21 +401,140 @@ object MoLangFunctions {
         }
     )
 
+    val pokemonStoreFunctions = mutableListOf<(PokemonStore<*>) -> HashMap<String, java.util.function.Function<MoParams, Any>>>(
+        { store ->
+            val map = hashMapOf<String, java.util.function.Function<MoParams, Any>>()
+            map.put("add") { params ->
+                val pokemon = params.get<ObjectValue<Pokemon>>(0)
+                return@put DoubleValue(store.add(pokemon.obj))
+            }
+            map.put("add_by_properties") { params ->
+                val props = params.getString(0).toProperties()
+                val player = (store as? PlayerPartyStore)?.playerUUID?.getPlayer() // Only really know for sure when it's a player party store
+                val pokemon = props.create(player = player)
+                return@put DoubleValue(store.add(pokemon))
+            }
+            map.put("find_by_properties") { params ->
+                val props = params.getString(0).toProperties()
+                val pokemon = store.find { props.matches(it) }
+                return@put pokemon?.asStruct() ?: DoubleValue.ZERO
+            }
+            map.put("find_all_by_properties") { params ->
+                val props = params.getString(0).toProperties()
+                val pokemon = store.filter { props.matches(it) }
+                return@put ArrayStruct(pokemon.mapIndexed { index, value -> "$index" to value.asStruct() }.toMap())
+            }
+            map.put("find_by_id") { params ->
+                val id = params.getString(0).asUUID
+                val pokemon = store.find { it.uuid == id }
+                return@put pokemon?.asStruct() ?: DoubleValue.ZERO
+            }
+            map.put("remove_by_id") { params ->
+                val id = params.getString(0).asUUID
+                val pokemon = store.find { it.uuid == id } ?: return@put DoubleValue.ZERO
+                return@put DoubleValue(store.remove(pokemon))
+            }
+            map.put("average_level") { _ ->
+                var numberOfPokemon = 0
+                var totalLevel = 0
+                for (pokemon in store) {
+                    totalLevel += pokemon.level
+                    numberOfPokemon++
+                }
+                if (numberOfPokemon == 0) {
+                    return@put DoubleValue.ZERO
+                }
+                return@put DoubleValue(totalLevel.toDouble() / numberOfPokemon)
+            }
+            map.put("count") { _ -> DoubleValue(store.count()) }
+            map.put("count_by_properties") { params ->
+                val props = params.getString(0).toProperties()
+                return@put DoubleValue(store.count { props.matches(it) })
+            }
+            map.put("highest_level") {
+                val highest = store.maxOfOrNull { it.level } ?: 0
+                return@put DoubleValue(highest)
+            }
+            map.put("lowest_level") {
+                val lowest = store.minOfOrNull { it.level } ?: 0
+                return@put DoubleValue(lowest)
+            }
+            map.put("heal") {
+                for (pokemon in store) {
+                    pokemon.heal()
+                }
+                return@put DoubleValue.ONE
+            }
+            map.put("healing_remainder_percent") { _ ->
+                var totalPercent = 0.0f
+                for (pokemon in store) {
+                    totalPercent += (1.0f - (pokemon.currentHealth.toFloat() / pokemon.maxHealth))
+                }
+                DoubleValue(totalPercent)
+            }
+            map.put("has_usable_pokemon") { _ -> DoubleValue(store.any { !it.isFainted() }) }
+            map
+        }
+    )
+
     val partyFunctions = mutableListOf<(PartyStore) -> HashMap<String, java.util.function.Function<MoParams, Any>>>(
         { party ->
             val map = hashMapOf<String, java.util.function.Function<MoParams, Any>>()
             map.put("get_pokemon") { params ->
                 val index = params.getInt(0)
                 val pokemon = party.get(index) ?: return@put DoubleValue.ZERO
-                val struct = VariableStruct()
-                pokemon.writeVariables(struct)
-                return@put struct
+                return@put pokemon.struct
             }
-            map.put("healing_remainder_percent") { _ -> DoubleValue(party.getHealingRemainderPercent()) }
-
             return@mutableListOf map
         })
 
+    val pcFunctions = mutableListOf<(PCStore) -> HashMap<String, java.util.function.Function<MoParams, Any>>>(
+        { pc ->
+            val map = hashMapOf<String, java.util.function.Function<MoParams, Any>>()
+            map.put("get_pokemon") { params ->
+                val box = params.getInt(0)
+                val slot = params.getInt(1)
+                val pokemon = pc[PCPosition(box, slot)] ?: return@put DoubleValue.ZERO
+                return@put pokemon.struct
+            }
+            map.put("resize") { params ->
+                val newSize = params.getInt(0)
+                val lockNewSize = params.getBooleanOrNull(1) == true
+                pc.resize(newSize, lockNewSize)
+                return@put DoubleValue.ONE
+            }
+            map.put("get_box_count") { _ -> DoubleValue(pc.boxes.size.toDouble()) }
+            return@mutableListOf map
+        }
+    )
+
+    val spawningContextFunctions = mutableListOf<(SpawningContext) -> HashMap<String, java.util.function.Function<MoParams, Any>>>(
+        { spawningContext ->
+            val map = hashMapOf<String, java.util.function.Function<MoParams, Any>>()
+            val worldValue = spawningContext.world.registryAccess().registryOrThrow(Registries.DIMENSION).wrapAsHolder(spawningContext.world).asWorldMoLangValue()
+            val biomeValue = spawningContext.biomeRegistry.wrapAsHolder(spawningContext.biome).asBiomeMoLangValue()
+            map.put("biome") { _ -> biomeValue }
+            map.put("world") { _ -> worldValue }
+            map.put("light") { _ -> DoubleValue(spawningContext.light.toDouble()) }
+            map.put("x") { _ -> DoubleValue(spawningContext.position.x.toDouble()) }
+            map.put("y") { _ -> DoubleValue(spawningContext.position.y.toDouble()) }
+            map.put("z") { _ -> DoubleValue(spawningContext.position.z.toDouble()) }
+            map.put("moon_phase") { _ -> DoubleValue(spawningContext.moonPhase.toDouble()) }
+            map.put("can_see_sky") { _ -> DoubleValue(spawningContext.canSeeSky) }
+            map.put("sky_light") { _ -> DoubleValue(spawningContext.skyLight.toDouble()) }
+            map.put("bucket") { _ -> StringValue(spawningContext.cause.bucket.name) }
+            map.put("player") { _ ->
+                val causeEntity = spawningContext.cause.entity ?: return@put DoubleValue.ZERO
+                if (causeEntity is ServerPlayer) {
+                    return@put causeEntity.asMoLangValue()
+                } else {
+                    return@put DoubleValue.ZERO
+                }
+            }
+            map
+        }
+    )
+
     fun Holder<Biome>.asBiomeMoLangValue() = asMoLangValue(Registries.BIOME).addFunctions(biomeFunctions)
     fun Holder<Level>.asWorldMoLangValue() = asMoLangValue(Registries.DIMENSION).addFunctions(worldFunctions)
     fun Holder<Block>.asBlockMoLangValue() = asMoLangValue(Registries.BLOCK).addFunctions(blockFunctions)
@@ -385,6 +549,33 @@ object MoLangFunctions {
         return value
     }
 
+    // We need to migrate the writeVariables thing to be all about query structs, variable doesn't make sense and I don't want to break fringe 1.6 compatibility issues close to release
+    fun Pokemon.asStruct(): ObjectValue<Pokemon> {
+        val queryStruct = ObjectValue(this)
+        queryStruct.addFunctions(pokemonFunctions.flatMap { it(this).entries.map { it.key to it.value } }.toMap())
+        return queryStruct
+    }
+
+    fun PartyStore.asMoLangValue(): ObjectValue<PartyStore> {
+        val value = ObjectValue(
+            obj = this,
+            stringify = { it.toString() }
+        )
+        value.addFunctions(pokemonStoreFunctions.flatMap { it(this).entries.map { it.key to it.value } }.toMap())
+        value.addFunctions(partyFunctions.flatMap { it(this).entries.map { it.key to it.value } }.toMap())
+        return value
+    }
+
+    fun PCStore.asMoLangValue(): ObjectValue<PCStore> {
+        val value = ObjectValue(
+            obj = this,
+            stringify = { it.toString() }
+        )
+        value.addFunctions(pokemonStoreFunctions.flatMap { it(this).entries.map { it.key to it.value } }.toMap())
+        value.addFunctions(pcFunctions.flatMap { it(this).entries.map { it.key to it.value } }.toMap())
+        return value
+    }
+
     fun NPCEntity.asMoLangValue(): ObjectValue<NPCEntity> {
         val value = ObjectValue(
             obj = this,
@@ -404,6 +595,15 @@ object MoLangFunctions {
         return value
     }
 
+    fun SpawningContext.asMoLangValue(): ObjectValue<SpawningContext> {
+        val value = ObjectValue(
+            obj = this,
+            stringify = { it.toString() }
+        )
+        value.addFunctions(spawningContextFunctions.flatMap { it(this).entries.map { it.key to it.value } }.toMap())
+        return value
+    }
+
     fun <T> Holder<T>.asMoLangValue(key: ResourceKey<Registry<T>>): ObjectValue<Holder<T>> {
         val value = ObjectValue(
             obj = this,

common/src/main/kotlin/com/cobblemon/mod/common/api/net/serializers/PlatformTypeDataSerializer.kt

@@ -0,0 +1,27 @@
+/*
+ * 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.net.serializers
+
+import com.cobblemon.mod.common.entity.PlatformType
+import com.cobblemon.mod.common.util.cobblemonResource
+import net.minecraft.network.RegistryFriendlyByteBuf
+import net.minecraft.network.codec.StreamCodec
+import net.minecraft.network.syncher.EntityDataSerializer
+
+object PlatformTypeDataSerializer : EntityDataSerializer<PlatformType> {
+    // TODO: This ID only looks it's used by NeoForge and that hasn't been tested yet
+    val ID = cobblemonResource("platform_type")
+    fun read(buf: RegistryFriendlyByteBuf) = PlatformType.entries[buf.readInt()]
+    override fun copy(value: PlatformType) = value
+    fun write(buf: RegistryFriendlyByteBuf, value: PlatformType) {
+        buf.writeInt(value.ordinal)
+    }
+
+    override fun codec() = StreamCodec.of(::write, ::read)
+}

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

@@ -47,9 +47,13 @@ class NPCClass {
     var variables = mutableMapOf<String, MoValue>() // Questionable whether this should be here.
     var party: NPCPartyProvider? = null
     var skill: Int = 0
-    var autoHealParty: Boolean = false
+    var autoHealParty: Boolean = true
     var battleTheme: ResourceLocation? = null
     var ai: MutableList<BrainConfig> = mutableListOf()
+    var isMovable: Boolean = true
+    var isInvulnerable = false
+    var isLeashable = true
+    var allowProjectileHits = true
 
     // If you're adding stuff here, add it to NPCPreset and NPCClassAdapter too
 
@@ -84,6 +88,10 @@ class NPCClass {
             buffer.writeString(value.asString())
         }
         buffer.writeNullable(battleTheme) { _, v -> buffer.writeIdentifier(v) }
+        buffer.writeBoolean(isMovable)
+        buffer.writeBoolean(isInvulnerable)
+        buffer.writeBoolean(isLeashable)
+        buffer.writeBoolean(allowProjectileHits)
     }
 
     fun decode(buffer: RegistryFriendlyByteBuf) {
@@ -129,5 +137,9 @@ class NPCClass {
             }
         }
         battleTheme = buffer.readNullable { buffer.readIdentifier() }
+        isMovable = buffer.readBoolean()
+        isInvulnerable = buffer.readBoolean()
+        isLeashable = buffer.readBoolean()
+        allowProjectileHits = buffer.readBoolean()
     }
 }

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

@@ -31,6 +31,10 @@ class NPCPreset {
     var skill: Int? = null
     var autoHealParty: Boolean? = null
     var battleTheme: ResourceLocation? = null
+    var isMovable: Boolean? = null
+    var isInvulnerable: Boolean? = null
+    var isLeashable: Boolean? = null
+    var allowProjectileHits: Boolean? = null
 
     fun applyTo(npcClass: NPCClass) {
         resourceIdentifier?.let { npcClass.resourceIdentifier = it }
@@ -51,5 +55,9 @@ class NPCPreset {
         autoHealParty?.let { npcClass.autoHealParty = it }
         battleTheme?.let { npcClass.battleTheme = it }
         ai?.let { npcClass.ai.addAll(it) }
+        isMovable?.let { npcClass.isMovable = it }
+        isInvulnerable?.let { npcClass.isInvulnerable = it }
+        isLeashable?.let { npcClass.isLeashable = it }
+        allowProjectileHits?.let { npcClass.allowProjectileHits = it }
     }
 }

common/src/main/kotlin/com/cobblemon/mod/common/api/npc/README.md

@@ -62,9 +62,10 @@ any number of presets and the properties of those presets will be merged into th
         }
       ],
       "names": [
-        "Vera",
-        "Hiro",
-        "John Cobblemon"
+        "Red",
+        "Green",
+        "Blue",
+        "Yellow"
       ],
       "interaction": {
         "type": "dialogue",
@@ -75,6 +76,7 @@ any number of presets and the properties of those presets will be merged into th
       },
       "canDespawn": false,
       "skill": 5,
+      "autoHealParty": true,
       "party": {
         "type": "simple",
         "pokemon": [
@@ -248,22 +250,24 @@ spawning system, it will use a seed level that is based on the player's party's
 spawned using the NPC command, the seed level can be defined in the command and is otherwise set to 1.
 
 A party provider produces either 'static' or 'dynamic' parties. A static party is one that is generated
-when the NPC is initialized and will not change. A dynamic party is one that may be configured using the
+when the NPC is initialized then does not change. A dynamic party is one that may be configured using the
 seed level but can be different any time the NPC is challenged.
 
 A dynamic party prevents the NPC from doing several actions, such as using healing machines, having
 persistent health of their party that changes between battles, and keeping their Pokémon out of their
-balls. This is because the NPC's party is not stored in the world.
+balls. This is because a NPC's dynamic party is not stored in the world and is generated every time
+they are challenged.
 
 #### simple
 The "simple" party type is a way to define a party of Pokémon in a simple list format. Each string in the
 list should be a set of Pokémon properties, as used in commands and spawn files.
 
-This party provider type is considered 'static'. Any level that is not mentioned in the Pokémon properties
-will be set to the seed level.
+This party provider type can be static or dynamic depending on the value of `isStatic`. Any level that 
+is not mentioned in the Pokémon properties will be set to the seed level.
 
     "party": {
       "type": "simple",
+      "isStatic": true,
       "pokemon": [
         "spiritomb moves=splash,firepunch,flamethrower,swift",
         "porygonz speed_ev=252",
@@ -274,5 +278,92 @@ will be set to the seed level.
       ]
     }
 
-#### dynamic
-To be implemented
+#### pool
+The "pool" party type is a way to define a party of Pokémon using a more complicated format that involves some
+randomization and weighting to different Pokémon options.
+
+A pool party provider can be static or dynamic depending on the value of `isStatic`. It specifies the minimum
+and maximum number of Pokémon that can be in the party using `minPokemon` and `maxPokemon`. The `pool` property dictates all of the possible Pokémon, with
+each being an object with several properties.
+
+- The `pokemon` property is the Pokémon properties as used in commands and spawn files that will generate the Pokémon. 
+- The `weight` property is a decimal number that represents how likely that Pokémon is to be chosen. If the weight is -1, it will be guaranteed to be selected. Defaults to 1. The larger the value, the more likely it will be chosen.
+- The `selectableTimes` property is the maximum number of times that the entry can be selected in the party. Defaults to 1.
+- The `npcLevels` property is a range of seed levels that the Pokémon can be generated at. For example, if the NPC is spawned with seed level 10, and the range is 5-9, the Pokémon will not be selected. The actual level of the Pokémon will be the seed level. Defaults to "1-100".
+- The `levelVariation` property is the amount of variation the Pokémon's level can have from the NPC seed level. For example, a value of 2 will mean that for an NPC generated with seed level 10, the Pokémon will be generated somewhere between level 8 and 12 inclusive. Defaults to zero.
+
+For `minPokemon`, `maxPokemon`, `weight`, `selectableTimes`, and `levelVariation`, the values can be a simple number or be full MoLang expressions. At the time
+of seeding an NPC, the cosmetic variations have already been applied. Therefore, it's possible to make these properties
+depend on visual aspects of the NPC. For example, if the NPC has a variation for "dirt", you could set a
+certain Pokémon to be `"weight": "q.npc.has_aspect('dirty') ? -1 : 0"` which would make it a guaranteed party Pokémon for "dirty" NPCs
+and impossible for all other variations of the NPC.
+
+      "party": {
+        "type": "pool",
+        "minPokemon": "3",
+        "maxPokemon": "6",
+        "isStatic": true,
+        "pool": [
+          {
+            "pokemon": "weedle",
+            "weight": "10",
+            "selectableTimes": "2",
+            "levelVariation": "2"
+            "npcLevels": "1-8"
+          },
+          {
+            "pokemon": "caterpie",
+            "weight": "5",
+            "npcLevels": "1-8",
+            "selectableTimes": "2"
+          },
+          {
+            "pokemon": "kakuna",
+            "weight": "7",
+            "selectableTimes": "2",
+            "npcLevels": "8-10"
+          },
+          {
+            "pokemon": "metapod",
+            "weight": "7",
+            "npcLevels": "8-10",
+            "selectableTimes": "2"
+          },
+          {
+            "pokemon": "beedrill",
+            "weight": "5",
+            "npcLevels": "10-15",
+            "selectableTimes": "1"
+          },
+          {
+            "pokemon": "butterfree",
+            "weight": "5",
+            "npcLevels": "10-15",
+            "selectableTimes": "1"
+          }
+        ]
+      }
+
+### autoHealParty
+Whether or not the NPC's party will be healed between battles. If the NPC has a dynamic party, this option will
+do nothing. If the NPC has a static party and this option is false, their Pokémon will not be healed and the
+NPC will have to use healing machines to heal them if they have that enabled in their AI.
+
+### isMovable
+Controls whether the NPC can be moved by players or other entities. If disabled, the NPC will remain 
+stationary.
+
+### isInvulnerable
+Controls whether the NPC is immune to all damage sources.
+
+### isLeashable
+Controls whether players can attach a lead to a NPC. If disabled, players will be unable to leash 
+the NPC and move them using leads.
+
+### allowProjectileHits
+Controls whether the NPC can be hit by projectiles. Disabling this option prevents unwanted 
+interactions, such as players moving the NPC with fishing rods or other projectiles.
+
+### ai
+The AI property is an array of brain configurations. This is used to configure the behaviours of the NPC. See
+the documentation for brain configurations at [AI Configuration](../ai/config/README.md).

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

@@ -58,8 +58,8 @@ class PoolPartyProvider : NPCPartyProvider {
             if (it is JsonPrimitive) {
                 return@map DynamicPokemon(
                     PokemonProperties.parse(it.asString),
-                    0..0,
-                    0..100,
+                    "0".asExpression(),
+                    1..100,
                     "1".asExpression(),
                     "1".asExpression()
                 )
@@ -68,8 +68,8 @@ class PoolPartyProvider : NPCPartyProvider {
             it as JsonObject
             DynamicPokemon(
                 PokemonProperties.parse(it.getAsJsonPrimitive("pokemon").asString),
-                it.getAsJsonPrimitive("levelVariation")?.asString?.split("-")?.let { it[0].toInt()..it[1].toInt() } ?: 0..0,
-                it.getAsJsonPrimitive("npcLevels")?.asString?.split("-")?.let { it[0].toInt()..it[1].toInt() } ?: 0..100,
+                it.getAsJsonPrimitive("levelVariation")?.asString?.asExpression() ?: "0".asExpression(),
+                it.getAsJsonPrimitive("npcLevels")?.asString?.split("-")?.let { it[0].toInt()..it[1].toInt() } ?: 1..100,
                 it.getAsJsonPrimitive("selectableTimes")?.asString?.asExpression() ?: "1".asExpression(),
                 it.getAsJsonPrimitive("weight")?.asString?.asExpression() ?: "1".asExpression()
             )
@@ -79,7 +79,7 @@ class PoolPartyProvider : NPCPartyProvider {
 
     class DynamicPokemon(
         val pokemon: PokemonProperties,
-        val levelVariation: IntRange,
+        val levelVariation: Expression,
         val npcLevels: IntRange,
         val selectableTimes: Expression,
         val weight: Expression = "1".asExpression()
@@ -114,7 +114,8 @@ class PoolPartyProvider : NPCPartyProvider {
             desiredPokemonCount--
 
             // If the Pokémon's props specifies a level then use that, otherwise choose a random level within the range
-            val randomLevel = (level + selected.levelVariation.random())
+            val levelVariation = (0..runtime.resolveInt(selected.levelVariation)).random()
+            val randomLevel = level + levelVariation
             val instance = selected.pokemon.copy().also { it.level = it.level ?: randomLevel }.create()
             party.add(instance)
         }

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

@@ -76,6 +76,7 @@ object CobblemonPermissions {
     val POKEDEX = this.create("${COMMAND_PREFIX}pokedex", PermissionLevel.CHEAT_COMMANDS_AND_COMMAND_BLOCKS)
 
     val NPC_EDIT = this.create("${COMMAND_PREFIX}npcedit", PermissionLevel.CHEAT_COMMANDS_AND_COMMAND_BLOCKS)
+    val NPC_DELETE = this.create("${COMMAND_PREFIX}npcdelete", PermissionLevel.CHEAT_COMMANDS_AND_COMMAND_BLOCKS)
     val FREEZE_POKEMON = this.create("${COMMAND_PREFIX}freezepokemon", PermissionLevel.CHEAT_COMMANDS_AND_COMMAND_BLOCKS)
     val APPLY_PLAYER_TEXTURE = this.create("${COMMAND_PREFIX}applyplayertexture", PermissionLevel.CHEAT_COMMANDS_AND_COMMAND_BLOCKS)
 

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

@@ -22,6 +22,11 @@ enum class PermissionLevel(val numericalValue: Int) {
     SPAWN_PROTECTION_BYPASS(1),
     CHEAT_COMMANDS_AND_COMMAND_BLOCKS(2),
     MULTIPLAYER_MANAGEMENT(3),
-    ALL_COMMANDS(4)
+    ALL_COMMANDS(4);
 
+    companion object {
+        fun byNumericValue(value: Int): PermissionLevel {
+            return entries.first { it.numericalValue == value }
+        }
+    }
 }

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

@@ -24,7 +24,6 @@ interface PermissionValidator {
 
     /**
      * Invoked when the validator replaces the existing one in [Cobblemon.permissionValidator].
-     *
      */
     fun initialize()
 
@@ -36,6 +35,14 @@ interface PermissionValidator {
      * @return If the [player] has the [permission].
      */
     fun hasPermission(player: ServerPlayer, permission: Permission): Boolean
+    /**
+     * Validates a permission for [ServerPlayer] based only on a permission string and a permission level.
+     *
+     * @param player The target [ServerPlayer].
+     * @param permission The permission string being queried such as cobblemon.command.giveallpokemon.
+     * @param level The permission level being queried. 4 is generally used for cheats.
+     */
+    fun hasPermission(player: ServerPlayer, permission: String, level: Int): Boolean = hasPermission(player, CobblemonPermission(permission, PermissionLevel.byNumericValue(level)))
 
     /**
      * Validates a permission for [CommandSource].
@@ -45,5 +52,12 @@ interface PermissionValidator {
      * @return If the [source] has the [permission].
      */
     fun hasPermission(source: CommandSourceStack, permission: Permission): Boolean
-
+    /**
+     * Validates a permission for [CommandSourceStack] based only on a permission string and a permission level.
+     *
+     * @param source The target [CommandSourceStack].
+     * @param permission The permission string being queried such as cobblemon.command.giveallpokemon.
+     * @param level The permission level being queried. 4 is generally used for cheats.
+     */
+    fun hasPermission(source: CommandSourceStack, permission: String, level: Int): Boolean = hasPermission(source, CobblemonPermission(permission, PermissionLevel.byNumericValue(level)))
 }

common/src/main/kotlin/com/cobblemon/mod/common/api/pokeball/catching/modifiers/CatchRateModifiers.kt

@@ -133,7 +133,7 @@ object CatchRateModifiers {
      */
     val LURE = WorldStateModifier { _, entity ->
         if (FishingSpawnCause.FISHED_ASPECT in entity.aspects)
-            4f
+            4F
         else
             1F
     }

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

@@ -42,7 +42,6 @@ abstract class AbstractPokedexManager {
         return speciesRecords.getOrPut(speciesId) {
             val record = SpeciesDexRecord()
             record.initialize(this, speciesId)
-            onSpeciesRecordUpdated(record)
             record
         }
     }
@@ -95,7 +94,7 @@ abstract class AbstractPokedexManager {
         if (formRecord == null || formRecord.knowledge == PokedexEntryProgress.NONE) {
             return PokedexLearnedInformation.FORM
         }
-        if (pokedexEntityData.aspects.none(speciesRecord::hasAspect) || pokedexEntityData.gender !in formRecord.getGenders() || !formRecord.hasSeenShinyState(pokedexEntityData.shiny)) {
+        if (pokedexEntityData.aspects.any{ !speciesRecord.hasAspect(it) } || pokedexEntityData.gender !in formRecord.getGenders() || !formRecord.hasSeenShinyState(pokedexEntityData.shiny)) {
             return PokedexLearnedInformation.VARIATION
         }
         return PokedexLearnedInformation.NONE

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

@@ -76,6 +76,12 @@ class FormDexRecord {
             .addFunction("has_seen_gender") { params -> genders.contains(Gender.valueOf(params.getString(0).uppercase())) }
     }
 
+    fun clone() = FormDexRecord().also {
+        it.genders.addAll(genders)
+        it.seenShinyStates.addAll(seenShinyStates)
+        it.knowledge = knowledge
+    }
+
     fun encountered(pokemon: Pokemon) {
         if (wouldBeDifferent(pokemon, PokedexEntryProgress.ENCOUNTERED)) {
             addInformation(pokemon, PokedexEntryProgress.ENCOUNTERED)

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

@@ -57,7 +57,7 @@ class PokedexManager(
         uuid.getPlayer()?.sendPacket(
             SetClientPlayerDataPacket(
                 type = PlayerInstancedDataStoreTypes.POKEDEX,
-                playerData = ClientPokedexManager(mutableMapOf(speciesDexRecord.id to speciesDexRecord)),
+                playerData = ClientPokedexManager(mutableMapOf(speciesDexRecord.id to speciesDexRecord.clone())),
                 isIncremental = true
             )
         )
@@ -75,5 +75,9 @@ class PokedexManager(
         }
     }
 
-    override fun toClientData() = ClientPokedexManager(speciesRecords)
+    override fun toClientData(): ClientPokedexManager {
+        val copied = mutableMapOf<ResourceLocation, SpeciesDexRecord>()
+        speciesRecords.forEach { (key, value) -> copied[key] = value.clone() }
+        return ClientPokedexManager(copied)
+    }
 }

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

@@ -51,6 +51,10 @@ class SpeciesDexRecord {
     private val aspects: MutableSet<String> = mutableSetOf()
     private val formRecords: MutableMap<String, FormDexRecord> = mutableMapOf()
 
+    fun describe(): String {
+        return "SpeciesDexRecord(aspects=$aspects, formRecords=$formRecords)"
+    }
+
     @Transient
     val struct = QueryStruct(hashMapOf()).addStandardFunctions()
         .addFunction("get_form_record") { params ->
@@ -107,7 +111,6 @@ class SpeciesDexRecord {
         return formRecords.getOrPut(formName.lowercase()) {
             val record = FormDexRecord()
             record.initialize(this, formName)
-            onFormRecordUpdated(record)
             // Some more stuff eventually
             record
         }
@@ -121,6 +124,11 @@ class SpeciesDexRecord {
         formRecords.remove(formName)
     }
 
+    fun clone() = SpeciesDexRecord().also {
+        it.aspects.addAll(aspects)
+        it.formRecords.putAll(formRecords.mapValues { it.value.clone() })
+    }
+
     fun getAspects(): Set<String> = this.aspects
     fun hasAspect(aspect: String) = aspect in aspects
     fun getKnowledge() = formRecords.values.maxOfOrNull { it.knowledge } ?: PokedexEntryProgress.NONE

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

@@ -0,0 +1,15 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.pokedex.filter
+
+enum class SearchByType {
+    SPECIES,
+    ABILITIES,
+    DROPS;
+}

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

@@ -8,10 +8,16 @@
 
 package com.cobblemon.mod.common.api.pokedex.filter
 
+import com.cobblemon.mod.common.api.drop.ItemDropEntry
 import com.cobblemon.mod.common.api.pokedex.AbstractPokedexManager
 import com.cobblemon.mod.common.api.pokedex.PokedexEntryProgress
 import com.cobblemon.mod.common.api.pokedex.entry.PokedexEntry
 import com.cobblemon.mod.common.api.pokemon.PokemonSpecies
+import com.cobblemon.mod.common.pokemon.abilities.HiddenAbility
+import com.cobblemon.mod.common.util.asTranslated
+import com.cobblemon.mod.common.util.itemRegistry
+import net.minecraft.client.Minecraft
+import net.minecraft.world.item.ItemStack
 
 /**
  * A Pokedex [EntryFilter] that filters out entries that do not contain the current search.
@@ -20,12 +26,45 @@ import com.cobblemon.mod.common.api.pokemon.PokemonSpecies
  * @since September 4th, 2024
  * @param searchString The string to use when checking.
  */
-class SearchFilter(val pokedexManager: AbstractPokedexManager, val searchString: String) : EntryFilter() {
+class SearchFilter(val pokedexManager: AbstractPokedexManager, val searchString: String, val searchByType: SearchByType = SearchByType.SPECIES) : EntryFilter() {
+
     override fun test(entry: PokedexEntry): Boolean {
         if (searchString == "") return true
+
         val species = PokemonSpecies.getByIdentifier(entry.speciesId) ?: return false
         if (pokedexManager.getHighestKnowledgeFor(entry) == PokedexEntryProgress.NONE) return false
-        return species.translatedName.string.contains(searchString.trim(), true)
+
+        when(searchByType) {
+            SearchByType.ABILITIES -> {
+                if (pokedexManager.getHighestKnowledgeFor(entry) !== PokedexEntryProgress.CAUGHT) return false
+                val abilityList = mutableListOf<String>()
+                val formsList = if (species.forms.isEmpty()) mutableListOf(species.standardForm) else species.forms
+                formsList.forEach {
+                    it.abilities.sortedBy { it is HiddenAbility }.map { ability -> ability.template }.forEach {
+                        abilityList.add(it.displayName.asTranslated().string.lowercase())
+                    }
+                }
+                return abilityList.any { it.contains(searchString.trim().lowercase()) }
+            }
+            SearchByType.DROPS -> {
+                if (pokedexManager.getHighestKnowledgeFor(entry) !== PokedexEntryProgress.CAUGHT) return false
+                val dropsList = mutableListOf<String>()
+                val formsList = if (species.forms.isEmpty()) mutableListOf(species.standardForm) else species.forms
+                formsList.forEach {
+                    it.drops.entries.forEach {
+                        if (it is ItemDropEntry) {
+                            val itemStack = Minecraft.getInstance().player?.level()?.itemRegistry?.get(it.item)?.defaultInstance ?: ItemStack.EMPTY
+                            if (!itemStack.isEmpty) dropsList.add(itemStack.displayName.string.lowercase())
+                        }
+                    }
+                }
+                return dropsList.any { it.contains(searchString.trim().lowercase()) }
+            }
+            // Search by species name
+            else -> {
+                return species.translatedName.string.contains(searchString.trim(), true)
+            }
+        }
     }
 
 }

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

@@ -657,8 +657,8 @@ open class PokemonProperties {
         nature = if (tag.contains(DataKeys.POKEMON_NATURE)) tag.getString(DataKeys.POKEMON_NATURE) else null
         ability = if (tag.contains(DataKeys.POKEMON_ABILITY)) tag.getString(DataKeys.POKEMON_ABILITY) else null
         status = if (tag.contains(DataKeys.POKEMON_STATUS_NAME)) tag.getString(DataKeys.POKEMON_STATUS_NAME) else null
-        ivs = if (tag.contains(DataKeys.POKEMON_IVS)) ivs?.loadFromNBT(tag.getCompound(DataKeys.POKEMON_IVS)) as IVs? else null
-        evs = if (tag.contains(DataKeys.POKEMON_EVS)) evs?.loadFromNBT(tag.getCompound(DataKeys.POKEMON_EVS)) as EVs? else null
+        ivs = if (tag.contains(DataKeys.POKEMON_IVS)) IVs().loadFromNBT(tag.getCompound(DataKeys.POKEMON_IVS)) as IVs else null
+        evs = if (tag.contains(DataKeys.POKEMON_EVS)) EVs().loadFromNBT(tag.getCompound(DataKeys.POKEMON_EVS)) as EVs else null
         type = if (tag.contains(DataKeys.ELEMENTAL_TYPE)) tag.getString(DataKeys.ELEMENTAL_TYPE) else null
         teraType = if (tag.contains(DataKeys.POKEMON_TERA_TYPE)) tag.getString(DataKeys.POKEMON_TERA_TYPE) else null
         dmaxLevel = if (tag.contains(DataKeys.POKEMON_DMAX_LEVEL)) tag.getInt(DataKeys.POKEMON_DMAX_LEVEL) else null
@@ -722,8 +722,8 @@ open class PokemonProperties {
         nature = json.get(DataKeys.POKEMON_NATURE)?.asString
         ability = json.get(DataKeys.POKEMON_ABILITY)?.asString
         status = json.get(DataKeys.POKEMON_STATUS_NAME)?.asString
-        ivs?.loadFromJSON(json.getAsJsonObject(DataKeys.POKEMON_IVS))
-        evs?.loadFromJSON(json.getAsJsonObject(DataKeys.POKEMON_EVS))
+        ivs = json.getAsJsonObject(DataKeys.POKEMON_IVS)?.let { IVs().loadFromJSON(it) } as IVs
+        evs = json.getAsJsonObject(DataKeys.POKEMON_EVS)?.let { EVs().loadFromJSON(it) } as EVs
         type = json.get(DataKeys.ELEMENTAL_TYPE)?.asString
         teraType = json.get(DataKeys.POKEMON_TERA_TYPE)?.asString
         dmaxLevel = json.get(DataKeys.POKEMON_DMAX_LEVEL)?.asInt

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

@@ -50,13 +50,13 @@ enum class Stats(override val identifier: ResourceLocation, override val display
         val BATTLE_ONLY: Set<Stat> = EnumSet.of(EVASION, ACCURACY)
 
         /** Gets the [Stat] from the respective Showdown id. */
-        fun getStat(statKey: String) = when(statKey) {
+        fun getStat(statKey: String) = when(statKey.lowercase()) {
             "hp" -> HP
-            "atk", "Attack" -> ATTACK // Hyper Cutter states the full stat name "Attack"
-            "def", "Defense" -> DEFENCE // Big Pecks states the full stat name "Defense"
+            "atk", "attack" -> ATTACK // Hyper Cutter states the full stat name "Attack"
+            "def", "defense" -> DEFENCE // Big Pecks states the full stat name "Defense"
             "spa" -> SPECIAL_ATTACK
             "spd" -> SPECIAL_DEFENCE
-            "spe" -> SPEED
+            "spe", "speed" -> SPEED
             "evasion" -> EVASION
             else -> ACCURACY
         }

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

@@ -8,9 +8,12 @@
 
 package com.cobblemon.mod.common.api.spawning
 
+import com.bedrockk.molang.Expression
 import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.api.conditional.RegistryLikeCondition
 import com.cobblemon.mod.common.api.data.JsonDataRegistry
+import com.cobblemon.mod.common.api.molang.ExpressionLike
+import com.cobblemon.mod.common.api.npc.NPCClass
 import com.cobblemon.mod.common.api.pokemon.PokemonProperties
 import com.cobblemon.mod.common.api.reactive.SimpleObservable
 import com.cobblemon.mod.common.api.spawning.condition.SpawningCondition
@@ -69,6 +72,9 @@ object SpawnDetailPresets : JsonDataRegistry<SpawnDetailPreset> {
         .registerTypeAdapter(MoonPhaseRange::class.java, IntRangesAdapter(MoonPhaseRange.moonPhaseRanges) { MoonPhaseRange(*it) })
         .registerTypeAdapter(PokemonProperties::class.java, pokemonPropertiesShortAdapter)
         .registerTypeAdapter(PossibleHeldItem::class.java, PossibleHeldItemAdapter)
+        .registerTypeAdapter(NPCClass::class.java, NPCClassReferenceAdapter)
+        .registerTypeAdapter(Expression::class.java, ExpressionAdapter)
+        .registerTypeAdapter(ExpressionLike::class.java, ExpressionLikeAdapter)
         .create()
 
     val presetTypes = mutableMapOf<String, Class<out SpawnDetailPreset>>()

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

@@ -8,9 +8,12 @@
 
 package com.cobblemon.mod.common.api.spawning
 
+import com.bedrockk.molang.Expression
 import com.cobblemon.mod.common.api.conditional.RegistryLikeCondition
 import com.cobblemon.mod.common.api.drop.DropEntry
 import com.cobblemon.mod.common.api.drop.ItemDropMethod
+import com.cobblemon.mod.common.api.molang.ExpressionLike
+import com.cobblemon.mod.common.api.npc.NPCClass
 import com.cobblemon.mod.common.api.pokemon.PokemonProperties
 import com.cobblemon.mod.common.api.spawning.condition.SpawningCondition
 import com.cobblemon.mod.common.api.spawning.context.RegisteredSpawningContext
@@ -68,6 +71,9 @@ object SpawnLoader {
         .registerTypeAdapter(CompoundTag::class.java, NbtCompoundAdapter)
         .registerTypeAdapter(IntRange::class.java, IntRangeAdapter)
         .registerTypeAdapter(PossibleHeldItem::class.java, PossibleHeldItemAdapter)
+        .registerTypeAdapter(NPCClass::class.java, NPCClassReferenceAdapter)
+        .registerTypeAdapter(Expression::class.java, ExpressionAdapter)
+        .registerTypeAdapter(ExpressionLike::class.java, ExpressionLikeAdapter)
         .create()
 
     var deserializingConditionClass: Class<out SpawningCondition<*>>? = null

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

@@ -8,9 +8,10 @@
 
 package com.cobblemon.mod.common.api.spawning.context
 
-import com.bedrockk.molang.runtime.struct.VariableStruct
-import com.bedrockk.molang.runtime.value.DoubleValue
-import com.cobblemon.mod.common.api.molang.ObjectValue
+import com.bedrockk.molang.runtime.MoLangRuntime
+import com.bedrockk.molang.runtime.struct.QueryStruct
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMoLangValue
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.setup
 import com.cobblemon.mod.common.api.spawning.SpawnCause
 import com.cobblemon.mod.common.api.spawning.condition.BasicSpawningCondition
 import com.cobblemon.mod.common.api.spawning.detail.SpawnDetail
@@ -55,6 +56,10 @@ abstract class SpawningContext {
         }
     }
 
+    @Transient
+    val runtime = MoLangRuntime().setup()
+        .also { runtime -> runtime.environment.query.addFunction("context") { getOrSetupStruct()  } }
+
     /** What caused the spawn context, as a [SpawnCause]. */
     abstract val cause: SpawnCause
     val spawner: Spawner
@@ -87,7 +92,7 @@ abstract class SpawningContext {
     val biomeName: ResourceLocation
         get() = this.biomeRegistry.getKey(biome)!!
 
-    private val struct = VariableStruct()
+    private var struct = QueryStruct(hashMapOf())
     private var structCompiled = false
 
     class StructureChunkCache {
@@ -168,19 +173,11 @@ abstract class SpawningContext {
         return weight
     }
 
-    fun getOrSetupStruct(): VariableStruct {
+    fun getOrSetupStruct(): QueryStruct {
         if (structCompiled) {
             return struct
         }
-
-        struct.setDirectly("light", DoubleValue(light.toDouble()))
-        struct.setDirectly("x", DoubleValue(position.x.toDouble()))
-        struct.setDirectly("y", DoubleValue(position.y.toDouble()))
-        struct.setDirectly("z", DoubleValue(position.z.toDouble()))
-        struct.setDirectly("moon_phase", DoubleValue(moonPhase.toDouble()))
-        struct.setDirectly("world", ObjectValue(world.registryAccess().registryOrThrow(Registries.DIMENSION).wrapAsHolder(world)))
-        struct.setDirectly("biome", ObjectValue(biomeRegistry.wrapAsHolder(biome)))
-
+        struct = this.asMoLangValue()
         structCompiled = true
         return struct
     }

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

@@ -8,10 +8,10 @@
 
 package com.cobblemon.mod.common.api.spawning.detail
 
+import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.api.spawning.context.SpawningContext
 import com.cobblemon.mod.common.entity.npc.NPCEntity
-import com.cobblemon.mod.common.util.party
-import net.minecraft.server.level.ServerPlayer
+import com.cobblemon.mod.common.util.resolveInt
 
 /**
  * A [SpawnAction] for creating [NPCEntity]s.
@@ -19,13 +19,15 @@ import net.minecraft.server.level.ServerPlayer
  * @author Hiroku
  * @since October 8th, 2023
  */
-class NPCSpawnAction(ctx: SpawningContext, override val detail: NPCSpawnDetail) : SpawnAction<EntitySpawnResult>(ctx, detail) {
-    override fun run(): EntitySpawnResult {
+class NPCSpawnAction(ctx: SpawningContext, override val detail: NPCSpawnDetail) : SingleEntitySpawnAction<NPCEntity>(ctx, detail) {
+    override fun createEntity(): NPCEntity {
         val npc = NPCEntity(ctx.world)
         npc.npc = detail.npcClass
         npc.appliedAspects.addAll(detail.aspects)
-        val seedLevel = (ctx.cause.entity as? ServerPlayer)?.let { it.party().maxOfOrNull { it.level } } ?: 10
+        val minLevel = ctx.runtime.resolveInt(detail.minLevel).coerceIn(1, Cobblemon.config.maxPokemonLevel)
+        val maxLevel = ctx.runtime.resolveInt(detail.maxLevel).coerceIn(1, Cobblemon.config.maxPokemonLevel)
+        val seedLevel = (minLevel..maxLevel).random()
         npc.initialize(seedLevel)
-        return EntitySpawnResult(listOf(npc))
+        return npc
     }
 }

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

@@ -8,10 +8,11 @@
 
 package com.cobblemon.mod.common.api.spawning.detail
 
+import com.bedrockk.molang.Expression
 import com.cobblemon.mod.common.api.npc.NPCClass
-import com.cobblemon.mod.common.api.npc.NPCConfiguration
 import com.cobblemon.mod.common.api.spawning.context.SpawningContext
 import com.cobblemon.mod.common.entity.npc.NPCEntity
+import com.cobblemon.mod.common.util.asExpression
 import com.google.gson.annotations.SerializedName
 
 /**
@@ -30,8 +31,9 @@ class NPCSpawnDetail : SpawnDetail() {
 
     @SerializedName(value = "npcClass", alternate = ["class", "npc"])
     val npcClass: NPCClass = blankClass
-    val configuration: NPCConfiguration? = null
     val aspects: Set<String> = emptySet()
+    val minLevel: Expression = "1".asExpression()
+    val maxLevel: Expression = "100".asExpression()
 
     override fun doSpawn(ctx: SpawningContext) = NPCSpawnAction(ctx, this)
 }

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

@@ -9,6 +9,7 @@
 package com.cobblemon.mod.common.api.storage.party
 
 import com.cobblemon.mod.common.CobblemonNetwork.sendPacket
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMoLangValue
 import com.cobblemon.mod.common.api.reactive.Observable
 import com.cobblemon.mod.common.api.reactive.Observable.Companion.stopAfter
 import com.cobblemon.mod.common.api.reactive.SimpleObservable
@@ -25,11 +26,11 @@ import com.cobblemon.mod.common.pokemon.Pokemon
 import com.cobblemon.mod.common.util.DataKeys
 import com.cobblemon.mod.common.util.server
 import com.google.gson.JsonObject
+import java.util.Collections
 import java.util.UUID
+import net.minecraft.core.RegistryAccess
 import net.minecraft.nbt.CompoundTag
 import net.minecraft.server.level.ServerPlayer
-import java.util.Collections
-import net.minecraft.core.RegistryAccess
 
 /**
  * A [PokemonStore] for a party of Pokémon. This is a simple structure that by default will hold 6 nullable slots of Pokémon.
@@ -47,6 +48,8 @@ open class PartyStore(override val uuid: UUID) : PokemonStore<PartyPosition>() {
     /** A list of player UUIDs representing players that are observing this store. This is NOT serialized/deserialized. */
     var observerUUIDs = mutableListOf<UUID>()
 
+    val struct = asMoLangValue()
+
     override fun iterator() = slots.filterNotNull().iterator()
     /** Gets the Pokémon at the specified slot. It will return null if the slot is empty or the given slot is out of bounds. */
     fun get(slot: Int) = slot.takeIf { it < slots.size && it >= 0 }?.let { slots[it] }

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

@@ -9,6 +9,7 @@
 package com.cobblemon.mod.common.api.storage.pc
 
 import com.cobblemon.mod.common.Cobblemon
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMoLangValue
 import com.cobblemon.mod.common.api.reactive.SimpleObservable
 import com.cobblemon.mod.common.api.storage.BottomlessStore
 import com.cobblemon.mod.common.api.storage.PokemonStore
@@ -23,11 +24,11 @@ import com.cobblemon.mod.common.util.DataKeys
 import com.cobblemon.mod.common.util.getPlayer
 import com.cobblemon.mod.common.util.lang
 import com.google.gson.JsonObject
+import java.util.UUID
+import net.minecraft.core.RegistryAccess
 import net.minecraft.nbt.CompoundTag
 import net.minecraft.network.chat.MutableComponent
 import net.minecraft.server.level.ServerPlayer
-import java.util.*
-import net.minecraft.core.RegistryAccess
 
 /**
  * The store used for PCs. It is divided into some number of [PCBox]es, and can
@@ -54,6 +55,9 @@ open class PCStore(
 
     override fun iterator() = boxes.flatMap { it.toList() }.iterator()
     override fun getObservingPlayers() = observingUUIDs.mapNotNull { it.getPlayer() }
+
+    val struct = asMoLangValue()
+
     fun addObserver(player: ServerPlayer) {
         observingUUIDs.add(player.uuid)
         sendTo(player)

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

@@ -105,6 +105,9 @@ object BattleBuilder {
             }
         }
 
+        player1Actor.battleTheme = player2.getBattleTheme()
+        player2Actor.battleTheme = player1.getBattleTheme()
+
         return if (errors.isEmpty) {
             var result: BattleStartResult = errors
             BattleRegistry.startBattle(
@@ -112,8 +115,6 @@ object BattleBuilder {
                 side1 = BattleSide(player1Actor),
                 side2 = BattleSide(player2Actor)
             ).ifSuccessful {
-                player1Actor.battleTheme = player2.getBattleTheme()
-                player2Actor.battleTheme = player1.getBattleTheme()
                 it.battlePartyStores.addAll(battlePartyStores)
                 result = SuccessfulBattleStart(it)
             }
@@ -197,19 +198,18 @@ object BattleBuilder {
             playerActors.swap(2,3)
         }
 
+        // TODO: less hard coding
+        playerActors[0].battleTheme = players[2].getBattleTheme()
+        playerActors[1].battleTheme = players[2].getBattleTheme()
+        playerActors[2].battleTheme = players[0].getBattleTheme()
+        playerActors[3].battleTheme = players[0].getBattleTheme()
+
         return if (errors.isEmpty) {
             BattleRegistry.startBattle(
                     battleFormat = battleFormat,
                     side1 = BattleSide(playerActors[0], playerActors[1]),
                     side2 = BattleSide(playerActors[2], playerActors[3])
             ).ifSuccessful {
-                // TODO: less hard coding
-                playerActors[0].battleTheme = players[2].getBattleTheme()
-                playerActors[1].battleTheme = players[2].getBattleTheme()
-
-                playerActors[2].battleTheme = players[0].getBattleTheme()
-                playerActors[3].battleTheme = players[0].getBattleTheme()
-
                 it.battlePartyStores.addAll(battlePartyStores)
             }
             errors
@@ -272,6 +272,8 @@ object BattleBuilder {
             errors.participantErrors[wildActor] += BattleStartError.alreadyInBattle(wildActor)
         }
 
+        playerActor.battleTheme = pokemonEntity.getBattleTheme()
+
         return if (errors.isEmpty) {
             var result: BattleStartResult = errors
             BattleRegistry.startBattle(
@@ -282,7 +284,6 @@ object BattleBuilder {
                 if (!cloneParties) {
                     pokemonEntity.battleId = it.battleId
                 }
-                playerActor.battleTheme = pokemonEntity.getBattleTheme()
                 result = SuccessfulBattleStart(it)
             }
             result
@@ -347,6 +348,8 @@ object BattleBuilder {
             )
         }
 
+        playerActor.battleTheme = npcEntity.getBattleTheme()
+
         return if (errors.isEmpty) {
             var result: BattleStartResult = errors
             BattleRegistry.startBattle(
@@ -354,7 +357,6 @@ object BattleBuilder {
                 side1 = BattleSide(playerActor),
                 side2 = BattleSide(npcActor)
             ).ifSuccessful { battle ->
-                playerActor.battleTheme = npcEntity.getBattleTheme()
                 npcEntity.entityData.update(NPCEntity.BATTLE_IDS) { it + battle.battleId }
                 result = SuccessfulBattleStart(battle)
             }

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

@@ -290,12 +290,13 @@ object ShowdownInterpreter {
     }
 
     fun broadcastOptionalAbility(battle: PokemonBattle, effect: Effect?, pokemon: BattlePokemon) {
-        if (effect != null && effect.type == Effect.Type.ABILITY)
-            broadcastAbility(battle, effect, pokemon)
+        if (effect == null) return
+        broadcastAbility(battle, effect, pokemon)
     }
 
     // Broadcasts a generic lang to notify players of ability activations (effects are broadcasted separately)
     fun broadcastAbility(battle: PokemonBattle, effect: Effect, pokemon: BattlePokemon) {
+        if (effect.type != Effect.Type.ABILITY) return
         battle.dispatchWaiting(0.5F) {
             val lang = battleLang("ability.generic", pokemon.getName(), effect.typelessData).yellow()
             battle.broadcastChatMessage(lang)

common/src/main/kotlin/com/cobblemon/mod/common/battles/actor/PlayerBattleActor.kt

@@ -24,11 +24,12 @@ import java.util.UUID
 import net.minecraft.network.chat.MutableComponent
 import net.minecraft.server.level.ServerPlayer
 import net.minecraft.sounds.SoundEvent
+import net.minecraft.sounds.SoundEvents
 import net.minecraft.world.phys.Vec3
 
 class PlayerBattleActor(
     uuid: UUID,
-    pokemonList: List<BattlePokemon>
+    pokemonList: List<BattlePokemon>,
 ) : BattleActor(uuid, pokemonList.toMutableList()), EntityBackedBattleActor<ServerPlayer> {
 
     override val initialPos: Vec3?
@@ -41,8 +42,7 @@ class PlayerBattleActor(
     /** The [SoundEvent] to play to the player during a battle. Will start playing as soon as the battle starts. */
     var battleTheme: SoundEvent? = null
         set(value) {
-            if (field != value && this.battle.started)
-                this.sendUpdate(BattleMusicPacket(value))
+            if (this.isInitialized() && this.battle.started) this.sendUpdate(BattleMusicPacket(value))
             field = value
         }
 

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

@@ -47,6 +47,7 @@ class AbilityInstruction(val instructionSet: InstructionSet, val message: Battle
             val lang = when (optionalEffect?.id) {
                 "trace" -> optionalPokemonName?.let { battleLang("ability.trace", pokemonName, it, effect.typelessData) }
                 "receiver", "powerofalchemy" -> optionalPokemonName?.let { battleLang("ability.receiver", it, effect.typelessData) } // Receiver and Power of Alchemy share the same text
+                "worryseed", "entrainment", "simplebeam", "roleplay", "doodle" -> battleLang("ability.replace", pokemonName, effect.typelessData)
                 else -> when (effect.id) {
                     "sturdy", "unnerve", "anticipation" -> battleLang("ability.${effect.id}", pokemonName) // Unique message
                     "airlock", "cloudnine" -> battleLang("ability.airlock") // Cloud Nine shares the same text as Air Lock

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

@@ -8,6 +8,7 @@
 
 package com.cobblemon.mod.common.battles.interpreter.instructions
 
+import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.api.battles.interpreter.BattleMessage
 import com.cobblemon.mod.common.api.battles.model.PokemonBattle
 import com.cobblemon.mod.common.api.scheduling.afterOnServer

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

@@ -30,7 +30,7 @@ class MegaInstruction(val message: BattleMessage): InterpreterInstruction {
         battle.dispatchWaiting {
             val pokemonName = battlePokemon.getName()
             battle.broadcastChatMessage(battleLang("mega", pokemonName).yellow())
-            CobblemonEvents.MEGA_EVOLUTON.post(MegaEvolutionEvent(battle, battlePokemon))
+            CobblemonEvents.MEGA_EVOLUTION.post(MegaEvolutionEvent(battle, battlePokemon))
             battle.minorBattleActions[battlePokemon.uuid] = message
         }
     }

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

@@ -10,17 +10,14 @@ package com.cobblemon.mod.common.battles.interpreter.instructions
 
 import com.cobblemon.mod.common.api.battles.interpreter.BattleMessage
 import com.cobblemon.mod.common.api.battles.model.PokemonBattle
-import com.cobblemon.mod.common.api.text.yellow
 import com.cobblemon.mod.common.battles.ShowdownInterpreter
 import com.cobblemon.mod.common.battles.dispatch.InstructionSet
 import com.cobblemon.mod.common.battles.dispatch.InterpreterInstruction
+import com.cobblemon.mod.common.entity.pokemon.effects.IllusionEffect
 import com.cobblemon.mod.common.net.messages.client.battle.BattleSwapPokemonPacket
 import com.cobblemon.mod.common.util.battleLang
 import com.cobblemon.mod.common.util.setPositionSafely
 import com.cobblemon.mod.common.util.swap
-import net.minecraft.server.level.ServerLevel
-import net.minecraft.world.phys.Vec3
-import java.util.logging.Level
 
 
 /**
@@ -32,58 +29,30 @@ import java.util.logging.Level
  */
 class SwapInstruction(val message: BattleMessage, val instructionSet: InstructionSet): InterpreterInstruction {
     override fun invoke(battle: PokemonBattle) {
-        // TODO: more error checks
         battle.dispatchWaiting {
             val battlePokemonA = message.battlePokemon(0, battle) ?: return@dispatchWaiting
             val pnxA = message.argumentAt(0)?.substring(0, 3)
-            var posA: Vec3? = null
             val (actor, activePokemonA) = battle.getActorAndActiveSlotFromPNX(pnxA!!)
-            if (battlePokemonA.entity == null) {
-                posA = ShowdownInterpreter.getSendoutPosition(battle, activePokemonA, battlePokemonA.actor)
-            } else {
-                posA = battlePokemonA.entity?.position()
-            }
+
 
             val activeBattlePokemonB = activePokemonA.getAdjacentAllies().firstOrNull()
-            if(activeBattlePokemonB != null) {
+            if (activeBattlePokemonB != null) {
                 val pnxB = activeBattlePokemonB.getPNX()
                 val (actorB, activePokemonB) = battle.getActorAndActiveSlotFromPNX(pnxB)
-
-                // Swap the position of the 2 on the field
-                var posB: Vec3? = null
-                if (activePokemonB.battlePokemon?.entity == null) {
-                    // target slot is likely fainted
-                    posB = ShowdownInterpreter.getSendoutPosition(battle, activePokemonB, actorB)
-                } else {
-                    posB = activePokemonB.battlePokemon?.entity?.position()
-                }
-                if (posB != null && battlePokemonA.entity != null) {
-                    battlePokemonA.entity?.setPositionSafely(posB)
-                } else if(posB != null) {
-                    if (activePokemonA.battlePokemon?.entity != null) {
-                        activePokemonA.battlePokemon?.entity?.setPositionSafely(posB)
-                    } else {
-                        activePokemonB.position.let {
-                            if (it != null) {
-                                activePokemonB.position = Pair<ServerLevel, Vec3>(it.first, posB)
-                            }
-                        }
-                    }
-                }
-                if(posA != null) {
-                    if (activePokemonB.battlePokemon?.entity != null) {
-                        activePokemonB.battlePokemon?.entity?.setPositionSafely(posA)
-                    } else {
-                        activePokemonA.position.let {
-                            if (it != null) {
-                                activePokemonB.position = Pair<ServerLevel, Vec3>(it.first, posA)
-                            }
-                        }
-                    }
-                }
                 // Swap references of the 2 pokemon
                 actor.activePokemon.swap((pnxA[2] - 'a'), (pnxB[2] - 'a'))
 
+                val posA = ShowdownInterpreter.getSendoutPosition(battle, activePokemonA, battlePokemonA.actor) ?: activePokemonA.position?.second
+                if (posA != null && battlePokemonA.entity != null) {
+                    battlePokemonA.entity?.setPositionSafely(battlePokemonA.entity!!.getAjustedSendoutPosition(posA))
+                }
+
+                val posB = ShowdownInterpreter.getSendoutPosition(battle, activePokemonB, battlePokemonA.actor) ?: activePokemonB.position?.second
+                val battlePokemonB = activePokemonB.battlePokemon
+                if (posB != null && battlePokemonB?.entity != null) {
+                    activePokemonB.battlePokemon?.entity?.setPositionSafely(battlePokemonB.entity!!.getAjustedSendoutPosition(posB))
+                }
+
                 // Notify clients of the swap
                 battle.sendUpdate(BattleSwapPokemonPacket(pnxA))
 

common/src/main/kotlin/com/cobblemon/mod/common/battles/pokemon/BattlePokemon.kt

@@ -8,7 +8,6 @@
 
 package com.cobblemon.mod.common.battles.pokemon
 
-import com.bedrockk.molang.runtime.struct.VariableStruct
 import com.cobblemon.mod.common.api.battles.model.actor.BattleActor
 import com.cobblemon.mod.common.api.moves.MoveSet
 import com.cobblemon.mod.common.api.pokemon.helditem.HeldItemManager
@@ -107,9 +106,5 @@ open class BattlePokemon(
                 !isSentOut() && !willBeSwitchedIn && health > 0
             }
 
-    fun writeVariables(struct: VariableStruct) {
-        effectedPokemon.writeVariables(struct)
-    }
-
     fun getIllusion(): BattlePokemon? = this.actor.activePokemon.find { it.battlePokemon == this }?.illusion
 }

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

@@ -8,10 +8,14 @@
 
 package com.cobblemon.mod.common.block
 
+import com.cobblemon.mod.common.CobblemonBlockEntities
 import com.cobblemon.mod.common.CobblemonSounds
 import com.cobblemon.mod.common.block.entity.LecternBlockEntity
+import com.cobblemon.mod.common.block.entity.ViewerCountBlockEntity
 import com.cobblemon.mod.common.item.PokedexItem
 import com.cobblemon.mod.common.net.messages.client.ui.PokedexUIPacket
+import com.cobblemon.mod.common.util.playSoundServer
+import com.cobblemon.mod.common.util.toVec3d
 import com.mojang.serialization.MapCodec
 import net.minecraft.core.BlockPos
 import net.minecraft.core.Direction
@@ -29,6 +33,7 @@ import net.minecraft.world.level.Level
 import net.minecraft.world.level.LevelReader
 import net.minecraft.world.level.block.*
 import net.minecraft.world.level.block.entity.BlockEntity
+import net.minecraft.world.level.block.entity.BlockEntityType
 import net.minecraft.world.level.block.state.BlockState
 import net.minecraft.world.level.block.state.StateDefinition
 import net.minecraft.world.level.block.state.properties.DirectionProperty
@@ -52,6 +57,8 @@ class LecternBlock(properties: Properties): BaseEntityBlock(properties) {
 
     override fun codec() = CODEC
 
+    override fun <T : BlockEntity> getTicker(world: Level, blockState: BlockState, BlockWithEntityType: BlockEntityType<T>) = createTickerHelper(BlockWithEntityType, CobblemonBlockEntities.LECTERN, ViewerCountBlockEntity.TICKER::tick)
+
     override fun getRenderShape(blockState: BlockState?) = RenderShape.MODEL
 
     override fun getOcclusionShape(blockState: BlockState?, blockGetter: BlockGetter?, blockPos: BlockPos?): VoxelShape = MinecraftLecternBlock.SHAPE_COMMON
@@ -117,12 +124,15 @@ class LecternBlock(properties: Properties): BaseEntityBlock(properties) {
             if (!itemStack.isEmpty && itemStack.item is PokedexItem) {
                 if (!level.isClientSide) {
                     if (player.isCrouching) takeStoredItem(blockEntity, blockState, level, blockPos, player)
-                    else PokedexUIPacket((blockEntity.getItemStack().item as PokedexItem).type).sendToPlayer(player as ServerPlayer)
+                    else {
+                        blockEntity.incrementViewerCount()
+                        PokedexUIPacket(type = (blockEntity.getItemStack().item as PokedexItem).type, blockPos = blockPos).sendToPlayer(player as ServerPlayer)
+                        level.playSoundServer(position = blockPos.toVec3d(), sound = CobblemonSounds.POKEDEX_OPEN, volume = 0.25F)
+                    }
                 }
-                else if (!player.isCrouching) player.playSound(CobblemonSounds.POKEDEX_OPEN)
             }
         }
-        return InteractionResult.CONSUME
+        return InteractionResult.SUCCESS_NO_ITEM_USED
     }
 
     override fun isPathfindable(blockState: BlockState?, pathComputationType: PathComputationType?) = false

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

@@ -173,10 +173,6 @@ class DisplayCaseBlockEntity(pos: BlockPos, state: BlockState) : BlockEntity(Cob
 
     override fun getMaxStackSize() = 1
 
-    override fun canPlaceItemThroughFace(slot: Int, stack: ItemStack, dir: Direction?): Boolean {
-        if(dir == Direction.DOWN) return false
-        return getStack().isEmpty
-    }
-
+    override fun canPlaceItemThroughFace(slot: Int, stack: ItemStack, dir: Direction?): Boolean = (getStack().isEmpty)
     override fun canTakeItemThroughFace(slot: Int, stack: ItemStack, direction: Direction): Boolean = (direction == Direction.DOWN)
 }

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

@@ -13,17 +13,12 @@ import net.minecraft.core.BlockPos
 import net.minecraft.core.HolderLookup
 import net.minecraft.core.NonNullList
 import net.minecraft.nbt.CompoundTag
-import net.minecraft.network.protocol.Packet
-import net.minecraft.network.protocol.game.ClientGamePacketListener
-import net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket
 import net.minecraft.world.ContainerHelper
 import net.minecraft.world.item.ItemStack
-import net.minecraft.world.level.Level
-import net.minecraft.world.level.block.Block
-import net.minecraft.world.level.block.entity.BlockEntity
+import net.minecraft.world.level.block.entity.BlockEntityTicker
 import net.minecraft.world.level.block.state.BlockState
 
-class LecternBlockEntity(blockPos: BlockPos, blockState: BlockState) : BlockEntity(CobblemonBlockEntities.LECTERN, blockPos, blockState) {
+class LecternBlockEntity(blockPos: BlockPos, blockState: BlockState) : ViewerCountBlockEntity(CobblemonBlockEntities.LECTERN, blockPos, blockState) {
     val inventory: NonNullList<ItemStack> = NonNullList.withSize(1, ItemStack.EMPTY)
 
     override fun saveAdditional(compoundTag: CompoundTag, registryLookup: HolderLookup.Provider) {
@@ -36,10 +31,6 @@ class LecternBlockEntity(blockPos: BlockPos, blockState: BlockState) : BlockEnti
         ContainerHelper.loadAllItems(compoundTag, inventory, registryLookup)
     }
 
-    override fun getUpdatePacket(): Packet<ClientGamePacketListener>? {
-        return ClientboundBlockEntityDataPacket.create(this)
-    }
-
     override fun getUpdateTag(registryLookup: HolderLookup.Provider): CompoundTag {
         return this.saveWithoutMetadata(registryLookup)
     }
@@ -51,23 +42,16 @@ class LecternBlockEntity(blockPos: BlockPos, blockState: BlockState) : BlockEnti
     fun setItemStack(itemStack: ItemStack) {
         if (level != null) {
             inventory[0] = itemStack
-            onItemUpdate(level!!)
+            updateBlock(level!!)
         }
     }
 
     fun removeItemStack(): ItemStack {
         if (level != null) {
             val itemStack = ContainerHelper.removeItem(inventory, 0, 1)
-            onItemUpdate(level!!)
+            updateBlock(level!!)
             return itemStack
         }
         return ItemStack.EMPTY
     }
-
-    private fun onItemUpdate(level: Level) {
-        val oldState = level.getBlockState(blockPos)
-        level.sendBlockUpdated(blockPos, oldState, level.getBlockState(blockPos), Block.UPDATE_ALL)
-        level.updateNeighbourForOutputSignal(blockPos, level.getBlockState(blockPos).block)
-        setChanged()
-    }
-}
+}

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

@@ -0,0 +1,99 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.block.entity
+
+import com.cobblemon.mod.common.util.DataKeys
+import net.minecraft.core.BlockPos
+import net.minecraft.core.HolderLookup
+import net.minecraft.nbt.CompoundTag
+import net.minecraft.network.protocol.Packet
+import net.minecraft.network.protocol.game.ClientGamePacketListener
+import net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket
+import net.minecraft.world.entity.player.Player
+import net.minecraft.world.level.ClipContext
+import net.minecraft.world.level.Level
+import net.minecraft.world.level.block.Block
+import net.minecraft.world.level.block.entity.BlockEntity
+import net.minecraft.world.level.block.entity.BlockEntityTicker
+import net.minecraft.world.level.block.entity.BlockEntityType
+import net.minecraft.world.level.block.state.BlockState
+import net.minecraft.world.level.entity.EntityTypeTest
+import net.minecraft.world.phys.AABB
+
+open class ViewerCountBlockEntity(type: BlockEntityType<*>?, blockPos: BlockPos, blockState: BlockState) : BlockEntity(type, blockPos, blockState) {
+
+    companion object {
+        internal val TICKER = BlockEntityTicker<ViewerCountBlockEntity> { world, _, _, blockEntity ->
+            if (world.isClientSide) return@BlockEntityTicker
+
+            blockEntity.checkUsers(blockEntity.getInRangeViewerCount(world, blockEntity.blockPos))
+        }
+    }
+
+    var viewerCount: Int = 0
+
+    private fun checkUsers(inRangeViewers: Int) {
+        if (inRangeViewers < viewerCount) changeViewerCount(inRangeViewers)
+    }
+
+    override fun saveAdditional(compoundTag: CompoundTag, registryLookup: HolderLookup.Provider) {
+        super.saveAdditional(compoundTag, registryLookup)
+        compoundTag.putInt(DataKeys.BLOCK_ENTITY_USER_AMOUNT, viewerCount)
+    }
+
+    override fun loadAdditional(compoundTag: CompoundTag, registryLookup: HolderLookup.Provider) {
+        super.loadAdditional(compoundTag, registryLookup)
+        viewerCount = if (compoundTag.contains(DataKeys.BLOCK_ENTITY_USER_AMOUNT)) compoundTag.getInt(DataKeys.BLOCK_ENTITY_USER_AMOUNT) else 0
+    }
+
+    override fun getUpdatePacket(): Packet<ClientGamePacketListener>? {
+        return ClientboundBlockEntityDataPacket.create(this)
+    }
+
+    override fun getUpdateTag(registryLookup: HolderLookup.Provider): CompoundTag {
+        return this.saveWithoutMetadata(registryLookup)
+    }
+
+    fun updateBlock(level: Level) {
+        val oldState = level.getBlockState(blockPos)
+        level.sendBlockUpdated(blockPos, oldState, level.getBlockState(blockPos), Block.UPDATE_ALL)
+        level.updateNeighbourForOutputSignal(blockPos, level.getBlockState(blockPos).block)
+        setChanged()
+    }
+
+    private fun isPlayerLookingAt(world: Level, player: Player, blockPos: BlockPos): Boolean {
+        val vec3 = player.eyePosition
+        val vec32 = vec3.add(player.calculateViewVector(player.xRot, player.yRot).scale(player.blockInteractionRange()))
+        val blockHitResult = world.clip(ClipContext(vec3, vec32, ClipContext.Block.OUTLINE, ClipContext.Fluid.ANY, player))
+        return blockPos == blockHitResult.blockPos
+    }
+
+    private fun getInRangeViewerCount(world: Level, pos: BlockPos, range: Double = 5.0): Int {
+        val box = AABB(
+            pos.x.toDouble() - range,
+            pos.y.toDouble() - range,
+            pos.z.toDouble() - range,
+            (pos.x + 1).toDouble() + range,
+            (pos.y + 1).toDouble() + range,
+            (pos.z + 1).toDouble() + range
+        )
+
+        return world.getEntities(EntityTypeTest.forClass(Player::class.java), box) { player: Player? -> isPlayerLookingAt(world, player!!, pos) }.size
+    }
+
+    fun changeViewerCount(amount: Int) {
+        if (level != null) {
+            viewerCount = maxOf(0, amount)
+            updateBlock(level!!)
+        }
+    }
+
+    fun incrementViewerCount() = changeViewerCount(viewerCount + 1)
+    fun decrementViewerCount() = changeViewerCount(viewerCount - 1)
+}

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

@@ -9,7 +9,6 @@
 package com.cobblemon.mod.common.client
 
 import com.cobblemon.mod.common.BakingOverride
-import com.cobblemon.mod.common.client.pokedex.PokedexTypes
 import com.cobblemon.mod.common.util.cobblemonModel
 import com.cobblemon.mod.common.util.cobblemonResource
 import net.minecraft.client.resources.model.ModelResourceLocation
@@ -104,51 +103,9 @@ object CobblemonBakingOverrides {
         cobblemonModel("surprise_mulch", "none")
     )
 
-    // Items
-    val POKEDEX_BLACK = registerOverride(
-        cobblemonResource("item/pokedex_black_model"),
-        cobblemonModel("pokedex_black_model", "inventory")
-    )
-    val POKEDEX_BLUE = registerOverride(
-        cobblemonResource("item/pokedex_blue_model"),
-        cobblemonModel("pokedex_blue_model", "inventory")
-    )
-    val POKEDEX_GREEN = registerOverride(
-        cobblemonResource("item/pokedex_green_model"),
-        cobblemonModel("pokedex_green_model", "inventory")
-    )
-    val POKEDEX_PINK = registerOverride(
-        cobblemonResource("item/pokedex_pink_model"),
-        cobblemonModel("pokedex_pink_model", "inventory")
-    )
-    val POKEDEX_RED = registerOverride(
-        cobblemonResource("item/pokedex_red_model"),
-        cobblemonModel("pokedex_red_model", "inventory")
-    )
-    val POKEDEX_WHITE = registerOverride(
-        cobblemonResource("item/pokedex_white_model"),
-        cobblemonModel("pokedex_white_model", "inventory")
-    )
-    val POKEDEX_YELLOW = registerOverride(
-        cobblemonResource("item/pokedex_yellow_model"),
-        cobblemonModel("pokedex_yellow_model", "inventory")
-    )
-
-    fun getPokedexOverride(type: PokedexTypes): BakingOverride {
-        return when (type) {
-            PokedexTypes.BLACK -> POKEDEX_BLACK
-            PokedexTypes.BLUE -> POKEDEX_BLUE
-            PokedexTypes.GREEN -> POKEDEX_GREEN
-            PokedexTypes.PINK -> POKEDEX_PINK
-            PokedexTypes.WHITE -> POKEDEX_WHITE
-            PokedexTypes.YELLOW -> POKEDEX_YELLOW
-            PokedexTypes.RED -> POKEDEX_RED
-        }
-    }
-
     fun registerOverride(modelLocation: ResourceLocation, modelIdentifier: ModelResourceLocation): BakingOverride {
         val result = BakingOverride(modelLocation, modelIdentifier)
         models.add(result)
         return result
     }
-}
+}

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

@@ -156,7 +156,7 @@ object CobblemonClient {
                     return@subscribe
                 }
                 val nearbyShinies = player?.level()?.getEntities(player, AABB.ofSize(player.position(), 16.0, 16.0, 16.0)) { (it is PokemonEntity) && it.pokemon.shiny }
-                nearbyShinies?.firstOrNull { player.isLookingAt(it) }.let {
+                nearbyShinies?.firstOrNull { player.isLookingAt(it) && !player.isSpectator }.let {
                     if(it is PokemonEntity)
                         it.delegate.spawnShinyParticle(player!!)
                 }

common/src/main/kotlin/com/cobblemon/mod/common/client/entity/PokemonClientDelegate.kt

@@ -379,7 +379,7 @@ class PokemonClientDelegate : PosableState(), PokemonSideDelegate {
         val player = Minecraft.getInstance().player ?: return
         val isWithinRange = player.position().distanceTo(currentEntity.position()) <= Cobblemon.config.shinyNoticeParticlesDistance
 
-        if (currentEntity.pokemon.shiny && currentEntity.ownerUUID == null) {
+        if (currentEntity.pokemon.shiny && currentEntity.ownerUUID == null && !player.isSpectator ) {
             if (isWithinRange && !shined) {
                 playShinyEffect("cobblemon:wild_shiny_ring")
                 shined = true

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/battle/subscreen/BattleSwitchPokemonSelection.kt

@@ -47,8 +47,8 @@ class BattleSwitchPokemonSelection(
     battleGUI,
     request,
     x = 0,
-    y = if (Minecraft.getInstance().window.guiScaledHeight > 630) Minecraft.getInstance().window.guiScaledHeight / 2 - 148 / 2
-    else Minecraft.getInstance().window.guiScaledHeight - 226,
+    y = if (Minecraft.getInstance().window.guiScaledHeight > 304) (Minecraft.getInstance().window.guiScaledHeight / 2) - (BACKGROUND_HEIGHT / 2)
+        else Minecraft.getInstance().window.guiScaledHeight - (BACKGROUND_HEIGHT + 78),
     width = Minecraft.getInstance().window.guiScaledWidth,
     height = Minecraft.getInstance().window.guiScaledHeight,
     battleLang("switch_pokemon")

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/battle/subscreen/BattleTargetSelection.kt

@@ -22,6 +22,7 @@ import com.cobblemon.mod.common.client.battle.ActiveClientBattlePokemon
 import com.cobblemon.mod.common.client.battle.SingleActionRequest
 import com.cobblemon.mod.common.client.gui.battle.BattleGUI
 import com.cobblemon.mod.common.client.gui.battle.BattleOverlay
+import com.cobblemon.mod.common.client.gui.battle.subscreen.BattleSwitchPokemonSelection.Companion
 import com.cobblemon.mod.common.client.gui.drawProfilePokemon
 import com.cobblemon.mod.common.client.render.drawScaledText
 import com.cobblemon.mod.common.client.render.models.blockbench.FloatingState
@@ -47,8 +48,8 @@ class BattleTargetSelection(
     battleGUI = battleGUI,
     request = request,
     x = 0,
-    y = if (Minecraft.getInstance().window.guiScaledHeight > 630) Minecraft.getInstance().window.guiScaledHeight / 2 - 148 / 2
-        else Minecraft.getInstance().window.guiScaledHeight - 226,
+    y = if (Minecraft.getInstance().window.guiScaledHeight > 304) (Minecraft.getInstance().window.guiScaledHeight / 2) - (BattleSwitchPokemonSelection.BACKGROUND_HEIGHT / 2)
+        else Minecraft.getInstance().window.guiScaledHeight - (BattleSwitchPokemonSelection.BACKGROUND_HEIGHT + 78),
     width = 100,
     height = 100,
     battleLang("ui.select_move")

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/dialogue/widgets/DialogueOptionWidget.kt

@@ -60,7 +60,7 @@ class DialogueOptionWidget(
         if (!selectable || dialogueScreen.waitingForServerUpdate) return true
 
         dialogueScreen.sendToServer(InputToDialoguePacket(dialogueScreen.dialogueDTO.dialogueInput.inputId, value))
-        Minecraft.getInstance().soundManager.play(SimpleSoundInstance.forUI(CobblemonSounds.GUI_CLICK, 0.6F))
+        Minecraft.getInstance().soundManager.play(SimpleSoundInstance.forUI(CobblemonSounds.GUI_CLICK, 1.0F))
         return true
     }
 }

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/interact/battleRequest/BattleConfigureGUI.kt

@@ -8,12 +8,10 @@
 
 package com.cobblemon.mod.common.client.gui.interact.battleRequest
 
-import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.api.gui.ColourLibrary
 import com.cobblemon.mod.common.api.gui.blitk
 import com.cobblemon.mod.common.api.text.bold
 import com.cobblemon.mod.common.battles.BattleFormat
-import com.cobblemon.mod.common.client.CobblemonClient
 import com.cobblemon.mod.common.client.CobblemonResources
 import com.cobblemon.mod.common.client.battle.ClientBattleChallenge
 import com.cobblemon.mod.common.client.battle.ClientTeamRequest
@@ -47,106 +45,106 @@ class BattleConfigureGUI(
         var autoLevelNavButtonRight: BattleRequestNavigationButton? = null
 
         val battleRequestMap = mutableMapOf(
-                Pair(
-                        PlayerInteractOptionsPacket.Options.SINGLE_BATTLE,
-                        BattleTypeTile(
-                                option = PlayerInteractOptionsPacket.Options.SINGLE_BATTLE,
-                                battleFormat = BattleFormat.GEN_9_SINGLES,
-                                tileTexture = cobblemonResource("textures/gui/interact/request/battle_request_single.png"),
-                                overlayTexture = cobblemonResource("textures/gui/interact/request/battle_request_overlay.png"),
-                                title = lang("ui.challenge.challenge_title").bold(),
-                                subTitle = lang("battle.types.singles").bold(),
-                                buttonText = lang("ui.challenge.challenge").bold(),
-                                onRequest = { packet, battleFormat -> sendBattleRequest(battleFormat, packet) },
-                                onResponse = { packet, requestID, accept -> sendBattleResponse(packet, requestID, accept) }
-                        )
-                ),
-                Pair(
-                        PlayerInteractOptionsPacket.Options.DOUBLE_BATTLE,
-                        BattleTypeTile(
-                                option = PlayerInteractOptionsPacket.Options.DOUBLE_BATTLE,
-                                battleFormat = BattleFormat.GEN_9_DOUBLES,
-                                tileTexture = cobblemonResource("textures/gui/interact/request/battle_request_double.png"),
-                                overlayTexture = cobblemonResource("textures/gui/interact/request/battle_request_overlay.png"),
-                                title = lang("ui.challenge.challenge_title").bold(),
-                                subTitle = lang("battle.types.doubles").bold(),
-                                buttonText = lang("ui.challenge.challenge").bold(),
-                                onRequest = { packet, battleFormat -> sendBattleRequest(battleFormat, packet) },
-                                onResponse = { packet, requestID, accept -> sendBattleResponse(packet, requestID, accept) }
-                        ),
-                ),
-                Pair(
-                        PlayerInteractOptionsPacket.Options.TRIPLE_BATTLE,
-                        BattleTypeTile(
-                                option = PlayerInteractOptionsPacket.Options.TRIPLE_BATTLE,
-                                battleFormat = BattleFormat.GEN_9_TRIPLES,
-                                tileTexture = cobblemonResource("textures/gui/interact/request/battle_request_triple.png"),
-                                overlayTexture = cobblemonResource("textures/gui/interact/request/battle_request_overlay.png"),
-                                title = lang("ui.challenge.challenge_title").bold(),
-                                subTitle = lang("battle.types.triples").bold(),
-                                buttonText = lang("ui.challenge.challenge").bold(),
-                                onRequest = { packet, battleFormat -> sendBattleRequest(battleFormat, packet) },
-                                onResponse = { packet, requestID, accept -> sendBattleResponse(packet, requestID, accept) }
-                        ),
-                ),
-                Pair(
-                        PlayerInteractOptionsPacket.Options.TEAM_REQUEST,
-                        BattleTypeTile(
-                                option = PlayerInteractOptionsPacket.Options.TEAM_REQUEST,
-                                battleFormat = BattleFormat.GEN_9_MULTI,
-                                tileTexture = cobblemonResource("textures/gui/interact/request/battle_request_multi.png"),
-                                overlayTexture = cobblemonResource("textures/gui/interact/request/battle_request_multi_overlay_partner.png"),
-                                title = lang("ui.team.invite_title").bold(),
-                                subTitle = lang("battle.types.multi").bold(),
-                                buttonText = lang("ui.team.invite").bold(),
-                                color = ColourLibrary.SIDE_1_ALLY_BATTLE_COLOUR,
-                                onRequest = { packet, battleFormat -> BattleTeamRequestPacket(packet.numericTargetId).sendToServer()  },
-                                onResponse = { packet, requestID, accept -> sendTeamResponse(packet, requestID, accept) }
-                        ),
-                ),
-                Pair(
-                        PlayerInteractOptionsPacket.Options.TEAM_LEAVE,
-                        BattleTypeTile(
-                                option = PlayerInteractOptionsPacket.Options.TEAM_LEAVE,
-                                battleFormat = BattleFormat.GEN_9_MULTI,
-                                tileTexture = cobblemonResource("textures/gui/interact/request/battle_request_multi.png"),
-                                overlayTexture = cobblemonResource("textures/gui/interact/request/battle_request_multi_overlay_partner_leave.png"),
-                                title = lang("ui.team.leave_title").bold(),
-                                subTitle = lang("battle.types.multi").bold(),
-                                buttonText = lang("ui.team.leave").bold(),
-                                color = ColourLibrary.SIDE_1_ALLY_BATTLE_COLOUR,
-                                onRequest = { _, _ -> BattleTeamLeavePacket().sendToServer() },
-                                onResponse = { _, _, _ -> Unit }
-                        ),
-                ),
-                Pair(
-                        PlayerInteractOptionsPacket.Options.MULTI_BATTLE,
-                        BattleTypeTile(
-                                option = PlayerInteractOptionsPacket.Options.MULTI_BATTLE,
-                                battleFormat = BattleFormat.GEN_9_MULTI,
-                                tileTexture = cobblemonResource("textures/gui/interact/request/battle_request_multi.png"),
-                                overlayTexture = cobblemonResource("textures/gui/interact/request/battle_request_multi_overlay_opponent.png"),
-                                title = lang("ui.challenge.challenge_title").bold(),
-                                subTitle = lang("battle.types.multi").bold(),
-                                buttonText = lang("ui.challenge.challenge").bold(),
-                                onRequest = { packet, battleFormat -> sendBattleRequest(battleFormat, packet) },
-                                onResponse = { packet, requestID, accept -> sendBattleResponse(packet, requestID, accept) }
-                        ),
-                ),
-                Pair(
-                        PlayerInteractOptionsPacket.Options.ROYAL_BATTLE,
-                        BattleTypeTile(
-                                option = PlayerInteractOptionsPacket.Options.ROYAL_BATTLE,
-                                battleFormat =  BattleFormat.GEN_9_ROYAL,
-                                tileTexture = cobblemonResource("textures/gui/interact/request/battle_request_royal.png"),
-                                overlayTexture = cobblemonResource("textures/gui/interact/request/battle_request_royal_overlay.png"),
-                                title = lang("ui.challenge.challenge_title").bold(),
-                                subTitle = lang("battle.types.freeforall").bold(),
-                                buttonText = lang("ui.challenge.challenge").bold(),
-                                onRequest = { packet, battleFormat -> sendBattleRequest(battleFormat, packet) },
-                                onResponse = { packet, requestID, accept -> sendBattleResponse(packet, requestID, accept) }
-                        ),
-                ),
+            Pair(
+                PlayerInteractOptionsPacket.Options.SINGLE_BATTLE,
+                BattleTypeTile(
+                    option = PlayerInteractOptionsPacket.Options.SINGLE_BATTLE,
+                    battleFormat = BattleFormat.GEN_9_SINGLES,
+                    tileTexture = cobblemonResource("textures/gui/interact/request/battle_request_single.png"),
+                    overlayTexture = cobblemonResource("textures/gui/interact/request/battle_request_overlay.png"),
+                    title = lang("ui.challenge.challenge_title").bold(),
+                    subTitle = lang("battle.types.singles").bold(),
+                    buttonText = lang("ui.challenge.challenge").bold(),
+                    onRequest = { packet, battleFormat -> sendBattleRequest(battleFormat, packet) },
+                    onResponse = { packet, requestID, accept -> sendBattleResponse(packet, requestID, accept) }
+                )
+            ),
+            Pair(
+                PlayerInteractOptionsPacket.Options.DOUBLE_BATTLE,
+                BattleTypeTile(
+                    option = PlayerInteractOptionsPacket.Options.DOUBLE_BATTLE,
+                    battleFormat = BattleFormat.GEN_9_DOUBLES,
+                    tileTexture = cobblemonResource("textures/gui/interact/request/battle_request_double.png"),
+                    overlayTexture = cobblemonResource("textures/gui/interact/request/battle_request_overlay.png"),
+                    title = lang("ui.challenge.challenge_title").bold(),
+                    subTitle = lang("battle.types.doubles").bold(),
+                    buttonText = lang("ui.challenge.challenge").bold(),
+                    onRequest = { packet, battleFormat -> sendBattleRequest(battleFormat, packet) },
+                    onResponse = { packet, requestID, accept -> sendBattleResponse(packet, requestID, accept) }
+                )
+            ),
+            Pair(
+                PlayerInteractOptionsPacket.Options.TRIPLE_BATTLE,
+                BattleTypeTile(
+                    option = PlayerInteractOptionsPacket.Options.TRIPLE_BATTLE,
+                    battleFormat = BattleFormat.GEN_9_TRIPLES,
+                    tileTexture = cobblemonResource("textures/gui/interact/request/battle_request_triple.png"),
+                    overlayTexture = cobblemonResource("textures/gui/interact/request/battle_request_overlay.png"),
+                    title = lang("ui.challenge.challenge_title").bold(),
+                    subTitle = lang("battle.types.triples").bold(),
+                    buttonText = lang("ui.challenge.challenge").bold(),
+                    onRequest = { packet, battleFormat -> sendBattleRequest(battleFormat, packet) },
+                    onResponse = { packet, requestID, accept -> sendBattleResponse(packet, requestID, accept) }
+                )
+            ),
+            Pair(
+                PlayerInteractOptionsPacket.Options.TEAM_REQUEST,
+                BattleTypeTile(
+                    option = PlayerInteractOptionsPacket.Options.TEAM_REQUEST,
+                    battleFormat = BattleFormat.GEN_9_MULTI,
+                    tileTexture = cobblemonResource("textures/gui/interact/request/battle_request_multi.png"),
+                    overlayTexture = cobblemonResource("textures/gui/interact/request/battle_request_multi_overlay_partner.png"),
+                    title = lang("ui.team.invite_title").bold(),
+                    subTitle = lang("battle.types.multi").bold(),
+                    buttonText = lang("ui.team.invite").bold(),
+                    color = ColourLibrary.SIDE_1_ALLY_BATTLE_COLOUR,
+                    onRequest = { packet, battleFormat -> BattleTeamRequestPacket(packet.numericTargetId).sendToServer()  },
+                    onResponse = { packet, requestID, accept -> sendTeamResponse(packet, requestID, accept) }
+                )
+            ),
+            Pair(
+                PlayerInteractOptionsPacket.Options.TEAM_LEAVE,
+                BattleTypeTile(
+                    option = PlayerInteractOptionsPacket.Options.TEAM_LEAVE,
+                    battleFormat = BattleFormat.GEN_9_MULTI,
+                    tileTexture = cobblemonResource("textures/gui/interact/request/battle_request_multi.png"),
+                    overlayTexture = cobblemonResource("textures/gui/interact/request/battle_request_multi_overlay_partner_leave.png"),
+                    title = lang("ui.team.leave_title").bold(),
+                    subTitle = lang("battle.types.multi").bold(),
+                    buttonText = lang("ui.team.leave").bold(),
+                    color = ColourLibrary.SIDE_1_ALLY_BATTLE_COLOUR,
+                    onRequest = { _, _ -> BattleTeamLeavePacket().sendToServer() },
+                    onResponse = { _, _, _ -> Unit }
+                )
+            ),
+            Pair(
+                PlayerInteractOptionsPacket.Options.MULTI_BATTLE,
+                BattleTypeTile(
+                    option = PlayerInteractOptionsPacket.Options.MULTI_BATTLE,
+                    battleFormat = BattleFormat.GEN_9_MULTI,
+                    tileTexture = cobblemonResource("textures/gui/interact/request/battle_request_multi.png"),
+                    overlayTexture = cobblemonResource("textures/gui/interact/request/battle_request_multi_overlay_opponent.png"),
+                    title = lang("ui.challenge.challenge_title").bold(),
+                    subTitle = lang("battle.types.multi").bold(),
+                    buttonText = lang("ui.challenge.challenge").bold(),
+                    onRequest = { packet, battleFormat -> sendBattleRequest(battleFormat, packet) },
+                    onResponse = { packet, requestID, accept -> sendBattleResponse(packet, requestID, accept) }
+                )
+            ),
+            Pair(
+                PlayerInteractOptionsPacket.Options.ROYAL_BATTLE,
+                BattleTypeTile(
+                    option = PlayerInteractOptionsPacket.Options.ROYAL_BATTLE,
+                    battleFormat =  BattleFormat.GEN_9_ROYAL,
+                    tileTexture = cobblemonResource("textures/gui/interact/request/battle_request_royal.png"),
+                    overlayTexture = cobblemonResource("textures/gui/interact/request/battle_request_royal_overlay.png"),
+                    title = lang("ui.challenge.challenge_title").bold(),
+                    subTitle = lang("battle.types.freeforall").bold(),
+                    buttonText = lang("ui.challenge.challenge").bold(),
+                    onRequest = { packet, battleFormat -> sendBattleRequest(battleFormat, packet) },
+                    onResponse = { packet, requestID, accept -> sendBattleResponse(packet, requestID, accept) }
+                )
+            )
         )
 
         val levelRulesetOption = mutableListOf(-1, 50, 100, 5)
@@ -266,42 +264,43 @@ class BattleConfigureGUI(
 
             // BattleFormat Selection buttons
             this.addRenderableWidget(
-                    BattleRequestNavigationButton(
-                    pX = x + 2,
-                    pY = y + 30,
-                    clickHeight = BattleRequestNavigationButton.HEIGHT * 6,
-                    forward = false
-                    ) { currentPage = (currentPage - 1) % options.count()
-                        updateRequestButtonText()
-                    }
+                BattleRequestNavigationButton(
+                pX = x + 2,
+                pY = y + 30,
+                clickHeight = BattleRequestNavigationButton.HEIGHT * 6,
+                forward = false
+                ) { currentPage = (currentPage - 1) % options.count()
+                    updateRequestButtonText()
+                }
             )
 
             this.addRenderableWidget(
-                    BattleRequestNavigationButton(
-                    pX = x + 106,
-                    pY = y + 30,
-                    clickHeight = BattleRequestNavigationButton.HEIGHT * 6,
-                    forward = true
-                    ) { currentPage = (currentPage + 1) % options.count()
-                        updateRequestButtonText()
-                    }
+                BattleRequestNavigationButton(
+                pX = x + 106,
+                pY = y + 30,
+                clickHeight = BattleRequestNavigationButton.HEIGHT * 6,
+                forward = true
+                ) { currentPage = (currentPage + 1) % options.count()
+                    updateRequestButtonText()
+                }
             )
 
 
             if (battleRequestMap[options[currentPage]]?.option != PlayerInteractOptionsPacket.Options.TEAM_REQUEST) {
-
                 // Level Selection buttons
                 autoLevelNavButtonLeft = BattleRequestNavigationButton(
-                        pX = x + 15,
-                        pY = y + 75,
-                        forward = false
+                    pX = x + 15,
+                    pY = y + 76,
+                    backwardIcon = cobblemonResource("textures/gui/interact/request/label_arrow_left.png"),
+                    forward = false
                 ) { levelRulesetOptionIndex -= 1 }
                 this.addRenderableWidget(autoLevelNavButtonLeft)
 
                 autoLevelNavButtonRight = BattleRequestNavigationButton(
-                        pX = x + 93,
-                        pY = y + 75,
-                        forward = true
+                    pX = x + 94,
+                    pY = y + 76,
+                    forwardIcon = cobblemonResource("textures/gui/interact/request/label_arrow_right.png"),
+                    forward = true
                 ) {levelRulesetOptionIndex += 1 }
                 this.addRenderableWidget(autoLevelNavButtonRight)
             }

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/interact/battleRequest/BattleRequestNavigationButton.kt

@@ -16,18 +16,22 @@ import net.minecraft.client.gui.components.Button
 import net.minecraft.client.resources.sounds.SimpleSoundInstance
 import net.minecraft.client.sounds.SoundManager
 import net.minecraft.network.chat.Component
+import net.minecraft.resources.ResourceLocation
 
 class BattleRequestNavigationButton(
-    pX: Int, pY: Int,
-    private val clickHeight: Float = HEIGHT,
+    pX: Number, pY: Number,
+    private val clickHeight: Int = HEIGHT,
     private val forward: Boolean,
+    private val forwardIcon: ResourceLocation = forwardButtonResource,
+    private val backwardIcon: ResourceLocation = backwardsButtonResource,
     onPress: OnPress
-): Button(pX, pY, (WIDTH * SCALE).toInt(), (clickHeight * SCALE).toInt(), Component.literal("Navigation"), onPress, DEFAULT_NARRATION) {
+): Button(pX.toInt(), pY.toInt(), (WIDTH * SCALE).toInt(), (clickHeight * SCALE).toInt(), Component.literal("Navigation"), onPress, DEFAULT_NARRATION) {
 
     companion object {
-        const val WIDTH = 9F
-        const val HEIGHT = 16F
+        const val HEIGHT = 16
+        const val WIDTH = 9
         const val SCALE = 0.5F
+
         private val forwardButtonResource = cobblemonResource("textures/gui/interact/request/arrow_right.png")
         private val backwardsButtonResource = cobblemonResource("textures/gui/interact/request/arrow_left.png")
     }
@@ -41,7 +45,7 @@ class BattleRequestNavigationButton(
             matrixStack = context.pose(),
             x = x / SCALE,
             y = (y + (clickHeight - HEIGHT) / 4) / SCALE,
-            texture = if (forward) forwardButtonResource else backwardsButtonResource,
+            texture = if (forward) forwardIcon else backwardIcon,
             width = WIDTH,
             height = HEIGHT,
             vOffset = if (hovered) HEIGHT else 0,

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/interact/battleRequest/BatttleRequestButton.kt

@@ -14,12 +14,10 @@ import com.cobblemon.mod.common.api.text.bold
 import com.cobblemon.mod.common.client.CobblemonResources
 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.client.gui.components.Button
 import net.minecraft.client.resources.sounds.SimpleSoundInstance
 import net.minecraft.client.sounds.SoundManager
-import net.minecraft.network.chat.Component
 import net.minecraft.network.chat.MutableComponent
 
 class BattleRequestButton(

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/interact/wheel/InteractWheelGuiFactory.kt

@@ -8,13 +8,11 @@
 
 package com.cobblemon.mod.common.client.gui.interact.wheel
 
-import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.CobblemonNetwork
 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.client.render.ClientPlayerIcon
 import com.cobblemon.mod.common.net.messages.client.PlayerInteractOptionsPacket
 import com.cobblemon.mod.common.net.messages.server.battle.SpectateBattlePacket
 import com.cobblemon.mod.common.net.messages.server.pokemon.interact.InteractPokemonPacket
@@ -133,7 +131,7 @@ fun createPlayerInteractGui(optionsPacket: PlayerInteractOptionsPacket): Interac
                 ))
             }
         }
-        if (it.equals(PlayerInteractOptionsPacket.Options.SPECTATE_BATTLE)) {
+        if (it.key == PlayerInteractOptionsPacket.Options.SPECTATE_BATTLE) {
             if(!hasChallenge) {
                 options.put(Orientation.TOP_RIGHT, spectate)
             }

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

@@ -19,17 +19,18 @@ 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.pokedex.filter.EntryFilter
+import com.cobblemon.mod.common.api.pokedex.filter.SearchByType
 import com.cobblemon.mod.common.api.pokedex.filter.SearchFilter
 import com.cobblemon.mod.common.api.pokemon.PokemonSpecies
 import com.cobblemon.mod.common.api.storage.player.client.ClientPokedexManager
 import com.cobblemon.mod.common.api.text.bold
+import com.cobblemon.mod.common.api.text.font
 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.CobblemonResources
 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_WIDTH
 import com.cobblemon.mod.common.client.gui.pokedex.PokedexGUIConstants.HEADER_BAR_HEIGHT
 import com.cobblemon.mod.common.client.gui.pokedex.PokedexGUIConstants.SCALE
 import com.cobblemon.mod.common.client.gui.pokedex.PokedexGUIConstants.TAB_ABILITIES
@@ -46,10 +47,12 @@ 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.pokedex.PokedexTypes
+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.abilities.HiddenAbility
 import com.cobblemon.mod.common.util.cobblemonResource
+import com.cobblemon.mod.common.util.lang
 import net.minecraft.client.Minecraft
 import net.minecraft.client.gui.GuiGraphics
 import net.minecraft.client.gui.components.Renderable
@@ -57,6 +60,7 @@ import net.minecraft.client.gui.components.events.GuiEventListener
 import net.minecraft.client.gui.narration.NarratableEntry
 import net.minecraft.client.gui.screens.Screen
 import net.minecraft.client.resources.sounds.SimpleSoundInstance
+import net.minecraft.core.BlockPos
 import net.minecraft.network.chat.Component
 import net.minecraft.resources.ResourceLocation
 import net.minecraft.sounds.SoundEvent
@@ -68,9 +72,41 @@ import net.minecraft.sounds.SoundEvent
  * @since February 24, 2024
  */
 class PokedexGUI private constructor(
-    val type: PokedexTypes,
-    val initSpecies: ResourceLocation?
+    val type: PokedexType,
+    val initSpecies: ResourceLocation?,
+    val blockPos: BlockPos?
 ): Screen(Component.translatable("cobblemon.ui.pokedex.title")) {
+    companion object {
+        private val screenBackground = cobblemonResource("textures/gui/pokedex/pokedex_screen.png")
+
+        private val globeIcon = cobblemonResource("textures/gui/pokedex/globe_icon.png")
+        private val caughtSeenIcon = cobblemonResource("textures/gui/pokedex/caught_seen_icon.png")
+
+        private val arrowUpIcon = cobblemonResource("textures/gui/pokedex/arrow_up.png")
+        private val arrowDownIcon = cobblemonResource("textures/gui/pokedex/arrow_down.png")
+
+        private val tooltipEdge = cobblemonResource("textures/gui/pokedex/tooltip_edge.png")
+        private val tooltipBackground = cobblemonResource("textures/gui/pokedex/tooltip_background.png")
+
+        private val tabSelectArrow = cobblemonResource("textures/gui/pokedex/select_arrow.png")
+        private val tabIcons = arrayOf(
+            cobblemonResource("textures/gui/pokedex/tab_info.png"),
+            cobblemonResource("textures/gui/pokedex/tab_abilities.png"),
+            cobblemonResource("textures/gui/pokedex/tab_size.png"),
+            cobblemonResource("textures/gui/pokedex/tab_stats.png"),
+            cobblemonResource("textures/gui/pokedex/tab_drops.png")
+        )
+
+        /**
+         * Attempts to open this screen for a client.
+         */
+        fun open(pokedex: ClientPokedexManager, type: PokedexType, species: ResourceLocation? = null, blockPos: BlockPos? = null) {
+            val mc = Minecraft.getInstance()
+            val screen = PokedexGUI(type, species, blockPos)
+            mc.setScreen(screen)
+        }
+    }
+
     var oldDragPosX = 0.0
     var canDragRender = false
 
@@ -88,12 +124,14 @@ class PokedexGUI private constructor(
     private var availableRegions = emptyList<ResourceLocation>()
     private var selectedRegionIndex = 0
 
+    private lateinit var regionSelectWidgetUp: ScaledButton
+    private lateinit var regionSelectWidgetDown: ScaledButton
+    private lateinit var searchByTypeButton: ScaledButton
     private lateinit var scrollScreen: EntriesScrollingWidget
     private lateinit var pokemonInfoWidget: PokemonInfoWidget
     private lateinit var searchWidget: SearchWidget
-    private lateinit var regionSelectWidgetUp: ScaledButton
-    private lateinit var regionSelectWidgetDown: ScaledButton
 
+    private var selectedSearchByType: SearchByType = SearchByType.SPECIES
     private val tabButtons: MutableList<ScaledButton> = mutableListOf()
 
     lateinit var tabInfoElement: GuiEventListener
@@ -132,7 +170,7 @@ class PokedexGUI private constructor(
         displaytabInfoElement(tabInfoIndex, false)
 
         if (::searchWidget.isInitialized) removeWidget(searchWidget)
-        searchWidget = SearchWidget(x + 26, y + 28, HALF_OVERLAY_WIDTH, HEADER_BAR_HEIGHT, update = ::updateFilters)
+        searchWidget = SearchWidget(x + 26, y + 28, 128, HEADER_BAR_HEIGHT, update = ::updateFilters)
         addRenderableWidget(searchWidget)
 
         if (::regionSelectWidgetUp.isInitialized) removeWidget(regionSelectWidgetUp)
@@ -157,9 +195,26 @@ class PokedexGUI private constructor(
             resource = arrowDownIcon,
             clickAction = { updatePokedexRegion(true) }
         )
-
         addRenderableWidget(regionSelectWidgetDown)
 
+        if (::searchByTypeButton.isInitialized) removeWidget(searchByTypeButton)
+        searchByTypeButton = ScaledButton(
+            buttonX = (x + 154.5).toFloat(),
+            buttonY = (y + 29.5).toFloat(),
+            buttonWidth = 16,
+            buttonHeight = 16,
+            scale = SCALE,
+            resource = cobblemonResource("textures/gui/pokedex/tab_${selectedSearchByType.name.lowercase()}.png"),
+            clickAction = {
+                val searchTypes = SearchByType.entries.toList()
+                val selectedIndex = searchTypes.indexOf(selectedSearchByType)
+                selectedSearchByType = searchTypes.get(if (selectedIndex == searchTypes.lastIndex) 0 else (selectedIndex + 1))
+                (it as ScaledButton).resource = cobblemonResource("textures/gui/pokedex/tab_${selectedSearchByType.name.lowercase()}.png")
+                updateFilters()
+            }
+        )
+        addRenderableWidget(searchByTypeButton)
+
         updateFilters(true)
     }
 
@@ -271,9 +326,25 @@ class PokedexGUI private constructor(
         }
 
         super.render(context, mouseX, mouseY, delta)
+
+        // Search type tooltip
+        if (searchByTypeButton.isButtonHovered(mouseX, mouseY)) {
+            matrices.pushPose()
+            matrices.translate(0.0, 0.0, 1000.0)
+            val searchTypeText = lang("ui.pokedex.search.search_by", lang("ui.pokedex.search.type.${selectedSearchByType.name.lowercase()}")).bold()
+            val searchTypeTextWidth = Minecraft.getInstance().font.width(searchTypeText.font(CobblemonResources.DEFAULT_LARGE))
+            val tooltipWidth = searchTypeTextWidth + 6
+
+            blitk(matrixStack = matrices, texture = tooltipEdge, x = mouseX - (tooltipWidth / 2) - 1, y = mouseY - 16, width = 1, height = 11)
+            blitk(matrixStack = matrices, texture = tooltipBackground, x = mouseX - (tooltipWidth / 2), y = mouseY - 16, width = tooltipWidth, height = 11)
+            blitk(matrixStack = matrices, texture = tooltipEdge, x = mouseX + (tooltipWidth / 2), y = mouseY - 16, width = 1, height = 11)
+            drawScaledText(context = context, font = CobblemonResources.DEFAULT_LARGE, text = searchTypeText, x = mouseX, y = mouseY - 15, shadow = true, centered = true)
+            matrices.popPose()
+        }
     }
 
     override fun onClose() {
+        if (blockPos != null) AdjustBlockEntityViewerCountPacket(blockPos, false).sendToServer()
         playSound(CobblemonSounds.POKEDEX_CLOSE)
         super.onClose()
     }
@@ -363,7 +434,7 @@ class PokedexGUI private constructor(
     fun getFilters(): Collection<EntryFilter> {
         val filters: MutableList<EntryFilter> = mutableListOf()
 
-        filters.add(SearchFilter(CobblemonClient.clientPokedexData, searchWidget.value))
+        filters.add(SearchFilter(CobblemonClient.clientPokedexData, searchWidget.value, selectedSearchByType))
 
         return filters
     }
@@ -511,33 +582,4 @@ class PokedexGUI private constructor(
     fun playSound(soundEvent: SoundEvent) {
         Minecraft.getInstance().soundManager.play(SimpleSoundInstance.forUI(soundEvent, 1.0F))
     }
-
-    companion object {
-        private val screenBackground = cobblemonResource("textures/gui/pokedex/pokedex_screen.png")
-
-        private val globeIcon = cobblemonResource("textures/gui/pokedex/globe_icon.png")
-        private val caughtSeenIcon = cobblemonResource("textures/gui/pokedex/caught_seen_icon.png")
-
-        private val arrowUpIcon = cobblemonResource("textures/gui/pokedex/arrow_up.png")
-        private val arrowDownIcon = cobblemonResource("textures/gui/pokedex/arrow_down.png")
-
-
-        private val tabSelectArrow = cobblemonResource("textures/gui/pokedex/select_arrow.png")
-        private val tabIcons = arrayOf(
-            cobblemonResource("textures/gui/pokedex/tab_info.png"),
-            cobblemonResource("textures/gui/pokedex/tab_abilities.png"),
-            cobblemonResource("textures/gui/pokedex/tab_size.png"),
-            cobblemonResource("textures/gui/pokedex/tab_stats.png"),
-            cobblemonResource("textures/gui/pokedex/tab_drops.png")
-        )
-
-        /**
-         * Attempts to open this screen for a client.
-         */
-        fun open(pokedex: ClientPokedexManager, type: PokedexTypes, species: ResourceLocation? = null) {
-            val mc = Minecraft.getInstance()
-            val screen = PokedexGUI(type, species)
-            mc.setScreen(screen)
-        }
-    }
 }

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

@@ -368,7 +368,7 @@ class PokemonInfoWidget(val pX: Int, val pY: Int, val updateForm: (PokedexForm)
             matrices.translate(
                 pX.toDouble() + (POKEMON_PORTRAIT_WIDTH.toDouble() + 2)/2,
                 pY.toDouble() + portraitStartY - 12,
-                0.0
+                1000.0 // Prevent model from clipping into background
             )
             matrices.scale(scaleAmount, scaleAmount, scaleAmount)
             val rotationVector = Vector3f(13F, rotationY, 0F)
@@ -398,7 +398,7 @@ class PokemonInfoWidget(val pX: Int, val pY: Int, val updateForm: (PokedexForm)
 
         // Ensure elements are not hidden behind Pokémon render
         matrices.pushPose()
-        matrices.translate(0.0, 0.0, 1000.0)
+        matrices.translate(0.0, 0.0, 2000.0)
 
         if (isSelectedPokemonOwned()) {
             val primaryType = type[0]

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

@@ -10,6 +10,7 @@ package com.cobblemon.mod.common.client.gui.pokedex.widgets
 
 import com.cobblemon.mod.common.api.gui.blitk
 import com.cobblemon.mod.common.api.text.bold
+import com.cobblemon.mod.common.api.text.font
 import com.cobblemon.mod.common.api.text.text
 import com.cobblemon.mod.common.client.CobblemonResources
 import com.cobblemon.mod.common.client.gui.pokedex.PokedexGUIConstants.HALF_OVERLAY_HEIGHT
@@ -17,9 +18,12 @@ import com.cobblemon.mod.common.client.gui.pokedex.PokedexGUIConstants.HALF_OVER
 import com.cobblemon.mod.common.client.gui.pokedex.PokedexGUIConstants.SCALE
 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.Util
 import net.minecraft.client.Minecraft
 import net.minecraft.client.gui.GuiGraphics
 import net.minecraft.client.gui.components.EditBox
+import net.minecraft.client.renderer.RenderType
 import net.minecraft.network.chat.Component
 
 class SearchWidget(
@@ -36,20 +40,22 @@ class SearchWidget(
         private val searchIcon = cobblemonResource("textures/gui/pokedex/search_icon.png")
     }
 
+    var focusedTime: Long = 0
+
     init {
-        this.setMaxLength(24)
-        this.setResponder {
-            update.invoke()
-        }
+        this.setMaxLength(23)
+        this.setResponder { update.invoke() }
+        focusedTime = Util.getMillis()
+    }
+
+    override fun setFocused(focused: Boolean) {
+        if (focused) focusedTime = Util.getMillis()
+        super.setFocused(focused)
     }
 
     override fun mouseClicked(mouseX: Double, mouseY: Double, button: Int): Boolean {
-        return if (mouseX.toInt() in x..(x + width) && mouseY.toInt() in y..(y + height)) {
-            isFocused = true
-            true
-        } else {
-            false
-        }
+        if (mouseX.toInt() in x..(x + width) && mouseY.toInt() in y..(y + height)) isFocused = true
+        return super.mouseClicked(mouseX, mouseY, button)
     }
 
     override fun renderWidget(context: GuiGraphics, mouseX: Int, mouseY: Int, delta: Float) {
@@ -73,29 +79,30 @@ class SearchWidget(
             scale = SCALE
         )
 
-//        if(text.isEmpty() && !isFocused) {
-//            drawScaledText(
-//                context = context,
-//                font = CobblemonResources.DEFAULT_LARGE,
-//                text = Component.translatable("cobblemon.ui.pokedex.search").bold(),
-//                x = posX.toInt() + 13,
-//                y = posY.toInt() + 1,
-//                shadow = true
-//            )
-//        }
-        if (cursorPosition != value.length) moveCursorToEnd(false)
-
-        val input = if (isFocused) "${value}_".text()
-            else (if(value.isEmpty()) Component.translatable("cobblemon.ui.pokedex.search") else value.text())
-
+        val showCursor = isFocused && ((Util.getMillis() - this.focusedTime) / 300L % 2L == 0L)
+        val input = if (isFocused) "${value}${if ((cursorPosition == value.length) && showCursor) "_" else ""}".text()
+            else (if(value.isEmpty()) lang("ui.pokedex.search") else value.text())
+        val startX = posX.toInt() + 13
+        val startY = posY.toInt() + 1
         drawScaledText(
             context = context,
             font = CobblemonResources.DEFAULT_LARGE,
             text = input.bold(),
-            // text = Component.translatable(if (isFocused) "${text}_" else text).bold(),
-            x = posX.toInt() + 13,
-            y = posY.toInt() + 1,
+            x = startX,
+            y = startY,
             shadow = true
         )
+
+        if (showCursor && !value.isEmpty() && cursorPosition != value.length) {
+            val startToCursorWidth = Minecraft.getInstance().font.width((input.getString(cursorPosition).text().bold()).font(CobblemonResources.DEFAULT_LARGE))
+            context.fill(
+                RenderType.guiTextHighlight(),
+                startX + startToCursorWidth - 1,
+                startY,
+                startX + startToCursorWidth,
+                startY + 9,
+                -3092272
+            )
+        }
     }
-}
+}

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/summary/Summary.kt

@@ -88,6 +88,9 @@ class Summary private constructor(party: Collection<Pokemon?>, private val edita
         private val typeSpacerDoubleResource = cobblemonResource("textures/gui/summary/type_spacer_double.png")
         private val sideSpacerResource = cobblemonResource("textures/gui/summary/summary_side_spacer.png")
         private val evolveButtonResource = cobblemonResource("textures/gui/summary/summary_evolve_button.png")
+        private val tabIconInfo = cobblemonResource("textures/gui/summary/summary_tab_icon_info.png")
+        private val tabIconMoves = cobblemonResource("textures/gui/summary/summary_tab_icon_moves.png")
+        private val tabIconStats = cobblemonResource("textures/gui/summary/summary_tab_icon_stats.png")
         val iconShinyResource = cobblemonResource("textures/gui/summary/icon_shiny.png")
 
         /**
@@ -167,7 +170,7 @@ class Summary private constructor(party: Collection<Pokemon?>, private val edita
         // Init Tabs
         summaryTabs.clear()
         summaryTabs.add(
-            SummaryTab(pX = x + 78, pY = y - 1, label = lang("ui.info")) {
+            SummaryTab(pX = x + 78, pY = y - 1, icon = tabIconInfo) {
                 if (mainScreenIndex != INFO) {
                     displayMainScreen(INFO)
                     playSound(CobblemonSounds.GUI_CLICK)
@@ -176,7 +179,7 @@ class Summary private constructor(party: Collection<Pokemon?>, private val edita
         )
 
         summaryTabs.add(
-            SummaryTab(pX = x + 119, pY = y - 1, label = lang("ui.moves")) {
+            SummaryTab(pX = x + 119, pY = y - 1, icon = tabIconMoves) {
                 if (mainScreenIndex != MOVES) {
                     displayMainScreen(MOVES)
                     playSound(CobblemonSounds.GUI_CLICK)
@@ -185,7 +188,7 @@ class Summary private constructor(party: Collection<Pokemon?>, private val edita
         )
 
         summaryTabs.add(
-            SummaryTab(pX = x + 160, pY = y - 1, label = lang("ui.stats")) {
+            SummaryTab(pX = x + 160, pY = y - 1, icon = tabIconStats) {
                 if (mainScreenIndex != STATS) {
                     displayMainScreen(STATS)
                     playSound(CobblemonSounds.GUI_CLICK)
@@ -200,7 +203,11 @@ class Summary private constructor(party: Collection<Pokemon?>, private val edita
         addRenderableWidget(
             ExitButton(pX = x + 302, pY = y + 145) {
                 playSound(CobblemonSounds.GUI_CLICK)
-                Minecraft.getInstance().setScreen(null)
+                if (sideScreenIndex != PARTY) {
+                    displaySideScreen(PARTY)
+                } else {
+                    Minecraft.getInstance().setScreen(null)
+                }
             }
         )
 

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/summary/widgets/screens/SummaryTab.kt

@@ -17,10 +17,12 @@ import net.minecraft.client.gui.GuiGraphics
 import net.minecraft.client.gui.components.Button
 import net.minecraft.client.sounds.SoundManager
 import net.minecraft.network.chat.MutableComponent
+import net.minecraft.resources.ResourceLocation
 
 class SummaryTab(
     pX: Int, pY: Int,
-    val label: MutableComponent,
+    val label: MutableComponent? = null,
+    val icon: ResourceLocation? = null,
     onPress: OnPress
 ): Button(pX, pY, 50, 13, label, onPress, DEFAULT_NARRATION) {
     private var isActive = false
@@ -38,15 +40,29 @@ class SummaryTab(
             )
         }
 
-        drawScaledText(
-            context = context,
-            font = CobblemonResources.DEFAULT_LARGE,
-            text = label.bold(),
-            x = x + 25,
-            y = y + 3,
-            centered = true,
-            shadow = true
-        )
+        if (icon !== null) {
+            blitk(
+                matrixStack = matrices,
+                texture = icon,
+                x = (x + 21) / 0.5F,
+                y = (y + 3.5) / 0.5F,
+                width = 17,
+                height = 17,
+                scale = 0.5F
+            )
+        }
+
+        if (label !== null) {
+            drawScaledText(
+                context = context,
+                font = CobblemonResources.DEFAULT_LARGE,
+                text = label.bold(),
+                x = x + 25,
+                y = y + 3,
+                centered = true,
+                shadow = true
+            )
+        }
     }
 
     override fun playDownSound(soundManager: SoundManager) {

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/summary/widgets/screens/stats/StatWidget.kt

@@ -43,17 +43,19 @@ import kotlin.math.sin
 class StatWidget(
     pX: Int, pY: Int,
     val pokemon: Pokemon,
-    val tabIndex: Int = STATS
+    val tabIndex: Int = 0
 ): SoundlessWidget(pX, pY, WIDTH, HEIGHT, Component.literal("StatWidget")) {
 
     companion object {
-        // Stat Index
-        private const val STATS = 0
-        private const val IV = 1
-        private const val EV = 2
-        private const val BASE = 3
-        private const val OTHER = 4
+        // Stat tab options
+        private const val STATS = "stats"
+        private const val IV = "iv"
+        private const val EV = "ev"
+        private const val OTHER = "other"
 
+        private val statOptions = listOf(STATS, IV, EV, OTHER)
+
+        private const val statTabWidth = 24
         private const val WIDTH = 134
         private const val HEIGHT = 148
         const val SCALE = 0.5F
@@ -73,7 +75,6 @@ class StatWidget(
         private val statDecreaseResource = cobblemonResource("textures/gui/summary/summary_stats_icon_decrease.png")
 
         private val statsLabel = lang("ui.stats")
-        private val baseLabel = lang("ui.stats.base")
         private val ivLabel = lang("ui.stats.ivs")
         private val evLabel = lang("ui.stats.evs")
         private val otherLabel = lang("ui.stats.other")
@@ -179,9 +180,6 @@ class StatWidget(
         drawTriangle(colour, specialDefencePoint, centerPoint, specialAttackPoint)
         // 11-o'clock
         drawTriangle(colour, specialAttackPoint, centerPoint, hpPoint)
-
-
-//        drawTriangle(colour, specialAttackPoint, centerPoint, hpPoint)
     }
 
     private fun drawFriendship(moduleX: Int, moduleY: Int, matrices: PoseStack, context: GuiGraphics, friendship: Int) {
@@ -254,7 +252,7 @@ class StatWidget(
     }
 
     override fun renderWidget(context: GuiGraphics, pMouseX: Int, pMouseY: Int, pPartialTicks: Float) {
-        val renderChart = statTabIndex != OTHER
+        val renderChart = statOptions.get(statTabIndex) != OTHER
         val matrices = context.pose()
 
         // Background
@@ -280,7 +278,7 @@ class StatWidget(
             )
         }
 
-        when (statTabIndex) {
+        when (statOptions.get(statTabIndex)) {
             STATS -> drawStatHexagon(
                 mapOf(
                     Stats.HP to pokemon.maxHealth,
@@ -293,11 +291,6 @@ class StatWidget(
                 colour = Vector3f(50F/255, 215F/255F, 1F),
                 maximum = 400
             )
-            BASE -> drawStatHexagon(
-                pokemon.form.baseStats,
-                colour = Vector3f(1F, 107F/255, 50F/255),
-                maximum = 200
-            )
             IV -> drawStatHexagon(
                 pokemon.ivs.associate { it.key to it.value },
                 colour = Vector3f(216F/255, 100F/255, 1F),
@@ -313,57 +306,48 @@ class StatWidget(
         drawScaledText(
             context = context,
             text = statsLabel.bold(),
-            x = x + 29,
+            x = x + 31,
             y = y + 143,
             scale = SCALE,
-            colour = if (statTabIndex == STATS) WHITE else GREY,
+            colour = if (statOptions.get(statTabIndex) == STATS) WHITE else GREY,
             centered = true
         )
 
         drawScaledText(
             context = context,
             text = ivLabel.bold(),
-            x = x + 48,
+            x = x + 55,
             y = y + 143,
             scale = SCALE,
-            colour = if (statTabIndex == IV) WHITE else GREY,
+            colour = if (statOptions.get(statTabIndex) == IV) WHITE else GREY,
             centered = true
         )
 
         drawScaledText(
             context = context,
             text = evLabel.bold(),
-            x = x + 67,
+            x = x + 79,
             y = y + 143,
             scale = SCALE,
-            colour = if (statTabIndex == EV) WHITE else GREY,
-            centered = true
-        )
-
-        drawScaledText(
-            context = context,
-            text = baseLabel.bold(),
-            x = x + 86,
-            y = y + 143,
-            scale = SCALE,
-            colour = if (statTabIndex == BASE) WHITE else GREY,
+            colour = if (statOptions.get(statTabIndex) == EV) WHITE else GREY,
             centered = true
         )
 
         drawScaledText(
             context = context,
             text = otherLabel.bold(),
-            x = x + 105,
+            x = x + 103,
             y = y + 143,
             scale = SCALE,
-            colour = if (statTabIndex == OTHER) WHITE else GREY,
+            colour = if (statOptions.get(statTabIndex) == OTHER) WHITE else GREY,
             centered = true
         )
 
+        val paddingLeft = (WIDTH - ((statOptions.size + 1) * statTabWidth)) / 2
         blitk(
             matrixStack = context.pose(),
             texture = tabMarkerResource,
-            x= (x + 27 + (statTabIndex * 19)) / SCALE,
+            x= ((x + paddingLeft + ((statTabIndex + 1) * statTabWidth)) / SCALE) - 2,
             y = (y + 140) / SCALE,
             width = 8,
             height = 4,
@@ -396,7 +380,7 @@ class StatWidget(
             )
 
             // Nature-modified Stat Icons
-            if (statTabIndex == STATS) {
+            if (statOptions.get(statTabIndex) == STATS) {
                 val nature = pokemon.effectiveNature
                 renderModifiedStatIcon(matrices, nature.increasedStat, true)
                 renderModifiedStatIcon(matrices, nature.decreasedStat, false)
@@ -419,18 +403,13 @@ class StatWidget(
                     drawY += 30
                 }
             }
-
-//            for (value in summaries) {
-//                drawBarModule(x + 5, drawY, matrices, context, value)
-//            }
-
         }
     }
 
     override fun mouseClicked(pMouseX: Double, pMouseY: Double, pButton: Int): Boolean {
         val index = getTabIndexFromPos(pMouseX, pMouseY)
         // Only play sound here as the rest of the widget is meant to be silent
-        if (index in 0..4) {
+        if (index in 0..4 && statTabIndex != index) {
             statTabIndex = index
             Minecraft.getInstance().soundManager.play(SimpleSoundInstance.forUI(CobblemonSounds.GUI_CLICK, 1.0F))
         }
@@ -438,9 +417,8 @@ class StatWidget(
     }
 
     private fun getStatValueAsText(stat: Stat): MutableComponent {
-        val value = when(statTabIndex) {
+        val value = when(statOptions.get(statTabIndex)) {
             STATS -> if (stat == Stats.HP) "${pokemon.currentHealth} / ${pokemon.maxHealth}" else pokemon.getStat(stat).toString()
-            BASE -> pokemon.form.baseStats[stat].toString()
             IV -> pokemon.ivs.getOrDefault(stat).toString()
             EV -> pokemon.evs.getOrDefault(stat).toString()
             else -> "0"
@@ -475,7 +453,7 @@ class StatWidget(
     }
 
     private fun getModifiedStatColour(stat: Stat, enableColour: Boolean): Int {
-        if (statTabIndex == STATS && enableColour) {
+        if (statOptions.get(statTabIndex) == STATS && enableColour) {
             val nature = pokemon.effectiveNature
 
             if (nature.increasedStat == stat) return RED
@@ -557,15 +535,16 @@ class StatWidget(
     }
 
     private fun getTabIndexFromPos(mouseX: Double, mouseY: Double): Int {
-        val left = x + 19.5
+        val paddingLeft = ((WIDTH - ((statOptions.size + 1) * statTabWidth)) / 2.0) + (statTabWidth / 2)
+        val left = x + paddingLeft
         val top = y + 140.0
-        if (mouseX in left..(left + 95.0) && mouseY in top..(top + 9.0)) {
+        if (mouseX in left..(left + (statTabWidth * (statOptions.size + 1))) && mouseY in top..(top + 9.0)) {
             var startX = left
-            var endX = left + 19
-            for (index in 0..4) {
+            var endX = left + statTabWidth
+            for (index in 0 until statOptions.size) {
                 if (mouseX in startX..endX) return index
-                startX += 19
-                endX += 19
+                startX += statTabWidth
+                endX += statTabWidth
             }
         }
         return -1

common/src/main/kotlin/com/cobblemon/mod/common/client/net/effect/SpawnSnowstormEntityParticleHandler.kt

@@ -9,30 +9,51 @@
 package com.cobblemon.mod.common.client.net.effect
 
 import com.bedrockk.molang.runtime.MoLangRuntime
+import com.cobblemon.mod.common.api.molang.MoLangFunctions
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.setup
 import com.cobblemon.mod.common.api.net.ClientNetworkPacketHandler
 import com.cobblemon.mod.common.client.ClientMoLangFunctions.setupClient
 import com.cobblemon.mod.common.client.particle.BedrockParticleOptionsRepository
 import com.cobblemon.mod.common.client.particle.ParticleStorm
+import com.cobblemon.mod.common.client.render.MatrixWrapper
 import com.cobblemon.mod.common.client.render.models.blockbench.PosableState
 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.entity.LivingEntity
 
 object SpawnSnowstormEntityParticleHandler : ClientNetworkPacketHandler<SpawnSnowstormEntityParticlePacket> {
     override fun handle(packet: SpawnSnowstormEntityParticlePacket, client: Minecraft) {
         val world = Minecraft.getInstance().level ?: return
         val effect = BedrockParticleOptionsRepository.getEffect(packet.effectId) ?: return
-        val entity = world.getEntity(packet.entityId) as? PosableEntity ?: return
-        entity as Entity
-        val state = entity.delegate as PosableState
-        val locators = packet.locator.firstNotNullOfOrNull { state.getMatchingLocators(it).takeIf { it.isNotEmpty() } } ?: return
+        val entity = world.getEntity(packet.entityId)
+        if (entity is PosableEntity) {
+            val state = entity.delegate as PosableState
+            val locators = packet.locator.firstNotNullOfOrNull { state.getMatchingLocators(it).takeIf { it.isNotEmpty() } } ?: return
 
-        val matrixWrappers = locators.mapNotNull { state.locatorStates[it] }
-        matrixWrappers.forEach { matrixWrapper ->
+            val matrixWrappers = locators.mapNotNull { state.locatorStates[it] }
+            matrixWrappers.forEach { matrixWrapper ->
+                val particleRuntime = MoLangRuntime().setup().setupClient()
+                particleRuntime.environment.query.addFunction("entity") { state.runtime.environment.query }
+                val storm = ParticleStorm(
+                    effect = effect,
+                    matrixWrapper = matrixWrapper,
+                    world = world,
+                    runtime = particleRuntime,
+                    sourceVelocity = { entity.deltaMovement },
+                    sourceAlive = { !entity.isRemoved },
+                    sourceVisible = { !entity.isInvisible },
+                    entity = entity
+                )
+
+                storm.spawn()
+            }
+        } else if (entity is LivingEntity) {
+            val matrixWrapper = MatrixWrapper()
+            matrixWrapper.updateFunction = { it.updatePosition(entity.position()) }
             val particleRuntime = MoLangRuntime().setup().setupClient()
-            particleRuntime.environment.query.addFunction("entity") { state.runtime.environment.query }
+            particleRuntime.environment.query.addFunction("entity") { params -> MoLangFunctions.entityFunctions.flatMap { it(entity).map { it.key to it.value } } }
             val storm = ParticleStorm(
                 effect = effect,
                 matrixWrapper = matrixWrapper,
@@ -43,8 +64,8 @@ object SpawnSnowstormEntityParticleHandler : ClientNetworkPacketHandler<SpawnSno
                 sourceVisible = { !entity.isInvisible },
                 entity = entity
             )
-
             storm.spawn()
         }
+
     }
 }

common/src/main/kotlin/com/cobblemon/mod/common/client/net/gui/PokedexUIPacketHandler.kt

@@ -18,7 +18,7 @@ import net.minecraft.client.Minecraft
 object PokedexUIPacketHandler: ClientNetworkPacketHandler<PokedexUIPacket> {
     override fun handle(packet: PokedexUIPacket, client: Minecraft) {
         try {
-            PokedexGUI.open(CobblemonClient.clientPokedexData, packet.type, packet.initSpecies)
+            PokedexGUI.open(CobblemonClient.clientPokedexData, packet.type, packet.initSpecies, packet.blockPos)
         } catch (e: Exception) {
             Cobblemon.LOGGER.debug("Failed to open the Pokedex from the Pokedex UI packet", e)
         }

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

@@ -126,7 +126,7 @@ class PokedexScannerRenderer {
 
                         if (infoDisplayedCounter == 2) {
                             val hasTrainer = (usageContext.scannableEntityInFocus?.resolveEntityScan() as? PokemonEntity)?.ownerUUID !== null
-                            val speciesName = pokedexEntityData.species.name.text().bold()
+                            val speciesName = pokedexEntityData.species.translatedName.bold()
                             var yOffsetName = if (hasTrainer) 2 else 0
                             if (hasTrainer) {
                                 drawScaledText(

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

@@ -10,14 +10,16 @@ package com.cobblemon.mod.common.client.pokedex
 
 import com.cobblemon.mod.common.util.cobblemonResource
 
-enum class PokedexTypes {
-    BLACK,
-    BLUE,
-    GREEN,
-    PINK,
+enum class PokedexType {
     RED,
-    WHITE,
-    YELLOW;
+    YELLOW,
+    GREEN,
+    BLUE,
+    PINK,
+    BLACK,
+    WHITE;
 
     fun getTexturePath() = cobblemonResource("textures/gui/pokedex/pokedex_base_${this.name.lowercase()}.png")
+    fun getItemModelPath(additionalState: String? = null) = cobblemonResource("item/pokedex_${this.name.lowercase()}_model${if (additionalState != null) "_$additionalState" else ""}")
+    fun getItemSpritePath() = cobblemonResource("pokedex_${this.name.lowercase()}")
 }

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

@@ -10,6 +10,7 @@ package com.cobblemon.mod.common.client.render
 
 import com.cobblemon.mod.common.util.math.geometry.getOrigin
 import com.cobblemon.mod.common.util.math.geometry.transformPosition
+import net.fabricmc.loader.impl.lib.sat4j.core.Vec
 import org.joml.Matrix4f
 import net.minecraft.world.phys.Vec3
 
@@ -22,6 +23,7 @@ import net.minecraft.world.phys.Vec3
 class MatrixWrapper {
     var position: Vec3 = Vec3.ZERO
     var matrix: Matrix4f = Matrix4f()
+    var updateFunction: ((MatrixWrapper) -> Unit)? = null
 
     fun updateMatrix(rotationMatrix: Matrix4f) = apply {
         this.matrix = Matrix4f(rotationMatrix)
@@ -31,6 +33,9 @@ class MatrixWrapper {
         this.position = position
     }
 
-    fun getOrigin() = position.add(matrix.getOrigin())
+    fun getOrigin(): Vec3 {
+        updateFunction?.invoke(this)
+        return position.add(matrix.getOrigin())
+    }
     fun transformPosition(position: Vec3) = this.position.add(matrix.transformPosition(position))
 }

common/src/main/kotlin/com/cobblemon/mod/common/client/render/block/DisplayCaseRenderer.kt

@@ -14,6 +14,7 @@ import com.cobblemon.mod.common.api.tags.CobblemonItemTags
 import com.cobblemon.mod.common.block.DisplayCaseBlock
 import com.cobblemon.mod.common.block.entity.DisplayCaseBlockEntity
 import com.cobblemon.mod.common.client.render.models.blockbench.repository.RenderContext
+import com.cobblemon.mod.common.item.PokedexItem
 import com.mojang.blaze3d.vertex.PoseStack
 import com.mojang.math.Axis
 import net.minecraft.client.Minecraft
@@ -159,6 +160,7 @@ class DisplayCaseRenderer(ctx: BlockEntityRendererProvider.Context) : BlockEntit
             stack.item is BedItem -> PositioningType.BED
             stack.item is BannerItem -> PositioningType.BANNER
             stack.`is`(CobblemonItemTags.POKE_BALLS) -> PositioningType.POKE_BALL
+            stack.item is PokedexItem -> PositioningType.POKEDEX
             stack.item == CobblemonItems.RELIC_COIN_POUCH -> PositioningType.COIN_POUCH
             stack.item == CobblemonItems.PASTURE -> PositioningType.PASTURE
             //stack.item == CobblemonItems.POKEMON_MODEL -> PositioningType.ITEM_MODEL
@@ -175,6 +177,7 @@ class DisplayCaseRenderer(ctx: BlockEntityRendererProvider.Context) : BlockEntit
         val rotY: Float = 0f
     ) {
         POKE_BALL(1f, 1f, 1f, 0f, 0.04f, 0f),
+        POKEDEX(1f, 1f, 1f, 0f, 0.04f, 0f, 180f),
         BLOCK_MODEL(1f, 1f, 1f, 0f, -0.15f, 0f),
         ITEM_MODEL(1f, 1f, 1f, 0f, 0.04f, 0f),
         BED(1f, 1f, 1f, 0f, -0.02f, 0f),

common/src/main/kotlin/com/cobblemon/mod/common/client/render/block/LecternBlockEntityRenderer.kt

@@ -8,21 +8,30 @@
 
 package com.cobblemon.mod.common.client.render.block
 
+import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.CobblemonBlocks
+import com.cobblemon.mod.common.ModAPI
 
 import com.cobblemon.mod.common.block.entity.LecternBlockEntity
+import com.cobblemon.mod.common.item.PokedexItem
 import com.mojang.blaze3d.vertex.PoseStack
 import com.mojang.math.Axis
 import net.minecraft.client.Minecraft
 import net.minecraft.client.renderer.MultiBufferSource
 import net.minecraft.client.renderer.blockentity.BlockEntityRenderer
 import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider
+import net.minecraft.client.resources.model.ModelResourceLocation
 import net.minecraft.core.Direction
 import net.minecraft.world.item.*
 import net.minecraft.world.level.block.HorizontalDirectionalBlock
 import net.minecraft.world.level.block.state.BlockState
+import org.spongepowered.asm.mixin.Unique
 
 class LecternBlockEntityRenderer(ctx: BlockEntityRendererProvider.Context) : BlockEntityRenderer<LecternBlockEntity> {
+
+    @Unique
+    private val MODEL_PATH = if (Cobblemon.implementation.modAPI == ModAPI.FABRIC) "fabric_resource" else "standalone"
+
     override fun render(blockEntity: LecternBlockEntity, tickDelta: Float, poseStack: PoseStack, multiBufferSource: MultiBufferSource, light: Int, overlay: Int ) {
         if (blockEntity !is LecternBlockEntity) return
         if (!blockEntity.isEmpty()) {
@@ -35,7 +44,15 @@ class LecternBlockEntityRenderer(ctx: BlockEntityRendererProvider.Context) : Blo
             poseStack.mulPose(Axis.YP.rotationDegrees(-yRot))
             poseStack.mulPose(Axis.XP.rotationDegrees(22.5F))
             poseStack.translate(0.0, 0.0, 0.13)
-            Minecraft.getInstance().itemRenderer.renderStatic(blockEntity.getItemStack(), ItemDisplayContext.GROUND, light, overlay, poseStack, multiBufferSource, blockEntity.level, 0)
+
+            if (blockEntity.getItemStack().item is PokedexItem) {
+                val resourceLocation = (blockEntity.getItemStack().item as PokedexItem).type.getItemModelPath(if (blockEntity.viewerCount > 0) "flat" else "flat_off")
+                val model = Minecraft.getInstance().itemRenderer.itemModelShaper.getModelManager().getModel(ModelResourceLocation(resourceLocation, MODEL_PATH))
+                Minecraft.getInstance().itemRenderer.render(blockEntity.getItemStack(), ItemDisplayContext.GROUND, false, poseStack, multiBufferSource, light, overlay, model)
+            } else {
+                Minecraft.getInstance().itemRenderer.renderStatic(blockEntity.getItemStack(), ItemDisplayContext.GROUND, light, overlay, poseStack, multiBufferSource, blockEntity.level, 0)
+            }
+
             poseStack.popPose()
         }
     }

common/src/main/kotlin/com/cobblemon/mod/common/client/render/entity/PokeBobberEntityRenderer.kt

@@ -179,8 +179,8 @@ class PokeBobberEntityRenderer(context: EntityRendererProvider.Context?) : Entit
         matrixStack.popPose() // close bobber rendering transforms
 
         var armOffset = if (playerEntity.mainArm == HumanoidArm.RIGHT) 1 else -1
-        val itemStack = playerEntity.mainHandItem
-        if (itemStack.item !is PokerodItem) {
+        val item = playerEntity.mainHandItem.item
+        if ((item !is PokerodItem) || item.pokeRodId != pokeRodId) {
             armOffset = -armOffset
         }
         val handSwingProgress = playerEntity.getAttackAnim(tickDelta)

common/src/main/kotlin/com/cobblemon/mod/common/client/render/item/CobblemonModelPredicateRegistry.kt

@@ -9,6 +9,7 @@
 package com.cobblemon.mod.common.client.render.item
 
 import com.cobblemon.mod.common.CobblemonItems
+import com.cobblemon.mod.common.entity.fishing.PokeRodFishingBobberEntity
 import com.cobblemon.mod.common.item.interactive.PokerodItem
 import net.minecraft.client.renderer.item.ItemProperties
 import net.minecraft.resources.ResourceLocation
@@ -71,17 +72,21 @@ object CobblemonModelPredicateRegistry {
 
         rods.forEach { rod ->
             ItemProperties.register(rod, ResourceLocation.parse("cast")) { stack, world, entity, seed ->
-                if (entity == null) {
-                    0.0f
-                } else {
-                    val isMainHand = entity.mainHandItem == stack
-                    var isOffHand = entity.offhandItem == stack
-                    if (entity.mainHandItem.item is PokerodItem) {
-                        isOffHand = false
-                    }
+                if (entity !is Player || entity.fishing !is PokeRodFishingBobberEntity) return@register 0.0f
 
-                    if ((isMainHand || isOffHand) && entity is Player && entity.fishing != null) 1.0f else 0.0f
+                val rodId = entity.fishing!!.entityData.get(PokeRodFishingBobberEntity.POKEROD_ID)
+
+                val isMainHand = stack == entity.mainHandItem
+                var isOffHand = stack == entity.offhandItem
+
+                var mainHandItem = entity.mainHandItem.item
+                val isFishingWithMainHand = mainHandItem is PokerodItem && rodId == mainHandItem.pokeRodId.toString()
+
+                if (isFishingWithMainHand) {
+                    isOffHand = false
                 }
+
+                if (isMainHand && isFishingWithMainHand || isOffHand) 1.0f else 0.0f
             }
         }
 

common/src/main/kotlin/com/cobblemon/mod/common/client/render/layer/PokemonOnShoulderRenderer.kt

@@ -11,7 +11,6 @@ package com.cobblemon.mod.common.client.render.layer
 import com.cobblemon.mod.common.api.pokemon.PokemonSpecies
 import com.cobblemon.mod.common.client.render.models.blockbench.FloatingState
 import com.cobblemon.mod.common.client.render.models.blockbench.PosableModel
-import com.cobblemon.mod.common.client.render.models.blockbench.PosableState
 import com.cobblemon.mod.common.client.render.models.blockbench.repository.PokemonModelRepository
 import com.cobblemon.mod.common.client.render.models.blockbench.repository.RenderContext
 import com.cobblemon.mod.common.entity.PoseType
@@ -23,6 +22,7 @@ import com.cobblemon.mod.common.util.isPokemonEntity
 import com.mojang.blaze3d.vertex.PoseStack
 import com.mojang.math.Axis
 import java.util.UUID
+import net.minecraft.client.Minecraft
 import net.minecraft.client.model.PlayerModel
 import net.minecraft.client.renderer.MultiBufferSource
 import net.minecraft.client.renderer.RenderType
@@ -59,8 +59,11 @@ class PokemonOnShoulderRenderer<T : Player>(renderLayerParent: RenderLayerParent
         netHeadYaw: Float,
         headPitch: Float
     ) {
-        this.render(matrixStack, buffer, packedLight, livingEntity, limbSwing, limbSwingAmount, partialTicks, ageInTicks, netHeadYaw, headPitch, true)
-        this.render(matrixStack, buffer, packedLight, livingEntity, limbSwing, limbSwingAmount, partialTicks, ageInTicks, netHeadYaw, headPitch, false)
+        // It's unclear why Minecraft's providing a partial ticks based on 60FPS regardless of the real FPS.
+        // Whatever - the delta manager works correctly.
+        val realPartialTicks = Minecraft.getInstance().timer.realtimeDeltaTicks
+        this.render(matrixStack, buffer, packedLight, livingEntity, limbSwing, limbSwingAmount, realPartialTicks, ageInTicks, netHeadYaw, headPitch, true)
+        this.render(matrixStack, buffer, packedLight, livingEntity, limbSwing, limbSwingAmount, realPartialTicks, ageInTicks, netHeadYaw, headPitch, false)
     }
 
     fun configureState(state: FloatingState, model: PosableModel, leftShoulder: Boolean): FloatingState {
@@ -206,7 +209,7 @@ class PokemonOnShoulderRenderer<T : Player>(renderLayerParent: RenderLayerParent
          * Checks if a player has shoulder data cached.
          *
          * @param player The player being checked.
-         * @return A [Pair] with [Pair.left] and [Pair.right] being the respective shoulder.
+         * @return A [Pair] with [Pair.first] and [Pair.second] being the respective shoulder.
          */
         @JvmStatic
         fun shoulderDataOf(player: Player): Pair<ShoulderData?, ShoulderData?> {

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

@@ -21,21 +21,21 @@ import com.cobblemon.mod.common.client.keybind.keybinds.PartySendBinding
 import com.cobblemon.mod.common.client.render.models.blockbench.PosableModel
 import com.cobblemon.mod.common.client.render.models.blockbench.PosableState
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PosablePokemonEntityModel
+import com.cobblemon.mod.common.client.render.models.blockbench.repository.MiscModelRepository
 import com.cobblemon.mod.common.client.render.models.blockbench.repository.PokeBallModelRepository
 import com.cobblemon.mod.common.client.render.models.blockbench.repository.PokemonModelRepository
 import com.cobblemon.mod.common.client.render.models.blockbench.repository.RenderContext
 import com.cobblemon.mod.common.client.render.pokeball.PokeBallPosableState
 import com.cobblemon.mod.common.client.render.renderBeaconBeam
 import com.cobblemon.mod.common.client.settings.ServerSettings
+import com.cobblemon.mod.common.entity.PlatformType
 import com.cobblemon.mod.common.entity.PosableEntity
 import com.cobblemon.mod.common.entity.npc.NPCEntity
 import com.cobblemon.mod.common.entity.pokeball.EmptyPokeBallEntity
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity.Companion.SPAWN_DIRECTION
 import com.cobblemon.mod.common.pokeball.PokeBall
-import com.cobblemon.mod.common.util.effectiveName
-import com.cobblemon.mod.common.util.isLookingAt
-import com.cobblemon.mod.common.util.lang
+import com.cobblemon.mod.common.util.*
 import com.cobblemon.mod.common.util.math.DoubleRange
 import com.cobblemon.mod.common.util.math.geometry.toRadians
 import com.cobblemon.mod.common.util.math.remap
@@ -120,6 +120,18 @@ class PokemonRenderer(
                 clientDelegate
             )
         }
+        if(entity.platform != PlatformType.NONE) {
+            drawPlatform(
+                    poseMatrix,
+                    entity,
+                    (entity.delegate as PokemonClientDelegate).entityScaleModifier,
+                    partialTicks,
+                    buffer,
+                    packedLight,
+            )
+            // keeps the pokemon's root on the raft
+            poseMatrix.translate(0.0, 0.25 * (entity.delegate as PokemonClientDelegate).entityScaleModifier, 0.0)
+        }
 
         modelNow.setLayerContext(buffer, clientDelegate, PokemonModelRepository.getLayers(entity.pokemon.species.resourceIdentifier, clientDelegate))
 
@@ -349,7 +361,7 @@ class PokemonRenderer(
             val matrix4f = matrices.last().pose()
             val opacity = (Minecraft.getInstance().options.getBackgroundOpacity(0.25F) * 255.0F).toInt() shl 24
             var label = if (ServerSettings.displayEntityNameLabel &&
-                !Cobblemon.config.diplayNameForUnknownPokemon &&
+                !Cobblemon.config.displayNameForUnknownPokemon &&
                 CobblemonClient.clientPokedexData.getKnowledgeForSpecies(entity.pokemon.species.resourceIdentifier) == PokedexEntryProgress.NONE) {
                 Component.literal("???")
             } else if (ServerSettings.displayEntityNameLabel) {
@@ -425,4 +437,24 @@ class PokemonRenderer(
         model.resetLayerContext()
         matrixStack.popPose()
     }
+
+    private fun drawPlatform(
+            matrixStack: PoseStack,
+            entity: PokemonEntity,
+            scale: Float = 1F,
+            partialTicks: Float,
+            buff: MultiBufferSource,
+            packedLight: Int,
+            ) {
+        val (modelResource, textureResource) = PlatformType.GetModelWithTexture(entity.platform)
+        val model = MiscModelRepository.modelOf(modelResource) ?: return
+        matrixStack.pushPose()
+        matrixStack.mulPose(Axis.ZP.rotationDegrees(180f))
+        matrixStack.rotateAround(Axis.YP.rotationDegrees(entity.entityData.get(SPAWN_DIRECTION)), 0.0f, 0f, 0.0f)
+        matrixStack.scale(scale, scale, scale)
+        val buffer = ItemRenderer.getFoilBufferDirect(buff, RenderType.entityCutout(textureResource), false, false)
+        model.render(matrixStack, buffer, packedLight, OverlayTexture.NO_OVERLAY, -0x1)
+
+        matrixStack.popPose()
+    }
 }