Merge branch 'item-2067' of gitlab.com:cable-mc/cobblemon into item-2067

# Conflicts:
#	common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/PokemonServerDelegate.kt

CHANGELOG.md

@@ -1,8 +1,7 @@
 # Changelog
-## [1.8.5 (MONTH xth, 2026)](#1-8-5)
+## [1.8.3 (MONTH xth, 2026)](#1-8-3)
 
 ### Additions
-- You can now drag to select multiple Pokémon inside the PC menu.
 
 ### Pokémon Added
 #### Generation 4
@@ -20,23 +19,22 @@
 ### Model updates for the following Pokémon
 
 ### Animation updates for the following Pokémon
-- Added the `healersSetSpawn` gamerule. When enabled, using a healing machine will set your spawnpoint.
 
 ### Changes
-- Amethyst now grows from Typegem core blocks like typegems do
 
 ### Fixes
-- Fixed Ponigiri food values for AppleSkin integration
-- Fixed errors emitted by typos in Parched Peat bog structure files
+- Fixed datapacks with item interaction evolutions that don't specify an item crashing the world on load.
+- Fixed the Pokédex evolution tree crashing when a datapack's dex entry is missing an evolution's form.
+- Fixed the Pokédex evolution tree crashing with a stack overflow on evolutions that loop back on themselves.
+- Fixed form-changing evolutions sometimes resolving to the source form in the Pokédex evolution tree.
+- Broken datapack evolutions are now logged and skipped in the Pokédex evolution tree instead of crashing.
+- Fixed Illusion, Imposter and Transform overwriting the species, form and EXP group of the owner's party Pokémon on the client, which made its level and HP display incorrectly and could leave the copied form showing in the party after battle
+- Fixed Illusion, Imposter and Transform not copying the size and alpha status of the Pokémon they turn into, which made disguises keep their original size
+
 
 ### Developer
 
 ### Molang & Datapacks
-- `q.is_standing_on_blocks` now properly checks for non-full blocks like slabs, Mud or Soul Sand
-- Added Molang functions to play footstep sounds based on the corresponding surface. These are intended to be used by Pokémon animations.
-- Pokémon can now have their Minecraft footstep sounds silenced in their poser. This doesn't affect emitting game events.
-
-### Particles
 
 ### Localization
 - Updated translations for:

changelogs/CHANGELOG-1.8.3.md

@@ -1,107 +0,0 @@
-# Changelog
-## [1.8.3 (October 25th, 2026)](#1-8-3)
-
-### Additions
-- Added compatability with AppleSkin.
-
-### New Rideable Pokémon
-- Vikavolt
-- Fearow
-
-### Particles
-## New Move Animations
-- Water Shuriken
-
-### Cries added/updated for the following Pokémon
-- Hoppip
-- Skiploom
-- Jumpluff
-- Houndour
-- Houndoom
-- Wurmple
-- Silcoon
-- Beautifly
-- Cascoon
-- Dustox
-- Surskit
-- Masquerain
-- Torkoal
-- Starly
-- Staravia
-- Staraptor
-- Combee
-- Vespiquen
-- Dusknoir
-- Helioptile
-- Heliolisk
-- Grubbin
-- Charjabug
-- Vikavolt
-- Applin (updated)
-- Flapple (updated)
-- Appletun
-- Runerigus
-- Dipplin
-
-### Animation updates for the following Pokémon
-- Vikavolt
-- Magby
-- Magmar
-- Ninetales (+ Alolan)
-- Spearow
-- Fearow
-- Squawkabilly
-- Mudkip
-- Marshtomp
-- Swampert
-
-### Changes
-- Changed the Misc icon in the Campfire Pot Recipe Book to Health Candy.
-- Moved EXP Candies from the Medicine recipe book category to the Misc category.
-- Removed Dynamic Lights data from the Magmarizer item for consistency with the block.
-- Added `doPokemonPredation` game rule, which controls aggressiveness of Pokémon with the `hate_entity` brain task defined.
-- Added `predation_chance` server config value, which controls the possibility of attacking the hated entity found in `hate_entity` brain tasks.
-- Prehistoric Eroded Pillar generates slightly more frequently.
-- Togekiss was changed from a jet-style mount to bird-style.
-
-### Fixes
-- Fixed datapacks with item interaction evolutions that don't specify an item crashing the world on load.
-- Fixed the Pokédex evolution tree crashing when a datapack's dex entry is missing an evolution's form.
-- Fixed the Pokédex evolution tree crashing with a stack overflow on evolutions that loop back on themselves.
-- Fixed the Pokédex evolution tree crashing when looking at a dex that is not part of the "National Dex" aggregate.
-- Fixed some display names in the Pokédex evolution tree having unintended font colours.
-- Fixed evolution trees not building properly when a Pokémon has several Pokédex entries for different regions.
-- Fixed form-changing evolutions sometimes resolving to the source form in the Pokédex evolution tree.
-- Broken datapack evolutions are now logged and skipped in the Pokédex evolution tree instead of crashing.
-- Fixed the `alpha` property having no tab completion in commands such as `/pokespawn`, `/pokegive` and `/pokeedit`, and added the missing `dmax_level`, `gmax_factor` and `tradable` aliases to tab completion.
-- Fixed friendship booster items not being recognised as such.
-- Fixed conflicts with other mods that would make use of recipe books in certain ways (Farmer's Delight Cooking Pot).
-- Fixed Pokémon battles stalling when a sidemod cancels the `THROWN_POKEBALL_HIT` hit event.
-- Fixed choice feature tab completion in `spawnpokemon/pokegive/pokeedit` commands.
-- Fixed MoLang that's targeting players intermittedly failing when they have died, requiring them to relog.
-- Fixed a NeoForge bug where none of the Cobblemon plants/berries could be placed into pots.
-- Fixed party overlay not hiding when the player opens the Pokédex scanner.
-- Fixed `hate_entity` task focusing on its own entity, therefore enabling deadly warfare between Zangoose and Seviper.
-- Prehistoric Frozen Pond, Prehistoric Frozen Spike, and Prehistoric Lush Den now actually generate (oops).
-- Fixed Frogadier floating in its `battle_idle` animation.
-- Fixed absence or incorrect mergers in spawning conditions, causing the max height/depth of conditions to use the min value instead.
-- Added stricter riding checks on server side to prevent possible packet forgery when a player tries to ride Pokémon.
-- Fixed Pokémon cries and animation sounds played from GUIs, such as the starter selection screen and the Pokédex, being tied to the Master volume slider instead of Friendly Creatures.
-- Fixed Archeops T-posing during its `air_cry` animation.
-
-### Developer
-- Bumped NeoForge to `21.1.195` to get access to MixinExtras `0.5` and the expressions annotation.
-- New Platform Event `PLAYER_RESPAWN` which is fired when a player respawns (either through death or returning from the end).
-- Platform Events `SERVER_PLAYER_TICK_PRE` and `SERVER_PLAYER_TICK_POST` no longer fire when the player is dead.
-  - It is now tied much closer to the actual entity rather than the player or their connection.
-
-### Molang & Datapacks
-- Fixed `q.pokemon.nature` returning class instance instead of proper string value (`cobblemon:adamant`).
-- Fixed `q.entity.is_looking_at` result being always `1` for whatever entity passed as the target parameter.
-- Added hate chance optional parameter to `hate_entity` task. `1.0` will make an entity always attack the target.
-
-### Localization
-- Updated translations for:
-  - Russian
-  - Japanese
-  - Brazilian Portuguese

changelogs/CHANGELOG-1.8.4.md

@@ -1,25 +0,0 @@
-# Changelog
-## [1.8.4 (October 27th, 2026)](#1-8-4)
-
-### Changes
-- The Froakie line now blinks. The world will never be the same.
-
-### Fixes
-- Fixed heaps of spawns not working. This was caused by us missing something before release. RIP.
-- Fixed a crash caused by Fearow blinking while you're riding one. Makes sense to me.
-- Fixed Minior's "Shields Down" ability being very broken.
-- Fixed Dusclops using Squirtle's cry sound (lol).
-- Fixed blank Cooking Pot recipe book entries and missing tabs on Fabric.
-- Fixed a hitbox issue with placeable Orb held items attached to a ceiling.
-- Fixed something sneaky. I'll tell you about it later.
-
-### Molang & Datapacks
-- Added `q.target_fainted` function to move action effects that checks if any opponents fainted from the move.
-
-### Particles
-- Updated Water Shuriken effect to be timed better when the opponent faints.
-
-### Localization
-- Updated translations for:
-  - Korean
-  - Simplified Chinese

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

@@ -15,7 +15,6 @@ import com.cobblemon.mod.common.api.riding.RidingStyle;
 import com.cobblemon.mod.common.api.spawning.spawner.PlayerSpawner;
 import com.cobblemon.mod.common.api.spawning.spawner.PlayerSpawnerFactory;
 import com.cobblemon.mod.common.api.stats.CobblemonStats;
-import com.cobblemon.mod.common.block.HealingMachineBlock;
 import com.cobblemon.mod.common.duck.ServerLevelDuck;
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
 import com.cobblemon.mod.common.world.gamerules.CobblemonGameRules;
@@ -23,14 +22,10 @@ import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import com.llamalad7.mixinextras.sugar.Local;
-import net.minecraft.core.BlockPos;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.entity.Entity;
-import net.minecraft.world.entity.EntityType;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.state.BlockState;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -38,9 +33,6 @@ import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-
-import java.util.Optional;
 
 @Mixin(ServerPlayer.class)
 public abstract class ServerPlayerMixin implements PlayerSpawnerAccessor {
@@ -150,17 +142,4 @@ public abstract class ServerPlayerMixin implements PlayerSpawnerAccessor {
                         ((ServerLevelDuck) this.serverLevel()).cobblemon$getLevelResourceLocation()
                 );
     }
-
-    @Inject(
-            method = "findRespawnAndUseSpawnBlock(Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/core/BlockPos;FZZ)Ljava/util/Optional;",
-            at = @At(value = "HEAD"),
-            cancellable = true
-    )
-    private static void cobblemon$useHealthStationAsRespawn(ServerLevel level, BlockPos pos, float angle, boolean forced, boolean keepInventory, CallbackInfoReturnable<Optional<ServerPlayer.RespawnPosAngle>> cir) {
-        BlockState state = level.getBlockState(pos);
-        Block block = state.getBlock();
-        if (block instanceof HealingMachineBlock && HealingMachineBlock.Companion.canSetSpawn(level)) {
-            cir.setReturnValue(HealingMachineBlock.Companion.findStandUpPosition(EntityType.PLAYER, level, pos).map((vec3) -> ServerPlayer.RespawnPosAngle.of(vec3, pos)));
-        }
-    }
 }

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

@@ -16,7 +16,6 @@ import com.cobblemon.mod.common.item.crafting.CookingPotShapelessRecipe;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Maps;
-import com.llamalad7.mixinextras.sugar.Local;
 import net.minecraft.client.ClientRecipeBook;
 import net.minecraft.client.RecipeBookCategories;
 import net.minecraft.client.gui.screens.recipebook.RecipeCollection;
@@ -64,12 +63,23 @@ public abstract class ClientRecipeBookMixin {
         }
     }
 
-    @Inject(method = "setupCollections",
-            at = @At(
-                    value = "INVOKE",
-                    target = "Lcom/google/common/collect/ImmutableMap;copyOf(Ljava/util/Map;)Lcom/google/common/collect/ImmutableMap;"
-            ))
-    private void addCustomAggregateCategories(Iterable<RecipeHolder<?>> recipes, RegistryAccess registryAccess, CallbackInfo ci, @Local(ordinal = 1) Map<RecipeBookCategories, List<RecipeCollection>> map2) {
+    @Inject(method = "setupCollections", at = @At("RETURN"))
+    private void addCustomAggregateCategories(Iterable<RecipeHolder<?>> recipes, RegistryAccess registryAccess, CallbackInfo ci) {
+        Map<RecipeBookCategories, List<List<RecipeHolder<?>>>> map = categorizeAndGroupRecipes(recipes);
+        Map<RecipeBookCategories, List<RecipeCollection>> map2 = Maps.newHashMap();
+        ImmutableList.Builder<RecipeCollection> builder = ImmutableList.builder();
+
+        map.forEach((recipeBookCategories, list) -> {
+            List<RecipeCollection> collections = list.stream()
+                    .map(listx -> new RecipeCollection(registryAccess, listx))
+                    .peek(builder::add)
+                    .collect(ImmutableList.toImmutableList());
+            map2.put(recipeBookCategories, collections);
+        });
+        RecipeBookCategories.AGGREGATE_CATEGORIES.forEach((recipeBookCategories, list) -> map2.put(recipeBookCategories, (List) list.stream().flatMap((recipeBookCategoriesx) -> ((List) map2.getOrDefault(recipeBookCategoriesx, ImmutableList.of())).stream()).collect(ImmutableList.toImmutableList())));
         CobblemonRecipeCategories.Companion.getCustomAggregateCategories().forEach((recipeBookCategories, list) -> map2.put(recipeBookCategories, (List) list.stream().flatMap((recipeBookCategoriesx) -> ((List) map2.getOrDefault(recipeBookCategoriesx, ImmutableList.of())).stream()).collect(ImmutableList.toImmutableList())));
+
+        this.collectionsByTab = ImmutableMap.copyOf(map2);
+        this.allCollections = builder.build();
     }
 }

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

@@ -9,25 +9,55 @@
 package com.cobblemon.mod.common.mixin.client;
 
 import com.cobblemon.mod.common.CobblemonRecipeCategories;
-import com.llamalad7.mixinextras.expression.Definition;
-import com.llamalad7.mixinextras.expression.Expression;
-import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
-import com.llamalad7.mixinextras.sugar.Local;
+import net.minecraft.client.ClientRecipeBook;
+import net.minecraft.client.Minecraft;
 import net.minecraft.client.RecipeBookCategories;
 import net.minecraft.client.gui.screens.recipebook.RecipeBookComponent;
+import net.minecraft.client.gui.screens.recipebook.RecipeBookPage;
+import net.minecraft.client.gui.screens.recipebook.RecipeBookTabButton;
+import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(RecipeBookComponent.class)
 public class RecipeBookComponentMixin {
-    @Definition(id = "recipeBookCategories", local = @Local(type = RecipeBookCategories.class))
-    @Definition(id = "FURNACE_SEARCH", field = "Lnet/minecraft/client/RecipeBookCategories;FURNACE_SEARCH:Lnet/minecraft/client/RecipeBookCategories;")
-    @Expression("recipeBookCategories != FURNACE_SEARCH")
-    @ModifyExpressionValue(
-            method = "updateTabs",
-            at = @At(value = "MIXINEXTRAS:EXPRESSION")
-    )
-    private boolean notCookingPotSearch(boolean original, @Local RecipeBookCategories recipeBookCategories) {
-        return original && recipeBookCategories != CobblemonRecipeCategories.COOKING_POT_SEARCH.toVanillaCategory();
+
+    @Shadow private ClientRecipeBook book;
+
+    @Shadow protected Minecraft minecraft;
+
+    @Shadow private int width;
+
+    @Shadow private int xOffset;
+
+    @Shadow private int height;
+
+    @Shadow @Final private RecipeBookPage recipeBookPage;
+
+    @Inject(method = "updateTabs", at = @At("HEAD"), cancellable = true)
+    private void customUpdateTabs(CallbackInfo ci) {
+        RecipeBookComponent instance = (RecipeBookComponent) (Object) this;
+        int i = (width - 147) / 2 - xOffset - 30;
+        int j = (height - 166) / 2 + 3;
+        int k = 27;
+        int l = 0;
+
+        for (RecipeBookTabButton recipeBookTabButton : instance.tabButtons) {
+            RecipeBookCategories recipeBookCategories = recipeBookTabButton.getCategory();
+            if (recipeBookCategories != RecipeBookCategories.CRAFTING_SEARCH && recipeBookCategories != RecipeBookCategories.FURNACE_SEARCH && recipeBookCategories != CobblemonRecipeCategories.COOKING_POT_SEARCH.toVanillaCategory()) {
+                if (recipeBookTabButton.updateVisibility(book)) {
+                    recipeBookTabButton.setPosition(i, j + 27 * l++);
+                    recipeBookTabButton.startAnimation(minecraft);
+                }
+            } else {
+                recipeBookTabButton.visible = true;
+                recipeBookTabButton.setPosition(i, j + k * l++);
+            }
+        }
+
+        ci.cancel();
     }
 }

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

@@ -260,9 +260,6 @@ object Cobblemon {
             RequestManager.onLogoff(it.player)
             serverPlayerStructs.remove(it.player.uuid)
         }
-        PlatformEvents.PLAYER_RESPAWN.subscribe {
-            serverPlayerStructs.remove(it.player.uuid)
-        }
         PlatformEvents.PLAYER_DEATH.subscribe {
             PCLinkManager.removeLink(it.player.uuid)
             battleRegistry.getBattleByParticipatingPlayer(it.player)?.stop()

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

@@ -845,35 +845,54 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<
     @JvmField
     val PEP_UP_FLOWER = this.create("pep_up_flower", FlowerBlock(MobEffects.LEVITATION, 10F, BlockBehaviour.Properties.of().mapColor(MapColor.PLANT).noCollission().instabreak().sound(SoundType.GRASS).offsetType(BlockBehaviour.OffsetType.XZ).pushReaction(PushReaction.DESTROY)))
     @JvmField
+    val POTTED_PEP_UP_FLOWER = this.create("potted_pep_up_flower", BlocksInvoker.createFlowerPotBlock(PEP_UP_FLOWER))
+    @JvmField
     val HEARTY_GRAINS = this.create("hearty_grains", HeartyGrainsBlock(BlockBehaviour.Properties.of().pushReaction(PushReaction.DESTROY).ignitedByLava().mapColor(MapColor.PLANT).noCollission().randomTicks().instabreak()))
+
     @JvmField
     val GALARICA_NUT_BUSH = this.create("galarica_nut_bush", NutBushBlock(BlockBehaviour.Properties.of().mapColor(MapColor.PLANT).randomTicks().noCollission().sound(SoundType.SWEET_BERRY_BUSH).pushReaction(PushReaction.DESTROY)))
 
+    @JvmField
+    val POTTED_RED_APRICORN_SAPLING = this.create("potted_red_apricorn_sapling", BlocksInvoker.createFlowerPotBlock(RED_APRICORN_SAPLING))
+    @JvmField
+    val POTTED_YELLOW_APRICORN_SAPLING = this.create("potted_yellow_apricorn_sapling", BlocksInvoker.createFlowerPotBlock(YELLOW_APRICORN_SAPLING))
+    @JvmField
+    val POTTED_GREEN_APRICORN_SAPLING = this.create("potted_green_apricorn_sapling", BlocksInvoker.createFlowerPotBlock(GREEN_APRICORN_SAPLING))
+    @JvmField
+    val POTTED_BLUE_APRICORN_SAPLING = this.create("potted_blue_apricorn_sapling", BlocksInvoker.createFlowerPotBlock(BLUE_APRICORN_SAPLING))
+    @JvmField
+    val POTTED_PINK_APRICORN_SAPLING = this.create("potted_pink_apricorn_sapling", BlocksInvoker.createFlowerPotBlock(PINK_APRICORN_SAPLING))
+    @JvmField
+    val POTTED_BLACK_APRICORN_SAPLING = this.create("potted_black_apricorn_sapling", BlocksInvoker.createFlowerPotBlock(BLACK_APRICORN_SAPLING))
+    @JvmField
+    val POTTED_WHITE_APRICORN_SAPLING = this.create("potted_white_apricorn_sapling", BlocksInvoker.createFlowerPotBlock(WHITE_APRICORN_SAPLING))
+    @JvmField
+    val POTTED_SACCHARINE_SAPLING = this.create("potted_saccharine_sapling", BlocksInvoker.createFlowerPotBlock(SACCHARINE_SAPLING))
 
     @JvmField
     val RED_MINT_LEAF_LITTER = this.mintLitter("red_mint_leaf_litter", MapColor.COLOR_RED)
     @JvmField
-    val POTTED_RED_MINT = this.flowerPot("potted_red_mint", RED_MINT_LEAF_LITTER)
+    val POTTED_RED_MINT = this.pottedPlant("potted_red_mint", RED_MINT_LEAF_LITTER)
     @JvmField
     val BLUE_MINT_LEAF_LITTER = this.mintLitter("blue_mint_leaf_litter", MapColor.COLOR_BLUE)
     @JvmField
-    val POTTED_BLUE_MINT = this.flowerPot("potted_blue_mint", BLUE_MINT_LEAF_LITTER)
+    val POTTED_BLUE_MINT = this.pottedPlant("potted_blue_mint", BLUE_MINT_LEAF_LITTER)
     @JvmField
     val CYAN_MINT_LEAF_LITTER = this.mintLitter("cyan_mint_leaf_litter", MapColor.COLOR_CYAN)
     @JvmField
-    val POTTED_CYAN_MINT = this.flowerPot("potted_cyan_mint", CYAN_MINT_LEAF_LITTER)
+    val POTTED_CYAN_MINT = this.pottedPlant("potted_cyan_mint", CYAN_MINT_LEAF_LITTER)
     @JvmField
     val PINK_MINT_LEAF_LITTER = this.mintLitter("pink_mint_leaf_litter", MapColor.COLOR_PINK)
     @JvmField
-    val POTTED_PINK_MINT = this.flowerPot("potted_pink_mint", PINK_MINT_LEAF_LITTER)
+    val POTTED_PINK_MINT = this.pottedPlant("potted_pink_mint", PINK_MINT_LEAF_LITTER)
     @JvmField
     val GREEN_MINT_LEAF_LITTER = this.mintLitter("green_mint_leaf_litter", MapColor.COLOR_GREEN)
     @JvmField
-    val POTTED_GREEN_MINT = this.flowerPot("potted_green_mint", GREEN_MINT_LEAF_LITTER)
+    val POTTED_GREEN_MINT = this.pottedPlant("potted_green_mint", GREEN_MINT_LEAF_LITTER)
     @JvmField
     val WHITE_MINT_LEAF_LITTER = this.mintLitter("white_mint_leaf_litter", MapColor.SNOW)
     @JvmField
-    val POTTED_WHITE_MINT = this.flowerPot("potted_white_mint", WHITE_MINT_LEAF_LITTER)
+    val POTTED_WHITE_MINT = this.pottedPlant("potted_white_mint", WHITE_MINT_LEAF_LITTER)
 
     @JvmField
     val LOBAILA = this.create("lobaila", LobailaFlowerBlock(BlockBehaviour.Properties.of().mapColor(MapColor.PLANT).noCollission().instabreak().sound(SoundType.GRASS).offsetType(BlockBehaviour.OffsetType.XZ).ignitedByLava().pushReaction(PushReaction.DESTROY)))
@@ -1085,163 +1104,145 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<
     //val BINDING_SOIL = this.create("binding_soil", BindingSoilBlock(BlockBehaviour.Properties.of()))
 
     @JvmField
-    val POTTED_AGUAV_BERRY = this.flowerPot("potted_aguav_berry", AGUAV_BERRY)
+    val POTTED_AGUAV_BERRY = this.create("potted_aguav_berry", BlocksInvoker.createFlowerPotBlock(AGUAV_BERRY))
     @JvmField
-    val POTTED_APICOT_BERRY = this.flowerPot("potted_apicot_berry", APICOT_BERRY)
+    val POTTED_APICOT_BERRY = this.create("potted_apicot_berry", BlocksInvoker.createFlowerPotBlock(APICOT_BERRY))
     @JvmField
-    val POTTED_ASPEAR_BERRY = this.flowerPot("potted_aspear_berry", ASPEAR_BERRY)
+    val POTTED_ASPEAR_BERRY = this.create("potted_aspear_berry", BlocksInvoker.createFlowerPotBlock(ASPEAR_BERRY))
     @JvmField
-    val POTTED_BABIRI_BERRY = this.flowerPot("potted_babiri_berry", BABIRI_BERRY)
+    val POTTED_BABIRI_BERRY = this.create("potted_babiri_berry", BlocksInvoker.createFlowerPotBlock(BABIRI_BERRY))
     @JvmField
-    val POTTED_BELUE_BERRY = this.flowerPot("potted_belue_berry", BELUE_BERRY)
+    val POTTED_BELUE_BERRY = this.create("potted_belue_berry", BlocksInvoker.createFlowerPotBlock(BELUE_BERRY))
     @JvmField
-    val POTTED_BLUK_BERRY = this.flowerPot("potted_bluk_berry", BLUK_BERRY)
+    val POTTED_BLUK_BERRY = this.create("potted_bluk_berry", BlocksInvoker.createFlowerPotBlock(BLUK_BERRY))
     @JvmField
-    val POTTED_CHARTI_BERRY = this.flowerPot("potted_charti_berry", CHARTI_BERRY)
+    val POTTED_CHARTI_BERRY = this.create("potted_charti_berry", BlocksInvoker.createFlowerPotBlock(CHARTI_BERRY))
     @JvmField
-    val POTTED_CHERI_BERRY = this.flowerPot("potted_cheri_berry", CHERI_BERRY)
+    val POTTED_CHERI_BERRY = this.create("potted_cheri_berry", BlocksInvoker.createFlowerPotBlock(CHERI_BERRY))
     @JvmField
-    val POTTED_CHESTO_BERRY = this.flowerPot("potted_chesto_berry", CHESTO_BERRY)
+    val POTTED_CHESTO_BERRY = this.create("potted_chesto_berry", BlocksInvoker.createFlowerPotBlock(CHESTO_BERRY))
     @JvmField
-    val POTTED_CHILAN_BERRY = this.flowerPot("potted_chilan_berry", CHILAN_BERRY)
+    val POTTED_CHILAN_BERRY = this.create("potted_chilan_berry", BlocksInvoker.createFlowerPotBlock(CHILAN_BERRY))
     @JvmField
-    val POTTED_CHOPLE_BERRY = this.flowerPot("potted_chople_berry", CHOPLE_BERRY)
+    val POTTED_CHOPLE_BERRY = this.create("potted_chople_berry", BlocksInvoker.createFlowerPotBlock(CHOPLE_BERRY))
     @JvmField
-    val POTTED_COBA_BERRY = this.flowerPot("potted_coba_berry", COBA_BERRY)
+    val POTTED_COBA_BERRY = this.create("potted_coba_berry", BlocksInvoker.createFlowerPotBlock(COBA_BERRY))
     @JvmField
-    val POTTED_COLBUR_BERRY = this.flowerPot("potted_colbur_berry", COLBUR_BERRY)
+    val POTTED_COLBUR_BERRY = this.create("potted_colbur_berry", BlocksInvoker.createFlowerPotBlock(COLBUR_BERRY))
     @JvmField
-    val POTTED_CORNN_BERRY = this.flowerPot("potted_cornn_berry", CORNN_BERRY)
+    val POTTED_CORNN_BERRY = this.create("potted_cornn_berry", BlocksInvoker.createFlowerPotBlock(CORNN_BERRY))
     @JvmField
-    val POTTED_CUSTAP_BERRY = this.flowerPot("potted_custap_berry", CUSTAP_BERRY)
+    val POTTED_CUSTAP_BERRY = this.create("potted_custap_berry", BlocksInvoker.createFlowerPotBlock(CUSTAP_BERRY))
     @JvmField
-    val POTTED_DURIN_BERRY = this.flowerPot("potted_durin_berry", DURIN_BERRY)
+    val POTTED_DURIN_BERRY = this.create("potted_durin_berry", BlocksInvoker.createFlowerPotBlock(DURIN_BERRY))
     @JvmField
-    val POTTED_EGGANT_BERRY = this.flowerPot("potted_eggant_berry", EGGANT_BERRY)
+    val POTTED_EGGANT_BERRY = this.create("potted_eggant_berry", BlocksInvoker.createFlowerPotBlock(EGGANT_BERRY))
     @JvmField
-    val POTTED_ENIGMA_BERRY = this.flowerPot("potted_enigma_berry", ENIGMA_BERRY)
+    val POTTED_ENIGMA_BERRY = this.create("potted_enigma_berry", BlocksInvoker.createFlowerPotBlock(ENIGMA_BERRY))
     @JvmField
-    val POTTED_FIGY_BERRY = this.flowerPot("potted_figy_berry", FIGY_BERRY)
+    val POTTED_FIGY_BERRY = this.create("potted_figy_berry", BlocksInvoker.createFlowerPotBlock(FIGY_BERRY))
     @JvmField
-    val POTTED_GANLON_BERRY = this.flowerPot("potted_ganlon_berry", GANLON_BERRY)
+    val POTTED_GANLON_BERRY = this.create("potted_ganlon_berry", BlocksInvoker.createFlowerPotBlock(GANLON_BERRY))
     @JvmField
-    val POTTED_GREPA_BERRY = this.flowerPot("potted_grepa_berry", GREPA_BERRY)
+    val POTTED_GREPA_BERRY = this.create("potted_grepa_berry", BlocksInvoker.createFlowerPotBlock(GREPA_BERRY))
     @JvmField
-    val POTTED_HABAN_BERRY = this.flowerPot("potted_haban_berry", HABAN_BERRY)
+    val POTTED_HABAN_BERRY = this.create("potted_haban_berry", BlocksInvoker.createFlowerPotBlock(HABAN_BERRY))
     @JvmField
-    val POTTED_HONDEW_BERRY = this.flowerPot("potted_hondew_berry", HONDEW_BERRY)
+    val POTTED_HONDEW_BERRY = this.create("potted_hondew_berry", BlocksInvoker.createFlowerPotBlock(HONDEW_BERRY))
     @JvmField
-    val POTTED_HOPO_BERRY = this.flowerPot("potted_hopo_berry", HOPO_BERRY)
+    val POTTED_HOPO_BERRY = this.create("potted_hopo_berry", BlocksInvoker.createFlowerPotBlock(HOPO_BERRY))
     @JvmField
-    val POTTED_IAPAPA_BERRY = this.flowerPot("potted_iapapa_berry", IAPAPA_BERRY)
+    val POTTED_IAPAPA_BERRY = this.create("potted_iapapa_berry", BlocksInvoker.createFlowerPotBlock(IAPAPA_BERRY))
     @JvmField
-    val POTTED_JABOCA_BERRY = this.flowerPot("potted_jaboca_berry", JABOCA_BERRY)
+    val POTTED_JABOCA_BERRY = this.create("potted_jaboca_berry", BlocksInvoker.createFlowerPotBlock(JABOCA_BERRY))
     @JvmField
-    val POTTED_KASIB_BERRY = this.flowerPot("potted_kasib_berry", KASIB_BERRY)
+    val POTTED_KASIB_BERRY = this.create("potted_kasib_berry", BlocksInvoker.createFlowerPotBlock(KASIB_BERRY))
     @JvmField
-    val POTTED_KEBIA_BERRY = this.flowerPot("potted_kebia_berry", KEBIA_BERRY)
+    val POTTED_KEBIA_BERRY = this.create("potted_kebia_berry", BlocksInvoker.createFlowerPotBlock(KEBIA_BERRY))
     @JvmField
-    val POTTED_KEE_BERRY = this.flowerPot("potted_kee_berry", KEE_BERRY)
+    val POTTED_KEE_BERRY = this.create("potted_kee_berry", BlocksInvoker.createFlowerPotBlock(KEE_BERRY))
     @JvmField
-    val POTTED_KELPSY_BERRY = this.flowerPot("potted_kelpsy_berry", KELPSY_BERRY)
+    val POTTED_KELPSY_BERRY = this.create("potted_kelpsy_berry", BlocksInvoker.createFlowerPotBlock(KELPSY_BERRY))
     @JvmField
-    val POTTED_LANSAT_BERRY = this.flowerPot("potted_lansat_berry", LANSAT_BERRY)
+    val POTTED_LANSAT_BERRY = this.create("potted_lansat_berry", BlocksInvoker.createFlowerPotBlock(LANSAT_BERRY))
     @JvmField
-    val POTTED_LEPPA_BERRY = this.flowerPot("potted_leppa_berry", LEPPA_BERRY)
+    val POTTED_LEPPA_BERRY = this.create("potted_leppa_berry", BlocksInvoker.createFlowerPotBlock(LEPPA_BERRY))
     @JvmField
-    val POTTED_LIECHI_BERRY = this.flowerPot("potted_liechi_berry", LIECHI_BERRY)
+    val POTTED_LIECHI_BERRY = this.create("potted_liechi_berry", BlocksInvoker.createFlowerPotBlock(LIECHI_BERRY))
     @JvmField
-    val POTTED_LUM_BERRY = this.flowerPot("potted_lum_berry", LUM_BERRY)
+    val POTTED_LUM_BERRY = this.create("potted_lum_berry", BlocksInvoker.createFlowerPotBlock(LUM_BERRY))
     @JvmField
-    val POTTED_MAGO_BERRY = this.flowerPot("potted_mago_berry", MAGO_BERRY)
+    val POTTED_MAGO_BERRY = this.create("potted_mago_berry", BlocksInvoker.createFlowerPotBlock(MAGO_BERRY))
     @JvmField
-    val POTTED_MAGOST_BERRY = this.flowerPot("potted_magost_berry", MAGOST_BERRY)
+    val POTTED_MAGOST_BERRY = this.create("potted_magost_berry", BlocksInvoker.createFlowerPotBlock(MAGOST_BERRY))
     @JvmField
-    val POTTED_MARANGA_BERRY = this.flowerPot("potted_maranga_berry", MARANGA_BERRY)
+    val POTTED_MARANGA_BERRY = this.create("potted_maranga_berry", BlocksInvoker.createFlowerPotBlock(MARANGA_BERRY))
     @JvmField
-    val POTTED_MICLE_BERRY = this.flowerPot("potted_micle_berry", MICLE_BERRY)
+    val POTTED_MICLE_BERRY = this.create("potted_micle_berry", BlocksInvoker.createFlowerPotBlock(MICLE_BERRY))
     @JvmField
-    val POTTED_NANAB_BERRY = this.flowerPot("potted_nanab_berry", NANAB_BERRY)
+    val POTTED_NANAB_BERRY = this.create("potted_nanab_berry", BlocksInvoker.createFlowerPotBlock(NANAB_BERRY))
     @JvmField
-    val POTTED_NOMEL_BERRY = this.flowerPot("potted_nomel_berry", NOMEL_BERRY)
+    val POTTED_NOMEL_BERRY = this.create("potted_nomel_berry", BlocksInvoker.createFlowerPotBlock(NOMEL_BERRY))
     @JvmField
-    val POTTED_OCCA_BERRY = this.flowerPot("potted_occa_berry", OCCA_BERRY)
+    val POTTED_OCCA_BERRY = this.create("potted_occa_berry", BlocksInvoker.createFlowerPotBlock(OCCA_BERRY))
     @JvmField
-    val POTTED_ORAN_BERRY = this.flowerPot("potted_oran_berry", ORAN_BERRY)
+    val POTTED_ORAN_BERRY = this.create("potted_oran_berry", BlocksInvoker.createFlowerPotBlock(ORAN_BERRY))
     @JvmField
-    val POTTED_PAMTRE_BERRY = this.flowerPot("potted_pamtre_berry", PAMTRE_BERRY)
+    val POTTED_PAMTRE_BERRY = this.create("potted_pamtre_berry", BlocksInvoker.createFlowerPotBlock(PAMTRE_BERRY))
     @JvmField
-    val POTTED_PASSHO_BERRY = this.flowerPot("potted_passho_berry", PASSHO_BERRY)
+    val POTTED_PASSHO_BERRY = this.create("potted_passho_berry", BlocksInvoker.createFlowerPotBlock(PASSHO_BERRY))
     @JvmField
-    val POTTED_PAYAPA_BERRY = this.flowerPot("potted_payapa_berry", PAYAPA_BERRY)
+    val POTTED_PAYAPA_BERRY = this.create("potted_payapa_berry", BlocksInvoker.createFlowerPotBlock(PAYAPA_BERRY))
     @JvmField
-    val POTTED_PECHA_BERRY = this.flowerPot("potted_pecha_berry", PECHA_BERRY)
+    val POTTED_PECHA_BERRY = this.create("potted_pecha_berry", BlocksInvoker.createFlowerPotBlock(PECHA_BERRY))
     @JvmField
-    val POTTED_PERSIM_BERRY = this.flowerPot("potted_persim_berry", PERSIM_BERRY)
+    val POTTED_PERSIM_BERRY = this.create("potted_persim_berry", BlocksInvoker.createFlowerPotBlock(PERSIM_BERRY))
     @JvmField
-    val POTTED_PETAYA_BERRY = this.flowerPot("potted_petaya_berry", PETAYA_BERRY)
+    val POTTED_PETAYA_BERRY = this.create("potted_petaya_berry", BlocksInvoker.createFlowerPotBlock(PETAYA_BERRY))
     @JvmField
-    val POTTED_PINAP_BERRY = this.flowerPot("potted_pinap_berry", PINAP_BERRY)
+    val POTTED_PINAP_BERRY = this.create("potted_pinap_berry", BlocksInvoker.createFlowerPotBlock(PINAP_BERRY))
     @JvmField
-    val POTTED_POMEG_BERRY = this.flowerPot("potted_pomeg_berry", POMEG_BERRY)
+    val POTTED_POMEG_BERRY = this.create("potted_pomeg_berry", BlocksInvoker.createFlowerPotBlock(POMEG_BERRY))
     @JvmField
-    val POTTED_QUALOT_BERRY = this.flowerPot("potted_qualot_berry", QUALOT_BERRY)
+    val POTTED_QUALOT_BERRY = this.create("potted_qualot_berry", BlocksInvoker.createFlowerPotBlock(QUALOT_BERRY))
     @JvmField
-    val POTTED_RABUTA_BERRY = this.flowerPot("potted_rabuta_berry", RABUTA_BERRY)
+    val POTTED_RABUTA_BERRY = this.create("potted_rabuta_berry", BlocksInvoker.createFlowerPotBlock(RABUTA_BERRY))
     @JvmField
-    val POTTED_RAWST_BERRY = this.flowerPot("potted_rawst_berry", RAWST_BERRY)
+    val POTTED_RAWST_BERRY = this.create("potted_rawst_berry", BlocksInvoker.createFlowerPotBlock(RAWST_BERRY))
     @JvmField
-    val POTTED_RAZZ_BERRY = this.flowerPot("potted_razz_berry", RAZZ_BERRY)
+    val POTTED_RAZZ_BERRY = this.create("potted_razz_berry", BlocksInvoker.createFlowerPotBlock(RAZZ_BERRY))
     @JvmField
-    val POTTED_RINDO_BERRY = this.flowerPot("potted_rindo_berry", RINDO_BERRY)
+    val POTTED_RINDO_BERRY = this.create("potted_rindo_berry", BlocksInvoker.createFlowerPotBlock(RINDO_BERRY))
     @JvmField
-    val POTTED_ROSELI_BERRY = this.flowerPot("potted_roseli_berry", ROSELI_BERRY)
+    val POTTED_ROSELI_BERRY = this.create("potted_roseli_berry", BlocksInvoker.createFlowerPotBlock(ROSELI_BERRY))
     @JvmField
-    val POTTED_ROWAP_BERRY = this.flowerPot("potted_rowap_berry", ROWAP_BERRY)
+    val POTTED_ROWAP_BERRY = this.create("potted_rowap_berry", BlocksInvoker.createFlowerPotBlock(ROWAP_BERRY))
     @JvmField
-    val POTTED_SALAC_BERRY = this.flowerPot("potted_salac_berry", SALAC_BERRY)
+    val POTTED_SALAC_BERRY = this.create("potted_salac_berry", BlocksInvoker.createFlowerPotBlock(SALAC_BERRY))
     @JvmField
-    val POTTED_SHUCA_BERRY = this.flowerPot("potted_shuca_berry", SHUCA_BERRY)
+    val POTTED_SHUCA_BERRY = this.create("potted_shuca_berry", BlocksInvoker.createFlowerPotBlock(SHUCA_BERRY))
     @JvmField
-    val POTTED_SITRUS_BERRY = this.flowerPot("potted_sitrus_berry", SITRUS_BERRY)
+    val POTTED_SITRUS_BERRY = this.create("potted_sitrus_berry", BlocksInvoker.createFlowerPotBlock(SITRUS_BERRY))
     @JvmField
-    val POTTED_SPELON_BERRY = this.flowerPot("potted_spelon_berry", SPELON_BERRY)
+    val POTTED_SPELON_BERRY = this.create("potted_spelon_berry", BlocksInvoker.createFlowerPotBlock(SPELON_BERRY))
     @JvmField
-    val POTTED_STARF_BERRY = this.flowerPot("potted_starf_berry", STARF_BERRY)
+    val POTTED_STARF_BERRY = this.create("potted_starf_berry", BlocksInvoker.createFlowerPotBlock(STARF_BERRY))
     @JvmField
-    val POTTED_TAMATO_BERRY = this.flowerPot("potted_tamato_berry", TAMATO_BERRY)
+    val POTTED_TAMATO_BERRY = this.create("potted_tamato_berry", BlocksInvoker.createFlowerPotBlock(TAMATO_BERRY))
     @JvmField
-    val POTTED_TANGA_BERRY = this.flowerPot("potted_tanga_berry", TANGA_BERRY)
+    val POTTED_TANGA_BERRY = this.create("potted_tanga_berry", BlocksInvoker.createFlowerPotBlock(TANGA_BERRY))
     @JvmField
-    val POTTED_TOUGA_BERRY = this.flowerPot("potted_touga_berry", TOUGA_BERRY)
+    val POTTED_TOUGA_BERRY = this.create("potted_touga_berry", BlocksInvoker.createFlowerPotBlock(TOUGA_BERRY))
     @JvmField
-    val POTTED_WACAN_BERRY = this.flowerPot("potted_wacan_berry", WACAN_BERRY)
+    val POTTED_WACAN_BERRY = this.create("potted_wacan_berry", BlocksInvoker.createFlowerPotBlock(WACAN_BERRY))
     @JvmField
-    val POTTED_WATMEL_BERRY = this.flowerPot("potted_watmel_berry", WATMEL_BERRY)
+    val POTTED_WATMEL_BERRY = this.create("potted_watmel_berry", BlocksInvoker.createFlowerPotBlock(WATMEL_BERRY))
     @JvmField
-    val POTTED_WEPEAR_BERRY = this.flowerPot("potted_wepear_berry", WEPEAR_BERRY)
+    val POTTED_WEPEAR_BERRY = this.create("potted_wepear_berry", BlocksInvoker.createFlowerPotBlock(WEPEAR_BERRY))
     @JvmField
-    val POTTED_WIKI_BERRY = this.flowerPot("potted_wiki_berry", WIKI_BERRY)
+    val POTTED_WIKI_BERRY = this.create("potted_wiki_berry", BlocksInvoker.createFlowerPotBlock(WIKI_BERRY))
     @JvmField
-    val POTTED_YACHE_BERRY = this.flowerPot("potted_yache_berry", YACHE_BERRY)
-    @JvmField
-    val POTTED_PEP_UP_FLOWER = this.flowerPot("potted_pep_up_flower", PEP_UP_FLOWER)
-    @JvmField
-    val POTTED_RED_APRICORN_SAPLING = this.flowerPot("potted_red_apricorn_sapling", RED_APRICORN_SAPLING)
-    @JvmField
-    val POTTED_YELLOW_APRICORN_SAPLING = this.flowerPot("potted_yellow_apricorn_sapling", YELLOW_APRICORN_SAPLING)
-    @JvmField
-    val POTTED_GREEN_APRICORN_SAPLING = this.flowerPot("potted_green_apricorn_sapling", GREEN_APRICORN_SAPLING)
-    @JvmField
-    val POTTED_BLUE_APRICORN_SAPLING = this.flowerPot("potted_blue_apricorn_sapling", BLUE_APRICORN_SAPLING)
-    @JvmField
-    val POTTED_PINK_APRICORN_SAPLING = this.flowerPot("potted_pink_apricorn_sapling", PINK_APRICORN_SAPLING)
-    @JvmField
-    val POTTED_BLACK_APRICORN_SAPLING = this.flowerPot("potted_black_apricorn_sapling", BLACK_APRICORN_SAPLING)
-    @JvmField
-    val POTTED_WHITE_APRICORN_SAPLING = this.flowerPot("potted_white_apricorn_sapling", WHITE_APRICORN_SAPLING)
-    @JvmField
-    val POTTED_SACCHARINE_SAPLING = this.flowerPot("potted_saccharine_sapling", SACCHARINE_SAPLING)
+    val POTTED_YACHE_BERRY = this.create("potted_yache_berry", BlocksInvoker.createFlowerPotBlock(YACHE_BERRY))
 
     init {
         /**
@@ -1345,16 +1346,7 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<
 
     fun typeGemClusters() = typeGemClusters.toMap()
 
-    private fun flowerPot(name: String, flower: Block) = this.create(
-        name,
-        FlowerPotBlock(
-            flower,
-            BlockBehaviour.Properties.of()
-                .instabreak()
-                .noOcclusion()
-                .pushReaction(PushReaction.DESTROY)
-        )
-    )
+    private fun pottedPlant(name: String, flower: Block) = this.create(name, BlocksInvoker.createFlowerPotBlock(flower))
 
     private fun mintLitter(name: String, color: MapColor) = this.create(
         name,

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

@@ -566,7 +566,6 @@ object CobblemonNetwork {
         list.add(PacketRegisterInfo(SwapPartyPokemonPacket.ID, SwapPartyPokemonPacket::decode, SwapPartyPokemonHandler))
 
         list.add(PacketRegisterInfo(MovePCPokemonPacket.ID, MovePCPokemonPacket::decode, MovePCPokemonHandler))
-        list.add(PacketRegisterInfo(MovePCPokemonBatchPacket.ID, MovePCPokemonBatchPacket::decode, MovePCPokemonBatchHandler))
         list.add(PacketRegisterInfo(MovePartyPokemonPacket.ID, MovePartyPokemonPacket::decode, MovePartyPokemonHandler))
 
         list.add(PacketRegisterInfo(SwapPCPartyPokemonPacket.ID, SwapPCPartyPokemonPacket::decode, SwapPCPartyPokemonHandler))

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

@@ -9,7 +9,6 @@
 package com.cobblemon.mod.common.api.ai.config.task
 
 import com.bedrockk.molang.Expression
-import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.api.ai.BehaviourConfigurationContext
 import com.cobblemon.mod.common.api.ai.ExpressionOrEntityVariable
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
@@ -18,7 +17,6 @@ import com.cobblemon.mod.common.util.asExpression
 import com.cobblemon.mod.common.util.mainThreadRuntime
 import com.cobblemon.mod.common.util.resolveBoolean
 import com.cobblemon.mod.common.util.withQueryValue
-import com.cobblemon.mod.common.world.gamerules.CobblemonGameRules
 import com.mojang.datafixers.util.Either
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.ai.behavior.BehaviorControl
@@ -36,8 +34,6 @@ import net.minecraft.world.entity.ai.sensing.SensorType
 class HateEntityTaskConfig : SingleTaskConfig {
     val entityCondition: Expression = "true".asExpression()
     val range: ExpressionOrEntityVariable = Either.left("24".asExpression())
-    val chance: Float = Cobblemon.config.predationChance
-    private val coercedChance = chance.coerceIn(0f, 1f)
 
     override fun getVariables(entity: LivingEntity, behaviourConfigurationContext: BehaviourConfigurationContext) = emptyList<MoLangConfigVariable>()
     override fun createTask(
@@ -47,44 +43,24 @@ class HateEntityTaskConfig : SingleTaskConfig {
         val range = range.resolveFloat(behaviourConfigurationContext.runtime)
         behaviourConfigurationContext.addMemories(
             MemoryModuleType.NEAREST_VISIBLE_LIVING_ENTITIES,
-            MemoryModuleType.ANGRY_AT,
-            MemoryModuleType.ATTACK_TARGET
+            MemoryModuleType.ANGRY_AT
         )
         behaviourConfigurationContext.addSensors(SensorType.NEAREST_LIVING_ENTITIES)
         return BehaviorBuilder.create { instance ->
             instance.group(
                 instance.present(MemoryModuleType.NEAREST_VISIBLE_LIVING_ENTITIES),
-                instance.registered(MemoryModuleType.ANGRY_AT),
-                instance.registered(MemoryModuleType.ATTACK_TARGET),
-            ).apply(instance) { entities, angryAt, attackTarget ->
+                instance.registered(MemoryModuleType.ANGRY_AT)
+            ).apply(instance) { entities, angryAt ->
                 Trigger { world, entity, _ ->
-                    // bail if gamerule is disabled
-                    if (!world.gameRules.getBoolean(CobblemonGameRules.DO_POKEMON_PREDATION)) return@Trigger false
-                    val target = instance.get(entities).findClosest { hated ->
-                        mainThreadRuntime.withQueryValue("entity", hated.asMostSpecificMoLangValue())
+                    val target = instance.get(entities).findClosest {
+                        mainThreadRuntime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
                         return@findClosest mainThreadRuntime.resolveBoolean(entityCondition)
                     }.orElse(null)
 
-                    var shouldTrigger = false
                     if (target != null && target.distanceTo(entity) <= range) {
-                        shouldTrigger = when {
-                            // set always attacking if activity chance is equal to 1.0
-                            coercedChance == 1f -> {
-                                angryAt.set(target.uuid)
-                                attackTarget.set(target)
-                                true
-                            }
-                            // roll the dice in other way
-                            coercedChance != 1f && world.random.nextFloat() < coercedChance -> {
-                                angryAt.set(target.uuid)
-                                attackTarget.set(target)
-                                true
-                            }
-                            // fallback to peaceful behavior in unattended cases
-                            else -> false
-                        }
+                        angryAt.set(target.uuid)
                     }
-                    return@Trigger shouldTrigger
+                    return@Trigger true
                 }
             }
         }

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

@@ -239,10 +239,6 @@ open class PokemonBattle(
     }
 
     fun writeShowdownAction(vararg messages: String) {
-        if (messages.any { it.contains("\n") || it.contains("\r") }) {
-            LOGGER.warn("Refusing to forward Showdown action with an embedded line break for battle {}: {}", battleId, messages.joinToString(" | "))
-            return
-        }
         log(messages.joinToString("\n"))
         ShowdownService.service.send(battleId, messages.toList().toTypedArray())
     }

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

@@ -98,14 +98,14 @@ object LivingEntityMoLangFunctions : AbstractMoLangFunctionHolder<LivingEntity>(
             val targetEntity = params.get<MoValue>(0)
             val maxDistance = params.getDoubleOrNull(1)?.toFloat() ?: 2.0F
 
-            val target =
+            val entity =
                 if (targetEntity is ObjectValue<*> && targetEntity.obj is Entity) {
                     targetEntity.obj as Entity
                 } else {
                     return@isLookingAt DoubleValue.ZERO
                 }
 
-            DoubleValue(entity.isLookingAt(target, maxDistance))
+            DoubleValue(entity.isLookingAt(entity, maxDistance))
         }
         functions["is_living_entity"] = { DoubleValue.ONE }
         functions["is_flying"] = { DoubleValue(entity.isFallFlying) }

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

@@ -212,7 +212,7 @@ object PokemonMoLangFunctions : AbstractMoLangFunctionHolder<Pokemon>() {
         // Lol. Lmao, even.
         // TO-DO: Subscribe to [PokemonSpecies.observable].
         functions["pre_evolution"] = { pokemon.species.preEvolution ?: DoubleValue.ZERO }
-        functions["nature"] = { StringValue(pokemon.nature.name.toString()) }
+        functions["nature"] = { StringValue(pokemon.nature.toString()) }
         functions["is_wild"] = { DoubleValue(pokemon.entity?.let { it.ownerUUID == null } == true) }
         functions["is_shiny"] = { DoubleValue(pokemon.shiny) }
         functions["is_in_party"] = { DoubleValue(pokemon.storeCoordinates.get()?.store is PartyStore) }

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

@@ -10,6 +10,9 @@ package com.cobblemon.mod.common.api.pokedex
 
 import com.cobblemon.mod.common.api.data.JsonDataRegistry
 import com.cobblemon.mod.common.api.pokedex.def.PokedexDef
+import com.cobblemon.mod.common.api.pokedex.entry.PokedexEntry
+import com.cobblemon.mod.common.api.pokedex.entry.PokedexForm
+import com.cobblemon.mod.common.api.pokemon.PokemonSpecies
 import com.cobblemon.mod.common.api.reactive.SimpleObservable
 import com.cobblemon.mod.common.net.messages.client.data.PokedexDexSyncPacket
 import com.cobblemon.mod.common.util.adapters.CodecBackedAdapter
@@ -61,6 +64,14 @@ object Dexes : JsonDataRegistry<PokedexDef> {
         PokedexDexSyncPacket(dexEntryMap.values).sendToPlayer(player)
     }
 
+    fun findDexEntryBySpeciesId(regionId: ResourceLocation, speciesId: ResourceLocation): PokedexEntry? {
+        return dexEntryMap[regionId]?.getEntries()?.firstOrNull { it -> it.speciesId == speciesId }
+    }
+
+    fun findDexEntryBySpeciesId(speciesId: ResourceLocation): PokedexEntry? {
+        return findDexEntryBySpeciesId(cobblemonResource("national"), speciesId)
+    }
+
     fun getFormEquivalents(formName: String): List<String> {
         val key = equivalentFormsLookup[formName.lowercase()]
         return equivalentForms[key] ?: listOf(formName.lowercase())

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

@@ -88,7 +88,7 @@ fun getToolTipHeaderIcon(tradeEvolution: TradeEvolution): CobblemonDexEvolutionR
         lang("ui.pokedex.evolution.trade.tooltip.with_any_species")
     } else {
         PokemonSpecies.getByIdentifier(species.asIdentifierDefaultingNamespace())
-            ?.let { lang("ui.pokedex.evolution.trade.tooltip.with_species", it.translatedName.plainCopy().green()) }
+            ?.let { lang("ui.pokedex.evolution.trade.tooltip.with_species", it.translatedName.green()) }
             ?: lang("ui.pokedex.evolution.trade.tooltip.with_any_species")
     }
     return CobblemonDexEvolutionRequirementDisplay(CobblemonItems.LINK_CABLE, tooltip)
@@ -282,7 +282,7 @@ fun buildLevelRequirement(levelRequirement: LevelRequirement): DexEvolutionRequi
 
 fun buildMoonPhaseRequirement(moonPhaseRequirement: MoonPhaseRequirement): DexEvolutionRequirementDisplay {
     val icon = Items.CLOCK
-    val moonPhaseComponent = moonPhaseRequirement.moonPhase.displayName().plainCopy().green()
+    val moonPhaseComponent = moonPhaseRequirement.moonPhase.displayName().green()
     val tooltip = lang("ui.pokedex.requirement.moon_phase.tooltip", moonPhaseComponent)
 
     return CobblemonDexEvolutionRequirementDisplay(icon, tooltip)
@@ -290,7 +290,7 @@ fun buildMoonPhaseRequirement(moonPhaseRequirement: MoonPhaseRequirement): DexEv
 
 fun buildMoveSetRequirement(moveSetRequirement: MoveSetRequirement): DexEvolutionRequirementDisplay {
     val icon = CobblemonItems.TECHNICAL_MACHINE
-    val tooltip = lang("ui.pokedex.requirement.has_move.tooltip", moveSetRequirement.move.displayName.plainCopy().green())
+    val tooltip = lang("ui.pokedex.requirement.has_move.tooltip", moveSetRequirement.move.displayName.green())
 
     return CobblemonDexEvolutionRequirementDisplay(icon, tooltip)
 }
@@ -319,7 +319,7 @@ fun buildMoveTypeRequirement(moveTypeRequirement: MoveTypeRequirement): DexEvolu
         else -> CobblemonItems.NORMAL_GEM
     }
 
-    val tooltip = lang("ui.pokedex.requirement.has_move_type.tooltip", moveTypeRequirement.type.displayName.plainCopy().green())
+    val tooltip = lang("ui.pokedex.requirement.has_move_type.tooltip", moveTypeRequirement.type.displayName.green())
 
     return CobblemonDexEvolutionRequirementDisplay(icon, tooltip)
 }
@@ -437,7 +437,7 @@ fun buildStructureRequirement(structureRequirement: StructureRequirement, negate
 
 fun buildTimeRangeRequirement(timeRangeRequirement: TimeRangeRequirement): DexEvolutionRequirementDisplay? {
     val icon = Items.CLOCK
-    val timeRangeComponent = timeRangeRequirement.range.displayName()?.plainCopy() ?: return null
+    val timeRangeComponent = timeRangeRequirement.range.displayName() ?: return null
     val tooltip = lang("ui.pokedex.requirement.time_range.tooltip", timeRangeComponent.green())
 
     return CobblemonDexEvolutionRequirementDisplay(icon, tooltip)
@@ -445,7 +445,7 @@ fun buildTimeRangeRequirement(timeRangeRequirement: TimeRangeRequirement): DexEv
 
 fun buildUseMoveRequirement(useMoveRequirement: UseMoveRequirement): DexEvolutionRequirementDisplay {
     val icon = CobblemonItems.CHOICE_BAND
-    val tooltip = lang("ui.pokedex.requirement.use_move.tooltip", useMoveRequirement.move.displayName.plainCopy().green())
+    val tooltip = lang("ui.pokedex.requirement.use_move.tooltip", useMoveRequirement.move.displayName.green())
 
     return CobblemonDexEvolutionRequirementDisplay(icon, tooltip)
 }

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

@@ -42,8 +42,8 @@ abstract class AreaTypeSpawningCondition<T : AreaSpawnablePosition> : SpawningCo
     override fun copyFrom(other: SpawningCondition<*>, merger: Merger) {
         super.copyFrom(other, merger)
         if (other is AreaTypeSpawningCondition) {
-            minHeight = merger.mergeSingle(minHeight, other.minHeight)
-            maxHeight = merger.mergeSingle(maxHeight, other.maxHeight)
+            merger.mergeSingle(minHeight, other.minHeight)
+            merger.mergeSingle(maxHeight, other.maxHeight)
             neededNearbyBlocks = merger.merge(neededNearbyBlocks, other.neededNearbyBlocks)?.toMutableList()
         }
     }

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

@@ -46,7 +46,7 @@ abstract class SubmergedTypeSpawningCondition<T : SubmergedSpawnablePosition> :
         super.copyFrom(other, merger)
         if (other is SubmergedTypeSpawningCondition) {
             minDepth = merger.mergeSingle(minDepth, other.minDepth)
-            maxDepth = merger.mergeSingle(maxDepth, other.maxDepth)
+            maxDepth = merger.mergeSingle(minDepth, other.minDepth)
             fluidIsSource = merger.mergeSingle(fluidIsSource, other.fluidIsSource)
             fluid = merger.mergeSingle(fluid, other.fluid)
         }

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

@@ -39,7 +39,7 @@ abstract class SurfaceTypeSpawningCondition<T : SurfaceSpawnablePosition> : Area
         super.copyFrom(other, merger)
         if (other is SurfaceTypeSpawningCondition) {
             minDepth = merger.mergeSingle(minDepth, other.minDepth)
-            maxDepth = merger.mergeSingle(maxDepth, other.maxDepth)
+            maxDepth = merger.mergeSingle(minDepth, other.minDepth)
             fluid = merger.mergeSingle(fluid, other.fluid)
         }
     }

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

@@ -198,17 +198,7 @@ interface Spawner {
         val mid = chunk.getBlockState(startPos)
         val above = chunk.getBlockState(abovePos)
 
-        // Above must be non-solid
-        if (!above.isPathfindable(PathComputationType.AIR)) {
-            return false
-        }
-
-        // Position must be non-air
-        if (mid.isAir) {
-            return false
-        }
-
-        return true
+        return above.isPathfindable(PathComputationType.AIR) && mid.isAir
     }
 
     fun constrainArea(area: SpawningZoneInput): SpawningZoneInput? {

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

@@ -29,7 +29,6 @@ import com.cobblemon.mod.common.net.messages.client.storage.pc.InitializePCPacke
 import com.cobblemon.mod.common.net.messages.client.storage.pc.MoveClientPCPokemonPacket
 import com.cobblemon.mod.common.net.messages.client.storage.pc.SetPCPokemonPacket
 import com.cobblemon.mod.common.net.messages.client.storage.pc.wallpaper.UnlockPCBoxWallpaperPacket
-import com.cobblemon.mod.common.net.messages.server.storage.pc.MovePCPokemonBatchPacket
 import com.cobblemon.mod.common.pokemon.Pokemon
 import com.cobblemon.mod.common.util.DataKeys
 import com.cobblemon.mod.common.util.asTranslated
@@ -271,34 +270,6 @@ open class PCStore(
         }
     }
 
-    fun moveBatch(moves: List<Triple<UUID, PCPosition, PCPosition>>): Boolean {
-        if (moves.isEmpty() || moves.size > MovePCPokemonBatchPacket.MAX_MOVES) return false
-        if (moves.map { it.second }.toSet().size != moves.size ||
-            moves.map { it.third }.toSet().size != moves.size ||
-            moves.map { it.first }.toSet().size != moves.size
-        ) return false
-        if (moves.any { (_, source, target) -> !isValidPosition(source) || !isValidPosition(target) }) return false
-
-        val sourcePositions = moves.mapTo(mutableSetOf()) { it.second }
-        val pokemonMoves = moves.map { (pokemonID, source, target) ->
-            val pokemon = get(source)?.takeIf { it.uuid == pokemonID } ?: return false
-            Triple(source, target, pokemon)
-        }
-        if (pokemonMoves.any { (_, target, _) -> get(target) != null && target !in sourcePositions }) return false
-
-        pokemonMoves.forEach { (source, _, _) -> setAtPosition(source, null) }
-        pokemonMoves.forEach { (_, target, pokemon) -> setAtPosition(target, pokemon) }
-
-        pokemonMoves.forEach { (_, _, pokemon) ->
-            sendPacketToObservers(RemoveClientPokemonPacket(this, pokemon.uuid))
-        }
-        pokemonMoves.forEach { (_, target, pokemon) ->
-            sendPacketToObservers(SetPCPokemonPacket(uuid, target) { pokemon })
-        }
-        pcChangeObservable.emit(Unit)
-        return true
-    }
-
     override fun loadPositionFromNBT(nbt: CompoundTag): StoreCoordinates<PCPosition> {
         return StoreCoordinates(this, PCPosition(nbt.getShort(DataKeys.STORE_BOX).toInt(), nbt.getByte(DataKeys.STORE_SLOT).toInt()))
     }

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

@@ -120,7 +120,7 @@ object CobblemonItemTags {
     @JvmField val DESTINY_KNOT = create("held/destiny_knot")
     @JvmField val EVERSTONE = create("held/everstone")
     @JvmField val EXPERIENCE_SHARE = create("held/experience_share")
-    @JvmField val IS_FRIENDSHIP_BOOSTER = create("held/is_friendship_booster")
+    @JvmField val IS_FRIENDSHIP_BOOSTER = create("is_friendship_booster")
     @JvmField val ANY_HELD_ITEM = create("held/is_held_item")
     @JvmField val BLACKLISTED_ITEMS_TO_HOLD = create("held/blacklisted_items_to_hold")
     @JvmField val WHITELISTED_ITEMS_TO_HOLD = create("held/whitelisted_items_to_hold")

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

@@ -117,9 +117,6 @@ abstract class ShowdownActionResponse(val type: ShowdownActionResponseType) {
 
 data class MoveActionResponse(var moveName: String, var targetPnx: String? = null, var gimmickID: String? = null): ShowdownActionResponse(ShowdownActionResponseType.MOVE) {
     override fun isValid(activeBattlePokemon: ActiveBattlePokemon, showdownMoveSet: ShowdownMoveset?, forceSwitch: Boolean): Boolean {
-        // Ensure that the gimmick ID the player is sending is valid
-        gimmickID?.let { if (it !in VALID_GIMMICK_IDS) return false }
-
         if (forceSwitch || showdownMoveSet == null) {
             return false
         }
@@ -171,10 +168,6 @@ data class MoveActionResponse(var moveName: String, var targetPnx: String? = nul
         gimmickID = buffer.readNullable { buffer.readString() }
         return this
     }
-
-    companion object {
-        private val VALID_GIMMICK_IDS = ShowdownMoveset.Gimmick.entries.map { it.id }.toSet()
-    }
 }
 
 data class HealItemActionResponse(var item: String) : ShowdownActionResponse(ShowdownActionResponseType.FORCE_PASS) {
@@ -190,8 +183,7 @@ data class HealItemActionResponse(var item: String) : ShowdownActionResponse(Sho
     }
 
     override fun isValid(activeBattlePokemon: ActiveBattlePokemon, showdownMoveSet: ShowdownMoveset?, forceSwitch: Boolean): Boolean {
-        // Previously checked for !forceSwitch, excepts in the case of a forceSwitch, this couldn't legally be sent anyway.
-        return false
+        return !forceSwitch
     }
 
     override fun toShowdownString(activeBattlePokemon: ActiveBattlePokemon, showdownMoveSet: ShowdownMoveset?): String {

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

@@ -37,6 +37,7 @@ import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
 import com.cobblemon.mod.common.util.battleLang
 import com.cobblemon.mod.common.util.cobblemonResource
 import java.util.concurrent.CompletableFuture
+import net.minecraft.world.entity.LivingEntity
 
 /**
  * Format: |move|POKEMON|MOVE|TARGET
@@ -76,7 +77,7 @@ class MoveInstruction(
             val pokemonName = userPokemon.getName()
             ShowdownInterpreter.lastCauser[battle.battleId] = message
             // For Spread targets the message data only gives the pnx strings. So we can't know what pokemon are actually targeted until the previous messages have been interpreted
-            val spreadTargetPokemon = spreadTargets.map { battle.activePokemon.firstOrNull { poke -> poke.getPNX() == it }?.battlePokemon }
+            val spreadTargetPokemon = spreadTargets.map { battle.activePokemon.firstOrNull() { poke -> poke.getPNX() == it }?.battlePokemon }
 
             val targetPokemonEntity = targetPokemon?.entity
             if (targetPokemonEntity != null) {
@@ -136,20 +137,10 @@ class MoveInstruction(
 
             val subsequentInstructions = instructionSet.findInstructionsCausedBy(this)
             val missedTargets = subsequentInstructions.filterIsInstance<MissInstruction>().mapNotNull { it.target }
-            val faintedTargets = subsequentInstructions.filterIsInstance<FaintInstruction>().map { it.faintingPokemon }
             val failed = subsequentInstructions.any { it is FailInstruction }
             val failedTargets = subsequentInstructions.filterIsInstance<FailInstruction>().mapNotNull { it.target }
             val hitCountInstruction = subsequentInstructions.filterIsInstance<HitCountInstruction>().firstOrNull()
 
-            runtime.environment.query.addFunction("target_fainted") { params ->
-                if (params.params.size == 0) {
-                    return@addFunction DoubleValue(faintedTargets.isNotEmpty())
-                } else {
-                    val entityUUID = params.getString(0)
-                    return@addFunction DoubleValue(faintedTargets.any { it.entity?.stringUUID == entityUUID })
-                }
-            }
-
             runtime.environment.query.addFunction("missed") { params ->
                 if (params.params.size == 0) {
                     return@addFunction DoubleValue(missedTargets.isNotEmpty())

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

@@ -24,7 +24,6 @@ import net.minecraft.network.chat.Component
 import net.minecraft.server.level.ServerPlayer
 import net.minecraft.util.RandomSource
 import net.minecraft.world.InteractionResult
-import net.minecraft.world.entity.EntityType
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.player.Player
 import net.minecraft.world.item.Item
@@ -32,9 +31,13 @@ import net.minecraft.world.item.ItemStack
 import net.minecraft.world.item.TooltipFlag
 import net.minecraft.world.item.context.BlockPlaceContext
 import net.minecraft.world.level.BlockGetter
-import net.minecraft.world.level.CollisionGetter
 import net.minecraft.world.level.Level
-import net.minecraft.world.level.block.*
+import net.minecraft.world.level.block.BaseEntityBlock
+import net.minecraft.world.level.block.Block
+import net.minecraft.world.level.block.HorizontalDirectionalBlock
+import net.minecraft.world.level.block.Mirror
+import net.minecraft.world.level.block.RenderShape
+import net.minecraft.world.level.block.Rotation
 import net.minecraft.world.level.block.entity.BlockEntity
 import net.minecraft.world.level.block.entity.BlockEntityTicker
 import net.minecraft.world.level.block.entity.BlockEntityType
@@ -45,11 +48,9 @@ import net.minecraft.world.level.block.state.properties.IntegerProperty
 import net.minecraft.world.level.block.state.properties.Property
 import net.minecraft.world.level.pathfinder.PathComputationType
 import net.minecraft.world.phys.BlockHitResult
-import net.minecraft.world.phys.Vec3
 import net.minecraft.world.phys.shapes.CollisionContext
 import net.minecraft.world.phys.shapes.Shapes
 import net.minecraft.world.phys.shapes.VoxelShape
-import java.util.Optional
 
 @Suppress("DEPRECATED", "OVERRIDE_DEPRECATION")
 class HealingMachineBlock(settings: Properties) : BaseEntityBlock(settings) {
@@ -78,14 +79,6 @@ class HealingMachineBlock(settings: Properties) : BaseEntityBlock(settings) {
         const val MAX_CHARGE_LEVEL = 5
         val CHARGE_LEVEL: IntegerProperty = IntegerProperty.create("charge", 0, MAX_CHARGE_LEVEL + 1)
         val NATURAL: BooleanProperty = BooleanProperty.create("natural")
-
-        fun canSetSpawn(level: Level): Boolean {
-            return level.gameRules.getBoolean(CobblemonGameRules.HEALER_SET_SPAWN)
-        }
-
-        fun findStandUpPosition(entityType: EntityType<*>, level: CollisionGetter, pos: BlockPos): Optional<Vec3> {
-            return RespawnAnchorBlock.findStandUpPosition(entityType, level, pos) // Exists if we ever want to make something more custom, but anchor block logic should suffice
-        }
     }
 
     init {
@@ -165,12 +158,7 @@ class HealingMachineBlock(settings: Properties) : BaseEntityBlock(settings) {
         }
         val party = serverPlayerEntity.party()
         val pc = serverPlayerEntity.pc()
-        val healPC = player.level().gameRules.getBoolean(CobblemonGameRules.HEALERS_HEAL_PC)
-
-        // Do spawnpoint stuff
-        if (canSetSpawn(world)) {
-            player.setRespawnPosition(world.dimension(), blockPos, player.yRot, false, true)
-        }
+        val healPC = player.level().gameRules.getBoolean(CobblemonGameRules.HEALERS_HEAL_PC);
 
         if (party.none() && (!healPC || pc.none())) {
             player.sendSystemMessage(lang("healingmachine.nopokemon").red(), true)
@@ -195,7 +183,6 @@ class HealingMachineBlock(settings: Properties) : BaseEntityBlock(settings) {
             player.sendSystemMessage(lang("healingmachine.notenoughcharge", "${((neededCharge/party.count())*100f).toInt()}%").red(), true)
         }
         party.forEach { it.tryRecallWithAnimation() }
-
         return InteractionResult.CONSUME
     }
 

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

@@ -30,7 +30,7 @@ class OrbBlock(properties: Properties) : SixFaceRotationalBlock(properties) {
 
         val FLOOR_NORTH = Shapes.box(0.3125, 0.0, 0.3125, 0.6875, 0.375, 0.6875)
         val WALL_NORTH = Shapes.box(0.3125, 0.3125, 0.625, 0.6875, 0.6875, 1.0)
-        val CEILING_NORTH = Shapes.box(0.3125, 0.625, 0.3125, 0.6875, 1.0, 0.6875)
+        val CEILING_NORTH = Shapes.box(0.3125, 0.625, 0.375, 0.6875, 1.0, 0.6875)
     }
 
     init {

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

@@ -160,8 +160,8 @@ class TypeGemClusterBlock(
             && state.getValue(STAGE) == 3) return false
 
         val supportPos = pos.relative(state.getValue(FACING).opposite)
-        val supportState = level.getBlockState(supportPos)
-        return supportState.`is`(CobblemonBlockTags.TYPE_GEM_BLOCKS) || supportState.block == CobblemonBlocks.TYPE_GEM_CORE // Cannot grow if not on any gem blocks
+        val supportBlock = level.getBlockState(supportPos).block
+        return CobblemonBlocks.typeGemBlocks().containsValue(supportBlock) || (supportBlock == CobblemonBlocks.TYPE_GEM_CORE) // Cannot grow if not on any gem blocks
     }
 
 

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

@@ -51,20 +51,10 @@ class TypeGemCoreBlock(properties: Properties) : Block(properties) {
                 ResourceLocation.parse("cobblemon:dragon_gem_block") to CobblemonBlocks.TYPE_GEM_CLUSTER_DRAGON,
                 ResourceLocation.parse("cobblemon:dark_gem_block") to CobblemonBlocks.TYPE_GEM_CLUSTER_DARK,
                 ResourceLocation.parse("cobblemon:steel_gem_block") to CobblemonBlocks.TYPE_GEM_CLUSTER_STEEL,
-                ResourceLocation.parse("cobblemon:fairy_gem_block") to CobblemonBlocks.TYPE_GEM_CLUSTER_FAIRY,
-                ResourceLocation.parse("minecraft:amethyst_block") to Blocks.SMALL_AMETHYST_BUD
+                ResourceLocation.parse("cobblemon:fairy_gem_block") to CobblemonBlocks.TYPE_GEM_CLUSTER_FAIRY
             )
         }
 
-        val AMETHYST_STAGES = listOf(
-            Blocks.SMALL_AMETHYST_BUD,
-            Blocks.MEDIUM_AMETHYST_BUD,
-            Blocks.LARGE_AMETHYST_BUD,
-            Blocks.AMETHYST_CLUSTER
-        )
-
-        private fun isAmethystStage(block: Block) = block in AMETHYST_STAGES
-
         fun getConnectedGemBlocks(level: BlockGetter, pos: BlockPos): List<Pair<BlockState, BlockPos>> {
             val connectedGems = mutableListOf<Pair<BlockState, BlockPos>>()
             val visited = mutableSetOf<BlockPos>()
@@ -95,16 +85,12 @@ class TypeGemCoreBlock(properties: Properties) : Block(properties) {
             Direction.entries.forEach {
                 if (random.nextFloat() < Cobblemon.config.typeGemGrowthChance) {
                     val faceState = level.getBlockState(pos.relative(it))
-                    var newState = BLOCK_TO_CLUSTER[BuiltInRegistries.BLOCK.getKey(state.block)]?.defaultBlockState()
+                    val randomGrowthType = decideClusterGrowthType(level, pos)
+                    val newState = BLOCK_TO_CLUSTER[BuiltInRegistries.BLOCK.getKey(state.block)]?.defaultBlockState()
                         ?.setValue(DirectionalBlock.FACING, it)
+                        ?.setValue(GROWTH_TYPE, randomGrowthType)
                         ?: return
 
-                    if (newState.hasProperty(GROWTH_TYPE)) {
-                        newState = newState.setValue(GROWTH_TYPE, decideClusterGrowthType(level, pos))
-                    } else if (getConnectedGemBlocks(level, pos).size > Cobblemon.config.typeGemMaxConnected) {
-                        return@forEach
-                    }
-
                     if (faceState.`is`(Blocks.AIR)) {
                         level.setBlock(pos.relative(it), newState, 3)
                     }
@@ -146,7 +132,7 @@ class TypeGemCoreBlock(properties: Properties) : Block(properties) {
                 if (!visited.add(clusterPos)) continue
 
                 val clusterState = level.getBlockState(clusterPos)
-                if (clusterState.block == expectedCluster && clusterState.hasProperty(GROWTH_TYPE)) {
+                if (clusterState.block == expectedCluster) {
                     clusters += clusterState to clusterPos
                 }
             }
@@ -192,41 +178,13 @@ class TypeGemCoreBlock(properties: Properties) : Block(properties) {
         Direction.entries.forEach { direction ->
             val relativePos = pos.relative(direction)
             val relativeState = level.getBlockState(relativePos)
-            val matchesFace = relativeState.hasProperty(DirectionalBlock.FACING)
-                    && relativeState.getValue(DirectionalBlock.FACING) == direction
-            if (!(forceGrow || (matchesFace && random.nextFloat() < Cobblemon.config.typeGemGrowthChance))) {
-                return@forEach
+            val clusterBlock = relativeState.block as? TypeGemClusterBlock ?: return@forEach
+
+            if ((relativeState.getValue(DirectionalBlock.FACING) == direction &&
+                random.nextFloat() < Cobblemon.config.typeGemGrowthChance) || forceGrow
+                ) {
+                clusterBlock.advanceGrowth(relativeState, level, relativePos, random)
             }
-
-            val block = relativeState.block
-            if (block is TypeGemClusterBlock) {
-                block.advanceGrowth(relativeState, level, relativePos, random)
-            } else if (isAmethystStage(block)) {
-                advanceAmethyst(relativeState, level, relativePos)
-            }
-        }
-    }
-
-    private fun advanceAmethyst(state: BlockState, level: LevelAccessor, pos: BlockPos) {
-        val facing = state.getValue(DirectionalBlock.FACING)
-        val supportState = level.getBlockState(pos.relative(facing.opposite))
-        if (!supportState.`is`(CobblemonBlockTags.TYPE_GEM_BLOCKS) && supportState.block != CobblemonBlocks.TYPE_GEM_CORE) {
-            return
-        }
-
-        if (state.block != Blocks.AMETHYST_CLUSTER) {
-            val nextStage = AMETHYST_STAGES[AMETHYST_STAGES.indexOf(state.block) + 1]
-            level.setBlock(pos, nextStage.defaultBlockState().setValue(DirectionalBlock.FACING, facing), 3)
-            return
-        }
-
-        // Fully grown clusters mature into amethyst blocks unless boxed in, mirroring stunted type gems
-        val boxedIn = Direction.entries.any { direction ->
-            direction != facing.opposite
-                    && level.getBlockState(pos.relative(direction)).`is`(CobblemonBlockTags.TYPE_GEM_BLOCKS)
-        }
-        if (!boxedIn) {
-            level.setBlock(pos, Blocks.AMETHYST_BLOCK.defaultBlockState(), 3)
         }
     }
 

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

@@ -111,7 +111,6 @@ object CobblemonClient {
     val battleOverlay: BattleOverlay by lazy { BattleOverlay() }
     val pokedexUsageContext: PokedexUsageContext by lazy { PokedexUsageContext() }
     val rideControlsOverlay: RideControlsOverlay by lazy { RideControlsOverlay() }
-    var pcHealthToggle: Boolean = false
 
     fun onLogin() {
         clientPlayerData = ClientGeneralPlayerData()

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

@@ -64,6 +64,8 @@ class PokemonClientDelegate : PosableState(), PokemonSideDelegate {
         const val SHINY_PARTICLE_COOLDOWN = 3.5F
     }
 
+    var storedPokemon: Pokemon? = null
+
     override val schedulingTracker: SchedulingTracker
         get() = currentEntity.schedulingTracker
 
@@ -108,8 +110,18 @@ class PokemonClientDelegate : PosableState(), PokemonSideDelegate {
         if (this::currentEntity.isInitialized) {
             if (data == PokemonEntity.SPECIES) {
                 val identifier = ResourceLocation.parse(currentEntity.entityData.get(PokemonEntity.SPECIES))
+                val species = PokemonSpecies.getByIdentifier(identifier)!! // TODO exception handling
+                val stored = storedPokemon
+                if (stored != null) {
+                    val disguised = species != stored.species && currentEntity.battleId != null
+                    if (disguised) {
+                        if (currentEntity.pokemon === stored) currentEntity.pokemon = renderCopy(stored)
+                    } else if (currentEntity.pokemon !== stored) {
+                        currentEntity.pokemon = stored
+                    }
+                }
                 currentPose = null
-                currentEntity.pokemon.species = PokemonSpecies.getByIdentifier(identifier)!! // TODO exception handling
+                currentEntity.pokemon.species = species
                 // force a model update - handles edge case where the PosableState's tracked PosableModel isn't updated until the LivingEntityRenderer render is run
                 currentModel = VaryingModelRepository.getPoser(identifier, this)
                 currentEntity.refreshRiding()
@@ -355,6 +367,22 @@ class PokemonClientDelegate : PosableState(), PokemonSideDelegate {
         pokemon.isClient = true
     }
 
+    private fun renderCopy(source: Pokemon) = Pokemon().apply {
+        isClient = true
+        uuid = source.uuid
+        scaleModifier = source.scaleModifier
+        species = source.species
+        form = source.form
+        gender = source.gender
+        shiny = source.shiny
+        forcedAspects = source.forcedAspects
+        nickname = source.nickname
+        activeMark = source.activeMark
+        caughtBall = source.caughtBall
+        isAlpha = source.isAlpha
+        level = source.level
+    }
+
     override fun addToStruct(struct: QueryStruct) {
         super.addToStruct(struct)
         struct.addFunctions(ClientMoLangFunctions.clientFunctions)

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

@@ -85,7 +85,6 @@ class PartyOverlay : Gui(Minecraft.getInstance()) {
             if (HidePartyBinding.shouldHide) {
                 return false
             }
-
             return true
         }
     }
@@ -559,4 +558,4 @@ class PartyOverlay : Gui(Minecraft.getInstance()) {
             }
         }
     }
-}
+}

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

@@ -29,8 +29,7 @@ class BoxStorageSlot(
 
         val grabbedSlot = parent.grabbedSlot
         return if (grabbedSlot == null) {
-            val pokemon = getPokemon()
-            pokemon == null || !parent.isInMultiSelection(pokemon, position)
+            true
         } else {
             grabbedSlot.getPokemon() != getPokemon()
         }

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

@@ -50,7 +50,6 @@ import net.minecraft.network.chat.Component
 import net.minecraft.sounds.SoundEvent
 import kotlin.isInitialized
 import net.minecraft.resources.ResourceLocation
-import net.minecraft.util.FastColor
 
 class PCGUI(
     val pc: ClientPC,
@@ -99,8 +98,6 @@ class PCGUI(
         private val buttonWallpaperResource = cobblemonResource("textures/gui/pc/pc_button_set_wallpaper.png")
         private val buttonInfoArrow = cobblemonResource("textures/gui/pc/info_arrow.png")
 
-        private val buttonHealthToggleResource = cobblemonResource("textures/gui/pc/pc_button_toggle_health.png")
-
         private val topSpacerResource = cobblemonResource("textures/gui/pc/pc_spacer_top.png")
         private val bottomSpacerResource = cobblemonResource("textures/gui/pc/pc_spacer_bottom.png")
         private val rightSpacerResource = cobblemonResource("textures/gui/pc/pc_spacer_right.png")
@@ -132,55 +129,6 @@ class PCGUI(
     var selectPointerOffsetIncrement = false
     var displayOptions = false
 
-    private var dragStartX: Int? = null
-    private var dragStartY: Int? = null
-    private var dragEndX: Int? = null
-    private var dragEndY: Int? = null
-    private var selectionDragActive = false
-
-    data class SelectionArea(val left: Int, val top: Int, val right: Int, val bottom: Int)
-
-    private data class BoxGridBounds(val left: Int, val top: Int, val right: Int, val bottom: Int) {
-        fun contains(x: Int, y: Int) = x in left..< right && y >= top && y < bottom
-    }
-
-    private fun getBoxGridBounds(): BoxGridBounds {
-        val left = storageWidget.x
-        val top = storageWidget.y
-        return BoxGridBounds(
-            left,
-            top,
-            left + StorageWidget.SCREEN_WIDTH,
-            top + StorageWidget.SCREEN_HEIGHT
-        )
-    }
-
-    fun getSelectionArea(): SelectionArea? {
-        if (!selectionDragActive) return null
-        val startX = dragStartX ?: return null
-        val startY = dragStartY ?: return null
-        val endX = dragEndX ?: return null
-        val endY = dragEndY ?: return null
-        val bounds = getBoxGridBounds()
-        if (!bounds.contains(startX, startY)) return null
-
-        val columns = 6
-        val rows = 5
-        val slotPitch = StorageSlot.SIZE + StorageWidget.BOX_SLOT_PADDING
-        val gridLeft = bounds.left + StorageWidget.BOX_SLOT_START_OFFSET_X
-        val gridTop = bounds.top + StorageWidget.BOX_SLOT_START_OFFSET_Y + if (displayOptions) 5 else 0
-        val startColumn = ((startX - gridLeft) / slotPitch).coerceIn(0, columns - 1)
-        val endColumn = (((endX.coerceIn(bounds.left, bounds.right - 1)) - gridLeft) / slotPitch).coerceIn(0, columns - 1)
-        val startRow = ((startY - gridTop) / slotPitch).coerceIn(0, rows - 1)
-        val endRow = (((endY.coerceIn(bounds.top, bounds.bottom - 1)) - gridTop) / slotPitch).coerceIn(0, rows - 1)
-        return SelectionArea(
-            gridLeft + minOf(startColumn, endColumn) * slotPitch, // left
-            gridTop + minOf(startRow, endRow) * slotPitch, // top
-            gridLeft + (maxOf(startColumn, endColumn) * slotPitch) + StorageSlot.SIZE, // right
-            gridTop + (maxOf(startRow, endRow) * slotPitch) + StorageSlot.SIZE // bottom
-        )
-    }
-
     override fun renderBlurredBackground(delta: Float) {}
 
     override fun renderMenuBackground(context: GuiGraphics) {}
@@ -271,6 +219,7 @@ class PCGUI(
                     storageWidget.setupStorageSlots()
                     for (button in optionButtons) {
                         button.visible = displayOptions
+                        button.highlighted = false
                     }
                 }.also { it.highlighted = displayOptions }
             )
@@ -301,28 +250,12 @@ class PCGUI(
                 configuration.showParty = isVisible
                 wallpaperWidget.visible = !isVisible
                 (it as IconButton).highlighted = !isVisible
-                if (unseenWallpapers.isNotEmpty()) MarkPCBoxWallpapersSeenPacket(unseenWallpapers).sendToServer()
+                if (!unseenWallpapers.isEmpty()) MarkPCBoxWallpapersSeenPacket(unseenWallpapers).sendToServer()
             }.also {
                 it.visible = displayOptions
                 optionButtons.add(it)
             })
 
-            val healthButton = this.addRenderableWidget(IconButton(
-                pX = x + 230,
-                pY = y + 31,
-                buttonWidth = 20,
-                buttonHeight = 20,
-                resource = buttonHealthToggleResource,
-                label = "toggle_health_bars",
-            ) {
-                CobblemonClient.pcHealthToggle = !CobblemonClient.pcHealthToggle
-                (it as IconButton).highlighted = CobblemonClient.pcHealthToggle
-            }.also {
-                it.visible = displayOptions
-                optionButtons.add(it)
-            })
-            healthButton.highlighted = CobblemonClient.pcHealthToggle
-
             PokemonSortMode.entries.forEachIndexed { index, sortType ->
                 val typeName = sortType.name.lowercase()
                 this.addRenderableWidget(IconButton(
@@ -382,20 +315,6 @@ class PCGUI(
         super.init()
     }
 
-    private fun renderSelectionBox(context: GuiGraphics, area: SelectionArea) {
-        context.pose().pushPose()
-        context.pose().translate(0.0, 0.0, 1500.0)
-        val borderColor = FastColor.ARGB32.color(255, 205, 212, 255)
-        val bgColor = FastColor.ARGB32.color(75, 133, 183, 230)
-        val thickness = 1
-        context.fill(area.left, area.top, area.right, area.bottom, bgColor)
-        context.fill(area.left, area.top, area.right, area.top + thickness, borderColor)
-        context.fill(area.left, area.bottom - thickness, area.right, area.bottom, borderColor)
-        context.fill(area.left, area.top, area.left + thickness, area.bottom, borderColor)
-        context.fill(area.right - thickness, area.top, area.right, area.bottom, borderColor)
-        context.pose().popPose()
-    }
-
     override fun render(context: GuiGraphics, mouseX: Int, mouseY: Int, delta: Float) {
         val matrices = context.pose()
         renderBackground(context, mouseX, mouseY, delta)
@@ -536,20 +455,6 @@ class PCGUI(
                 shadow = true
             )
 
-//            var dexNo = pokemon.species.nationalPokedexNumber.toString()
-//            while (dexNo.length < 4) {
-//                dexNo = "0$dexNo"
-//            }
-//            drawScaledText(
-//                context = context,
-//                font = CobblemonResources.DEFAULT_LARGE,
-//                text = Component.literal(dexNo).bold(),
-//                x = x + 38,
-//                y = y + 1.5,
-//                shadow = true,
-//                scale = 0.85f
-//            )
-
             drawScaledText(
                 context = context,
                 font = CobblemonResources.DEFAULT_LARGE,
@@ -780,14 +685,12 @@ class PCGUI(
             scale = SCALE
         )
 
-        if (optionButtons.isNotEmpty() && displayOptions) {
+        if (!optionButtons.isEmpty() && displayOptions) {
             for (button in optionButtons) button.showAlt = hasShiftDown()
         }
 
         super.render(context, mouseX, mouseY, delta)
 
-        getSelectionArea()?.let { renderSelectionBox(context, it) }
-
         // Item Tooltip
         if (pokemon != null) {
             val displayedItem = if (showCosmeticItem) pokemon.cosmeticItem else pokemon.heldItemNoCopy()
@@ -809,20 +712,6 @@ class PCGUI(
     }
 
     override fun mouseClicked(mouseX: Double, mouseY: Double, button: Int): Boolean {
-        storageWidget.clearPendingStorageSlotClick()
-        selectionDragActive = false
-        val clickX = mouseX.toInt()
-        val clickY = mouseY.toInt()
-        if (storageWidget.multiSelection == null && button == 0 &&
-            getBoxGridBounds().contains(clickX, clickY) &&
-            storageWidget.pastureWidget == null) {
-            dragStartX = clickX
-            dragStartY = clickY
-        } else {
-            dragStartX = null
-            dragStartY = null
-        }
-
         // Trigger child component function as they will need to check the entire screen click area
         if (::boxNameWidget.isInitialized) boxNameWidget.mouseClicked(mouseX, mouseY, button)
         return super.mouseClicked(mouseX, mouseY, button)
@@ -851,43 +740,9 @@ class PCGUI(
         storageWidget.pastureWidget?.let { pasture ->
             if (pasture.pastureScrollList.isHovered) pasture.pastureScrollList.mouseDragged(mouseX, mouseY, button, deltaX, deltaY)
         }
-        if (button == 0 && storageWidget.pastureWidget == null) {
-            val startX = dragStartX
-            val startY = dragStartY
-            if (startX != null && startY != null) {
-                val offsetX = mouseX - startX
-                val offsetY = mouseY - startY
-                if (offsetX * offsetX + offsetY * offsetY >= 25.0) {
-                    selectionDragActive = true
-                    storageWidget.clearPendingStorageSlotClick()
-                    dragEndX = mouseX.toInt()
-                    dragEndY = mouseY.toInt()
-                }
-            }
-        }
         return super.mouseDragged(mouseX, mouseY, button, deltaX, deltaY)
     }
 
-    override fun mouseReleased(mouseX: Double, mouseY: Double, button: Int): Boolean {
-        val handled = super.mouseReleased(mouseX, mouseY, button)
-        if (button == 0) {
-            if (selectionDragActive) {
-                dragEndX = mouseX.toInt()
-                dragEndY = mouseY.toInt()
-                storageWidget.updateSelection()
-                storageWidget.clearPendingStorageSlotClick()
-            } else {
-                storageWidget.completePendingStorageSlotClick(mouseX, mouseY)
-            }
-        }
-        dragStartX = null
-        dragStartY = null
-        dragEndX = null
-        dragEndY = null
-        selectionDragActive = false
-        return handled
-    }
-
     override fun keyPressed(keyCode: Int, scanCode: Int, modifiers: Int): Boolean {
         val boxNameFocused = this::boxNameWidget.isInitialized && boxNameWidget.isFocused
         val filterFocused = this::filterWidget.isInitialized && filterWidget.isFocused

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

@@ -1,37 +0,0 @@
-package com.cobblemon.mod.common.client.gui.pc
-
-import com.cobblemon.mod.common.pokemon.Pokemon
-
-data class PCMultiSelection(
-    private val grid: MutableList<MutableList<Pokemon?>> = mutableListOf(),
-    val sourceBox: Int = 0,
-    val sourceColumn: Int = 0,
-    val sourceRow: Int = 0
-) {
-    fun getHorizontalSize(): Int = grid.firstOrNull()?.size ?: 0
-    fun getVerticalSize(): Int = grid.size
-
-    constructor(horizontalSize: Int, verticalSize: Int, sourceBox: Int, sourceColumn: Int, sourceRow: Int) : this(
-        MutableList(verticalSize) { MutableList<Pokemon?>(horizontalSize) { null } },
-        sourceBox,
-        sourceColumn,
-        sourceRow
-    )
-
-    fun getPokemon(x: Int, y: Int): Pokemon? {
-        return grid[y][x]
-    }
-
-    fun setPokemon(x: Int, y: Int, pokemon: Pokemon?) {
-        grid[y][x] = pokemon
-    }
-
-    fun pokemonEntries(): List<Triple<Int, Int, Pokemon>> {
-        return grid.flatMapIndexed { y, row ->
-            row.mapIndexedNotNull { x, pokemon -> pokemon?.let { Triple(x, y, it) } }
-        }
-    }
-
-    fun getPokemonCount(): Int = pokemonEntries().size
-
-}

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

@@ -45,13 +45,11 @@ class ReleaseButton(
                 vOffset = if (isHovered(mouseX.toDouble(), mouseY.toDouble())) HEIGHT else 0,
                 textureHeight = HEIGHT * 2
             )
-            val pokemonCount = parent.multiSelection?.getPokemonCount() ?: 0
 
             drawScaledText(
                 context = context,
                 font = CobblemonResources.DEFAULT_LARGE,
-                text = if (pokemonCount > 1)
-                    { lang("ui.pc.release_all").bold() } else { lang("ui.pc.release").bold() },
+                text = lang("ui.pc.release").bold(),
                 x = x + (WIDTH / 2),
                 y = y + 3.5,
                 centered = true,

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

@@ -10,11 +10,10 @@ package com.cobblemon.mod.common.client.gui.pc
 
 import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.api.gui.blitk
-import com.cobblemon.mod.common.client.CobblemonClient
 import com.cobblemon.mod.common.client.gui.CobblemonRenderable
-import com.cobblemon.mod.common.client.gui.PokemonGUIAnimationStyle
 import com.cobblemon.mod.common.client.gui.drawProfilePokemon
 import com.cobblemon.mod.common.client.gui.pasture.PasturePCGUIConfiguration
+import com.cobblemon.mod.common.client.gui.PokemonGUIAnimationStyle
 import com.cobblemon.mod.common.client.render.drawScaledText
 import com.cobblemon.mod.common.client.render.models.blockbench.FloatingState
 import com.cobblemon.mod.common.client.render.renderScaledGuiItemIcon
@@ -23,19 +22,13 @@ import com.cobblemon.mod.common.pokemon.Pokemon
 import com.cobblemon.mod.common.util.cobblemonResource
 import com.cobblemon.mod.common.util.lang
 import com.cobblemon.mod.common.util.math.fromEulerXYZDegrees
-import juuxel.adorn.util.Colors
 import net.minecraft.client.Minecraft
 import net.minecraft.client.gui.GuiGraphics
 import net.minecraft.client.gui.components.Button
-import net.minecraft.client.renderer.RenderType
 import net.minecraft.client.sounds.SoundManager
 import net.minecraft.network.chat.Component
-import net.minecraft.util.Mth
 import org.joml.Quaternionf
 import org.joml.Vector3f
-import kotlin.math.abs
-import kotlin.math.max
-import kotlin.math.roundToInt
 
 open class StorageSlot(
     x: Int, y: Int,
@@ -61,17 +54,9 @@ open class StorageSlot(
     }
 
     override fun renderWidget(context: GuiGraphics, mouseX: Int, mouseY: Int, delta: Float) {
-        val selectionArea = parent.pcGui.getSelectionArea()
-        if (selectionArea != null && parent.getSelectedPokemon(selectionArea).contains(this)) {
-            val highlightColor = 0x40FFFFFF
-            context.fill(x + 1, y, x + (SIZE - 1), y + SIZE, highlightColor)
-            context.fill(x, y + 1, x + 1, y + (SIZE - 1), highlightColor)
-            context.fill(x + SIZE - 1, y + 1, x + SIZE, y + (SIZE - 1), highlightColor)
-        }
         if (shouldRender()) {
             renderSlot(context, x, y, delta)
         }
-
     }
 
     fun renderSlot(context: GuiGraphics, posX: Int, posY: Int, partialTicks: Float) {
@@ -145,23 +130,6 @@ open class StorageSlot(
                     matrixStack = matrices
                 )
             }
-
-            // Pokemon health
-            // Taken from vanilla durability rendering
-            val currentHealth = pokemon.currentHealth
-            val maxHealth = pokemon.maxHealth.toFloat()
-            if (currentHealth < maxHealth && CobblemonClient.pcHealthToggle) {
-                val damageValue = maxHealth - currentHealth
-                val f = max(0.0f, (maxHealth - (maxHealth - currentHealth)) / maxHealth)
-                val color = Mth.hsvToRgb(f / 3.0f, 1.0f, 1.0f)
-                val totalWidth = 12
-                val width = (totalWidth - damageValue * totalWidth / pokemon.maxHealth.toFloat()).roundToInt();
-                val k = posX + 1
-                val l = posY + 6
-                val bgColor = if (this is PartyStorageSlot) Colors.BLACK else 0xFF3E3E3E.toInt()
-                context.fill(RenderType.guiOverlay(), k, l, k + totalWidth, l + 1, bgColor)
-                context.fill(RenderType.guiOverlay(), k, l, k + width, l + 1, color or bgColor)
-            }
             matrices.popPose()
         }
 

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

@@ -11,6 +11,7 @@ package com.cobblemon.mod.common.client.gui.pc
 import com.cobblemon.mod.common.CobblemonNetwork
 import com.cobblemon.mod.common.CobblemonSounds
 import com.cobblemon.mod.common.api.gui.blitk
+import com.cobblemon.mod.common.api.storage.StorePosition
 import com.cobblemon.mod.common.api.storage.party.PartyPosition
 import com.cobblemon.mod.common.api.storage.pc.PCPosition
 import com.cobblemon.mod.common.api.text.bold
@@ -38,9 +39,8 @@ import net.minecraft.client.gui.components.Button
 import net.minecraft.client.gui.screens.Screen
 import net.minecraft.client.resources.sounds.SimpleSoundInstance
 import net.minecraft.network.chat.Component
+import net.minecraft.resources.ResourceLocation
 import net.minecraft.sounds.SoundEvent
-import java.util.UUID
-import com.cobblemon.mod.common.net.messages.server.storage.pc.MovePCPokemonBatchPacket.PCPokemonMove
 
 class StorageWidget(
     pX: Int, pY: Int,
@@ -77,14 +77,9 @@ class StorageWidget(
 
     var displayConfirmRelease = false
     var screenLoaded = false
-    var selectedPosition: PartyPosition? = null
+    var selectedPosition: StorePosition? = null
     var grabbedSlot: GrabbedStorageSlot? = null
 
-    var multiSelection: PCMultiSelection? = null
-    private val multiGrabbedSlots = mutableMapOf<UUID, GrabbedStorageSlot>()
-    private var pendingStorageSlotClick: Button? = null
-    private var movePending = false
-
     var box = 0
         set(value) {
             field =
@@ -118,22 +113,16 @@ class StorageWidget(
             subKey = "ui.generic.yes",
             onPress = {
                 if (canDeleteSelected() && displayConfirmRelease) {
-                    val selection = multiSelection
-                    if (selection != null) {
-                        selection.pokemonEntries().forEach { (column, row, pokemon) ->
-                            val position = PCPosition(
-                                selection.sourceBox,
-                                (selection.sourceRow + row) * 6 + selection.sourceColumn + column
-                            )
-                            CobblemonNetwork.sendToServer(ReleasePCPokemonPacket(pokemon.uuid, position))
-                        }
-                    } else {
-                        val position = selectedPosition ?: return@ReleaseConfirmButton
-                        val pokemon = getSelectedPokemon() ?: return@ReleaseConfirmButton
+                    val position = selectedPosition ?: return@ReleaseConfirmButton
+                    val pokemon = getSelectedPokemon() ?: return@ReleaseConfirmButton
 
-                        CobblemonNetwork.sendToServer(ReleasePartyPokemonPacket(pokemon.uuid, position))
+                    val packet = when (position) {
+                        is PartyPosition -> ReleasePartyPokemonPacket(pokemon.uuid, position)
+                        is PCPosition -> ReleasePCPokemonPacket(pokemon.uuid, position)
+                        else -> return@ReleaseConfirmButton
                     }
 
+                    CobblemonNetwork.sendToServer(packet)
                     playSound(CobblemonSounds.PC_RELEASE)
                     resetSelected()
                     displayConfirmRelease = false
@@ -160,8 +149,9 @@ class StorageWidget(
     }
 
     fun canDeleteSelected(): Boolean {
-        multiSelection?.let { return it.pokemonEntries().isNotEmpty() }
-        return party.filterNotNull().size > 1 && selectedPosition != null && grabbedSlot != null
+        return !(selectedPosition is PartyPosition && party.filterNotNull().size <= 1)
+                && selectedPosition != null
+                && grabbedSlot != null
     }
 
     fun setupStorageSlots() {
@@ -180,7 +170,7 @@ class StorageWidget(
                     parent = this,
                     pc = pc,
                     position = PCPosition(box, index),
-                    onPress = { pendingStorageSlotClick = it }
+                    onPress = { this.onStorageSlotClicked(it) }
                 ).also {  widget ->
                     this.addWidget(widget)
                     this.boxSlots.add(widget)
@@ -210,7 +200,7 @@ class StorageWidget(
                 parent = this,
                 party = party,
                 position = PartyPosition(partyIndex),
-                onPress = { pendingStorageSlotClick = it }
+                onPress = { this.onStorageSlotClicked(it) }
             ).also { widget ->
                 this.addWidget(widget)
                 this.partySlots.add(widget)
@@ -220,117 +210,14 @@ class StorageWidget(
 
     private fun getSelectedPokemon(): Pokemon? {
         val selectedPosition = this.selectedPosition ?: return null
-        return party.get(selectedPosition)
-    }
-
-    fun getSelectedPokemon(area: PCGUI.SelectionArea): List<BoxStorageSlot> {
-        return boxSlots.filter { slot ->
-            slot.x < area.right && slot.x + StorageSlot.SIZE > area.left &&
-                slot.y < area.bottom && slot.y + StorageSlot.SIZE > area.top &&
-                slot.getPokemon()?.let(pcGui.search::passes) == true
+        return when (selectedPosition) {
+            is PCPosition -> pc.get(selectedPosition)
+            is PartyPosition -> party.get(selectedPosition)
+            else -> null
         }
     }
 
-    fun clearPendingStorageSlotClick() {
-        pendingStorageSlotClick = null
-    }
-
-    fun completePendingStorageSlotClick(mouseX: Double, mouseY: Double) {
-        val button = pendingStorageSlotClick ?: return
-        pendingStorageSlotClick = null
-        if (button.isMouseOver(mouseX, mouseY)) {
-            onStorageSlotClicked(button)
-        }
-    }
-
-    fun updateSelection() {
-        val area = pcGui.getSelectionArea()
-        if (area == null) {
-            multiSelection = null
-            return
-        }
-
-        selectedPosition = null
-        grabbedSlot = null
-        pcGui.setPreviewPokemon(null)
-
-        val selectedSlots = getSelectedPokemon(area)
-        if (selectedSlots.isEmpty()) {
-            multiSelection = null
-            return
-        }
-
-        val minColumn = selectedSlots.minOf { it.position.slot % 6 }
-        val maxColumn = selectedSlots.maxOf { it.position.slot % 6 }
-        val minRow = selectedSlots.minOf { it.position.slot / 6 }
-        val maxRow = selectedSlots.maxOf { it.position.slot / 6 }
-        val selection = PCMultiSelection(maxColumn - minColumn + 1, maxRow - minRow + 1, box, minColumn, minRow)
-
-        selectedSlots.forEach { slot ->
-            val pokemon = slot.getPokemon() ?: return@forEach
-            val slotIndex = slot.position.slot
-            val column = slotIndex % 6
-            val row = slotIndex / 6
-            if (column in minColumn..maxColumn && row in minRow..maxRow) {
-                selection.setPokemon(column - minColumn, row - minRow, pokemon)
-            }
-        }
-        playSound(CobblemonSounds.PC_GRAB)
-
-        multiSelection = selection
-    }
-
-    private fun moveMultiSelectionTo(destination: PCPosition): Boolean {
-        val selection = multiSelection ?: return false
-
-        val width = selection.getHorizontalSize()
-        val height = selection.getVerticalSize()
-        val destinationColumn = destination.slot % 6
-        val destinationRow = destination.slot / 6
-        if (destinationColumn + width > 6 || destinationRow + height > 5) return false
-
-        val moves = mutableListOf<PCPokemonMove>()
-        val selectedSources = mutableSetOf<PCPosition>()
-        for (row in 0 until height) {
-            for (column in 0 until width) {
-                val pokemon = selection.getPokemon(column, row) ?: continue
-                val source = PCPosition(selection.sourceBox, (selection.sourceRow + row) * 6 + selection.sourceColumn + column)
-                val target = PCPosition(destination.box, (destinationRow + row) * 6 + destinationColumn + column)
-                selectedSources.add(source)
-                moves.add(PCPokemonMove(pokemon.uuid, source, target))
-            }
-        }
-
-        if (moves.isEmpty()) return false
-
-        for (row in 0 until height) {
-            for (column in 0 until width) {
-                if (selection.getPokemon(column, row) == null) continue
-                val target = PCPosition(destination.box, (destinationRow + row) * 6 + destinationColumn + column)
-                val displacedPokemon = pc.get(target) ?: continue
-                if (target in selectedSources) continue
-
-                val displacedSource = PCPosition(
-                    selection.sourceBox,
-                    (selection.sourceRow + row) * 6 + selection.sourceColumn + column
-                )
-                if (pc.get(displacedSource) != null && displacedSource !in selectedSources) return false
-                moves.add(PCPokemonMove(displacedPokemon.uuid, target, displacedSource))
-            }
-        }
-
-        if (moves.map { it.newPosition }.toSet().size != moves.size) return false
-        MovePCPokemonBatchPacket(moves).sendToServer()
-        return true
-    }
-
-    fun isInMultiSelection(pokemon: Pokemon, position: PCPosition): Boolean {
-        val selection = multiSelection ?: return false
-        return selection.sourceBox == position.box && selection.pokemonEntries().any { it.third == pokemon }
-    }
-
     override fun renderWidget(context: GuiGraphics, mouseX: Int, mouseY: Int, delta: Float) {
-        updatePendingMove()
         val matrices = context.pose()
         // Party  Label
         if (pcGui.configuration.showParty) {
@@ -353,14 +240,11 @@ class StorageWidget(
                 shadow = true
             )
 
-            val pokemonCount = multiSelection?.getPokemonCount() ?: 0
-
             if (canDeleteSelected() && displayConfirmRelease) {
                 drawScaledText(
                     context = context,
                     font = CobblemonResources.DEFAULT_LARGE,
-                    text = if (pokemonCount > 1)
-                    { lang("ui.pc.release_all").bold() } else { lang("ui.pc.release").bold() },
+                    text = lang("ui.pc.release").bold(),
                     x = x + 223,
                     y = y + 119,
                     centered = true
@@ -424,7 +308,6 @@ class StorageWidget(
                 slot.render(context, mouseX, mouseY, delta)
                 val pokemon = slot.getPokemon()
                 if (grabbedSlot == null && slot.isHovered(mouseX, mouseY)
-                    && multiSelection == null
                     && pokemon != null && pokemon != pcGui.previewPokemon
                 ) {
                     pcGui.setPreviewPokemon(pokemon, pcGui.isPreviewInParty ?: false)
@@ -441,7 +324,6 @@ class StorageWidget(
                 slot.render(context, mouseX, mouseY, delta)
                 val pokemon = slot.getPokemon()
                 if (grabbedSlot == null && slot.isHovered(mouseX, mouseY)
-                    && multiSelection == null
                     && pokemon != null && pokemon != pcGui.previewPokemon
                 ) {
                     pcGui.setPreviewPokemon(pokemon, pcGui.isPreviewInParty ?: true)
@@ -453,32 +335,10 @@ class StorageWidget(
         pastureWidget?.render(context, mouseX, mouseY, delta)
         matrices.pushPose()
         matrices.translate(0.0, 0.0, 1000.0)
-        renderSelectedPokemon(context, mouseX, mouseY, delta)
+        grabbedSlot?.render(context, mouseX, mouseY, delta)
         matrices.popPose()
     }
 
-    private fun renderSelectedPokemon(context: GuiGraphics, mouseX: Int, mouseY: Int, delta: Float) {
-        if (movePending) return
-        val selection = multiSelection
-        if (selection == null) {
-            grabbedSlot?.render(context, mouseX, mouseY, delta)
-            return
-        }
-
-        val slotOffset = StorageSlot.SIZE + BOX_SLOT_PADDING
-        selection.pokemonEntries().forEach { (column, row, pokemon) ->
-            val grabbed = multiGrabbedSlots.getOrPut(pokemon.uuid) {
-                GrabbedStorageSlot(0, 0, this, pokemon)
-            }
-            grabbed.render(
-                context,
-                mouseX + column * slotOffset,
-                mouseY + row * slotOffset,
-                delta
-            )
-        }
-    }
-
     override fun mouseClicked(pMouseX: Double, pMouseY: Double, pButton: Int): Boolean {
         if (displayConfirmRelease) {
             if (releaseYesButton.isHovered(pMouseX, pMouseY)) releaseYesButton.mouseClicked(pMouseX, pMouseY, pButton)
@@ -511,55 +371,23 @@ class StorageWidget(
             else -> return
         }
 
-        val clickedPokemon = when (clickedPosition) {
-            is PCPosition -> pc.get(clickedPosition)
-            is PartyPosition -> party.get(clickedPosition)
-            else -> null
-        }
-
-        multiSelection?.let { selection ->
-            when (clickedPosition) {
-                is PCPosition -> {
-                    if (clickedPosition.box == selection.sourceBox &&
-                        clickedPosition.slot == selection.sourceRow * 6 + selection.sourceColumn
-                    ) {
-                        resetSelected()
-                    } else if (moveMultiSelectionTo(clickedPosition)) {
-                        playSound(CobblemonSounds.PC_DROP)
-                        movePending = true
-                    }
-                }
-                is PartyPosition -> {
-                    val selectedPokemon = selection.pokemonEntries().singleOrNull() ?: return
-                    val (column, row, pokemon) = selectedPokemon
-                    val source = PCPosition(
-                        selection.sourceBox,
-                        (selection.sourceRow + row) * 6 + selection.sourceColumn + column
-                    )
-                    if (pc.get(source) !== pokemon) return
-                    val packet = clickedPokemon?.let {
-                        SwapPCPartyPokemonPacket(it.uuid, clickedPosition, pokemon.uuid, source)
-                    } ?: MovePCPokemonToPartyPacket(pokemon.uuid, source, clickedPosition)
-                    packet.sendToServer()
-                    playSound(CobblemonSounds.PC_DROP)
-                    movePending = true
-                }
-                else -> Unit
-            }
-            return
-        }
-
         // Reset release confirmation
         displayConfirmRelease = false
 
         // Clicking on itself, so unselect position
-        if (selectedPosition == clickedPosition) {
+        if (this.selectedPosition != null && this.selectedPosition == clickedPosition) {
             if (grabbedSlot != null) playSound(CobblemonSounds.PC_DROP)
             resetSelected()
             return
         }
 
         // Check for selecting a Pokémon
+        val clickedPokemon = when(button) {
+            is BoxStorageSlot -> pc.get(clickedPosition as PCPosition)
+            is PartyStorageSlot -> party.get(clickedPosition as PartyPosition)
+            else -> null
+        }
+
         val selectOverride = pcGui.configuration.selectOverride
         if (selectOverride != null) {
             selectOverride(pcGui, clickedPosition, clickedPokemon)
@@ -592,47 +420,59 @@ class StorageWidget(
                     }
                 }
 
-                if (clickedPosition is PCPosition) {
-                    val column = clickedPosition.slot % 6
-                    val row = clickedPosition.slot / 6
-                    multiSelection = PCMultiSelection(1, 1, clickedPosition.box, column, row).also {
-                        it.setPokemon(0, 0, clickedPokemon)
-                    }
-                    playSound(CobblemonSounds.PC_GRAB)
-                    return
-                } else if (clickedPosition is PartyPosition) {
-                    this.selectedPosition = clickedPosition
-                    this.pcGui.setPreviewPokemon(clickedPokemon, pcGui.isPreviewInParty ?: false)
-                    grabbedSlot = GrabbedStorageSlot(
-                        x = button.x,
-                        y = button.y,
-                        parent = this,
-                        pokemon = clickedPokemon
-                    )
-                    playSound(CobblemonSounds.PC_GRAB)
-                }
+                this.selectedPosition = clickedPosition
+                this.pcGui.setPreviewPokemon(clickedPokemon, pcGui.isPreviewInParty ?: false)
+                grabbedSlot = GrabbedStorageSlot(
+                    x = button.x,
+                    y = button.y,
+                    parent = this,
+                    pokemon = clickedPokemon
+                )
+                playSound(CobblemonSounds.PC_GRAB)
+
             }
         } else  {
-            val sourcePosition = selectedPosition ?: return
-            val selectedPokemon = party.get(sourcePosition) ?: return
+            // Handle movement within the Box
+            val selectedPokemon = when(this.selectedPosition) {
+                is PCPosition -> pc.get(this.selectedPosition as PCPosition)
+                is PartyPosition -> party.get(this.selectedPosition as PartyPosition)
+                else -> null
+            } ?: return
+
+            // Box to Box
+            if (this.selectedPosition is PCPosition && clickedPosition is PCPosition) {
+                val packet = clickedPokemon?.let { SwapPCPokemonPacket(it.uuid, clickedPosition, selectedPokemon.uuid, this.selectedPosition as PCPosition) }
+                    ?: MovePCPokemonPacket(selectedPokemon.uuid, selectedPosition as PCPosition, clickedPosition)
+                packet.sendToServer()
+                playSound(CobblemonSounds.PC_DROP)
+                resetSelected()
+            }
+            // Box to Party
+            else if (this.selectedPosition is PCPosition && clickedPosition is PartyPosition) {
+                val packet = clickedPokemon?.let { SwapPCPartyPokemonPacket(clickedPokemon.uuid, clickedPosition, selectedPokemon.uuid, this.selectedPosition as PCPosition) }
+                    ?: MovePCPokemonToPartyPacket(selectedPokemon.uuid, this.selectedPosition as PCPosition, clickedPosition)
+                packet.sendToServer()
+                playSound(CobblemonSounds.PC_DROP)
+                resetSelected()
+            }
             // Party to Box
-            if (clickedPosition is PCPosition) {
+            else if (this.selectedPosition is PartyPosition && clickedPosition is PCPosition) {
                 if (ServerSettings.preventCompletePartyDeposit && this.party.filterNotNull().size == 1 && clickedPokemon == null) {
                     return
                 }
-                val packet = clickedPokemon?.let { SwapPCPartyPokemonPacket(selectedPokemon.uuid, sourcePosition, clickedPokemon.uuid, clickedPosition) }
-                    ?: MovePartyPokemonToPCPacket(selectedPokemon.uuid, sourcePosition, clickedPosition)
+                val packet = clickedPokemon?.let { SwapPCPartyPokemonPacket(selectedPokemon.uuid, this.selectedPosition as PartyPosition, clickedPokemon.uuid, clickedPosition) }
+                    ?: MovePartyPokemonToPCPacket(selectedPokemon.uuid, this.selectedPosition as PartyPosition, clickedPosition)
                 packet.sendToServer()
                 playSound(CobblemonSounds.PC_DROP)
-                movePending = true
+                resetSelected()
             }
             // Party to Party
-            else if (clickedPosition is PartyPosition) {
-                val packet = clickedPokemon?.let { SwapPartyPokemonPacket(it.uuid, clickedPosition, selectedPokemon.uuid, sourcePosition) }
-                    ?: MovePartyPokemonPacket(selectedPokemon.uuid, sourcePosition, clickedPosition)
+            else if (this.selectedPosition is PartyPosition && clickedPosition is PartyPosition) {
+                val packet = clickedPokemon?.let { SwapPartyPokemonPacket(it.uuid, clickedPosition, selectedPokemon.uuid, this.selectedPosition as PartyPosition) }
+                    ?: MovePartyPokemonPacket(selectedPokemon.uuid, selectedPosition as PartyPosition, clickedPosition)
                 packet.sendToServer()
                 playSound(CobblemonSounds.PC_DROP)
-                movePending = true
+                resetSelected()
             }
         }
     }
@@ -640,36 +480,6 @@ class StorageWidget(
     fun resetSelected() {
         selectedPosition = null
         grabbedSlot = null
-        multiSelection = null
-        multiGrabbedSlots.clear()
         pcGui.setPreviewPokemon(null)
     }
-
-    // annoyingly complex solution, but server/client desync causes flashing when moving pokemon. this should fix it
-    // if you can think of a simpler solution, feel free to implement it
-    private fun updatePendingMove() {
-        if (!movePending) return
-        val selection = multiSelection
-
-        if (selection != null) {
-            val updated = selection.pokemonEntries().any { (column, row, pokemon) ->
-                val source = PCPosition(selection.sourceBox, (selection.sourceRow + row) * 6 + selection.sourceColumn + column)
-                pc.get(source)?.uuid != pokemon.uuid
-            }
-            if (updated) {
-                movePending = false
-                resetSelected()
-            }
-            return
-        }
-
-        val source = selectedPosition
-        val pokemon = grabbedSlot?.getPokemon()
-        if (source != null && pokemon != null) {
-            if (party.get(source)?.uuid != pokemon.uuid) {
-                movePending = false
-                resetSelected()
-            }
-        }
-    }
 }

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

@@ -9,11 +9,19 @@
 package com.cobblemon.mod.common.client.gui.pokedex.widgets
 
 import com.cobblemon.mod.common.Cobblemon
+import com.cobblemon.mod.common.CobblemonItems
 import com.cobblemon.mod.common.api.gui.*
 import com.cobblemon.mod.common.api.pokedex.Dexes
 import com.cobblemon.mod.common.api.pokedex.PokedexEntryProgress
-import com.cobblemon.mod.common.api.pokedex.entry.*
+import com.cobblemon.mod.common.api.pokedex.entry.CobblemonBiomeDexEvolutionRequirementDisplay
+import com.cobblemon.mod.common.api.pokedex.entry.DexEntries
+import com.cobblemon.mod.common.api.pokedex.entry.DexEvolutionDisplay
+import com.cobblemon.mod.common.api.pokedex.entry.DexEvolutionRequirementDisplay
+import com.cobblemon.mod.common.api.pokedex.entry.PokedexEntry
+import com.cobblemon.mod.common.api.pokedex.entry.PokedexForm
+import com.cobblemon.mod.common.api.pokemon.PokemonProperties
 import com.cobblemon.mod.common.api.pokemon.PokemonSpecies
+import com.cobblemon.mod.common.api.pokemon.evolution.Evolution
 import com.cobblemon.mod.common.api.text.add
 import com.cobblemon.mod.common.api.text.bold
 import com.cobblemon.mod.common.api.text.green
@@ -33,15 +41,16 @@ import com.cobblemon.mod.common.client.render.renderScaledGuiItemIcon
 import com.cobblemon.mod.common.pokemon.FormData
 import com.cobblemon.mod.common.pokemon.Gender
 import com.cobblemon.mod.common.pokemon.RenderablePokemon
+import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
 import com.cobblemon.mod.common.util.cobblemonResource
 import com.cobblemon.mod.common.util.lang
 import net.minecraft.client.Minecraft
 import net.minecraft.client.gui.GuiGraphics
 import net.minecraft.core.registries.Registries
 import net.minecraft.locale.Language
+import net.minecraft.resources.ResourceLocation
 import net.minecraft.network.chat.Component
 import net.minecraft.network.chat.MutableComponent
-import net.minecraft.resources.ResourceLocation
 import net.minecraft.tags.TagKey
 
 class EvolutionTreeWidget(
@@ -159,8 +168,7 @@ class EvolutionTreeWidget(
         // Stop at whatever the dex can't resolve, and at cycles (datapacks)
         val visited = mutableSetOf(rootSpecies.speciesId to rootForm.displayForm)
         while (preEvolution != null) {
-            val preEvolutionSpecies = DexEntries.entries.values.firstOrNull { it.speciesId == preEvolution.fromSpecies &&
-                    it.forms.any {form -> form.displayForm.equals(preEvolution.fromForm, ignoreCase = true)}} ?: break
+            val preEvolutionSpecies = Dexes.findDexEntryBySpeciesId(preEvolution.fromSpecies) ?: break
             val preEvolutionForm = preEvolutionSpecies.forms.firstOrNull { it.displayForm.equals(preEvolution.fromForm, ignoreCase = true) } ?: break
             if (!visited.add(preEvolutionSpecies.speciesId to preEvolutionForm.displayForm)) break
             rootSpecies = preEvolutionSpecies
@@ -168,16 +176,19 @@ class EvolutionTreeWidget(
             preEvolution = findPreEvolution(rootSpecies, rootForm)
         }
 
+        val entry = Dexes.findDexEntryBySpeciesId(rootSpecies.speciesId)
+            ?: throw RuntimeException("Root dex entry not found")
+
         val viewedFormEquivalents = Dexes.getFormEquivalents(pokedexForm.displayForm)
         viewedForm = PokemonSpecies.getByIdentifier(pokedexEntry.speciesId)
             ?.forms?.firstOrNull { viewedFormEquivalents.contains(it.name.lowercase()) }
 
         val formEquivalents = Dexes.getFormEquivalents(rootForm.displayForm)
         val form =
-            rootSpecies.forms.firstOrNull { formEquivalents.contains(it.displayForm.lowercase()) } ?:
-            rootSpecies.forms.first { it.displayForm.equals("Normal", ignoreCase = true) }
+            entry.forms.firstOrNull { formEquivalents.contains(it.displayForm.lowercase()) } ?:
+            entry.forms.first { it.displayForm.equals("Normal", ignoreCase = true) }
 
-        val rootEvolutionNode = buildEvolutionTree(rootSpecies, form)
+        val rootEvolutionNode = buildEvolutionTree(entry, form)
 
 //        val isSameEntry = previousRootPokedexEntry != null && pokedexEntry?.id == previousRootPokedexEntry?.id
 //        val isSameForm =
@@ -203,7 +214,7 @@ class EvolutionTreeWidget(
 
     /** The evolution leading to [form]; the standard form falls back to any form of the species (no evolution leads to regular Vivillon). */
     private fun findPreEvolution(entry: PokedexEntry, form: PokedexForm): DexEvolutionDisplay? {
-        return DexEntries.evolutionDisplays.firstOrNull { it.toSpecies == entry.speciesId && form.displayForm.equals(it.toForm, ignoreCase = true) }
+        return DexEntries.evolutionDisplays.firstOrNull { it.toSpecies == entry.speciesId && it.toForm == form.displayForm }
             ?: DexEntries.evolutionDisplays.takeIf { form.displayForm.equals("Normal", ignoreCase = true) }
                 ?.firstOrNull { it.toSpecies == entry.speciesId }
     }
@@ -235,8 +246,7 @@ class EvolutionTreeWidget(
         val evolutions = DexEntries.evolutionDisplays.filter { it.fromSpecies == pokedexEntry.speciesId && formEquivalents.contains(it.fromForm.lowercase()) }
 
         val children = evolutions.mapNotNull {
-            val childPokedexEntry = DexEntries.entries.values.firstOrNull { entry -> entry.speciesId == it.toSpecies &&
-                    entry.forms.any {form -> form.displayForm.equals(it.toForm, ignoreCase = true)}}
+            val childPokedexEntry = Dexes.findDexEntryBySpeciesId(it.toSpecies)
             if (childPokedexEntry == null) {
                 Cobblemon.LOGGER.warn("Dex entry not found for species: ${it.toSpecies}")
                 return@mapNotNull null

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

@@ -34,7 +34,6 @@ import com.cobblemon.mod.common.client.render.models.blockbench.bedrock.animatio
 import com.cobblemon.mod.common.client.render.models.blockbench.pose.Pose
 import com.cobblemon.mod.common.client.render.models.blockbench.quirk.ModelQuirk
 import com.cobblemon.mod.common.client.render.models.blockbench.quirk.QuirkData
-import com.cobblemon.mod.common.client.sound.instances.UIEntitySoundInstance
 import com.cobblemon.mod.common.entity.PosableEntity
 import com.cobblemon.mod.common.entity.PoseType
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
@@ -45,6 +44,7 @@ import com.mojang.brigadier.exceptions.CommandSyntaxException
 import java.util.concurrent.ConcurrentLinkedQueue
 import net.minecraft.client.Minecraft
 import net.minecraft.client.multiplayer.ClientLevel
+import net.minecraft.client.resources.sounds.SimpleSoundInstance
 import net.minecraft.commands.arguments.item.ItemParser
 import net.minecraft.sounds.SoundEvent
 import net.minecraft.world.entity.Entity
@@ -289,7 +289,7 @@ abstract class PosableState : Schedulable {
                         entity.level().playLocalSound(entity, soundEvent, entity.soundSource, volume, pitch)
                     }
                 } else {
-                    Minecraft.getInstance().soundManager.play(UIEntitySoundInstance(soundEvent, volume, pitch))
+                    Minecraft.getInstance().soundManager.play(SimpleSoundInstance.forUI(soundEvent, volume, pitch))
                 }
             }
         }

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/bedrock/animation/BedrockAnimation.kt

@@ -19,7 +19,6 @@ import com.cobblemon.mod.common.client.render.models.blockbench.PosableState
 import com.cobblemon.mod.common.client.render.models.blockbench.pose.Bone
 import com.cobblemon.mod.common.client.render.models.blockbench.repository.RenderContext
 import com.cobblemon.mod.common.client.sound.instances.AlphaCrySoundInstance
-import com.cobblemon.mod.common.client.sound.instances.UIEntitySoundInstance
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.util.effectiveName
 import com.cobblemon.mod.common.util.genericRuntime
@@ -32,6 +31,7 @@ import net.minecraft.client.Minecraft
 import net.minecraft.client.model.geom.ModelPart
 import net.minecraft.client.multiplayer.ClientLevel
 import net.minecraft.client.resources.sounds.EntityBoundSoundInstance
+import net.minecraft.client.resources.sounds.SimpleSoundInstance
 import net.minecraft.resources.ResourceLocation
 import net.minecraft.sounds.SoundEvent
 import net.minecraft.world.entity.Entity
@@ -121,7 +121,7 @@ class BedrockSoundKeyframe(
                     }
                 }
             } else {
-                Minecraft.getInstance().soundManager.play(UIEntitySoundInstance(soundEvent))
+                Minecraft.getInstance().soundManager.play(SimpleSoundInstance.forUI(soundEvent, 1F, 1F))
             }
         }
     }

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

@@ -29,8 +29,8 @@ class FarfetchdGalarianModel(root: ModelPart) : PokemonPosableModel(root), Heade
     override var portraitScale = 2.6F
     override var portraitTranslation = Vec3(-0.2, -1.0, 0.0)
 
-    override var profileScale = 0.93F
-    override var profileTranslation = Vec3(-0.1, 0.36, 0.0)
+    override var profileScale = 1.1F
+    override var profileTranslation = Vec3(-0.1, 0.1, 0.0)
 
     lateinit var standing: Pose
     lateinit var walk: Pose

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

@@ -28,8 +28,8 @@ class FarfetchdModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame,
     override var portraitScale = 2.6F
     override var portraitTranslation = Vec3(-0.2, -1.0, 0.0)
 
-    override var profileScale = 0.93F
-    override var profileTranslation = Vec3(-0.1, 0.36, 0.0)
+    override var profileScale = 1.1F
+    override var profileTranslation = Vec3(-0.1, 0.1, 0.0)
 
     lateinit var standing: Pose
     lateinit var walk: Pose

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

@@ -23,8 +23,8 @@ class KabutoModel(root: ModelPart) : PokemonPosableModel(root) {
     override var portraitScale = 3.3F
     override var portraitTranslation = Vec3(0.0, -3.3, 0.0)
 
-    override var profileScale = 1.25F
-    override var profileTranslation = Vec3(0.0, -0.17, 0.0)
+    override var profileScale = 1.6F
+    override var profileTranslation = Vec3(0.0, -0.6, 0.0)
 
     lateinit var standing: CobblemonPose
     lateinit var walk: CobblemonPose

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/HoothootModel.kt

@@ -21,8 +21,8 @@ class HoothootModel (root: ModelPart) : PokemonPosableModel(root) {
 
     override var portraitScale = 2.2F
     override var portraitTranslation = Vec3(-0.25, -0.9, 0.0)
-    override var profileScale = 0.82F
-    override var profileTranslation = Vec3(0.0, 0.53, 0.0)
+    override var profileScale = 1.0F
+    override var profileTranslation = Vec3(0.0, 0.3, 0.0)
 
     lateinit var standing: Pose
     lateinit var walk: Pose

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/WooperModel.kt

@@ -29,8 +29,8 @@ class WooperModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame {
     override var portraitScale = 2.0F
     override var portraitTranslation = Vec3(-0.15, -0.65, 0.0)
 
-    override var profileScale = 0.75F
-    override var profileTranslation = Vec3(0.0, 0.6, 0.0)
+    override var profileScale = 0.9F
+    override var profileTranslation = Vec3(0.0, 0.4, 0.0)
 
     lateinit var shoulderLeft: Pose
     lateinit var shoulderRight: Pose

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/WooperPaldeanModel.kt

@@ -29,8 +29,8 @@ class WooperPaldeanModel(root: ModelPart) : PokemonPosableModel(root), HeadedFra
     override var portraitScale = 2.0F
     override var portraitTranslation = Vec3(-0.15, -0.65, 0.0)
 
-    override var profileScale = 0.75F
-    override var profileTranslation = Vec3(0.0, 0.6, 0.0)
+    override var profileScale = 0.9F
+    override var profileTranslation = Vec3(0.0, 0.4, 0.0)
 
     lateinit var shoulderLeft: Pose
     lateinit var shoulderRight: Pose

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/DusclopsModel.kt

@@ -34,7 +34,7 @@ class DusclopsModel (root: ModelPart) : PokemonPosableModel(root) {
     lateinit var battleidle: Pose
 
     override fun registerPoses() {
-        animations["cry"] = "q.bedrock_stateful('dusclops', 'cry')".asExpressionLike()
+        animations["cry"] = "q.bedrock_stateful('squirtle', 'cry')".asExpressionLike()
 
         val blink = quirk { bedrockStateful("dusclops", "blink") }
 

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/MasquerainModel.kt

@@ -12,7 +12,6 @@ import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonP
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
 import com.cobblemon.mod.common.client.render.models.blockbench.pose.Pose
 import com.cobblemon.mod.common.entity.PoseType
-import com.cobblemon.mod.common.util.asExpressionLike
 import net.minecraft.client.model.geom.ModelPart
 import net.minecraft.world.phys.Vec3
 
@@ -29,8 +28,6 @@ class MasquerainModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame
     lateinit var walk: Pose
     lateinit var standing: Pose
     override fun registerPoses() {
-        animations["cry"] = "q.bedrock_stateful('masquerain', 'cry')".asExpressionLike()
-
         val blink = quirk { bedrockStateful("masquerain", "blink") }
         standing = registerPose(
             poseName = "standing",

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/SurskitModel.kt

@@ -14,7 +14,6 @@ import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonP
 import com.cobblemon.mod.common.client.render.models.blockbench.pose.ModelPartTransformation
 import com.cobblemon.mod.common.client.render.models.blockbench.pose.Pose
 import com.cobblemon.mod.common.entity.PoseType
-import com.cobblemon.mod.common.util.asExpressionLike
 import com.cobblemon.mod.common.util.isInWater
 import net.minecraft.client.model.geom.ModelPart
 import net.minecraft.world.phys.Vec3
@@ -37,8 +36,6 @@ class SurskitModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame {
     val wateroffset = -8
 
     override fun registerPoses() {
-        animations["cry"] = "q.bedrock_stateful('surskit', 'cry')".asExpressionLike()
-
         val blink = quirk { bedrockStateful("surskit", "blink") }
         standing = registerPose(
             poseName = "standing",

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

@@ -14,7 +14,6 @@ import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonP
 import com.cobblemon.mod.common.client.render.models.blockbench.pose.ModelPartTransformation
 import com.cobblemon.mod.common.client.render.models.blockbench.pose.Pose
 import com.cobblemon.mod.common.entity.PoseType
-import com.cobblemon.mod.common.util.asExpressionLike
 import net.minecraft.client.model.geom.ModelPart
 import net.minecraft.world.phys.Vec3
 
@@ -37,8 +36,6 @@ class CombeeModel (root: ModelPart) : PokemonPosableModel(root) {
     val shoulderZOffset = 8
 
     override fun registerPoses() {
-        animations["cry"] = "q.bedrock_stateful('combee', 'cry')".asExpressionLike()
-
         val blink1 = quirk { bedrockStateful("combee", "blink_right") }
         val blink2 = quirk { bedrockStateful("combee", "blink_gender") }
         val blink3 = quirk { bedrockStateful("combee", "blink_left") }

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

@@ -12,7 +12,6 @@ import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonP
 import com.cobblemon.mod.common.client.render.models.blockbench.PosableState
 import com.cobblemon.mod.common.client.render.models.blockbench.pose.Pose
 import com.cobblemon.mod.common.entity.PoseType
-import com.cobblemon.mod.common.util.asExpressionLike
 import net.minecraft.client.model.geom.ModelPart
 import net.minecraft.world.phys.Vec3
 
@@ -31,8 +30,6 @@ class VespiquenModel (root: ModelPart) : PokemonPosableModel(root) {
     lateinit var standing: Pose
 
     override fun registerPoses() {
-        animations["cry"] = "q.bedrock_stateful('vespiquen', 'cry')".asExpressionLike()
-
         val blink1 = quirk { bedrockStateful("vespiquen", "blink") }
         val wingsleep = quirk { bedrockStateful("vespiquen", "sleep_flap") }
 

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

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

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

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

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

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

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

@@ -23,7 +23,7 @@ class CarbinkModel (root: ModelPart) : PokemonPosableModel(root) {
     override var portraitScale = 1.8F
     override var portraitTranslation = Vec3(0.0, 0.2, 0.0)
 
-    override var profileScale = 0.68F
+    override var profileScale = 0.85F
     override var profileTranslation = Vec3(0.0, 0.7, 0.0)
 
     lateinit var standing: CobblemonPose

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

@@ -0,0 +1,85 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen6
+
+import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
+import com.cobblemon.mod.common.client.render.models.blockbench.pose.Pose
+import com.cobblemon.mod.common.entity.PoseType
+import net.minecraft.client.model.geom.ModelPart
+import net.minecraft.world.phys.Vec3
+
+class GourgeistModel (root: ModelPart) : PokemonPosableModel(root), HeadedFrame {
+    override val rootPart = root.registerChildWithAllChildren("gourgeist")
+    override val head = getPart("head")
+
+    override var portraitScale = 4.0F
+    override var portraitTranslation = Vec3(-0.1, 0.6, 0.0)
+
+    override var profileScale = 0.8F
+    override var profileTranslation = Vec3(0.0, 0.55, 0.0)
+
+    lateinit var standing: Pose
+    lateinit var walk: Pose
+    lateinit var hovering: Pose
+    lateinit var fly: Pose
+    lateinit var sleep: Pose
+
+    override val cryAnimation = CryProvider { bedrockStateful("gourgeist", "cry") }
+
+    override fun registerPoses() {
+        val blink = quirk { bedrockStateful("gourgeist", "blink") }
+        standing = registerPose(
+            poseName = "standing",
+            poseTypes = PoseType.UI_POSES + PoseType.STAND,
+            quirks = arrayOf(blink),
+            animations = arrayOf(
+                singleBoneLook(),
+                bedrock("gourgeist", "ground_idle")
+            )
+        )
+
+        walk = registerPose(
+            poseName = "walk",
+            poseType = PoseType.WALK,
+            quirks = arrayOf(blink),
+            animations = arrayOf(
+                bedrock("gourgeist", "ground_walk")
+            )
+        )
+
+        hovering = registerPose(
+            poseName = "hovering",
+            poseType = PoseType.HOVER,
+            quirks = arrayOf(blink),
+            animations = arrayOf(
+                bedrock("gourgeist", "air_idle")
+            )
+        )
+
+        fly = registerPose(
+            poseName = "fly",
+            poseType = PoseType.FLY,
+            quirks = arrayOf(blink),
+            animations = arrayOf(
+                bedrock("gourgeist", "air_fly")
+            )
+        )
+
+        sleep = registerPose(
+            poseName = "sleep",
+            poseType = PoseType.SLEEP,
+            quirks = arrayOf(blink),
+            animations = arrayOf(
+                bedrock("gourgeist", "sleep")
+            )
+        )
+    }
+}

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

@@ -0,0 +1,77 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen6
+
+import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
+import com.cobblemon.mod.common.client.render.models.blockbench.pose.CobblemonPose
+import com.cobblemon.mod.common.entity.PoseType
+import net.minecraft.client.model.geom.ModelPart
+import net.minecraft.world.phys.Vec3
+
+class PumpkabooModel (root: ModelPart) : PokemonPosableModel(root), HeadedFrame {
+    override val rootPart = root.registerChildWithAllChildren("pumpkaboo")
+    override val head = getPart("head")
+
+    override var portraitScale = 3.5F
+    override var portraitTranslation = Vec3(0.0, -1.5, 0.0)
+
+    override var profileScale = 1.0F
+    override var profileTranslation = Vec3(0.0, 0.25, 0.0)
+
+    lateinit var standing: CobblemonPose
+    lateinit var walk: CobblemonPose
+    lateinit var battleidle: CobblemonPose
+    lateinit var sleep: CobblemonPose
+
+    override val cryAnimation = CryProvider { bedrockStateful("pumpkaboo", "cry") }
+
+    override fun registerPoses() {
+        val blink = quirk { bedrockStateful("pumpkaboo", "blink") }
+        val quirk = quirk { bedrockStateful("pumpkaboo", "quirk_idle") }
+
+        sleep = registerPose(
+            poseName = "sleep",
+            poseType = PoseType.SLEEP,
+            quirks = arrayOf(blink),
+            animations = arrayOf(
+                bedrock("pumpkaboo", "sleep")
+            )
+        )
+
+        standing = registerPose(
+            poseName = "standing",
+            poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES,
+            quirks = arrayOf(blink, quirk),
+            animations = arrayOf(
+                singleBoneLook(),
+                bedrock("pumpkaboo", "ground_idle")
+            )
+        )
+
+        walk = registerPose(
+            poseName = "walk",
+            poseTypes = PoseType.MOVING_POSES,
+            quirks = arrayOf(blink),
+            animations = arrayOf(
+                bedrock("pumpkaboo", "ground_walk")
+            )
+        )
+
+        battleidle = registerPose(
+            poseName = "battleidle",
+            poseTypes = PoseType.STATIONARY_POSES,
+            quirks = arrayOf(blink),
+            animations = arrayOf(
+                bedrock("pumpkaboo", "battle_idle")
+            )
+        )
+    }
+}

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

@@ -26,8 +26,8 @@ class ScatterbugModel (root: ModelPart) : PokemonPosableModel(root), HeadedFrame
     override var portraitScale = 2.6F
     override var portraitTranslation = Vec3(-0.2, -1.9, 0.0)
 
-    override var profileScale = 0.98F
-    override var profileTranslation = Vec3(0.0, 0.28, 0.0)
+    override var profileScale = 1.2F
+    override var profileTranslation = Vec3(0.0, 0.05, 0.0)
 
     lateinit var standing: CobblemonPose
     lateinit var walk: CobblemonPose

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/CharcadetModel.kt

@@ -36,8 +36,8 @@ class CharcadetModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame,
     override var portraitScale = 1.7F
     override var portraitTranslation = Vec3(-0.15, 0.08, 0.0)
 
-    override var profileScale = 0.58F
-    override var profileTranslation = Vec3(0.0, 0.91, 0.0)
+    override var profileScale = 0.8F
+    override var profileTranslation = Vec3(0.0, 0.6, 0.0)
 
     lateinit var standing: CobblemonPose
     lateinit var walking: CobblemonPose

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/QuaquavalModel.kt

@@ -35,8 +35,8 @@ class QuaquavalModel (root: ModelPart) : PokemonPosableModel(root), HeadedFrame,
     override var portraitScale = 2.3F
     override var portraitTranslation = Vec3(-0.42, 3.7, 0.0)
 
-    override var profileScale = 0.36F
-    override var profileTranslation = Vec3(0.0, 1.19, 0.0)
+    override var profileScale = 0.32F
+    override var profileTranslation = Vec3(0.0, 1.24, 0.0)
 
     lateinit var standing: CobblemonPose
     lateinit var standing2: CobblemonPose

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/SquawkabillyModel.kt

@@ -0,0 +1,208 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen9
+
+import com.cobblemon.mod.common.client.render.models.blockbench.animation.WingFlapIdleAnimation
+import com.cobblemon.mod.common.client.render.models.blockbench.createTransformation
+import com.cobblemon.mod.common.client.render.models.blockbench.frame.BiWingedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.frame.BipedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
+import com.cobblemon.mod.common.client.render.models.blockbench.pose.ModelPartTransformation
+import com.cobblemon.mod.common.client.render.models.blockbench.pose.Pose
+import com.cobblemon.mod.common.client.render.models.blockbench.wavefunction.parabolaFunction
+import com.cobblemon.mod.common.client.render.models.blockbench.wavefunction.sineFunction
+import com.cobblemon.mod.common.entity.PoseType
+import com.cobblemon.mod.common.util.math.geometry.toRadians
+import net.minecraft.client.model.geom.ModelPart
+import net.minecraft.world.phys.Vec3
+
+class SquawkabillyModel (root: ModelPart) : PokemonPosableModel(root), HeadedFrame, BipedFrame, BiWingedFrame {
+    override val rootPart = root.registerChildWithAllChildren("squawkabilly")
+    override val head = getPart("head")
+    override val leftWing = getPart("wing_left")
+    override val rightWing = getPart("wing_right")
+    override val leftLeg = getPart("leg_left")
+    override val rightLeg = getPart("leg_right")
+    private val tail = getPart("tail")
+
+    override var portraitScale = 2.0F
+    override var portraitTranslation = Vec3(-0.2, -0.2, 0.0)
+
+    override var profileScale = 0.85F
+    override var profileTranslation = Vec3(0.0, 0.51, 0.0)
+
+    lateinit var standing: Pose
+    lateinit var walk: Pose
+    lateinit var hovering: Pose
+    lateinit var flying: Pose
+    lateinit var shoulderLeft: Pose
+    lateinit var shoulderRight: Pose
+
+    override val cryAnimation = CryProvider { bedrockStateful("squawkabilly", "cry") }
+
+    val shoulderOffsetX = -1.0
+    val shoulderOffsetY = 0
+    override fun registerPoses() {
+        val blink = quirk { bedrockStateful("squawkabilly", "blink") }
+
+        standing = registerPose(
+            poseName = "standing",
+            quirks = arrayOf(blink),
+            poseTypes = PoseType.UI_POSES + PoseType.STAND,
+            transformTicks = 10,
+            animations = arrayOf(
+                singleBoneLook(),
+                bedrock("squawkabilly", "ground_idle")
+            )
+        )
+
+        walk = registerPose(
+            poseName = "walk",
+            quirks = arrayOf(blink),
+            poseType = PoseType.WALK,
+            transformTicks = 10,
+            animations = arrayOf(
+                singleBoneLook(),
+                bedrock("squawkabilly", "ground_idle"),
+                rootPart.translation(
+                    function = parabolaFunction(
+                        peak = -4F,
+                        period = 0.4F
+                    ),
+                    timeVariable = { state, _, _ -> state.animationSeconds },
+                    axis = ModelPartTransformation.Y_AXIS
+                ),
+                head.translation(
+                    function = sineFunction(
+                        amplitude = (-20F).toRadians(),
+                        period = 1F,
+                        verticalShift = (-10F).toRadians()
+                    ),
+                    axis = ModelPartTransformation.X_AXIS,
+                    timeVariable = { state, _, _ -> state.animationSeconds }
+                ),
+                leftLeg.rotation(
+                    function = parabolaFunction(
+                        tightness = -20F,
+                        phaseShift = 0F,
+                        verticalShift = (30F).toRadians()
+                    ),
+                    axis = ModelPartTransformation.X_AXIS,
+                    timeVariable = { _, _, ageInTicks -> ageInTicks / 20 },
+                ),
+                rightLeg.rotation(
+                    function = parabolaFunction(
+                        tightness = -20F,
+                        phaseShift = 0F,
+                        verticalShift = (30F).toRadians()
+                    ),
+                    axis = ModelPartTransformation.X_AXIS,
+                    timeVariable = { _, _, ageInTicks -> ageInTicks / 20 },
+                ),
+                tail.rotation(
+                    function = sineFunction(
+                        amplitude = (-5F).toRadians(),
+                        period = 1F
+                    ),
+                    axis = ModelPartTransformation.X_AXIS,
+                    timeVariable = { _, _, ageInTicks -> ageInTicks / 20 },
+                ),
+                wingFlap(
+                    flapFunction = sineFunction(
+                        amplitude = (-5F).toRadians(),
+                        period = 0.4F,
+                        phaseShift = 0.00F,
+                        verticalShift = (-20F).toRadians()
+                    ),
+                    timeVariable = { state, _, _ -> state.animationSeconds },
+                    axis = ModelPartTransformation.Z_AXIS
+                ),
+                rightWing.translation(
+                    function = parabolaFunction(
+                        tightness = -10F,
+                        phaseShift = 30F,
+                        verticalShift = (25F).toRadians()
+                    ),
+                    axis = ModelPartTransformation.Y_AXIS,
+                    timeVariable = { _, _, ageInTicks -> ageInTicks / 20 },
+                ),
+                leftWing.translation(
+                    function = parabolaFunction(
+                        tightness = -10F,
+                        phaseShift = 30F,
+                        verticalShift = (25F).toRadians()
+                    ),
+                    axis = ModelPartTransformation.Y_AXIS,
+                    timeVariable = { _, _, ageInTicks -> ageInTicks / 20 },
+                ),
+            )
+        )
+
+        hovering = registerPose(
+            poseName = "hovering",
+            quirks = arrayOf(blink),
+            poseTypes = setOf(PoseType.FLOAT, PoseType.HOVER),
+            transformTicks = 10,
+            animations = arrayOf(
+                singleBoneLook(),
+                WingFlapIdleAnimation(this,
+                    flapFunction = sineFunction(verticalShift = -10F.toRadians(), period = 0.9F, amplitude = 0.9F),
+                    timeVariable = { state, _, _ -> state.animationSeconds },
+                    axis = ModelPartTransformation.Z_AXIS
+                )
+            )
+        )
+
+        flying = registerPose(
+            poseName = "flying",
+            quirks = arrayOf(blink),
+            poseTypes = setOf(PoseType.FLY, PoseType.SWIM),
+            transformTicks = 10,
+            animations = arrayOf(
+                singleBoneLook(),
+                WingFlapIdleAnimation(this,
+                    flapFunction = sineFunction(verticalShift = -14F.toRadians(), period = 0.9F, amplitude = 0.9F),
+                    timeVariable = { state, _, _ -> state.animationSeconds },
+                    axis = ModelPartTransformation.Z_AXIS
+                )
+            )
+        )
+
+        shoulderLeft = registerPose(
+            poseType = PoseType.SHOULDER_LEFT,
+            quirks = arrayOf(blink),
+            animations = arrayOf(
+                singleBoneLook(),
+                bedrock("squawkabilly", "ground_idle")
+            ),
+            transformedParts = arrayOf(
+                rootPart.createTransformation().addPosition(shoulderOffsetX, shoulderOffsetY, 0.0)
+            )
+        )
+
+        shoulderRight = registerPose(
+            poseType = PoseType.SHOULDER_RIGHT,
+            quirks = arrayOf(blink),
+            animations = arrayOf(
+                singleBoneLook(),
+                bedrock("squawkabilly", "ground_idle")
+            ),
+            transformedParts = arrayOf(
+                rootPart.createTransformation().addPosition(-shoulderOffsetX, shoulderOffsetY, 0.0)
+            )
+        )
+
+    }
+//    override fun getFaintAnimation(
+//        pokemonEntity: PokemonEntity,
+//        state: PosableState<PokemonEntity>
+//    ) = if (state.isNotPosedIn(sleep)) bedrockStateful("squawkabilly", "faint") else null
+}

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

@@ -322,6 +322,8 @@ object VaryingModelRepository {
         inbuilt("loudred", :: LoudredModel)
         inbuilt("exploud", :: ExploudModel)
         inbuilt("cryogonal", :: CryogonalModel)
+        inbuilt("pumpkaboo", :: PumpkabooModel)
+        inbuilt("gourgeist", :: GourgeistModel)
         inbuilt("eiscue", :: EiscueModel)
         inbuilt("wooloo", :: WoolooModel)
         inbuilt("dubwool", :: DubwoolModel)
@@ -338,6 +340,9 @@ object VaryingModelRepository {
         inbuilt("thwackey", ::ThwackeyModel)
         inbuilt("rillaboom", ::RillaboomModel)
         inbuilt("samurott", ::SamurottModel)
+        inbuilt("snivy", ::SnivyModel)
+        inbuilt("servine", ::ServineModel)
+        inbuilt("serperior", ::SerperiorModel)
         inbuilt("slugma", ::SlugmaModel)
         inbuilt("magcargo", ::MagcargoModel)
         inbuilt("slugma_shiny", ::SlugmaShinyModel)
@@ -397,6 +402,7 @@ object VaryingModelRepository {
         inbuilt("bunnelby", ::BunnelbyModel)
         inbuilt("arrokuda", ::ArrokudaModel)
         inbuilt("barraskewda", ::BarraskewdaModel)
+        inbuilt("squawkabilly", ::SquawkabillyModel)
         inbuilt("ponyta_galarian", ::PonytaGalarianModel)
         inbuilt("rapidash_galarian", ::RapidashGalarianModel)
         inbuilt("volbeat", ::VolbeatModel)

common/src/main/kotlin/com/cobblemon/mod/common/client/sound/instances/UIEntitySoundInstance.kt

@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.client.sound.instances
-
-import net.minecraft.client.resources.sounds.SimpleSoundInstance
-import net.minecraft.client.resources.sounds.SoundInstance
-import net.minecraft.sounds.SoundEvent
-import net.minecraft.sounds.SoundSource
-
-/**
- * Plays a sound for a Pokémon rendered in a GUI, where there is no entity to take the sound source from.
- * Unlike [SimpleSoundInstance.forUI] this uses [SoundSource.NEUTRAL] so the Friendly Creatures slider applies.
- */
-class UIEntitySoundInstance(sound: SoundEvent, volume: Float = 1F, pitch: Float = 1F) :
-    SimpleSoundInstance(sound.location, SoundSource.NEUTRAL, volume, pitch, SoundInstance.createUnseededRandom(),
-        false, 0, SoundInstance.Attenuation.NONE, 0.0, 0.0, 0.0, true)

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

@@ -164,9 +164,6 @@ class CobblemonConfig {
     @CobblemonConfigField(Category.Pokemon, lang = "experience_multiplier", SERVER)
     var experienceMultiplier = 2F
 
-    @CobblemonConfigField(Category.Pokemon, lang = "predation_chance", SERVER)
-    var predationChance = 0.05F
-
     @CobblemonConfigField(Category.Spawning, lang = "pokemon_per_chunk", SERVER)
     var pokemonPerChunk = 1F
 

common/src/main/kotlin/com/cobblemon/mod/common/entity/pokeball/EmptyPokeBallEntity.kt

@@ -269,7 +269,6 @@ class EmptyPokeBallEntity : ThrowableItemProjectile, PosableEntity, WaterDragMod
                         attemptCatch(pokemonEntity)
                     },
                     ifCanceled = {
-                        captureFuture.complete(false)
                         drop()
                         return
                     }

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

@@ -1294,7 +1294,16 @@ open class PokemonEntity(
     }
 
     private fun showInteractionWheel(player: ServerPlayer, itemStack: ItemStack) {
-        val canRide = isRideableFor(player)
+         val canRide = ifRidingAvailableSupply(false) { behaviour, settings, state ->
+            if (platform != PlatformType.NONE) return@ifRidingAvailableSupply false
+            if (tethering != null) return@ifRidingAvailableSupply false;
+            if (seats.isEmpty()) return@ifRidingAvailableSupply false;
+            if ((owner as? ServerPlayer)?.isInBattle() == true) return@ifRidingAvailableSupply false;
+            if (this.owner != player && this.passengers.isEmpty()) return@ifRidingAvailableSupply false;
+            if(pokemon.effectiveScale < Cobblemon.config.minimumRidingScale) return@ifRidingAvailableSupply false;
+            if(beamMode == 3) return@ifRidingAvailableSupply false;
+            return@ifRidingAvailableSupply behaviour.isActive(settings, state, this);
+        }
         if (pokemon.getOwnerPlayer() == player) {
             val cosmeticItemDefinition = CobblemonCosmeticItems.findValidCosmeticForPokemonAndItem(
                 player.level().registryAccess(),
@@ -1316,18 +1325,6 @@ open class PokemonEntity(
         }
     }
 
-    fun isRideableFor(player: ServerPlayer): Boolean = ifRidingAvailableSupply(false) canRide@{ behaviour, settings, state ->
-        if (!player.canInteractWithEntity(this, player.entityInteractionRange())) return@canRide false
-        if (platform != PlatformType.NONE) return@canRide false
-        if (tethering != null) return@canRide false
-        if (seats.isEmpty()) return@canRide false
-        if ((owner as? ServerPlayer)?.isInBattle() == true) return@canRide false
-        if (this.owner != player && this.passengers.isEmpty()) return@canRide false
-        if (pokemon.effectiveScale < Cobblemon.config.minimumRidingScale) return@canRide false
-        if (beamMode == 3) return@canRide false
-        return@canRide behaviour.isActive(settings, state, this)
-    }
-
     override fun getDimensions(pose: Pose): EntityDimensions {
         val scale = effects.mockEffect?.scale ?: (form.baseScale * pokemon.effectiveScale)
         var result = this.exposedForm.hitbox.scale(scale)
@@ -1609,8 +1606,9 @@ open class PokemonEntity(
                 || stack.`is`(CobblemonItemTags.WHITELISTED_ITEMS_TO_HOLD)
 
     fun tryRidingPokemon(player: ServerPlayer): Boolean {
-        if (!isRideableFor(player)) return false
-
+        if (pokemon.effectiveScale < Cobblemon.config.minimumRidingScale) {
+            return false
+        }
         val event = RidePokemonEvent.Pre(player, this)
         CobblemonEvents.RIDE_EVENT_PRE.post(event)
         if (!event.isCanceled) {
@@ -2744,9 +2742,4 @@ open class PokemonEntity(
     }
 
     fun hasRider() = this.passengers.any { it is LivingEntity }
-
-    override fun playStepSound(pos: BlockPos, state: BlockState) {
-        if (this.pokemon.species.silenceStepSounds) return
-        super.playStepSound(pos, state)
-    }
-}
+}

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

@@ -232,14 +232,15 @@ class PokemonServerDelegate : PokemonSideDelegate {
         val trackedAspects = mock?.aspects ?: entity.pokemon.aspects
         val trackedBall = mock?.pokeball ?: entity.pokemon.caughtBall.name.toString()
         val trackedScaleModifier = mock?.scaleModifier ?: entity.pokemon.effectiveScale
+        val trackedAlpha = mock?.let { it.isAlpha == true } ?: entity.pokemon.isAlpha
 
         entity.ownerUUID = entity.pokemon.getOwnerUUID()
         entity.entityData.set(PokemonEntity.SPECIES, trackedSpecies)
         if (entity.entityData.get(PokemonEntity.NICKNAME) != trackedNickname) {
             entity.entityData.set(PokemonEntity.NICKNAME, trackedNickname)
         }
-        if (entity.entityData.get(PokemonEntity.IS_ALPHA) != entity.pokemon.isAlpha) {
-            entity.entityData.set(PokemonEntity.IS_ALPHA, entity.pokemon.isAlpha)
+        if (entity.entityData.get(PokemonEntity.IS_ALPHA) != trackedAlpha) {
+            entity.entityData.set(PokemonEntity.IS_ALPHA, trackedAlpha)
         }
         entity.entityData.set(PokemonEntity.ASPECTS, trackedAspects)
         entity.entityData.set(PokemonEntity.LABEL_LEVEL, entity.pokemon.level)

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

@@ -38,7 +38,8 @@ class IllusionEffect(
 ) : BattleEffect(), MocKEffect {
 
     constructor(disguise: Pokemon) : this(
-        mock = disguise.createPokemonProperties(PokemonPropertyExtractor.ILLUSION),
+        // effectiveScale is used instead of scaleModifier so alpha sized disguises are copied without copying the alpha flag itself
+        mock = disguise.createPokemonProperties(PokemonPropertyExtractor.ILLUSION).also { it.scaleModifier = disguise.effectiveScale },
         scale = disguise.form.baseScale * disguise.effectiveScale
     )
 

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

@@ -35,7 +35,8 @@ class TransformEffect(
 ) : BattleEffect(), MocKEffect {
 
     constructor(mimic: Pokemon, doCry: Boolean = true) : this(
-        mock = mimic.createPokemonProperties(PokemonPropertyExtractor.TRANSFORM),
+        // effectiveScale is used instead of scaleModifier so alpha sized targets are copied without copying the alpha flag itself
+        mock = mimic.createPokemonProperties(PokemonPropertyExtractor.TRANSFORM).also { it.scaleModifier = mimic.effectiveScale },
         scale = mimic.form.baseScale * mimic.effectiveScale,
         doCry = doCry
     )

common/src/main/kotlin/com/cobblemon/mod/common/item/interactive/PonigiriItem.kt

@@ -9,7 +9,6 @@
 package com.cobblemon.mod.common.item.interactive
 
 import com.cobblemon.mod.common.CobblemonItemComponents
-import com.cobblemon.mod.common.item.components.FoodComponent
 import net.minecraft.network.chat.Component
 import net.minecraft.sounds.SoundEvent
 import net.minecraft.sounds.SoundEvents
@@ -24,15 +23,10 @@ import net.minecraft.world.level.Level
 class PonigiriItem : Item(
         Properties().stacksTo(64)
                 .food(FoodProperties.Builder()
-                        .nutrition(NUTRITION)
-                        .saturationModifier(SATURATION_MODIFIER)
+                        .nutrition(2)
+                        .saturationModifier(0.55f)
                         .build())
 ) {
-    companion object {
-        const val NUTRITION = 2
-        const val SATURATION_MODIFIER = 0.55f
-    }
-
     override fun getName(stack: ItemStack): Component {
 
         val ingredients = stack.get(CobblemonItemComponents.INGREDIENT)
@@ -65,9 +59,4 @@ class PonigiriItem : Item(
     override fun getEatingSound(): SoundEvent {
         return SoundEvents.GENERIC_EAT
     }
-
-    fun getFoodValues(stack: ItemStack): Pair<Int, Float> {
-        val (hunger, saturation) = stack.getOrDefault(CobblemonItemComponents.FOOD, FoodComponent(NUTRITION, SATURATION_MODIFIER))
-        return hunger to saturation
-    }
-}
+}

common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/spawn/SpawnPokemonPacket.kt

@@ -14,6 +14,7 @@ import com.cobblemon.mod.common.api.pokeball.PokeBalls
 import com.cobblemon.mod.common.api.pokemon.PokemonSpecies
 import com.cobblemon.mod.common.api.riding.stats.RidingStat
 import com.cobblemon.mod.common.client.CobblemonClient
+import com.cobblemon.mod.common.client.entity.PokemonClientDelegate
 import com.cobblemon.mod.common.entity.PlatformType
 import com.cobblemon.mod.common.entity.PoseType
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
@@ -74,7 +75,7 @@ class SpawnPokemonPacket(
         entity.ownerUUID,
         entity.pokemon.uuid,
         entity.pokemon.storeCoordinates.get()?.store?.uuid,
-        entity.pokemon.scaleModifier,
+        entity.entityData.get(PokemonEntity.SCALE_MODIFIER),
         entity.exposedSpecies.resourceIdentifier,
         entity.pokemon.gender,
         entity.pokemon.shiny,
@@ -147,7 +148,13 @@ class SpawnPokemonPacket(
         this@SpawnPokemonPacket.storageUUID?.let {
             val storedPokemon = CobblemonClient.storage.locatePokemon(it, this@SpawnPokemonPacket.pokemonUUID)
             if (storedPokemon != null) {
-                entity.pokemon = storedPokemon
+                (entity.delegate as? PokemonClientDelegate)?.storedPokemon = storedPokemon
+                val disguised = this@SpawnPokemonPacket.battleId != null &&
+                    (storedPokemon.species.resourceIdentifier != this@SpawnPokemonPacket.speciesId ||
+                        storedPokemon.form.formOnlyShowdownId() != this@SpawnPokemonPacket.formName)
+                if (!disguised) {
+                    entity.pokemon = storedPokemon
+                }
             }
         }
 

common/src/main/kotlin/com/cobblemon/mod/common/net/messages/server/storage/pc/MovePCPokemonBatchPacket.kt

@@ -1,55 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://www.mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.net.messages.server.storage.pc
-
-import com.cobblemon.mod.common.api.net.NetworkPacket
-import com.cobblemon.mod.common.api.storage.pc.PCPosition
-import com.cobblemon.mod.common.util.cobblemonResource
-import com.cobblemon.mod.common.util.readPCPosition
-import com.cobblemon.mod.common.util.writePCPosition
-import java.util.UUID
-import net.minecraft.network.RegistryFriendlyByteBuf
-
-class MovePCPokemonBatchPacket(val moves: List<PCPokemonMove>) : NetworkPacket<MovePCPokemonBatchPacket> {
-    override val id = ID
-
-    data class PCPokemonMove(
-        val pokemonID: UUID,
-        val oldPosition: PCPosition,
-        val newPosition: PCPosition
-    )
-
-    override fun encode(buffer: RegistryFriendlyByteBuf) {
-        buffer.writeVarInt(moves.size)
-        moves.forEach { move ->
-            buffer.writeUUID(move.pokemonID)
-            buffer.writePCPosition(move.oldPosition)
-            buffer.writePCPosition(move.newPosition)
-        }
-    }
-
-    companion object {
-        val ID = cobblemonResource("move_pc_pokemon_batch")
-        const val MAX_MOVES = 60
-
-        fun decode(buffer: RegistryFriendlyByteBuf): MovePCPokemonBatchPacket {
-            val size = buffer.readVarInt()
-            require(size in 1..MAX_MOVES) { "Invalid batch PC move size: $size" }
-            return MovePCPokemonBatchPacket(
-                List(size) {
-                    PCPokemonMove(
-                        pokemonID = buffer.readUUID(),
-                        oldPosition = buffer.readPCPosition(),
-                        newPosition = buffer.readPCPosition()
-                    )
-                }
-            )
-        }
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/net/serverhandling/battle/BattleSelectActionsHandler.kt

@@ -8,12 +8,9 @@
 
 package com.cobblemon.mod.common.net.serverhandling.battle
 
-import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.api.net.ServerNetworkPacketHandler
 import com.cobblemon.mod.common.api.text.red
 import com.cobblemon.mod.common.battles.BattleRegistry
-import com.cobblemon.mod.common.battles.HealItemActionResponse
-import com.cobblemon.mod.common.battles.MoveActionResponse
 import com.cobblemon.mod.common.exception.IllegalActionChoiceException
 import com.cobblemon.mod.common.net.messages.client.battle.BattleMakeChoicePacket
 import com.cobblemon.mod.common.net.messages.client.battle.BattleQueueRequestPacket
@@ -28,27 +25,6 @@ object BattleSelectActionsHandler : ServerNetworkPacketHandler<BattleSelectActio
         if (!actor.mustChoose) {
             return
         }
-
-        // Battle command injection attempt detection
-        packet.showdownActionResponses.asSequence()
-            .flatMap {
-                when (it) {
-                    is MoveActionResponse -> sequenceOf(it.moveName, it.targetPnx, it.gimmickID)
-                    is HealItemActionResponse -> sequenceOf(it.item)
-                    else -> emptySequence()
-                }
-            }
-            .filterNotNull()
-            .firstOrNull { field -> field.any(Char::isISOControl) }
-            ?.let {
-                // Escapes control chars as \uXXXX to prevent forging logs.
-                val printable = it.replace(Regex("\\p{Cc}")) { "\\u%04x".format(it.value[0].code) }
-                Cobblemon.LOGGER.warn("Blocked battle command injection from ${player.name.string}: $printable")
-                actor.sendUpdate(BattleQueueRequestPacket(actor.request!!))
-                actor.sendUpdate(BattleMakeChoicePacket())
-                return
-            }
-
         try {
             actor.setActionResponses(packet.showdownActionResponses)
         } catch (e: IllegalActionChoiceException) {

common/src/main/kotlin/com/cobblemon/mod/common/net/serverhandling/storage/pc/MovePCPokemonBatchHandler.kt

@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://www.mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.net.serverhandling.storage.pc
-
-import com.cobblemon.mod.common.api.net.ServerNetworkPacketHandler
-import com.cobblemon.mod.common.api.storage.pc.link.PCLinkManager
-import com.cobblemon.mod.common.net.messages.client.storage.pc.ClosePCPacket
-import com.cobblemon.mod.common.net.messages.server.storage.pc.MovePCPokemonBatchPacket
-import net.minecraft.server.MinecraftServer
-import net.minecraft.server.level.ServerPlayer
-
-object MovePCPokemonBatchHandler : ServerNetworkPacketHandler<MovePCPokemonBatchPacket> {
-    override fun handle(packet: MovePCPokemonBatchPacket, server: MinecraftServer, player: ServerPlayer) {
-        val pc = PCLinkManager.getPC(player) ?: return run { ClosePCPacket(null).sendToPlayer(player) }
-        pc.moveBatch(packet.moves.map { Triple(it.pokemonID, it.oldPosition, it.newPosition) })
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/platform/events/PlatformEvents.kt

@@ -55,8 +55,6 @@ object PlatformEvents {
     @JvmField
     val CLIENT_PLAYER_LOGOUT = EventObservable<ClientPlayerEvent.Logout>()
     @JvmField
-    val PLAYER_RESPAWN = EventObservable<ServerPlayerEvent.Respawn>()
-    @JvmField
     val PLAYER_DEATH = CancelableObservable<ServerPlayerEvent.Death>()
     @JvmField
     val RIGHT_CLICK_BLOCK = CancelableObservable<ServerPlayerEvent.RightClickBlock>()

common/src/main/kotlin/com/cobblemon/mod/common/platform/events/ServerPlayerEvent.kt

@@ -50,11 +50,6 @@ interface ServerPlayerEvent {
      */
     data class Logout(override val player: ServerPlayer) : ServerPlayerEvent
 
-    /**
-     * Fired when the [player] respawns (either by coming back from the end or dying).
-     */
-    data class Respawn(override val player: ServerPlayer) : ServerPlayerEvent
-
     /**
      * Fired when the [player] dies.
      * If canceled the death will be prevented but healing is required in order to not be stuck in a loop.

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

@@ -173,7 +173,6 @@ class Species : ShowdownIdentifiable {
         .addStandardFunctions()
         .addSpeciesFunctions(this)
 
-    var silenceStepSounds = false
 
     fun initialize() {
         Cobblemon.statProvider.provide(this)
@@ -257,7 +256,6 @@ class Species : ShowdownIdentifiable {
         }
 
         this.riding.encode(buffer)
-        buffer.writeBoolean(this.silenceStepSounds)
     }
 
     fun decode(buffer: RegistryFriendlyByteBuf) {
@@ -301,7 +299,6 @@ class Species : ShowdownIdentifiable {
             }
         }
         this.riding = RidingProperties.decode(buffer)
-        this.silenceStepSounds = buffer.readBoolean()
         this.initialize()
     }
 

common/src/main/kotlin/com/cobblemon/mod/common/pokemon/properties/PropertiesCompletionProvider.kt

@@ -13,7 +13,6 @@ import com.cobblemon.mod.common.api.abilities.Abilities
 import com.cobblemon.mod.common.api.data.DataRegistry
 import com.cobblemon.mod.common.api.pokeball.PokeBalls
 import com.cobblemon.mod.common.api.pokemon.Natures
-import com.cobblemon.mod.common.api.pokemon.feature.AbstractChoiceSpeciesFeatureProvider
 import com.cobblemon.mod.common.api.pokemon.stats.Stats
 import com.cobblemon.mod.common.api.pokemon.status.Statuses
 import com.cobblemon.mod.common.api.properties.CustomPokemonProperty
@@ -135,18 +134,17 @@ internal object PropertiesCompletionProvider : DataRegistry {
     private fun addDefaults() {
         this.inject(setOf("level", "lvl", "l"), setOf("1", "${Cobblemon.config.maxPokemonLevel}") )
         this.inject(setOf("shiny", "s"), setOf("yes", "no"))
-        this.inject(setOf("alpha", "is_alpha"), setOf("yes", "no"))
-        this.inject(setOf("gender"), Gender.entries.map { it.name.lowercase() })
+        this.inject(setOf("gender"), Gender.values().map { it.name.lowercase() })
         this.inject(setOf("friendship"), setOf("0", Cobblemon.config.maxPokemonFriendship.toString()))
         this.inject(setOf("fullness"), setOf("0", "255"))
         this.inject(setOf("pokeball"), PokeBalls.all().map { it.name.simplify() })
         this.inject(setOf("nature"), Natures.all().map { it.name.simplify() })
         this.inject(setOf("ability"), Abilities.all().map { if (it.name.asIdentifierDefaultingNamespace().namespace == Cobblemon.MODID) it.name.asIdentifierDefaultingNamespace().path else it.name })
-        this.inject(setOf("dmax_level", "dmax"), setOf("0", Cobblemon.config.maxDynamaxLevel.toString()))
-        this.inject(setOf("gmax_factor", "gmax"), setOf("yes", "no"))
+        this.inject(setOf("dmax"), setOf("0", Cobblemon.config.maxDynamaxLevel.toString()))
+        this.inject(setOf("gmax"), setOf("yes", "no"))
         this.inject(setOf("type", "elemental_type"), ElementalTypes.all().map { it.name })
         this.inject(setOf("tera_type", "tera"), TeraTypes.map { it.id.simplify() })
-        this.inject(setOf("tradeable", "tradable"), setOf("yes", "no"))
+        this.inject(setOf("tradeable"), setOf("yes", "no"))
         this.inject(setOf("originaltrainer", "ot"), setOf(""))
         this.inject(setOf("originaltrainertype", "ottype"), setOf("None", "Player", "NPC"))
         this.inject(setOf("nickname", "nick"), setOf(""))
@@ -166,11 +164,7 @@ internal object PropertiesCompletionProvider : DataRegistry {
     private fun addCustom() {
         CustomPokemonProperty.properties.forEach { property ->
             // We won't tab complete properties that have no key attached to them as it would be fairly hard to determine which one to suggest
-            if (property.needsKey && property !is AbstractChoiceSpeciesFeatureProvider<*>) {
-                this.inject(property.keys, property.examples())
-            }
-            // Except choice features that fill examples with all available choices - Gito
-            if (property is AbstractChoiceSpeciesFeatureProvider<*>) {
+            if (property.needsKey) {
                 this.inject(property.keys, property.examples())
             }
         }
@@ -181,4 +175,4 @@ internal object PropertiesCompletionProvider : DataRegistry {
         val suggestions: Collection<String>
     )
 
-}
+}

common/src/main/kotlin/com/cobblemon/mod/common/util/EntityExtensions.kt

@@ -234,11 +234,11 @@ fun Entity.isDusk(): Boolean {
 }
 
 fun Entity.isStandingOn(blocks: Set<String>, depth: Int = 2): Boolean {
-    for (currentDepth in 0..depth) {
-        val bellowBlockPos = blockPosBelowThatAffectsMyMovement.below(currentDepth)
+    for (currentDepth in 1..depth) {
+        val bellowBlockPos = blockPosition().below(currentDepth)
         val blockState = level().getBlockState(bellowBlockPos)
 
-        if (blockState.isAir) continue
+        if (blockState.isAir || !blockState.isCollisionShapeFullBlock(level(), bellowBlockPos)) continue
 
         val elementOrTags = ExtraCodecs.TAG_OR_ELEMENT_ID.listOf().decode(JavaOps.INSTANCE, blocks.toList()).result().get().first
         elementOrTags.forEach {

common/src/main/kotlin/com/cobblemon/mod/common/world/gamerules/CobblemonGameRules.kt

@@ -26,8 +26,5 @@ object CobblemonGameRules {
     val SHINY_STARTERS: GameRules.Key<GameRules.BooleanValue> = Cobblemon.implementation.registerGameRule("doShinyStarters", GameRules.Category.MISC, BooleanRuleInvoker.`cobblemon$create`(false))
     @JvmField
     val HEALERS_HEAL_PC: GameRules.Key<GameRules.BooleanValue> = Cobblemon.implementation.registerGameRule("healersHealPC", GameRules.Category.MISC, BooleanRuleInvoker.`cobblemon$create`(false))
-    @JvmField
-    val HEALER_SET_SPAWN: GameRules.Key<GameRules.BooleanValue> = Cobblemon.implementation.registerGameRule("healersSetSpawn", GameRules.Category.MISC, BooleanRuleInvoker.`cobblemon$create`(false))
-    @JvmField
-    val DO_POKEMON_PREDATION: GameRules.Key<GameRules.BooleanValue> = Cobblemon.implementation.registerGameRule("doPokemonPredation", GameRules.Category.MOBS, BooleanRuleInvoker.`cobblemon$create`(true))
+
 }

common/src/main/resources/assets/cobblemon/bedrock/particles/moves/watershuriken/watershuriken_actor.particle.json

@@ -1,90 +0,0 @@
-{
-	"format_version": "1.10.0",
-	"particle_effect": {
-		"description": {
-			"identifier": "cobblemon:watershuriken_actor",
-			"basic_render_parameters": {
-				"material": "particles_blend",
-				"texture": "textures/particles/moves/watershuriken"
-			}
-		},
-		"curves": {
-			"variable.rsize": {
-				"type": "linear",
-				"input": "v.particle_age",
-				"horizontal_range": "v.particle_lifetime",
-				"nodes": [0, 1, 1, 1, 1, 1, 1, 1]
-			}
-		},
-		"events": {
-			"trail": {
-				"particle_effect": {
-					"effect": "cobblemon:watershuriken_actortrail",
-					"type": "particle"
-				}
-			},
-			"hit": {
-				"particle_effect": {
-					"effect": "cobblemon:watershuriken_target",
-					"type": "particle"
-				}
-			}
-		},
-		"components": {
-			"minecraft:emitter_initialization": {
-				"creation_expression": "v.target_deltaz=5;"
-			},
-			"minecraft:emitter_rate_instant": {
-				"num_particles": 1
-			},
-			"minecraft:emitter_lifetime_once": {
-				"active_time": 0.25
-			},
-			"minecraft:emitter_shape_disc": {
-				"offset": [0, 0.02, 0.1],
-				"radius": 0.5,
-				"direction": "outwards"
-			},
-			"minecraft:particle_lifetime_expression": {
-				"max_lifetime": 0.35
-			},
-			"minecraft:particle_lifetime_events": {
-				"timeline": {
-					"0.00": "trail",
-					"0.06": "trail",
-					"0.12": "trail",
-					"0.18": "trail",
-					"0.24": "trail",
-					"0.30": "trail",
-					"0.34": "hit"
-				}
-			},
-			"minecraft:particle_initial_spin": {
-				"rotation": "math.random_integer(0,3)*90"
-			},
-			"minecraft:particle_motion_parametric": {
-				"relative_position": ["-v.target_deltax*(v.particle_age / v.particle_lifetime)", "(v.target_deltay*(v.particle_age / v.particle_lifetime))", "-v.target_deltaz*(v.particle_age / v.particle_lifetime)"]
-			},
-			"minecraft:particle_appearance_billboard": {
-				"size": ["0.4*v.rsize", "0.4*v.rsize"],
-				"facing_camera_mode": "lookat_direction",
-				"direction": {
-					"mode": "custom",
-					"custom_direction": [0, 0, -1]
-				},
-				"uv": {
-					"texture_width": 60,
-					"texture_height": 15,
-					"flipbook": {
-						"base_UV": [0, 0],
-						"size_UV": [15, 15],
-						"step_UV": [15, 0],
-						"frames_per_second": 24,
-						"max_frame": 4,
-						"loop": true
-					}
-				}
-			}
-		}
-	}
-}

common/src/main/resources/assets/cobblemon/bedrock/particles/moves/watershuriken/watershuriken_actoralt.particle.json

@@ -1,91 +0,0 @@
-{
-	"format_version": "1.10.0",
-	"particle_effect": {
-		"description": {
-			"identifier": "cobblemon:watershuriken_actoralt",
-			"basic_render_parameters": {
-				"material": "particles_blend",
-				"texture": "textures/particles/moves/watershuriken"
-			}
-		},
-		"curves": {
-			"variable.rsize": {
-				"type": "linear",
-				"input": "v.particle_age",
-				"horizontal_range": "v.particle_lifetime",
-				"nodes": [0, 1, 1, 1, 1, 1, 1, 1]
-			}
-		},
-		"events": {
-			"trail": {
-				"particle_effect": {
-					"effect": "cobblemon:watershuriken_actortrail",
-					"type": "particle"
-				}
-			},
-			"hit": {
-				"particle_effect": {
-					"effect": "cobblemon:watershuriken_target",
-					"type": "particle"
-				}
-			}
-		},
-		"components": {
-			"minecraft:emitter_initialization": {
-				"creation_expression": "v.target_deltaz=5;"
-			},
-			"minecraft:emitter_rate_steady": {
-				"spawn_rate": 7,
-				"max_particles": 3
-			},
-			"minecraft:emitter_lifetime_once": {
-				"active_time": 0.4
-			},
-			"minecraft:emitter_shape_disc": {
-				"offset": [0, 0.02, 0.1],
-				"radius": 0.5,
-				"direction": "outwards"
-			},
-			"minecraft:particle_lifetime_expression": {
-				"max_lifetime": 0.35
-			},
-			"minecraft:particle_lifetime_events": {
-				"timeline": {
-					"0.00": "trail",
-					"0.06": "trail",
-					"0.12": "trail",
-					"0.18": "trail",
-					"0.24": "trail",
-					"0.30": "trail",
-					"0.34": "hit"
-				}
-			},
-			"minecraft:particle_initial_spin": {
-				"rotation": "math.random_integer(0,3)*90"
-			},
-			"minecraft:particle_motion_parametric": {
-				"relative_position": ["-(v.target_deltax+((v.particle_random_1-0.5)*1.33))*(v.particle_age / v.particle_lifetime)", "(v.target_deltay+((v.particle_random_2-0.5)*1.33))*(v.particle_age / v.particle_lifetime)", "-v.target_deltaz*(v.particle_age / v.particle_lifetime)"]
-			},
-			"minecraft:particle_appearance_billboard": {
-				"size": ["0.4*v.rsize", "0.4*v.rsize"],
-				"facing_camera_mode": "lookat_direction",
-				"direction": {
-					"mode": "custom",
-					"custom_direction": [0, 0, -1]
-				},
-				"uv": {
-					"texture_width": 60,
-					"texture_height": 15,
-					"flipbook": {
-						"base_UV": [0, 0],
-						"size_UV": [15, 15],
-						"step_UV": [15, 0],
-						"frames_per_second": 24,
-						"max_frame": 4,
-						"loop": true
-					}
-				}
-			}
-		}
-	}
-}

common/src/main/resources/assets/cobblemon/bedrock/particles/moves/watershuriken/watershuriken_actorhor.particle.json

@@ -1,86 +0,0 @@
-{
-	"format_version": "1.10.0",
-	"particle_effect": {
-		"description": {
-			"identifier": "cobblemon:watershuriken_actorhor",
-			"basic_render_parameters": {
-				"material": "particles_blend",
-				"texture": "textures/particles/moves/watershuriken"
-			}
-		},
-		"curves": {
-			"variable.rsize": {
-				"type": "linear",
-				"input": "v.particle_age",
-				"horizontal_range": "v.particle_lifetime",
-				"nodes": [0, 1, 1, 1, 1, 1, 1, 1]
-			}
-		},
-		"events": {
-			"trail": {
-				"particle_effect": {
-					"effect": "cobblemon:watershuriken_actortrail",
-					"type": "particle"
-				}
-			},
-			"hit": {
-				"particle_effect": {
-					"effect": "cobblemon:watershuriken_target",
-					"type": "particle"
-				}
-			}
-		},
-		"components": {
-			"minecraft:emitter_initialization": {
-				"creation_expression": "v.target_deltaz=5;"
-			},
-			"minecraft:emitter_rate_instant": {
-				"num_particles": 1
-			},
-			"minecraft:emitter_lifetime_once": {
-				"active_time": 0.25
-			},
-			"minecraft:emitter_shape_disc": {
-				"offset": [0, 0.02, 0.1],
-				"radius": 0.5,
-				"direction": "outwards"
-			},
-			"minecraft:particle_lifetime_expression": {
-				"max_lifetime": 0.35
-			},
-			"minecraft:particle_lifetime_events": {
-				"timeline": {
-					"0.00": "trail",
-					"0.06": "trail",
-					"0.12": "trail",
-					"0.18": "trail",
-					"0.24": "trail",
-					"0.30": "trail",
-					"0.34": "hit"
-				}
-			},
-			"minecraft:particle_initial_spin": {
-				"rotation": "math.random_integer(0,3)*90"
-			},
-			"minecraft:particle_motion_parametric": {
-				"relative_position": ["-v.target_deltax*(v.particle_age / v.particle_lifetime)", "(v.target_deltay*(v.particle_age / v.particle_lifetime))", "-v.target_deltaz*(v.particle_age / v.particle_lifetime)"]
-			},
-			"minecraft:particle_appearance_billboard": {
-				"size": ["0.4*v.rsize", "0.4*v.rsize"],
-				"facing_camera_mode": "emitter_transform_xz",
-				"uv": {
-					"texture_width": 60,
-					"texture_height": 15,
-					"flipbook": {
-						"base_UV": [0, 0],
-						"size_UV": [15, 15],
-						"step_UV": [15, 0],
-						"frames_per_second": 24,
-						"max_frame": 4,
-						"loop": true
-					}
-				}
-			}
-		}
-	}
-}

common/src/main/resources/assets/cobblemon/bedrock/particles/moves/watershuriken/watershuriken_actortrail.particle.json

@@ -1,63 +0,0 @@
-{
-	"format_version": "1.10.0",
-	"particle_effect": {
-		"description": {
-			"identifier": "cobblemon:watershuriken_actortrail",
-			"basic_render_parameters": {
-				"material": "particles_alpha",
-				"texture": "textures/particles/generic/impact/impact_water"
-			}
-		},
-		"curves": {
-			"variable.scale": {
-				"type": "linear",
-				"input": "v.particle_age",
-				"horizontal_range": "v.particle_lifetime",
-				"nodes": [1, 0]
-			}
-		},
-		"components": {
-			"minecraft:emitter_rate_instant": {
-				"num_particles": 1
-			},
-			"minecraft:emitter_lifetime_once": {
-				"active_time": 1
-			},
-			"minecraft:emitter_shape_point": {
-				"direction": ["v.particle_random_1-0.5", "v.particle_random_2-0.25", -3]
-			},
-			"minecraft:particle_lifetime_expression": {
-				"max_lifetime": "math.random(0.3, 0.6)"
-			},
-			"minecraft:particle_initial_spin": {
-				"rotation": "math.round(v.particle_random_4*3)*90"
-			},
-			"minecraft:particle_initial_speed": 8,
-			"minecraft:particle_motion_dynamic": {
-				"linear_acceleration": [0, -5, 0],
-				"linear_drag_coefficient": 8
-			},
-			"minecraft:particle_appearance_billboard": {
-				"size": ["0.22 * variable.scale", "0.22 * variable.scale"],
-				"facing_camera_mode": "rotate_xyz",
-				"uv": {
-					"texture_width": 8,
-					"texture_height": 56,
-					"flipbook": {
-						"base_UV": [0, 24],
-						"size_UV": [8, 8],
-						"step_UV": [0, 8],
-						"frames_per_second": 16,
-						"max_frame": 4
-					}
-				}
-			},
-			"minecraft:particle_motion_collision": {
-				"collision_radius": 0.02
-			},
-			"minecraft:particle_appearance_tinting": {
-				"color": [0.61176, 0.87451, 1, 1]
-			}
-		}
-	}
-}

common/src/main/resources/assets/cobblemon/bedrock/particles/moves/watershuriken/watershuriken_actorvert.particle.json

@@ -1,86 +0,0 @@
-{
-	"format_version": "1.10.0",
-	"particle_effect": {
-		"description": {
-			"identifier": "cobblemon:watershuriken_actorvert",
-			"basic_render_parameters": {
-				"material": "particles_blend",
-				"texture": "textures/particles/moves/watershuriken"
-			}
-		},
-		"curves": {
-			"variable.rsize": {
-				"type": "linear",
-				"input": "v.particle_age",
-				"horizontal_range": "v.particle_lifetime",
-				"nodes": [0, 1, 1, 1, 1, 1, 1, 1]
-			}
-		},
-		"events": {
-			"trail": {
-				"particle_effect": {
-					"effect": "cobblemon:watershuriken_actortrail",
-					"type": "particle"
-				}
-			},
-			"hit": {
-				"particle_effect": {
-					"effect": "cobblemon:watershuriken_target",
-					"type": "particle"
-				}
-			}
-		},
-		"components": {
-			"minecraft:emitter_initialization": {
-				"creation_expression": "v.target_deltaz=5;"
-			},
-			"minecraft:emitter_rate_instant": {
-				"num_particles": 1
-			},
-			"minecraft:emitter_lifetime_once": {
-				"active_time": 0.25
-			},
-			"minecraft:emitter_shape_disc": {
-				"offset": [0, 0.02, 0.1],
-				"radius": 0.5,
-				"direction": "outwards"
-			},
-			"minecraft:particle_lifetime_expression": {
-				"max_lifetime": 0.35
-			},
-			"minecraft:particle_lifetime_events": {
-				"timeline": {
-					"0.00": "trail",
-					"0.06": "trail",
-					"0.12": "trail",
-					"0.18": "trail",
-					"0.24": "trail",
-					"0.30": "trail",
-					"0.34": "hit"
-				}
-			},
-			"minecraft:particle_initial_spin": {
-				"rotation": "math.random_integer(0,3)*90"
-			},
-			"minecraft:particle_motion_parametric": {
-				"relative_position": ["-v.target_deltax*(v.particle_age / v.particle_lifetime)", "(v.target_deltay*(v.particle_age / v.particle_lifetime))", "-v.target_deltaz*(v.particle_age / v.particle_lifetime)"]
-			},
-			"minecraft:particle_appearance_billboard": {
-				"size": ["0.4*v.rsize", "0.4*v.rsize"],
-				"facing_camera_mode": "emitter_transform_yz",
-				"uv": {
-					"texture_width": 60,
-					"texture_height": 15,
-					"flipbook": {
-						"base_UV": [0, 0],
-						"size_UV": [15, 15],
-						"step_UV": [15, 0],
-						"frames_per_second": 24,
-						"max_frame": 4,
-						"loop": true
-					}
-				}
-			}
-		}
-	}
-}

common/src/main/resources/assets/cobblemon/bedrock/particles/moves/watershuriken/watershuriken_target.particle.json

@@ -1,69 +0,0 @@
-{
-	"format_version": "1.10.0",
-	"particle_effect": {
-		"description": {
-			"identifier": "cobblemon:watershuriken_target",
-			"basic_render_parameters": {
-				"material": "particles_alpha",
-				"texture": "textures/particles/generic/impact/impact_water"
-			}
-		},
-		"curves": {
-			"variable.scale": {
-				"type": "linear",
-				"input": "v.particle_age",
-				"horizontal_range": "v.particle_lifetime",
-				"nodes": [1, 0]
-			}
-		},
-		"events": {
-			"event": {
-				"particle_effect": {
-					"effect": "cobblemon:watershuriken_targetspark",
-					"type": "particle"
-				}
-			}
-		},
-		"components": {
-			"minecraft:emitter_rate_steady": {
-				"spawn_rate": 240,
-				"max_particles": 14
-			},
-			"minecraft:emitter_lifetime_once": {
-				"active_time": 0.1
-			},
-			"minecraft:emitter_lifetime_events": {
-				"creation_event": "event"
-			},
-			"minecraft:emitter_shape_point": {},
-			"minecraft:particle_lifetime_expression": {
-				"max_lifetime": "math.random(0.3, 0.6)"
-			},
-			"minecraft:particle_initial_spin": {
-				"rotation": "math.round(v.particle_random_4*3)*90"
-			},
-			"minecraft:particle_initial_speed": "math.random(9,17)",
-			"minecraft:particle_motion_dynamic": {
-				"linear_drag_coefficient": 5
-			},
-			"minecraft:particle_appearance_billboard": {
-				"size": ["0.3 * variable.scale", "0.3 * variable.scale"],
-				"facing_camera_mode": "rotate_xyz",
-				"uv": {
-					"texture_width": 8,
-					"texture_height": 56,
-					"flipbook": {
-						"base_UV": [0, 16],
-						"size_UV": [8, 8],
-						"step_UV": [0, 8],
-						"frames_per_second": 16,
-						"max_frame": 5
-					}
-				}
-			},
-			"minecraft:particle_appearance_tinting": {
-				"color": [0.61176, 0.87451, 1, 1]
-			}
-		}
-	}
-}

common/src/main/resources/assets/cobblemon/bedrock/particles/moves/watershuriken/watershuriken_targetspark.particle.json

@@ -1,62 +0,0 @@
-{
-	"format_version": "1.10.0",
-	"particle_effect": {
-		"description": {
-			"identifier": "cobblemon:watershuriken_targetspark",
-			"basic_render_parameters": {
-				"material": "particles_blend",
-				"texture": "textures/particles/vanilla/critical_hit"
-			}
-		},
-		"curves": {
-			"variable.bitespark": {
-				"type": "linear",
-				"input": "v.particle_age",
-				"horizontal_range": "v.particle_lifetime",
-				"nodes": [0, 1, 0.88, 0.66, 0.35, -0.05]
-			}
-		},
-		"components": {
-			"minecraft:emitter_rate_instant": {
-				"num_particles": 7
-			},
-			"minecraft:emitter_lifetime_once": {
-				"active_time": 1
-			},
-			"minecraft:emitter_shape_point": {
-				"offset": [0, 0, -0.25],
-				"direction": ["v.particle_random_1-0.5", "v.particle_random_2-0.25", "v.particle_random_3-0.5"]
-			},
-			"minecraft:particle_lifetime_expression": {
-				"max_lifetime": "0.5-(v.particle_random_4*0.1)"
-			},
-			"minecraft:particle_initial_speed": "math.random(1.75,3.55)*3",
-			"minecraft:particle_motion_dynamic": {
-				"linear_acceleration": [0, -5, 0],
-				"linear_drag_coefficient": 4
-			},
-			"minecraft:particle_appearance_billboard": {
-				"size": ["0.125*v.bitespark", "0.125*v.bitespark"],
-				"facing_camera_mode": "rotate_xyz",
-				"uv": {
-					"texture_width": 8,
-					"texture_height": 8,
-					"uv": [0, 0],
-					"uv_size": [7, 7]
-				}
-			},
-			"minecraft:particle_motion_collision": {
-				"collision_radius": 0.01
-			},
-			"minecraft:particle_appearance_tinting": {
-				"color": {
-					"interpolant": "v.particle_age / v.particle_lifetime",
-					"gradient": {
-						"0.0": "#FF51D8FF",
-						"1.0": "#FF0076FF"
-					}
-				}
-			}
-		}
-	}
-}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0018_pidgeot/pidgeot.animation.json

@@ -1815,12 +1815,6 @@
 				"wings_open": {
 					"scale": 0
 				}
-			},
-			"timeline": {
-				"0.0": "q.run_molang('cobblemon:stepsound_claw_medium');",
-				"0.5": "q.run_molang('cobblemon:stepsound_claw_medium');",
-				"1.0": "q.run_molang('cobblemon:stepsound_claw_medium');",
-				"1.5": "q.run_molang('cobblemon:stepsound_claw_medium');"
 			}
 		},
 		"animation.pidgeot.mount_ground_idle": {
@@ -3637,12 +3631,6 @@
 				"wings_open": {
 					"scale": 0
 				}
-			},
-			"timeline": {
-				"0.0": "q.run_molang('cobblemon:stepsound_claw_medium');",
-				"0.5": "q.run_molang('cobblemon:stepsound_claw_medium');",
-				"1.0": "q.run_molang('cobblemon:stepsound_claw_medium');",
-				"1.5": "q.run_molang('cobblemon:stepsound_claw_medium');"
 			}
 		},
 		"animation.pidgeot.ride_ground_walk": {

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0021_spearow/spearow.animation.json

@@ -37,10 +37,10 @@
 					"rotation": [0, -7.5, 0]
 				},
 				"tail2": {
-					"rotation": ["30-math.sin(q.anim_time*90*2-60)*-3", 0, 0]
+					"rotation": [30, 0, 0]
 				},
 				"tail3": {
-					"rotation": ["12.5-math.sin(q.anim_time*90*2-120)*-3", 0, 0]
+					"rotation": [12.5, 0, 0]
 				},
 				"leg_right": {
 					"rotation": [0, 5, 0]
@@ -53,22 +53,6 @@
 				},
 				"wings_open": {
 					"scale": 0
-				},
-				"torso": {
-					"rotation": ["-math.sin(q.anim_time*90*2-90)*1", 0, "math.sin(q.anim_time*90*1-90)*1"],
-					"position": [0, "math.sin(q.anim_time*90*2)*0.1", 0]
-				},
-				"wing_closed_left": {
-					"rotation": ["-0-math.sin(q.anim_time*90*2-150)*1", 0, 0]
-				},
-				"wing_closed_right": {
-					"rotation": ["-0-math.sin(q.anim_time*90*2-150)*1", 0, 0]
-				},
-				"neck": {
-					"rotation": ["-math.sin(q.anim_time*90*2-180)*1", 0, 0]
-				},
-				"head": {
-					"rotation": ["-math.sin(q.anim_time*90*2-90)*-2", 0, "math.sin(q.anim_time*90*1-60)*-1"]
 				}
 			}
 		},
@@ -127,30 +111,6 @@
 						}
 					}
 				},
-				"torso": {
-					"rotation": {
-						"0.0": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.3333": {
-							"post": [5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.5833": {
-							"post": [2.5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.8333": {
-							"post": [-5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.1667": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						}
-					}
-				},
 				"jaw": {
 					"rotation": {
 						"0.0": {
@@ -158,15 +118,19 @@
 							"lerp_mode": "catmullrom"
 						},
 						"0.1667": {
-							"post": [72.5, 0, 0],
+							"post": [85, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.4167": {
+							"post": [85, 0, 0],
 							"lerp_mode": "catmullrom"
 						},
 						"0.5833": {
 							"post": [0, 0, 0],
 							"lerp_mode": "catmullrom"
 						},
-						"0.8333": {
-							"post": [52.5, 0, 0],
+						"0.75": {
+							"post": [85, 0, 0],
 							"lerp_mode": "catmullrom"
 						},
 						"1.1667": {
@@ -174,32 +138,6 @@
 							"lerp_mode": "catmullrom"
 						}
 					}
-				},
-				"eyelid_left": {
-					"position": {
-						"0.0": [0, 0, 0],
-						"0.5833": {
-							"pre": [0, 0, 0],
-							"post": [0.1, 0, -0.1]
-						},
-						"0.75": {
-							"pre": [0.1, 0, -0.1],
-							"post": [0, 0, 0]
-						}
-					}
-				},
-				"eyelid_right": {
-					"position": {
-						"0.0": [0, 0, 0],
-						"0.5833": {
-							"pre": [0, 0, 0],
-							"post": [-0.1, 0, -0.1]
-						},
-						"0.75": {
-							"pre": [-0.1, 0, -0.1],
-							"post": [0, 0, 0]
-						}
-					}
 				}
 			},
 			"sound_effects": {
@@ -265,546 +203,6 @@
 					"position": [-0.1, 0, -0.1]
 				}
 			}
-		},
-		"animation.spearow.hold_item": {
-			"loop": true,
-			"bones": {
-				"jaw": {
-					"rotation": [30, 0, 0]
-				}
-			}
-		},
-		"animation.spearow.ground_walk": {
-			"loop": true,
-			"animation_length": 0.75,
-			"bones": {
-				"torso": {
-					"rotation": ["1-math.cos(q.anim_time*90*16/3*2)*-2", "-math.sin(q.anim_time*90*16/3+60)*3", "-1+math.sin(q.anim_time*90*16/3+30)*-4"],
-					"position": [0, "math.sin(q.anim_time*90*16/3*2)*0.2", 0]
-				},
-				"wings_open": {
-					"scale": 0
-				},
-				"wing_closed_left": {
-					"rotation": [3, 0, 0]
-				},
-				"wing_closed_right": {
-					"rotation": [3, 0, 0]
-				},
-				"tail2": {
-					"rotation": ["22-math.cos(q.anim_time*90*16/3*2)*5", 0, 0]
-				},
-				"tail3": {
-					"rotation": ["5-math.cos(q.anim_time*90*16/3*2)*5", 0, 0]
-				},
-				"neck": {
-					"rotation": {
-						"0.0": ["-math.cos(q.anim_time*90*16/3*2)*-12.5", "-math.sin(q.anim_time*90*16/3+60)*-3", "math.sin(q.anim_time*90*16/3+30)*3"],
-						"0.125": ["-math.cos(q.anim_time*90*16/3*2)*-9.5", "-math.sin(q.anim_time*90*16/3+60)*-3", "math.sin(q.anim_time*90*16/3+30)*3"],
-						"0.1667": ["-math.cos(q.anim_time*90*16/3*2)*-12.5", "-math.sin(q.anim_time*90*16/3+60)*-3", "math.sin(q.anim_time*90*16/3+30)*3"],
-						"0.375": ["-math.cos(q.anim_time*90*16/3*2)*-12.5", "-math.sin(q.anim_time*90*16/3+60)*-3", "math.sin(q.anim_time*90*16/3+30)*3"],
-						"0.5": ["-math.cos(q.anim_time*90*16/3*2)*-9.5", "-math.sin(q.anim_time*90*16/3+60)*-3", "math.sin(q.anim_time*90*16/3+30)*3"],
-						"0.5417": ["-math.cos(q.anim_time*90*16/3*2)*-12.5", "-math.sin(q.anim_time*90*16/3+60)*-3", "math.sin(q.anim_time*90*16/3+30)*3"]
-					},
-					"position": {
-						"0.0": [0, "math.cos(q.anim_time*90*16/3*2)*0.2", 0],
-						"0.0417": [0, -0.075, 0.025],
-						"0.0833": [0, "-0.2+math.cos(q.anim_time*90*16/3*2)*0.2", -0.2],
-						"0.125": [0, -0.22, -0.17],
-						"0.1667": [0, -0.21, -0.185],
-						"0.375": [0, "math.cos(q.anim_time*90*16/3*2)*0.2", 0],
-						"0.4167": [0, -0.075, 0.025],
-						"0.4583": [0, "-0.2+math.cos(q.anim_time*90*16/3*2)*0.2", -0.2],
-						"0.5": [0, -0.22, -0.17],
-						"0.5417": [0, -0.21, -0.185],
-						"0.75": [0, "math.cos(q.anim_time*90*16/3*2)*0.2", 0]
-					}
-				},
-				"head": {
-					"rotation": ["5-math.cos(q.anim_time*90*16/3*2)*18", 0, 0],
-					"position": [0, 0, "-0.2+math.cos(q.anim_time*90*16/3*2)*0.3"]
-				},
-				"scruff_left": {
-					"rotation": [0, "-0-math.cos(q.anim_time*90*16/3*2-30)*7", 0]
-				},
-				"scruff_right": {
-					"rotation": [0, "0+math.cos(q.anim_time*90*16/3*2-30)*7", 0]
-				},
-				"scruff_top_right": {
-					"rotation": ["-0-math.cos(q.anim_time*90*16/3*2-30)*5", 0, 0]
-				},
-				"scruff_bottom": {
-					"rotation": ["-0-math.cos(q.anim_time*90*16/3*2)*-12", 0, 0]
-				},
-				"leg_left": {
-					"rotation": {
-						"0.0": [25, -17.5, 0],
-						"0.125": {
-							"pre": [21.25, -12.5, 0],
-							"post": [21.25, -12.5, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.375": [-40, -5, 0],
-						"0.75": [25, -17.5, 0]
-					},
-					"position": {
-						"0.0": [0.3, 0.1, 0.6],
-						"0.0417": [0.23, 0.25, 0.71],
-						"0.125": {
-							"pre": [0, 0.68, -0.08],
-							"post": [0, 0.68, -0.08],
-							"lerp_mode": "catmullrom"
-						},
-						"0.25": {
-							"post": [0, 0.97, -1.41],
-							"lerp_mode": "catmullrom"
-						},
-						"0.375": [0, -0.5, -2.15],
-						"0.5": [0, -0.19, -1.02],
-						"0.5833": [0, -0.07, -0.3],
-						"0.625": [0, -0.02, 0.21],
-						"0.7083": [0.1, 0.215, 0.43],
-						"0.75": [0.3, 0.1, 0.6]
-					}
-				},
-				"leg_left2": {
-					"rotation": {
-						"0.0": [0, 0, 0],
-						"0.125": {
-							"pre": [-30.83, 0, 0],
-							"post": [-30.83, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.25": {
-							"post": [-2.65, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.375": [12.5, 0, 0],
-						"0.75": [0, 0, 0]
-					}
-				},
-				"foot_left": {
-					"rotation": {
-						"0.0": [27.5, 0, -5],
-						"0.125": {
-							"pre": [20.17, 0, 0],
-							"post": [20.17, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.25": {
-							"post": [12.596, 0.6637, -1.3486],
-							"lerp_mode": "catmullrom"
-						},
-						"0.375": [28, 0, 0],
-						"0.625": [-7.33, 0, 0],
-						"0.75": [27.5, 0, -5]
-					},
-					"position": {
-						"0.0": [0, 0.25, 0],
-						"0.125": [0, 0, 0],
-						"0.375": [0, 0, 0],
-						"0.625": [0, 0.17, 0],
-						"0.75": [0, 0.25, 0]
-					}
-				},
-				"toe_back_left": {
-					"rotation": {
-						"0.0": [-20, 0, 0],
-						"0.2083": {
-							"pre": [-8.33, 0, 0],
-							"post": [-8.33, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.375": [0, 0, 0],
-						"0.625": [0, 0, 0],
-						"0.75": [-20, 0, 0]
-					}
-				},
-				"toe_inner_left": {
-					"rotation": {
-						"0.0": [-55, 10, -7.5],
-						"0.125": {
-							"pre": [7.5, 15, 0],
-							"post": [7.5, 15, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.25": {
-							"post": [5, 15, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.375": [0, 15, 0],
-						"0.625": [0, 15, 0],
-						"0.75": [-55, 10, -7.5]
-					},
-					"position": {
-						"0.0": [0, -0.75, 1.35],
-						"0.125": [0, 0, 0],
-						"0.625": [0, 0, 0],
-						"0.75": [0, -0.75, 1.35]
-					}
-				},
-				"toe_outer_left": {
-					"rotation": {
-						"0.0": [-51.5, -2.5, 10],
-						"0.125": {
-							"pre": [5, -15, 0],
-							"post": [5, -15, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.25": {
-							"post": [5, -15, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.375": [0, -15, 0],
-						"0.625": [0, -15, 0],
-						"0.75": [-51.5, -2.5, 10]
-					},
-					"position": {
-						"0.0": [0, -0.75, 1.35],
-						"0.125": [0, 0, 0],
-						"0.625": [0, 0, 0],
-						"0.75": [0, -0.75, 1.35]
-					}
-				},
-				"leg_right": {
-					"rotation": {
-						"0.0": [-40, 5, 0],
-						"0.375": [25, 17.5, 0],
-						"0.5": {
-							"pre": [21.25, 12.5, 0],
-							"post": [21.25, 12.5, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.75": [-40, 5, 0]
-					},
-					"position": {
-						"0.0": [0, -0.5, -2.15],
-						"0.125": [0, -0.19, -1.02],
-						"0.2083": [0, -0.07, -0.3],
-						"0.25": [0, -0.02, 0.21],
-						"0.3333": [-0.1, 0.215, 0.43],
-						"0.375": [-0.3, 0.1, 0.6],
-						"0.4167": [-0.23, 0.25, 0.71],
-						"0.5": {
-							"pre": [0, 0.68, -0.08],
-							"post": [0, 0.68, -0.08],
-							"lerp_mode": "catmullrom"
-						},
-						"0.625": {
-							"post": [0, 0.97, -1.41],
-							"lerp_mode": "catmullrom"
-						},
-						"0.75": [0, -0.5, -2.15]
-					}
-				},
-				"leg_right2": {
-					"rotation": {
-						"0.0": [12.5, 0, 0],
-						"0.375": [0, 0, 0],
-						"0.5": {
-							"pre": [-30.83, 0, 0],
-							"post": [-30.83, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.625": {
-							"post": [-2.65, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.75": [12.5, 0, 0]
-					}
-				},
-				"foot_right": {
-					"rotation": {
-						"0.0": [28, 0, 0],
-						"0.25": [-7.33, 0, 0],
-						"0.375": [27.5, 0, 5],
-						"0.5": {
-							"pre": [20.17, 0, 0],
-							"post": [20.17, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.625": {
-							"post": [12.596, -0.6637, 1.3486],
-							"lerp_mode": "catmullrom"
-						},
-						"0.75": [28, 0, 0]
-					},
-					"position": {
-						"0.0": [0, 0, 0],
-						"0.25": [0, 0.17, 0],
-						"0.375": [0, 0.25, 0],
-						"0.5": [0, 0, 0],
-						"0.75": [0, 0, 0]
-					}
-				},
-				"toe_back_right": {
-					"rotation": {
-						"0.0": [0, 0, 0],
-						"0.25": [0, 0, 0],
-						"0.375": [-20, 0, 0],
-						"0.5833": {
-							"pre": [-8.33, 0, 0],
-							"post": [-8.33, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.75": [0, 0, 0]
-					}
-				},
-				"toe_inner_right": {
-					"rotation": {
-						"0.0": [0, -15, 0],
-						"0.25": [0, -15, 0],
-						"0.375": [-55, -10, 7.5],
-						"0.5": {
-							"pre": [7.5, -15, 0],
-							"post": [7.5, -15, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.625": {
-							"post": [5, -15, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.75": [0, -15, 0]
-					},
-					"position": {
-						"0.0": [0, 0, 0],
-						"0.25": [0, 0, 0],
-						"0.375": [0, -0.75, 1.35],
-						"0.5": [0, 0, 0],
-						"0.75": [0, 0, 0]
-					}
-				},
-				"toe_outer_right": {
-					"rotation": {
-						"0.0": [0, 15, 0],
-						"0.25": [0, 15, 0],
-						"0.375": [-51.5, 2.5, -10],
-						"0.5": {
-							"pre": [5, 15, 0],
-							"post": [5, 15, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.625": {
-							"post": [5, 15, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.75": [0, 15, 0]
-					},
-					"position": {
-						"0.0": [0, 0, 0],
-						"0.25": [0, 0, 0],
-						"0.375": [0, -0.75, 1.35],
-						"0.5": [0, 0, 0],
-						"0.75": [0, 0, 0]
-					}
-				}
-			}
-		},
-		"animation.spearow.air_idle": {
-			"loop": true,
-			"animation_length": 4,
-			"bones": {
-				"body": {
-					"position": ["-math.sin(q.anim_time*90*3-45)*0.5", "math.sin(q.anim_time*90*6-45)*1.5", "math.sin(q.anim_time*90*6-45)*1/2"]
-				},
-				"torso": {
-					"rotation": ["-math.sin(q.anim_time*90*6-120)*-4", 0, "math.sin(q.anim_time*90*3-90)*4"]
-				},
-				"wing_open_left": {
-					"rotation": ["-math.sin(q.anim_time*90*6-90)*6", 0, "math.sin(q.anim_time*90*6)*65"],
-					"position": [0, "math.sin(q.anim_time*90*6)*-1", 0]
-				},
-				"wing_open_left2": {
-					"rotation": [0, 0, "20+math.sin(q.anim_time*90*6-45)*30"]
-				},
-				"wing_open_left3": {
-					"rotation": [0, 0, "0+math.sin(q.anim_time*90*6-75)*30"]
-				},
-				"wing_open_right": {
-					"rotation": ["-math.sin(q.anim_time*90*6-90)*6", 0, "-math.sin(q.anim_time*90*6)*65"],
-					"position": [0, "math.sin(q.anim_time*90*6)*-1", 0]
-				},
-				"wing_open_right2": {
-					"rotation": [0, 0, "-20-math.sin(q.anim_time*90*6-45)*30"]
-				},
-				"wing_open_right3": {
-					"rotation": [0, 0, "-0-math.sin(q.anim_time*90*6-75)*30"]
-				},
-				"tail2": {
-					"rotation": ["-math.sin(q.anim_time*90*6-30)*5", 0, 0]
-				},
-				"tail3": {
-					"rotation": ["-math.sin(q.anim_time*90*6-90)*5", 0, 0]
-				},
-				"neck": {
-					"rotation": ["5-math.sin(q.anim_time*90*6-140)*-1", 0, "math.sin(q.anim_time*90*3-00)*-1"]
-				},
-				"head": {
-					"rotation": ["-math.sin(q.anim_time*90*6-110)*3", 0, "math.sin(q.anim_time*90*3-120)*-2"]
-				},
-				"scruff_left": {
-					"rotation": [0, "-0-math.sin(q.anim_time*90*6-170)*4", 0]
-				},
-				"scruff_right": {
-					"rotation": [0, "0+math.sin(q.anim_time*90*6-170)*4", 0]
-				},
-				"scruff_top_right": {
-					"rotation": ["-0-math.sin(q.anim_time*90*6-210)*6", 0, 0]
-				},
-				"scruff_bottom": {
-					"rotation": ["-0-math.sin(q.anim_time*90*6-170)*3", 0, 0]
-				},
-				"leg_left": {
-					"rotation": [50, 0, 0]
-				},
-				"leg_left2": {
-					"rotation": [-100, 0, 0]
-				},
-				"foot_left": {
-					"rotation": ["40-math.sin(q.anim_time*90*6-30)*-5", -10, "math.sin(q.anim_time*90*3-150)*6"]
-				},
-				"toe_back_left": {
-					"rotation": [-27.5, 0, 0]
-				},
-				"toe_inner_left": {
-					"rotation": [37.5, 0, 0]
-				},
-				"toe_outer_left": {
-					"rotation": [37.5, 0, 0]
-				},
-				"leg_right": {
-					"rotation": [50, 0, 0]
-				},
-				"leg_right2": {
-					"rotation": [-100, 0, 0]
-				},
-				"foot_right": {
-					"rotation": ["40-math.sin(q.anim_time*90*6-30)*-5", 10, "-math.sin(q.anim_time*90*3-150)*6"]
-				},
-				"toe_back_right": {
-					"rotation": [-27.5, 0, 0]
-				},
-				"toe_inner_right": {
-					"rotation": [37.5, 0, 0]
-				},
-				"toe_outer_right": {
-					"rotation": [37.5, 0, 0]
-				}
-			},
-			"timeline": {
-				"0.6667": "q.has_entity?{q.sound('animation.plumage.wing_flap.small');};",
-				"1.3333": "q.has_entity?{q.sound('animation.plumage.wing_flap.small');};",
-				"2.0": "q.has_entity?{q.sound('animation.plumage.wing_flap.small');};",
-				"2.6667": "q.has_entity?{q.sound('animation.plumage.wing_flap.small');};",
-				"3.3333": "q.has_entity?{q.sound('animation.plumage.wing_flap.small');};",
-				"4.0": "q.has_entity?{q.sound('animation.plumage.wing_flap.small');};"
-			}
-		},
-		"animation.spearow.air_fly": {
-			"loop": true,
-			"animation_length": 4,
-			"bones": {
-				"body": {
-					"position": ["-math.sin(q.anim_time*90*3-45)*0.5", "math.sin(q.anim_time*90*6-45)*1.5", "math.sin(q.anim_time*90*6-45)*1/2"]
-				},
-				"torso": {
-					"rotation": ["15-math.sin(q.anim_time*90*6-120)*-1.5", 0, "math.sin(q.anim_time*90*3-90)*4"]
-				},
-				"wing_open_left": {
-					"rotation": ["-math.sin(q.anim_time*90*6-90)*6", 0, "math.sin(q.anim_time*90*6)*65"],
-					"position": [0, "math.sin(q.anim_time*90*6)*-1", 0]
-				},
-				"wing_open_left2": {
-					"rotation": [0, 0, "20+math.sin(q.anim_time*90*6-45)*30"]
-				},
-				"wing_open_left3": {
-					"rotation": [0, 0, "0+math.sin(q.anim_time*90*6-75)*30"]
-				},
-				"wing_open_right": {
-					"rotation": ["-math.sin(q.anim_time*90*6-90)*6", 0, "-math.sin(q.anim_time*90*6)*65"],
-					"position": [0, "math.sin(q.anim_time*90*6)*-1", 0]
-				},
-				"wing_open_right2": {
-					"rotation": [0, 0, "-20-math.sin(q.anim_time*90*6-45)*30"]
-				},
-				"wing_open_right3": {
-					"rotation": [0, 0, "-0-math.sin(q.anim_time*90*6-75)*30"]
-				},
-				"tail": {
-					"rotation": [-10, 0, 0]
-				},
-				"tail2": {
-					"rotation": ["-math.sin(q.anim_time*90*6-30)*5", 0, 0]
-				},
-				"tail3": {
-					"rotation": ["-math.sin(q.anim_time*90*6-90)*5", 0, 0]
-				},
-				"neck": {
-					"rotation": ["5-math.sin(q.anim_time*90*6-140)*-1", 0, "math.sin(q.anim_time*90*3-00)*-1"]
-				},
-				"head_ai": {
-					"rotation": [5, 0, 0]
-				},
-				"head": {
-					"rotation": ["-7.5-math.sin(q.anim_time*90*6-110)*3", 0, "math.sin(q.anim_time*90*3-120)*-2"]
-				},
-				"scruff_left": {
-					"rotation": [0, "-0-math.sin(q.anim_time*90*6-170)*4", 0]
-				},
-				"scruff_right": {
-					"rotation": [0, "0+math.sin(q.anim_time*90*6-170)*4", 0]
-				},
-				"scruff_top_right": {
-					"rotation": ["-0-math.sin(q.anim_time*90*6-210)*6", 0, 0]
-				},
-				"scruff_bottom": {
-					"rotation": ["-0-math.sin(q.anim_time*90*6-170)*3", 0, 0]
-				},
-				"leg_left": {
-					"rotation": [50, 0, 0]
-				},
-				"leg_left2": {
-					"rotation": [-100, 0, 0]
-				},
-				"foot_left": {
-					"rotation": ["40-math.sin(q.anim_time*90*6-30)*-5", -10, "math.sin(q.anim_time*90*3-150)*6"]
-				},
-				"toe_back_left": {
-					"rotation": [-27.5, 0, 0]
-				},
-				"toe_inner_left": {
-					"rotation": [37.5, 0, 0]
-				},
-				"toe_outer_left": {
-					"rotation": [37.5, 0, 0]
-				},
-				"leg_right": {
-					"rotation": [50, 0, 0]
-				},
-				"leg_right2": {
-					"rotation": [-100, 0, 0]
-				},
-				"foot_right": {
-					"rotation": ["40-math.sin(q.anim_time*90*6-30)*-5", 10, "-math.sin(q.anim_time*90*3-150)*6"]
-				},
-				"toe_back_right": {
-					"rotation": [-27.5, 0, 0]
-				},
-				"toe_inner_right": {
-					"rotation": [37.5, 0, 0]
-				},
-				"toe_outer_right": {
-					"rotation": [37.5, 0, 0]
-				}
-			},
-			"timeline": {
-				"0.6667": "q.has_entity?{q.sound('animation.plumage.wing_flap.small');};",
-				"1.3333": "q.has_entity?{q.sound('animation.plumage.wing_flap.small');};",
-				"2.0": "q.has_entity?{q.sound('animation.plumage.wing_flap.small');};",
-				"2.6667": "q.has_entity?{q.sound('animation.plumage.wing_flap.small');};",
-				"3.3333": "q.has_entity?{q.sound('animation.plumage.wing_flap.small');};",
-				"4.0": "q.has_entity?{q.sound('animation.plumage.wing_flap.small');};"
-			}
 		}
 	}
 }

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0026_raichu/raichu_cap.animation.json

@@ -217,7 +217,7 @@
 				}
 			}
 		},
-		"animation.raichu_cap.water_surface_swim": {
+		"animation.raichu_cap.water_swim": {
 			"loop": true,
 			"animation_length": 1,
 			"bones": {

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0038_ninetales/ninetales.animation.json

@@ -2,312 +2,6 @@
 	"format_version": "1.8.0",
 	"animations": {
 		"animation.ninetales.ground_idle": {
-			"loop": true,
-			"bones": {
-				"body": {
-					"position": [0, -0.3, 0]
-				},
-				"torso": {
-					"rotation": ["5+math.sin(q.anim_time*90*1-0)*0.5", 0, "0-math.sin(q.anim_time*90*0.5-30)*0.5"]
-				},
-				"chest": {
-					"rotation": ["-4.8+math.sin(q.anim_time*90*1-30)*0.5", 0, -1.2]
-				},
-				"neck": {
-					"rotation": ["-12.5+math.sin(q.anim_time*90*1-60)*1", 0, 0]
-				},
-				"neck_fur_left2": {
-					"rotation": [0, 0, "-7.5-math.sin(q.anim_time*90*1-90)*1"]
-				},
-				"neck_fur_right2": {
-					"rotation": [0, 0, "7.5+math.sin(q.anim_time*90*1-90)*1"]
-				},
-				"neck2": {
-					"rotation": ["-12.5+math.sin(q.anim_time*90*1-90)*0.5", 0, 0]
-				},
-				"head_rotation": {
-					"rotation": ["32.5+math.sin(q.anim_time*90*1-90)*-2", 0, "0-math.sin(q.anim_time*90*1-120)*-0.5"]
-				},
-				"hair2": {
-					"rotation": ["-2.5+math.sin(q.anim_time*90*1-210)*1", 0, 0]
-				},
-				"hair_back_top": {
-					"rotation": ["-2.5+math.sin(q.anim_time*90*1-300)*2", 0, 0]
-				},
-				"hair_back_top2": {
-					"rotation": ["-22.5+math.sin(q.anim_time*90*1-360)*4", 0, 0]
-				},
-				"hair_back_bottom2": {
-					"rotation": ["-20+math.sin(q.anim_time*90*1-380)*4", 0, 0]
-				},
-				"tail_middle": {
-					"rotation": ["42.5+math.sin(q.anim_time*90*1-60)*-0.5", 0, 0]
-				},
-				"tail_middle2": {
-					"rotation": ["7.5+math.sin(q.anim_time*90*1-120)*-1", 0, 0]
-				},
-				"tail_middle3": {
-					"rotation": ["17.5+math.sin(q.anim_time*90*1-180)*-1", 0, 0]
-				},
-				"tail_middle4": {
-					"rotation": ["-37.5+math.sin(q.anim_time*90*1-240)*-4", 0, 0]
-				},
-				"tail_middle5": {
-					"rotation": ["-35+math.sin(q.anim_time*90*1-300)*-6", 2.5, 0]
-				},
-				"tail_middle6": {
-					"rotation": ["-42.5+math.sin(q.anim_time*90*1-300)*-6", 0, 0]
-				},
-				"tail_middle7": {
-					"rotation": ["-25+math.sin(q.anim_time*90*1-400)*-6", 0, 0]
-				},
-				"tail_middle8": {
-					"rotation": ["35+math.sin(q.anim_time*90*1-460)*-12", 0, 0]
-				},
-				"tail_left1_rotation": {
-					"rotation": ["27.525638448+math.sin(q.anim_time*90*1-60)*-0.5", 2.04767, 1.43455]
-				},
-				"tail_left1_2": {
-					"rotation": ["15.013645339+math.sin(q.anim_time*90*1-120)*-1", 2.41476, 0.64743]
-				},
-				"tail_left1_3": {
-					"rotation": ["17.5+math.sin(q.anim_time*90*1-180)*-1", 0, 0]
-				},
-				"tail_left1_4": {
-					"rotation": ["-32.599068173+math.sin(q.anim_time*90*1-240)*-4", -4.21541, 2.69136]
-				},
-				"tail_left1_5": {
-					"rotation": ["-37.605552+math.sin(q.anim_time*90*1-300)*-6", -3.9649, 3.04868]
-				},
-				"tail_left1_6": {
-					"rotation": ["-40.107597848+math.sin(q.anim_time*90*1-360)*-4", 3.82821, -3.21873]
-				},
-				"tail_left1_7": {
-					"rotation": ["-27.702122918+math.sin(q.anim_time*90*1-400)*-6", 6.64851, -3.47875]
-				},
-				"tail_left1_8": {
-					"rotation": ["30.867477791+math.sin(q.anim_time*90*1-460)*-12", 12.95254, 7.63074]
-				},
-				"tail_left2_rotation": {
-					"rotation": ["22.577335588+math.sin(q.anim_time*90*1-60)*-0.5", 4.61854, 1.91757]
-				},
-				"tail_left2_2": {
-					"rotation": ["12.5+math.sin(q.anim_time*90*1-120)*-1", 0, 0]
-				},
-				"tail_left2_3": {
-					"rotation": ["15+math.sin(q.anim_time*90*1-180)*-1", 0, 0]
-				},
-				"tail_left2_4": {
-					"rotation": ["-20+math.sin(q.anim_time*90*1-240)*-4", 0, 0]
-				},
-				"tail_left2_5": {
-					"rotation": ["-56.265008831+math.sin(q.anim_time*90*1-300)*-6", -9.93191, 14.48174]
-				},
-				"tail_left2_6": {
-					"rotation": ["-37.158458405+math.sin(q.anim_time*90*1-300)*-6", 18.26883, -13.36473]
-				},
-				"tail_left2_7": {
-					"rotation": ["33.125975871+math.sin(q.anim_time*90*1-360)*-12", 10.51794, 6.79286]
-				},
-				"tail_left3_rotation": {
-					"rotation": ["10+math.sin(q.anim_time*90*1-60)*-0.5", 0, 0]
-				},
-				"tail_left3_2": {
-					"rotation": ["22.577335588+math.sin(q.anim_time*90*1-120)*-1", 4.61854, 1.91757]
-				},
-				"tail_left3_3": {
-					"rotation": ["10+math.sin(q.anim_time*90*1-180)*-1", 0, 0]
-				},
-				"tail_left3_4": {
-					"rotation": ["-30+math.sin(q.anim_time*90*1-240)*-4", 0, 0]
-				},
-				"tail_left3_5": {
-					"rotation": ["-27.860824367+math.sin(q.anim_time*90*1-300)*-6", -8.86042, 4.65468]
-				},
-				"tail_left3_6": {
-					"rotation": ["-43.1852829+math.sin(q.anim_time*90*1-300)*-6", 9.18229, -8.51814]
-				},
-				"tail_left3_7": {
-					"rotation": ["35.413183453+math.sin(q.anim_time*90*1-360)*-12", 8.17773, 5.77509]
-				},
-				"tail_right1_rotation": {
-					"rotation": ["27.525638448+math.sin(q.anim_time*90*1-60)*-0.5", -2.04767, -1.43455]
-				},
-				"tail_right1_2": {
-					"rotation": ["15.013645339+math.sin(q.anim_time*90*1-120)*-1", -2.41476, -0.64743]
-				},
-				"tail_right1_3": {
-					"rotation": ["17.5+math.sin(q.anim_time*90*1-180)*-1", 0, 0]
-				},
-				"tail_right1_4": {
-					"rotation": ["-32.599068173+math.sin(q.anim_time*90*1-240)*-4", 4.21541, -2.69136]
-				},
-				"tail_right1_5": {
-					"rotation": ["-37.605552+math.sin(q.anim_time*90*1-300)*-6", 3.9649, -3.04868]
-				},
-				"tail_right1_6": {
-					"rotation": ["-40.107597848+math.sin(q.anim_time*90*1-360)*-4", -3.82821, 3.21873]
-				},
-				"tail_right1_7": {
-					"rotation": ["-27.702122918+math.sin(q.anim_time*90*1-400)*-6", -6.64851, 3.47875]
-				},
-				"tail_right1_8": {
-					"rotation": ["30.867477791+math.sin(q.anim_time*90*1-460)*-12", -12.95254, -7.63074]
-				},
-				"tail_right2_rotation": {
-					"rotation": ["22.577335588+math.sin(q.anim_time*90*1-60)*-0.5", -4.61854, -1.91757]
-				},
-				"tail_right2_2": {
-					"rotation": ["12.5+math.sin(q.anim_time*90*1-120)*-1", 0, 0]
-				},
-				"tail_right2_3": {
-					"rotation": ["15+math.sin(q.anim_time*90*1-180)*-1", 0, 0]
-				},
-				"tail_right2_4": {
-					"rotation": ["-20+math.sin(q.anim_time*90*1-240)*-4", 0, 0]
-				},
-				"tail_right2_5": {
-					"rotation": ["-56.265008831+math.sin(q.anim_time*90*1-300)*-6", 9.93191, -14.48174]
-				},
-				"tail_right2_6": {
-					"rotation": ["-37.158458405+math.sin(q.anim_time*90*1-300)*-6", -18.26883, 13.36473]
-				},
-				"tail_right2_7": {
-					"rotation": ["33.125975871+math.sin(q.anim_time*90*1-360)*-12", -10.51794, -6.79286]
-				},
-				"leg_front_left": {
-					"rotation": ["-9.981069394+math.sin(q.anim_time*90*1-0)*-1", 0.43523, 4.98107],
-					"position": [0, "0-math.sin(q.anim_time*90*1-0)*0.025", "0-math.sin(q.anim_time*90*1-0)*-0.15"]
-				},
-				"leg_front_left2": {
-					"rotation": ["-2.5+math.sin(q.anim_time*90*1-0)*0.5", 0, 0]
-				},
-				"foot_front_left": {
-					"rotation": ["12.5+math.sin(q.anim_time*90*1-0)*0.5", 0, -5]
-				},
-				"leg_back_left": {
-					"rotation": ["10+math.sin(q.anim_time*90*1-0)*1", 0, -7.5],
-					"position": [0, "0-math.sin(q.anim_time*90*1-0)*0.2", "0-math.sin(q.anim_time*90*1-0)*0.25"]
-				},
-				"leg_back_left2": {
-					"rotation": ["-2.5+math.sin(q.anim_time*90*1-0)*1", 0, 0]
-				},
-				"leg_back_left3": {
-					"rotation": ["-2.5+math.sin(q.anim_time*90*1-0)*-1", 0, 0]
-				},
-				"foot_back_left": {
-					"rotation": ["-5+math.sin(q.anim_time*90*1-0)*-1", 0, 7.5]
-				},
-				"leg_front_right": {
-					"rotation": ["10.018930606+math.sin(q.anim_time*90*1-0)*-1", -0.43523, -4.98107],
-					"position": [0, "0-math.sin(q.anim_time*90*1-0)*0.025", "0-math.sin(q.anim_time*90*1-0)*-0.15"]
-				},
-				"leg_front_right2": {
-					"rotation": ["-10+math.sin(q.anim_time*90*1-0)*0.5", 0, 0]
-				},
-				"foot_front_right": {
-					"rotation": ["-0+math.sin(q.anim_time*90*1-0)*0.5", 0, 5]
-				},
-				"leg_back_right": {
-					"rotation": ["17.521361057+math.sin(q.anim_time*90*1-0)*1", 0.32621, 7.49294],
-					"position": [0, "0-math.sin(q.anim_time*90*1-0)*0.2", "0-math.sin(q.anim_time*90*1-0)*0.25"]
-				},
-				"leg_back_right2": {
-					"rotation": ["-5+math.sin(q.anim_time*90*1-0)*1", 0, 0]
-				},
-				"leg_back_right3": {
-					"rotation": ["2.5+math.sin(q.anim_time*90*1-0)*-1", 0, 0]
-				},
-				"foot_back_right": {
-					"rotation": ["-15+math.sin(q.anim_time*90*1-0)*-1", 0, -7.5]
-				},
-				"tail_right3_rotation": {
-					"rotation": ["10+math.sin(q.anim_time*90*1-60)*-0.5", 0, 0]
-				},
-				"tail_right3_2": {
-					"rotation": ["22.577335588+math.sin(q.anim_time*90*1-120)*-1", -4.61854, -1.91757]
-				},
-				"tail_right3_3": {
-					"rotation": ["10+math.sin(q.anim_time*90*1-180)*-1", 0, 0]
-				},
-				"tail_right3_4": {
-					"rotation": ["-30+math.sin(q.anim_time*90*1-240)*-4", 0, 0]
-				},
-				"tail_right3_5": {
-					"rotation": ["-27.860824367+math.sin(q.anim_time*90*1-300)*-6", 8.86042, -4.65468]
-				},
-				"tail_right3_6": {
-					"rotation": ["-43.1852829+math.sin(q.anim_time*90*1-300)*-6", -9.18229, 8.51814]
-				},
-				"tail_right3_7": {
-					"rotation": ["35.413183453+math.sin(q.anim_time*90*1-360)*-12", -8.17773, -5.77509]
-				},
-				"tail_left4_rotation": {
-					"rotation": ["-0+math.sin(q.anim_time*90*1-60)*-0.5", 10, 0]
-				},
-				"tail_left4_2": {
-					"rotation": ["17.5+math.sin(q.anim_time*90*1-120)*-1", 0, 0]
-				},
-				"tail_left4_3": {
-					"rotation": ["20.4458201+math.sin(q.anim_time*90*1-180)*-2", -11.73507, -4.3361]
-				},
-				"tail_left4_4": {
-					"rotation": ["-41.341977449+math.sin(q.anim_time*90*1-240)*-4", -13.31791, 11.45696]
-				},
-				"tail_left4_5": {
-					"rotation": ["-35.413183453+math.sin(q.anim_time*90*1-300)*-6", 8.17773, -5.77509]
-				},
-				"tail_left4_6": {
-					"rotation": ["39.711284319+math.sin(q.anim_time*90*1-360)*-12", 17.67415, 14.15251]
-				},
-				"tail_right4_rotation": {
-					"rotation": ["-0+math.sin(q.anim_time*90*1-60)*-0.5", -10, 0]
-				},
-				"tail_right4_2": {
-					"rotation": ["17.5+math.sin(q.anim_time*90*1-120)*-1", 0, 0]
-				},
-				"tail_right4_3": {
-					"rotation": ["20.4458201+math.sin(q.anim_time*90*1-180)*-2", 11.73507, 4.3361]
-				},
-				"tail_right4_4": {
-					"rotation": ["-41.341977449+math.sin(q.anim_time*90*1-240)*-4", 13.31791, -11.45696]
-				},
-				"tail_right4_5": {
-					"rotation": ["-35.413183453+math.sin(q.anim_time*90*1-300)*-6", -8.17773, 5.77509]
-				},
-				"tail_right4_6": {
-					"rotation": ["39.711284319+math.sin(q.anim_time*90*1-360)*-12", -17.67415, -14.15251]
-				},
-				"neck_fur_front": {
-					"rotation": ["-0+math.sin(q.anim_time*90*1-60)*-1", 0, 0]
-				},
-				"neck_fur_front2": {
-					"rotation": ["-0+math.sin(q.anim_time*90*1-90)*2", 0, 0]
-				},
-				"neck_fur_front3": {
-					"rotation": ["-0+math.sin(q.anim_time*90*1-120)*2", 0, 0]
-				},
-				"ear_left": {
-					"rotation": ["-0+math.sin(q.anim_time*90*1-120)*1", 0, "0-math.sin(q.anim_time*90*1-30)*2"]
-				},
-				"ear_right": {
-					"rotation": ["-0+math.sin(q.anim_time*90*1-120)*1", 0, "-0+math.sin(q.anim_time*90*1-30)*2"]
-				},
-				"hair": {
-					"rotation": ["-0+math.sin(q.anim_time*90*1-150)*2", 0, 0]
-				},
-				"hair_detail": {
-					"rotation": ["-0+math.sin(q.anim_time*90*1-180)*1", 0, 0]
-				},
-				"hair_detail2": {
-					"rotation": ["-0+math.sin(q.anim_time*90*1-240)*1", 0, 0]
-				},
-				"hair_back_bottom": {
-					"rotation": ["-0+math.sin(q.anim_time*90*1-320)*2", 0, 0]
-				}
-			}
-		},
-		"animation.ninetales.base": {
 			"loop": true,
 			"bones": {
 				"body": {
@@ -582,6 +276,64 @@
 				}
 			}
 		},
+		"animation.ninetales.cry": {
+			"animation_length": 1,
+			"bones": {
+				"mouth": {
+					"position": {
+						"0.0": [0, 0, 0],
+						"0.25": [0, -0.0999, -0.00436],
+						"0.75": [0, -0.0999, -0.00436],
+						"1.0": [0, 0, 0]
+					}
+				},
+				"head": {
+					"rotation": {
+						"0.0": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.25": {
+							"post": [-15, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.6667": {
+							"post": [-15, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.9167": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						}
+					}
+				},
+				"jaw": {
+					"rotation": {
+						"0.0": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.25": {
+							"post": [65, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.75": {
+							"post": [65, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"1.0": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						}
+					}
+				}
+			},
+			"sound_effects": {
+				"0.0": {
+					"effect": "pokemon.ninetales.cry"
+				}
+			}
+		},
 		"animation.ninetales.blink": {
 			"animation_length": 0.1667,
 			"bones": {
@@ -661,164 +413,6 @@
 					"position": [-0.1, 0, -0.1]
 				}
 			}
-		},
-		"animation.ninetales.cry": {
-			"animation_length": 2,
-			"bones": {
-				"torso": {
-					"rotation": {
-						"0.0": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.25": {
-							"post": [1, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.5": {
-							"post": [-2, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.3333": {
-							"post": [-4, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.6667": {
-							"post": [-0.5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"2.0": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						}
-					}
-				},
-				"neck2": {
-					"rotation": {
-						"0.0": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.2083": {
-							"post": [2.5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.4167": {
-							"post": [-5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.25": {
-							"post": [-7.5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.625": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"2.0": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						}
-					}
-				},
-				"head_rotation": {
-					"rotation": {
-						"0.0": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.2083": {
-							"post": [5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.4583": {
-							"post": [-22.5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.25": {
-							"post": [-27, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.625": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"2.0": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						}
-					}
-				},
-				"eyelid_left": {
-					"position": {
-						"0.0": [0, 0, 0],
-						"0.3333": {"pre": [0, 0, 0], "post": [0.1, 0, -0.1]},
-						"1.5": {"pre": [0.1, 0, -0.1], "post": [0, 0, 0]}
-					}
-				},
-				"eyelid_right": {
-					"position": {
-						"0.0": [0, 0, 0],
-						"0.3333": {"pre": [0, 0, 0], "post": [-0.1, 0, -0.1]},
-						"1.5": {"pre": [-0.1, 0, -0.1], "post": [0, 0, 0]}
-					}
-				},
-				"jaw": {
-					"rotation": {
-						"0.2917": {
-							"pre": [0, 0, 0],
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.5": {
-							"post": [47.5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.25": {
-							"post": [20, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.5417": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						}
-					},
-					"position": [0, 0, 0]
-				},
-				"hair": {
-					"rotation": {
-						"0.0": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.1667": {
-							"post": [10, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.5": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.1667": {
-							"post": [-2.5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.625": {
-							"post": [5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"2.0": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						}
-					}
-				}
-			},
-			"sound_effects": {
-				"0.3333": {
-					"effect": "pokemon.ninetales.cry"
-				}
-			}
 		}
 	}
 }

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0038_ninetales/ninetales_alolan.animation.json

@@ -1,7 +1,7 @@
 {
 	"format_version": "1.8.0",
 	"animations": {
-		"animation.ninetales_alolan.base": {
+		"animation.ninetales_alolan.ground_idle": {
 			"loop": true,
 			"bones": {
 				"body": {
@@ -381,411 +381,61 @@
 				}
 			}
 		},
-		"animation.ninetales_alolan.ground_idle": {
-			"loop": true,
+		"animation.ninetales_alolan.cry": {
+			"animation_length": 1,
 			"bones": {
-				"body": {
-					"position": [0, -0.25, 0]
-				},
-				"torso": {
-					"rotation": ["2.5+math.sin(q.anim_time*90*1-0)*0.5", 0, "0-math.sin(q.anim_time*90*0.5-30)*0.5"]
-				},
-				"chest": {
-					"rotation": ["-5+math.sin(q.anim_time*90*1-30)*0.5", 0, 0]
-				},
-				"neck": {
-					"rotation": ["-10+math.sin(q.anim_time*90*1-60)*1", 0, 0]
-				},
-				"neck2": {
-					"rotation": ["-10+math.sin(q.anim_time*90*1-90)*0.5", 0, 0]
-				},
-				"head_rotation": {
-					"rotation": ["14.54701+math.sin(q.anim_time*90*1-90)*-2", -3.59452, "0.40543-math.sin(q.anim_time*90*1-120)*-0.5"]
-				},
-				"hair": {
-					"rotation": ["13.75153+math.sin(q.anim_time*90*1-90)*1", 7.26228, 1.47729]
-				},
-				"hair2": {
-					"rotation": ["-12.54624+math.sin(q.anim_time*90*1-120)*2", 4.88119, -1.08482]
-				},
-				"hair3": {
-					"rotation": ["-24.58726+math.sin(q.anim_time*90*1-180)*2", -15.69466, 1.78427]
-				},
-				"hair4": {
-					"rotation": ["3.48303+math.sin(q.anim_time*90*1-240)*4", -24.77164, -8.26511]
-				},
-				"hair5": {
-					"rotation": ["-7.97337+math.sin(q.anim_time*90*1-300)*8", -59.03741, 4.53051]
-				},
-				"hair_bottom": {
-					"rotation": ["7.5+math.sin(q.anim_time*90*1-360)*12", 0, 0]
-				},
-				"hair_bottom2": {
-					"rotation": ["-27.70212+math.sin(q.anim_time*90*1-420)*18", -6.64851, 3.47875]
-				},
-				"hair_bottom3": {
-					"rotation": ["25.56145+math.sin(q.anim_time*90*1-480)*24", -27.51235, -12.45891]
-				},
-				"hair6": {
-					"rotation": ["7.5+math.sin(q.anim_time*90*1-360)*12", 0, 0]
-				},
-				"hair7": {
-					"rotation": ["-40.98084+math.sin(q.anim_time*90*1-420)*18", -11.43563, 9.77243]
-				},
-				"hair8": {
-					"rotation": ["30.86748+math.sin(q.anim_time*90*1-480)*24", -12.95254, -7.63074]
-				},
-				"tail": {
-					"rotation": [0, 0, 0]
-				},
-				"tail_middle_rotation": {
-					"rotation": ["65+math.sin(q.anim_time*90*1-60)*-0.5", 0, 0]
-				},
-				"tail_middle2": {
-					"rotation": ["-7.5+math.sin(q.anim_time*90*1-120)*-1", 0, 0]
-				},
-				"tail_middle3": {
-					"rotation": ["-25+math.sin(q.anim_time*90*1-180)*-2", 0, 0]
-				},
-				"tail_middle4": {
-					"rotation": ["-30+math.sin(q.anim_time*90*1-240)*-4", 0, 0]
-				},
-				"tail_middle5": {
-					"rotation": ["-25+math.sin(q.anim_time*90*1-300)*-6", 0, 0]
-				},
-				"tail_middle6": {
-					"rotation": ["-12.62353+math.sin(q.anim_time*90*1-360)*-12", 7.24305, -1.95155]
-				},
-				"tail_middle7": {
-					"rotation": ["-31.18939+math.sin(q.anim_time*90*1-400)*-12", -15.09492, 8.95891]
-				},
-				"tail_middle8": {
-					"rotation": ["15.22074+math.sin(q.anim_time*90*1-460)*-12", 9.65594, 2.61298]
-				},
-				"tail_middle9": {
-					"rotation": ["-20+math.sin(q.anim_time*90*1-520)*-18", 0, 0]
-				},
-				"tail_left1_rotation": {
-					"rotation": ["64.2174+math.sin(q.anim_time*90*1-60)*-0.5", 8.98581, 12.04686]
-				},
-				"tail_left1_2": {
-					"rotation": ["-17.51565+math.sin(q.anim_time*90*1-120)*-1", -2.38422, 0.7522]
-				},
-				"tail_left1_3": {
-					"rotation": ["-10.03742+math.sin(q.anim_time*90*1-180)*-2", -4.92385, 0.87038]
-				},
-				"tail_left1_4": {
-					"rotation": ["-37.52635+math.sin(q.anim_time*90*1-240)*-4", -1.98315, 1.52251]
-				},
-				"tail_left1_5": {
-					"rotation": ["-17.51565+math.sin(q.anim_time*90*1-300)*-6", -2.38422, 0.7522]
-				},
-				"tail_left1_6": {
-					"rotation": ["-25.08377+math.sin(q.anim_time*90*1-360)*-12", -4.53051, 2.11751]
-				},
-				"tail_left1_7": {
-					"rotation": ["-15.22074+math.sin(q.anim_time*90*1-400)*-12", 9.65594, -2.61298]
-				},
-				"tail_left1_8": {
-					"rotation": ["30.71983+math.sin(q.anim_time*90*1-460)*-12", -13.97399, -3.85625]
-				},
-				"tail_left1_9": {
-					"rotation": ["-42.24682+math.sin(q.anim_time*90*1-520)*-18", 17.04679, -14.9092]
-				},
-				"tail_left2_rotation": {
-					"rotation": ["63.58314+math.sin(q.anim_time*90*1-60)*-0.5", 11.98346, 41.65117]
-				},
-				"tail_left2_2": {
-					"rotation": ["-15.50409+math.sin(q.anim_time*90*1-120)*-1", -14.47751, 3.96713]
-				},
-				"tail_left2_3": {
-					"rotation": ["-9.9045+math.sin(q.anim_time*90*1-180)*-2", -2.61747, -1.08202]
-				},
-				"tail_left2_4": {
-					"rotation": ["-27.5209+math.sin(q.anim_time*90*1-240)*-4", -2.26564, 1.0571]
-				},
-				"tail_left2_5": {
-					"rotation": ["-30.09468+math.sin(q.anim_time*90*1-300)*-6", -4.32875, 2.50477]
-				},
-				"tail_left2_6": {
-					"rotation": ["-13.06681+math.sin(q.anim_time*90*1-360)*-12", 11.06861, -5.84485]
-				},
-				"tail_left2_7": {
-					"rotation": ["-25.08377+math.sin(q.anim_time*90*1-400)*-12", 4.53051, -2.11751]
-				},
-				"tail_left2_8": {
-					"rotation": ["21.88023+math.sin(q.anim_time*90*1-460)*-12", -23.39896, -9.06159]
-				},
-				"tail_left2_9": {
-					"rotation": ["-0+math.sin(q.anim_time*90*1-520)*-18", 25, 0]
-				},
-				"tail_left3": {
-					"rotation": [-7.34619, 17.12827, -7.84022]
-				},
-				"tail_left3_rotation": {
-					"rotation": ["76.5201+math.sin(q.anim_time*90*1-60)*-0.5", -21.21599, 70.91151]
-				},
-				"tail_left3_2": {
-					"rotation": ["-23.00013+math.sin(q.anim_time*90*1-120)*-1", -11.40209, 5.14995]
-				},
-				"tail_left3_3": {
-					"rotation": ["-10+math.sin(q.anim_time*90*1-180)*-2", 0, 0]
-				},
-				"tail_left3_4": {
-					"rotation": ["-20+math.sin(q.anim_time*90*1-240)*-4", 0, 0]
-				},
-				"tail_left3_5": {
-					"rotation": ["-30.02363+math.sin(q.anim_time*90*1-300)*-6", 2.16489, -1.2506]
-				},
-				"tail_left3_6": {
-					"rotation": ["-12.99008+math.sin(q.anim_time*90*1-360)*-12", 11.53486, -4.8493]
-				},
-				"tail_left3_7": {
-					"rotation": ["15+math.sin(q.anim_time*90*1-400)*-12", 20, 0]
-				},
-				"tail_left3_8": {
-					"rotation": ["-22.89875+math.sin(q.anim_time*90*1-460)*-12", -8.42145, 5.41207]
-				},
-				"tail_left3_9": {
-					"rotation": ["30+math.sin(q.anim_time*90*1-520)*-18", 22.5, 0]
-				},
-				"tail_left4_rotation": {
-					"rotation": ["83.07626+math.sin(q.anim_time*90*1-60)*-0.5", 7.16729, 88.89799]
-				},
-				"tail_left4_2": {
-					"rotation": ["-28.3693+math.sin(q.anim_time*90*1-120)*-1", -12.72029, 8.00075]
-				},
-				"tail_left4_3": {
-					"rotation": ["-12.60443+math.sin(q.anim_time*90*1-180)*-2", -7.32123, 1.63219]
-				},
-				"tail_left4_4": {
-					"rotation": ["-15.04624+math.sin(q.anim_time*90*1-240)*-4", -4.88119, 1.08482]
-				},
-				"tail_left4_5": {
-					"rotation": ["-29.41237+math.sin(q.anim_time*90*1-300)*-6", -2.14804, -1.84068]
-				},
-				"tail_left4_6": {
-					"rotation": ["-9.14867+math.sin(q.anim_time*90*1-360)*-12", 20.70481, -9.00717]
-				},
-				"tail_left4_7": {
-					"rotation": ["-15+math.sin(q.anim_time*90*1-400)*-12", -2.5, 0]
-				},
-				"tail_left4_8": {
-					"rotation": ["10+math.sin(q.anim_time*90*1-460)*-12", 20, 0]
-				},
-				"tail_left4_9": {
-					"rotation": ["-0+math.sin(q.anim_time*90*1-520)*-18", -25, 0]
-				},
-				"tail_right1_rotation": {
-					"rotation": ["64.2174+math.sin(q.anim_time*90*1-60)*-0.5", -8.98581, -12.04686]
-				},
-				"tail_right1_2": {
-					"rotation": ["-17.51565+math.sin(q.anim_time*90*1-120)*-1", 2.38422, -0.7522]
-				},
-				"tail_right1_3": {
-					"rotation": ["-10.03742+math.sin(q.anim_time*90*1-180)*-2", 4.92385, -0.87038]
-				},
-				"tail_right1_4": {
-					"rotation": ["-37.52635+math.sin(q.anim_time*90*1-240)*-4", 1.98315, -1.52251]
-				},
-				"tail_right1_5": {
-					"rotation": ["-17.51565+math.sin(q.anim_time*90*1-300)*-6", 2.38422, -0.7522]
-				},
-				"tail_right1_6": {
-					"rotation": ["-25.08377+math.sin(q.anim_time*90*1-360)*-12", 4.53051, -2.11751]
-				},
-				"tail_right1_7": {
-					"rotation": ["-15.22074+math.sin(q.anim_time*90*1-400)*-12", -9.65594, 2.61298]
-				},
-				"tail_right1_8": {
-					"rotation": ["30.71983+math.sin(q.anim_time*90*1-460)*-12", 13.97399, 3.85625]
-				},
-				"tail_right1_9": {
-					"rotation": ["-42.24682+math.sin(q.anim_time*90*1-520)*-18", -17.04679, 14.9092]
-				},
-				"tail_right2_rotation": {
-					"rotation": ["63.58314+math.sin(q.anim_time*90*1-60)*-0.5", -11.98346, -41.65117]
-				},
-				"tail_right2_2": {
-					"rotation": ["-15.50409+math.sin(q.anim_time*90*1-60)*-0.5", 14.47751, -3.96713]
-				},
-				"tail_right2_3": {
-					"rotation": ["-9.9045+math.sin(q.anim_time*90*1-180)*-2", 2.61747, 1.08202]
-				},
-				"tail_right2_4": {
-					"rotation": ["-27.5209+math.sin(q.anim_time*90*1-240)*-4", 2.26564, -1.0571]
-				},
-				"tail_right2_5": {
-					"rotation": ["-30.09468+math.sin(q.anim_time*90*1-300)*-6", 4.32875, -2.50477]
-				},
-				"tail_right2_6": {
-					"rotation": ["-13.06681+math.sin(q.anim_time*90*1-360)*-12", -11.06861, 5.84485]
-				},
-				"tail_right2_7": {
-					"rotation": ["-25.08377+math.sin(q.anim_time*90*1-400)*-12", -4.53051, 2.11751]
-				},
-				"tail_right2_8": {
-					"rotation": ["21.88023+math.sin(q.anim_time*90*1-460)*-12", 23.39896, 9.06159]
-				},
-				"tail_right2_9": {
-					"rotation": ["-0+math.sin(q.anim_time*90*1-520)*-18", -25, 0]
-				},
-				"leg_front_left": {
-					"rotation": ["-4.99527+math.sin(q.anim_time*90*1-0)*-1", 0.21782, 2.4905],
-					"position": [0, "0-math.sin(q.anim_time*90*1-0)*0.025", "0-math.sin(q.anim_time*90*1-0)*-0.15"]
-				},
-				"leg_front_left2": {
-					"rotation": ["-5+math.sin(q.anim_time*90*1-0)*0.5", 0, 0]
-				},
-				"foot_front_left": {
-					"rotation": ["9.99067+math.sin(q.anim_time*90*1-0)*0.5", 0.43399, -2.46207]
-				},
-				"leg_back_left": {
-					"rotation": ["12.5048+math.sin(q.anim_time*90*1-0)*1", 1.93726, -2.22807],
-					"position": [0, "0-math.sin(q.anim_time*90*1-0)*0.2", "0-math.sin(q.anim_time*90*1-0)*0.25"]
-				},
-				"leg_back_left2": {
-					"rotation": ["-5+math.sin(q.anim_time*90*1-0)*1", 0, 0]
-				},
-				"leg_back_left3": {
-					"rotation": ["-2.49673+math.sin(q.anim_time*90*1-0)*-1", -0.12261, 0.03929]
-				},
-				"foot_back_left": {
-					"rotation": ["-5.00899+math.sin(q.anim_time*90*1-0)*-1", -0.3507, 2.5603]
-				},
-				"leg_front_right": {
-					"rotation": ["7.47178+math.sin(q.anim_time*90*1-0)*-1", 0.65182, -4.95744],
-					"position": [0, "0-math.sin(q.anim_time*90*1-0)*0.025", "0-math.sin(q.anim_time*90*1-0)*-0.15"]
-				},
-				"leg_front_right2": {
-					"rotation": ["-2.5+math.sin(q.anim_time*90*1-0)*0.5", 0, 0]
-				},
-				"foot_front_right": {
-					"rotation": ["-5+math.sin(q.anim_time*90*1-0)*0.5", 0, 5]
-				},
-				"leg_back_right": {
-					"rotation": ["-9.8369+math.sin(q.anim_time*90*1-0)*1", 5.47408, 1.12804],
-					"position": [0, "0-math.sin(q.anim_time*90*1-0)*0.2", "0-math.sin(q.anim_time*90*1-0)*0.25"]
-				},
-				"leg_back_right2": {
-					"rotation": ["5+math.sin(q.anim_time*90*1-0)*1", 0, 0]
-				},
-				"leg_back_right3": {
-					"rotation": ["-0+math.sin(q.anim_time*90*1-0)*-1", 0, 0]
-				},
-				"foot_back_right": {
-					"rotation": ["4.98247+math.sin(q.anim_time*90*1-0)*-1", 0.85481, -2.34941]
-				},
-				"tail_right3": {
-					"rotation": [-7.34619, -17.12827, 7.84022]
-				},
-				"tail_right3_rotation": {
-					"rotation": ["76.5201+math.sin(q.anim_time*90*1-60)*-0.5", 21.21599, -70.91151]
-				},
-				"tail_right3_2": {
-					"rotation": ["-23.00013+math.sin(q.anim_time*90*1-120)*-1", 11.40209, -5.14995]
-				},
-				"tail_right3_3": {
-					"rotation": ["-10+math.sin(q.anim_time*90*1-180)*-2", 0, 0]
-				},
-				"tail_right3_4": {
-					"rotation": ["-20+math.sin(q.anim_time*90*1-240)*-4", 0, 0]
-				},
-				"tail_right3_5": {
-					"rotation": ["-30.02363+math.sin(q.anim_time*90*1-300)*-6", -2.16489, 1.2506]
-				},
-				"tail_right3_6": {
-					"rotation": ["-12.99008+math.sin(q.anim_time*90*1-360)*-12", -11.53486, 4.8493]
-				},
-				"tail_right3_7": {
-					"rotation": ["15+math.sin(q.anim_time*90*1-400)*-12", -20, 0]
-				},
-				"tail_right3_8": {
-					"rotation": ["-22.89875+math.sin(q.anim_time*90*1-460)*-12", 8.42145, -5.41207]
-				},
-				"tail_right3_9": {
-					"rotation": ["30+math.sin(q.anim_time*90*1-520)*-18", -22.5, 0]
-				},
-				"tail_right4_rotation": {
-					"rotation": ["83.07626+math.sin(q.anim_time*90*1-60)*-0.5", -7.16729, -88.89799]
-				},
-				"tail_right4_2": {
-					"rotation": ["-28.3693+math.sin(q.anim_time*90*1-120)*-1", 12.72029, -8.00075]
-				},
-				"tail_right4_3": {
-					"rotation": ["-12.60443+math.sin(q.anim_time*90*1-180)*-2", 7.32123, -1.63219]
-				},
-				"tail_right4_4": {
-					"rotation": ["-15.04624+math.sin(q.anim_time*90*1-240)*-4", 4.88119, -1.08482]
-				},
-				"tail_right4_5": {
-					"rotation": ["-29.41237+math.sin(q.anim_time*90*1-300)*-6", 2.14804, 1.84068]
-				},
-				"tail_right4_6": {
-					"rotation": ["-9.14867+math.sin(q.anim_time*90*1-360)*-12", -20.70481, 9.00717]
-				},
-				"tail_right4_7": {
-					"rotation": ["-15+math.sin(q.anim_time*90*1-400)*-12", 2.5, 0]
-				},
-				"tail_right4_8": {
-					"rotation": ["10+math.sin(q.anim_time*90*1-460)*-12", -20, 0]
-				},
-				"tail_right4_9": {
-					"rotation": ["-0+math.sin(q.anim_time*90*1-520)*-18", 25, 0]
-				},
-				"hair_left": {
-					"rotation": [0, -17.5, "55+math.sin(q.anim_time*90*1-120)*2"]
-				},
-				"hair_left2": {
-					"rotation": [-1.6575, 12.39135, "9.82005+math.sin(q.anim_time*90*1-180)*4"]
-				},
-				"hair_left3": {
-					"rotation": [8.00384, 21.21629, "20.75164+math.sin(q.anim_time*90*1-240)*8"]
-				},
-				"hair_left4": {
-					"rotation": [7.90373, -21.34916, "-15.85201+math.sin(q.anim_time*90*1-300)*18"]
-				},
-				"hair_left5": {
-					"rotation": [-6.42784, -34.18333, "7.10385+math.sin(q.anim_time*90*1-360)*24"]
-				},
-				"hair_right": {
-					"rotation": [0, 17.5, "-55-math.sin(q.anim_time*90*1-120)*2"]
-				},
-				"hair_right2": {
-					"rotation": [-1.6575, -12.39135, "-9.82005-math.sin(q.anim_time*90*1-180)*4"]
-				},
-				"hair_right3": {
-					"rotation": [8.00384, -21.21629, "-20.75164-math.sin(q.anim_time*90*1-240)*8"]
-				},
-				"hair_right4": {
-					"rotation": [7.90373, 21.34916, "15.85201-math.sin(q.anim_time*90*1-300)*18"]
-				},
-				"hair_right5": {
-					"rotation": [-6.42784, 34.18333, "-7.10385-math.sin(q.anim_time*90*1-360)*24"]
-				},
-				"neck_fur_front": {
-					"rotation": ["-0+math.sin(q.anim_time*90*1-60)*-1", 0, 0]
-				},
-				"neck_fur_front2": {
-					"rotation": ["-0+math.sin(q.anim_time*90*1-90)*2", 0, 0]
-				},
-				"neck_fur_front3": {
-					"rotation": ["-0+math.sin(q.anim_time*90*1-120)*2", 0, 0]
-				},
-				"neck_fur_left": {
-					"rotation": [0, 0, "0-math.sin(q.anim_time*90*1-90)*1"]
-				},
-				"neck_fur_right": {
-					"rotation": [0, 0, "-0+math.sin(q.anim_time*90*1-90)*1"]
-				},
-				"ear_left": {
-					"rotation": ["-0+math.sin(q.anim_time*90*1-120)*1", 0, "0-math.sin(q.anim_time*90*1-30)*2"]
-				},
-				"ear_right": {
-					"rotation": ["-0+math.sin(q.anim_time*90*1-120)*1", 0, "-0+math.sin(q.anim_time*90*1-30)*2"]
-				},
-				"hair_front": {
-					"rotation": ["-0+math.sin(q.anim_time*90*1-120)*2", 0, 0]
+				"mouth": {
+					"position": {
+						"0.0": [0, 0, 0],
+						"0.25": [0, -0.0999, -0.00436],
+						"0.75": [0, -0.0999, -0.00436],
+						"1.0": [0, 0, 0]
+					}
+				},
+				"head": {
+					"rotation": {
+						"0.0": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.25": {
+							"post": [-15, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.6667": {
+							"post": [-15, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.9167": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						}
+					}
+				},
+				"jaw": {
+					"rotation": {
+						"0.0": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.25": {
+							"post": [65, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.75": {
+							"post": [65, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"1.0": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						}
+					}
+				}
+			},
+			"sound_effects": {
+				"0.0": {
+					"effect": "pokemon.ninetales_alolan.cry"
 				}
 			}
 		},
@@ -868,176 +518,6 @@
 					"position": [-0.1, 0, -0.1]
 				}
 			}
-		},
-		"animation.ninetales_alolan.cry": {
-			"animation_length": 2,
-			"bones": {
-				"torso": {
-					"rotation": {
-						"0.0": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.25": {
-							"post": [1, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.5": {
-							"post": [-2, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.3333": {
-							"post": [-4, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.6667": {
-							"post": [-0.5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"2.0": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						}
-					}
-				},
-				"neck2": {
-					"rotation": {
-						"0.0": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.2083": {
-							"post": [2.5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.4167": {
-							"post": [-5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.25": {
-							"post": [-7.5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.625": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"2.0": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						}
-					}
-				},
-				"head_rotation": {
-					"rotation": {
-						"0.0": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.2083": {
-							"post": [5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.4583": {
-							"post": [-22.5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.25": {
-							"post": [-27, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.625": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"2.0": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						}
-					}
-				},
-				"eyelid_left": {
-					"position": {
-						"0.0": [0, 0, 0],
-						"0.3333": {
-							"pre": [0, 0, 0],
-							"post": [0.1, 0, -0.1]
-						},
-						"1.5": {
-							"pre": [0.1, 0, -0.1],
-							"post": [0, 0, 0]
-						}
-					}
-				},
-				"eyelid_right": {
-					"position": {
-						"0.0": [0, 0, 0],
-						"0.3333": {
-							"pre": [0, 0, 0],
-							"post": [-0.1, 0, -0.1]
-						},
-						"1.5": {
-							"pre": [-0.1, 0, -0.1],
-							"post": [0, 0, 0]
-						}
-					}
-				},
-				"jaw": {
-					"rotation": {
-						"0.2917": {
-							"pre": [0, 0, 0],
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.5": {
-							"post": [47.5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.25": {
-							"post": [20, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.5417": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						}
-					},
-					"position": [0, 0, 0]
-				},
-				"hair": {
-					"rotation": {
-						"0.0": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.1667": {
-							"post": [10, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.5": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.1667": {
-							"post": [-2.5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.625": {
-							"post": [5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"2.0": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						}
-					}
-				}
-			},
-			"sound_effects": {
-				"0.3333": {
-					"effect": "pokemon.ninetales_alolan.cry"
-				}
-			}
 		}
 	}
 }

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0059_arcanine/arcanine.animation.json

@@ -1682,12 +1682,6 @@
 						"1.3333": [10, 9, 0]
 					}
 				}
-			},
-			"timeline": {
-				"0.0": "q.run_molang('cobblemon:stepsound_standard_medium');",
-				"0.4583": "q.run_molang('cobblemon:stepsound_standard_medium');",
-				"0.6667": "q.run_molang('cobblemon:stepsound_standard_medium');",
-				"1.125": "q.run_molang('cobblemon:stepsound_standard_medium');"
 			}
 		},
 		"animation.arcanine.ride_ground_walk": {
@@ -2645,12 +2639,6 @@
 				"chest_fluff_right": {
 					"rotation": [5, "-22.5+math.cos(q.anim_time*90*8-120)*15", "-math.sin(q.anim_time*90*8-120)*3"]
 				}
-			},
-			"timeline": {
-				"0.125": "q.run_molang('cobblemon:stepsound_standard_medium');",
-				"0.2083": "q.run_molang('cobblemon:stepsound_standard_large');",
-				"0.2917": "q.run_molang('cobblemon:stepsound_standard_medium');",
-				"0.375": "q.run_molang('cobblemon:stepsound_standard_medium');"
 			}
 		},
 		"animation.arcanine.ride_ground_run": {
@@ -4173,101 +4161,41 @@
 				"eye_left": {
 					"position": {
 						"0.0": [0, 0, 0],
-						"0.1667": {
-							"pre": [0, 0, 0],
-							"post": [-0.1, 0, 0.1]
-						},
-						"0.5": {
-							"pre": [-0.1, 0, 0.1],
-							"post": [0, 0, 0]
-						},
-						"1.4167": {
-							"pre": [0, 0, 0],
-							"post": [-0.1, 0, 0.1]
-						},
-						"1.6667": {
-							"pre": [-0.1, 0, 0.1],
-							"post": [0, 0, 0]
-						},
-						"2.5": {
-							"pre": [0, 0, 0],
-							"post": [0, 0, 0]
-						}
+						"0.1667": {"pre": [0, 0, 0], "post": [-0.1, 0, 0.1]},
+						"0.5": {"pre": [-0.1, 0, 0.1], "post": [0, 0, 0]},
+						"1.4167": {"pre": [0, 0, 0], "post": [-0.1, 0, 0.1]},
+						"1.6667": {"pre": [-0.1, 0, 0.1], "post": [0, 0, 0]},
+						"2.5": {"pre": [0, 0, 0], "post": [0, 0, 0]}
 					}
 				},
 				"eye_right": {
 					"position": {
 						"0.0": [0, 0, 0],
-						"0.1667": {
-							"pre": [0, 0, 0],
-							"post": [0.1, 0, 0.1]
-						},
-						"0.5": {
-							"pre": [0.1, 0, 0.1],
-							"post": [0, 0, 0]
-						},
-						"1.4167": {
-							"pre": [0, 0, 0],
-							"post": [0.1, 0, 0.1]
-						},
-						"1.6667": {
-							"pre": [0.1, 0, 0.1],
-							"post": [0, 0, 0]
-						},
-						"2.5": {
-							"pre": [0, 0, 0],
-							"post": [0, 0, 0]
-						}
+						"0.1667": {"pre": [0, 0, 0], "post": [0.1, 0, 0.1]},
+						"0.5": {"pre": [0.1, 0, 0.1], "post": [0, 0, 0]},
+						"1.4167": {"pre": [0, 0, 0], "post": [0.1, 0, 0.1]},
+						"1.6667": {"pre": [0.1, 0, 0.1], "post": [0, 0, 0]},
+						"2.5": {"pre": [0, 0, 0], "post": [0, 0, 0]}
 					}
 				},
 				"eyelid_left": {
 					"position": {
 						"0.0": [0, 0, 0],
-						"0.1667": {
-							"pre": [0, 0, 0],
-							"post": [0.1, 0, -0.1]
-						},
-						"0.5": {
-							"pre": [0.1, 0, -0.1],
-							"post": [0, 0, 0]
-						},
-						"1.4167": {
-							"pre": [0, 0, 0],
-							"post": [0.1, 0, -0.1]
-						},
-						"1.6667": {
-							"pre": [0.1, 0, -0.1],
-							"post": [0, 0, 0]
-						},
-						"2.5": {
-							"pre": [0, 0, 0],
-							"post": [0, 0, 0]
-						}
+						"0.1667": {"pre": [0, 0, 0], "post": [0.1, 0, -0.1]},
+						"0.5": {"pre": [0.1, 0, -0.1], "post": [0, 0, 0]},
+						"1.4167": {"pre": [0, 0, 0], "post": [0.1, 0, -0.1]},
+						"1.6667": {"pre": [0.1, 0, -0.1], "post": [0, 0, 0]},
+						"2.5": {"pre": [0, 0, 0], "post": [0, 0, 0]}
 					}
 				},
 				"eyelid_right": {
 					"position": {
 						"0.0": [0, 0, 0],
-						"0.1667": {
-							"pre": [0, 0, 0],
-							"post": [-0.1, 0, -0.1]
-						},
-						"0.5": {
-							"pre": [-0.1, 0, -0.1],
-							"post": [0, 0, 0]
-						},
-						"1.4167": {
-							"pre": [0, 0, 0],
-							"post": [-0.1, 0, -0.1]
-						},
-						"1.6667": {
-							"pre": [-0.1, 0, -0.1],
-							"post": [0, 0, 0]
-						},
-						"2.5": {
-							"pre": [0, 0, 0],
-							"post": [0, 0, 0]
-						}
+						"0.1667": {"pre": [0, 0, 0], "post": [-0.1, 0, -0.1]},
+						"0.5": {"pre": [-0.1, 0, -0.1], "post": [0, 0, 0]},
+						"1.4167": {"pre": [0, 0, 0], "post": [-0.1, 0, -0.1]},
+						"1.6667": {"pre": [-0.1, 0, -0.1], "post": [0, 0, 0]},
+						"2.5": {"pre": [0, 0, 0], "post": [0, 0, 0]}
 					}
 				},
 				"jaw": {
@@ -4895,101 +4823,41 @@
 				"eye_left": {
 					"position": {
 						"0.0": [0, 0, 0],
-						"0.1667": {
-							"pre": [0, 0, 0],
-							"post": [-0.1, 0, 0.1]
-						},
-						"0.5": {
-							"pre": [-0.1, 0, 0.1],
-							"post": [0, 0, 0]
-						},
-						"1.4167": {
-							"pre": [0, 0, 0],
-							"post": [-0.1, 0, 0.1]
-						},
-						"1.6667": {
-							"pre": [-0.1, 0, 0.1],
-							"post": [0, 0, 0]
-						},
-						"2.5": {
-							"pre": [0, 0, 0],
-							"post": [0, 0, 0]
-						}
+						"0.1667": {"pre": [0, 0, 0], "post": [-0.1, 0, 0.1]},
+						"0.5": {"pre": [-0.1, 0, 0.1], "post": [0, 0, 0]},
+						"1.4167": {"pre": [0, 0, 0], "post": [-0.1, 0, 0.1]},
+						"1.6667": {"pre": [-0.1, 0, 0.1], "post": [0, 0, 0]},
+						"2.5": {"pre": [0, 0, 0], "post": [0, 0, 0]}
 					}
 				},
 				"eye_right": {
 					"position": {
 						"0.0": [0, 0, 0],
-						"0.1667": {
-							"pre": [0, 0, 0],
-							"post": [0.1, 0, 0.1]
-						},
-						"0.5": {
-							"pre": [0.1, 0, 0.1],
-							"post": [0, 0, 0]
-						},
-						"1.4167": {
-							"pre": [0, 0, 0],
-							"post": [0.1, 0, 0.1]
-						},
-						"1.6667": {
-							"pre": [0.1, 0, 0.1],
-							"post": [0, 0, 0]
-						},
-						"2.5": {
-							"pre": [0, 0, 0],
-							"post": [0, 0, 0]
-						}
+						"0.1667": {"pre": [0, 0, 0], "post": [0.1, 0, 0.1]},
+						"0.5": {"pre": [0.1, 0, 0.1], "post": [0, 0, 0]},
+						"1.4167": {"pre": [0, 0, 0], "post": [0.1, 0, 0.1]},
+						"1.6667": {"pre": [0.1, 0, 0.1], "post": [0, 0, 0]},
+						"2.5": {"pre": [0, 0, 0], "post": [0, 0, 0]}
 					}
 				},
 				"eyelid_left": {
 					"position": {
 						"0.0": [0, 0, 0],
-						"0.1667": {
-							"pre": [0, 0, 0],
-							"post": [0.1, 0, -0.1]
-						},
-						"0.5": {
-							"pre": [0.1, 0, -0.1],
-							"post": [0, 0, 0]
-						},
-						"1.4167": {
-							"pre": [0, 0, 0],
-							"post": [0.1, 0, -0.1]
-						},
-						"1.6667": {
-							"pre": [0.1, 0, -0.1],
-							"post": [0, 0, 0]
-						},
-						"2.5": {
-							"pre": [0, 0, 0],
-							"post": [0, 0, 0]
-						}
+						"0.1667": {"pre": [0, 0, 0], "post": [0.1, 0, -0.1]},
+						"0.5": {"pre": [0.1, 0, -0.1], "post": [0, 0, 0]},
+						"1.4167": {"pre": [0, 0, 0], "post": [0.1, 0, -0.1]},
+						"1.6667": {"pre": [0.1, 0, -0.1], "post": [0, 0, 0]},
+						"2.5": {"pre": [0, 0, 0], "post": [0, 0, 0]}
 					}
 				},
 				"eyelid_right": {
 					"position": {
 						"0.0": [0, 0, 0],
-						"0.1667": {
-							"pre": [0, 0, 0],
-							"post": [-0.1, 0, -0.1]
-						},
-						"0.5": {
-							"pre": [-0.1, 0, -0.1],
-							"post": [0, 0, 0]
-						},
-						"1.4167": {
-							"pre": [0, 0, 0],
-							"post": [-0.1, 0, -0.1]
-						},
-						"1.6667": {
-							"pre": [-0.1, 0, -0.1],
-							"post": [0, 0, 0]
-						},
-						"2.5": {
-							"pre": [0, 0, 0],
-							"post": [0, 0, 0]
-						}
+						"0.1667": {"pre": [0, 0, 0], "post": [-0.1, 0, -0.1]},
+						"0.5": {"pre": [-0.1, 0, -0.1], "post": [0, 0, 0]},
+						"1.4167": {"pre": [0, 0, 0], "post": [-0.1, 0, -0.1]},
+						"1.6667": {"pre": [-0.1, 0, -0.1], "post": [0, 0, 0]},
+						"2.5": {"pre": [0, 0, 0], "post": [0, 0, 0]}
 					}
 				},
 				"jaw": {
@@ -5419,20 +5287,14 @@
 					"position": {
 						"0.0": [-0.1, 0, 0.1],
 						"0.125": [-0.1, 0, 0.1],
-						"0.1667": {
-							"pre": [-0.1, 0, 0.1],
-							"post": [0, 0, 0]
-						}
+						"0.1667": {"pre": [-0.1, 0, 0.1], "post": [0, 0, 0]}
 					}
 				},
 				"eye_right": {
 					"position": {
 						"0.0": [0.1, 0, 0.1],
 						"0.125": [0.1, 0, 0.1],
-						"0.1667": {
-							"pre": [0.1, 0, 0.1],
-							"post": [0, 0, 0]
-						}
+						"0.1667": {"pre": [0.1, 0, 0.1], "post": [0, 0, 0]}
 					}
 				}
 			}
@@ -5629,95 +5491,47 @@
 				"eye_left": {
 					"position": {
 						"0.0": [0, 0, 0],
-						"0.0417": {
-							"pre": [0, 0, 0],
-							"post": [-0.2, 0, 0.1]
-						},
-						"0.3333": {
-							"pre": [-0.2, 0, 0.1],
-							"post": [0, 0, 0]
-						},
-						"1.25": {
-							"pre": [0, 0, 0],
-							"post": [0, 0, 0]
-						}
+						"0.0417": {"pre": [0, 0, 0], "post": [-0.2, 0, 0.1]},
+						"0.3333": {"pre": [-0.2, 0, 0.1], "post": [0, 0, 0]},
+						"1.25": {"pre": [0, 0, 0], "post": [0, 0, 0]}
 					}
 				},
 				"eye_right": {
 					"position": {
 						"0.0": [0, 0, 0],
-						"0.0417": {
-							"pre": [0, 0, 0],
-							"post": [0.2, 0, 0.1]
-						},
-						"0.3333": {
-							"pre": [0.2, 0, 0.1],
-							"post": [0, 0, 0]
-						},
-						"1.25": {
-							"pre": [0, 0, 0],
-							"post": [0, 0, 0]
-						}
+						"0.0417": {"pre": [0, 0, 0], "post": [0.2, 0, 0.1]},
+						"0.3333": {"pre": [0.2, 0, 0.1], "post": [0, 0, 0]},
+						"1.25": {"pre": [0, 0, 0], "post": [0, 0, 0]}
 					}
 				},
 				"eyelid_left": {
 					"position": {
 						"0.0": [0, 0, 0],
-						"0.0417": {
-							"pre": [0, 0, 0],
-							"post": [-0.2, 0, 0.1]
-						},
-						"0.3333": {
-							"pre": [-0.2, 0, 0.1],
-							"post": [0, 0, 0]
-						},
-						"1.25": {
-							"pre": [0, 0, 0],
-							"post": [0, 0, 0]
-						}
+						"0.0417": {"pre": [0, 0, 0], "post": [-0.2, 0, 0.1]},
+						"0.3333": {"pre": [-0.2, 0, 0.1], "post": [0, 0, 0]},
+						"1.25": {"pre": [0, 0, 0], "post": [0, 0, 0]}
 					}
 				},
 				"eyelid_right": {
 					"position": {
 						"0.0": [0, 0, 0],
-						"0.0417": {
-							"pre": [0, 0, 0],
-							"post": [0.2, 0, 0.1]
-						},
-						"0.3333": {
-							"pre": [0.2, 0, 0.1],
-							"post": [0, 0, 0]
-						},
-						"1.25": {
-							"pre": [0, 0, 0],
-							"post": [0, 0, 0]
-						}
+						"0.0417": {"pre": [0, 0, 0], "post": [0.2, 0, 0.1]},
+						"0.3333": {"pre": [0.2, 0, 0.1], "post": [0, 0, 0]},
+						"1.25": {"pre": [0, 0, 0], "post": [0, 0, 0]}
 					}
 				},
 				"eyelid_left_hurt": {
 					"position": {
 						"0.0": [0, 0, 0],
-						"0.0417": {
-							"pre": [0, 0, 0],
-							"post": [0.1, 0, -0.1]
-						},
-						"0.3333": {
-							"pre": [0.1, 0, -0.1],
-							"post": [0, 0, 0]
-						}
+						"0.0417": {"pre": [0, 0, 0], "post": [0.1, 0, -0.1]},
+						"0.3333": {"pre": [0.1, 0, -0.1], "post": [0, 0, 0]}
 					}
 				},
 				"eyelid_right_hurt": {
 					"position": {
 						"0.0": [0, 0, 0],
-						"0.0417": {
-							"pre": [0, 0, 0],
-							"post": [-0.1, 0, -0.1]
-						},
-						"0.3333": {
-							"pre": [-0.1, 0, -0.1],
-							"post": [0, 0, 0]
-						}
+						"0.0417": {"pre": [0, 0, 0], "post": [-0.1, 0, -0.1]},
+						"0.3333": {"pre": [-0.1, 0, -0.1], "post": [0, 0, 0]}
 					}
 				},
 				"jaw": {
@@ -6424,95 +6238,47 @@
 				"eye_left": {
 					"position": {
 						"0.0": [0, 0, 0],
-						"0.0417": {
-							"pre": [0, 0, 0],
-							"post": [-0.2, 0, 0.1]
-						},
-						"0.3333": {
-							"pre": [-0.2, 0, 0.1],
-							"post": [0, 0, 0]
-						},
-						"1.25": {
-							"pre": [0, 0, 0],
-							"post": [0, 0, 0]
-						}
+						"0.0417": {"pre": [0, 0, 0], "post": [-0.2, 0, 0.1]},
+						"0.3333": {"pre": [-0.2, 0, 0.1], "post": [0, 0, 0]},
+						"1.25": {"pre": [0, 0, 0], "post": [0, 0, 0]}
 					}
 				},
 				"eye_right": {
 					"position": {
 						"0.0": [0, 0, 0],
-						"0.0417": {
-							"pre": [0, 0, 0],
-							"post": [0.2, 0, 0.1]
-						},
-						"0.3333": {
-							"pre": [0.2, 0, 0.1],
-							"post": [0, 0, 0]
-						},
-						"1.25": {
-							"pre": [0, 0, 0],
-							"post": [0, 0, 0]
-						}
+						"0.0417": {"pre": [0, 0, 0], "post": [0.2, 0, 0.1]},
+						"0.3333": {"pre": [0.2, 0, 0.1], "post": [0, 0, 0]},
+						"1.25": {"pre": [0, 0, 0], "post": [0, 0, 0]}
 					}
 				},
 				"eyelid_left": {
 					"position": {
 						"0.0": [0, 0, 0],
-						"0.0417": {
-							"pre": [0, 0, 0],
-							"post": [-0.2, 0, 0.1]
-						},
-						"0.3333": {
-							"pre": [-0.2, 0, 0.1],
-							"post": [0, 0, 0]
-						},
-						"1.25": {
-							"pre": [0, 0, 0],
-							"post": [0, 0, 0]
-						}
+						"0.0417": {"pre": [0, 0, 0], "post": [-0.2, 0, 0.1]},
+						"0.3333": {"pre": [-0.2, 0, 0.1], "post": [0, 0, 0]},
+						"1.25": {"pre": [0, 0, 0], "post": [0, 0, 0]}
 					}
 				},
 				"eyelid_right": {
 					"position": {
 						"0.0": [0, 0, 0],
-						"0.0417": {
-							"pre": [0, 0, 0],
-							"post": [0.2, 0, 0.1]
-						},
-						"0.3333": {
-							"pre": [0.2, 0, 0.1],
-							"post": [0, 0, 0]
-						},
-						"1.25": {
-							"pre": [0, 0, 0],
-							"post": [0, 0, 0]
-						}
+						"0.0417": {"pre": [0, 0, 0], "post": [0.2, 0, 0.1]},
+						"0.3333": {"pre": [0.2, 0, 0.1], "post": [0, 0, 0]},
+						"1.25": {"pre": [0, 0, 0], "post": [0, 0, 0]}
 					}
 				},
 				"eyelid_left_hurt": {
 					"position": {
 						"0.0": [0, 0, 0],
-						"0.0417": {
-							"pre": [0, 0, 0],
-							"post": [0.1, 0, -0.1]
-						},
-						"0.3333": {
-							"pre": [0.1, 0, -0.1],
-							"post": [0, 0, 0]
-						}
+						"0.0417": {"pre": [0, 0, 0], "post": [0.1, 0, -0.1]},
+						"0.3333": {"pre": [0.1, 0, -0.1], "post": [0, 0, 0]}
 					}
 				},
 				"eyelid_right_hurt": {
 					"position": {
 						"0.0": [0, 0, 0],
-						"0.0417": {
-							"pre": [0, 0, 0],
-							"post": [-0.1, 0, -0.1]
-						},
-						"0.3333": {
-							"pre": [-0.1, 0, -0.1],
-							"post": [0, 0, 0]
-						}
+						"0.0417": {"pre": [0, 0, 0], "post": [-0.1, 0, -0.1]},
+						"0.3333": {"pre": [-0.1, 0, -0.1], "post": [0, 0, 0]}
 					}
 				},
 				"jaw": {

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0258_mudkip/mudkip.animation.json

@@ -3,274 +3,58 @@
 	"animations": {
 		"animation.mudkip.ground_idle": {
 			"loop": true,
-			"animation_length": 2,
 			"bones": {
 				"head": {
-					"rotation": ["2.5+math.sin(q.anim_time*90*4-90)*1.5", "math.sin(q.anim_time*90*2-60)*1.5", "math.sin(q.anim_time*90*2-60)*1"]
+					"rotation": [2.5, 0, 0]
 				},
 				"fin2": {
-					"rotation": [2.5, 0, "0+math.sin(q.anim_time*90*2-150)*-3"]
+					"rotation": [2.5, 0, 0]
 				},
 				"cheek_left2": {
-					"rotation": [0, -7.5, "0+math.sin(q.anim_time*90*4-90)*1.5"]
+					"rotation": [0, -7.5, 0]
 				},
 				"leg_front_left": {
-					"rotation": ["5+math.sin(q.anim_time*90*4)*2", 5, 0],
-					"position": [0, "-0.125+math.sin(q.anim_time*90*4)*-0.05", "0+math.sin(q.anim_time*90*4)*-0.07"]
+					"rotation": [7.5, 5, 0]
 				},
 				"leg_front_left2": {
-					"rotation": ["-5+math.sin(q.anim_time*90*4)*-2", 0, 0]
+					"rotation": [-7.5, 0, 0]
 				},
 				"leg_front_right": {
-					"rotation": ["5+math.sin(q.anim_time*90*4)*2", -5, 0],
-					"position": [0, "-0.125+math.sin(q.anim_time*90*4)*-0.05", "0+math.sin(q.anim_time*90*4)*-0.07"]
+					"rotation": [7.5, -5, 0]
 				},
 				"leg_front_right2": {
-					"rotation": ["-5+math.sin(q.anim_time*90*4)*-2", 0, 0]
+					"rotation": [-7.5, 0, 0]
 				},
 				"leg_back_left": {
-					"rotation": ["-5+math.sin(q.anim_time*90*4)*-1", -5, 0],
-					"position": [0, "-0.125+math.sin(q.anim_time*90*4)*-0.025", "0+math.sin(q.anim_time*90*4)*0.035"]
+					"rotation": [5, -5, 0]
 				},
 				"leg_back_left2": {
-					"rotation": ["5+math.sin(q.anim_time*90*4)*1", 0, 0]
+					"rotation": [-5, 0, 0]
 				},
 				"leg_back_right": {
-					"rotation": ["-5+math.sin(q.anim_time*90*4)*-1", 5, 0],
-					"position": [0, "-0.125+math.sin(q.anim_time*90*4)*-0.025", "0+math.sin(q.anim_time*90*4)*0.035"]
+					"rotation": [5, 5, 0]
 				},
 				"leg_back_right2": {
-					"rotation": ["5+math.sin(q.anim_time*90*4)*1", 0, 0]
+					"rotation": [-5, 0, 0]
 				},
 				"body": {
 					"position": [0, -0.1, 0]
 				},
 				"tail": {
-					"rotation": ["6+math.sin(q.anim_time*90*4)*1", "0+math.sin(q.anim_time*90*2-90)*-10", 0]
+					"rotation": [5, 0, 0]
 				},
 				"fin": {
-					"rotation": [2.5, 0, "0+math.sin(q.anim_time*90*2-90)*-4"]
+					"rotation": [2.5, 0, 0]
 				},
 				"cheek_right2": {
-					"rotation": [0, 7.5, "0+math.sin(q.anim_time*90*4-90)*-1.5"]
-				},
-				"torso": {
-					"rotation": ["0+math.sin(q.anim_time*90*4)*0.75", "0+math.sin(q.anim_time*90*2-30)*0.5", 0],
-					"position": [0, "0+math.sin(q.anim_time*90*4+30)*-0.05", 0]
-				},
-				"tail2": {
-					"rotation": [0, "0+math.sin(q.anim_time*90*2-150)*-12.5", 0]
-				}
-			}
-		},
-		"animation.mudkip.battle_idle": {
-			"loop": true,
-			"animation_length": 2,
-			"bones": {
-				"head": {
-					"rotation": ["-7.5+math.sin(q.anim_time*90*4-90)*3", "math.sin(q.anim_time*90*2-60)*1", "math.sin(q.anim_time*90*2-60)*1"]
-				},
-				"fin2": {
-					"rotation": [2.5, 0, "0+math.sin(q.anim_time*90*2-120)*-3"]
-				},
-				"cheek_left2": {
-					"rotation": [0, -7.5, "-5+math.sin(q.anim_time*90*4-90)*1.5"]
-				},
-				"leg_front_left": {
-					"rotation": ["4.305+math.sin(q.anim_time*90*4)*2", 5.60922, -7.50745],
-					"position": [0, "-0.275+math.sin(q.anim_time*90*4)*-0.05", "0.3+math.sin(q.anim_time*90*4)*-0.07"]
-				},
-				"leg_front_left2": {
-					"rotation": ["-4.9575+math.sin(q.anim_time*90*4)*-2", 0.65182, 7.47178]
-				},
-				"leg_front_right": {
-					"rotation": ["4.305+math.sin(q.anim_time*90*4)*2", -5.60922, 7.50745],
-					"position": [0, "-0.275+math.sin(q.anim_time*90*4)*-0.05", "0.3+math.sin(q.anim_time*90*4)*-0.07"]
-				},
-				"leg_front_right2": {
-					"rotation": ["-4.9575+math.sin(q.anim_time*90*4)*-2", -0.65182, -7.47178]
-				},
-				"leg_back_left": {
-					"rotation": ["-5+math.sin(q.anim_time*90*4)*-1", -5, 0],
-					"position": [0, "-0.125+math.sin(q.anim_time*90*4)*-0.025", "0+math.sin(q.anim_time*90*4)*0.035"]
-				},
-				"leg_back_left2": {
-					"rotation": ["5+math.sin(q.anim_time*90*4)*1", 0, 0]
-				},
-				"leg_back_right": {
-					"rotation": ["-5+math.sin(q.anim_time*90*4)*-1", 5, 0],
-					"position": [0, "-0.125+math.sin(q.anim_time*90*4)*-0.025", "0+math.sin(q.anim_time*90*4)*0.035"]
-				},
-				"leg_back_right2": {
-					"rotation": ["5+math.sin(q.anim_time*90*4)*1", 0, 0]
-				},
-				"body": {
-					"position": [0, -0.1, 0]
-				},
-				"tail": {
-					"rotation": ["6+math.sin(q.anim_time*90*4)*1", "0+math.sin(q.anim_time*90*2-90)*-17.5", 0]
-				},
-				"fin": {
-					"rotation": [2.5, 0, "0+math.sin(q.anim_time*90*2-90)*-4"]
-				},
-				"cheek_right2": {
-					"rotation": [0, 7.5, "5+math.sin(q.anim_time*90*4-90)*-1.5"]
-				},
-				"torso": {
-					"rotation": ["10+math.sin(q.anim_time*90*4)*2.5", "math.sin(q.anim_time*90*2-30)*0.5", 0],
-					"position": [0, "0+math.sin(q.anim_time*90*4+30)*-0.07", 0]
-				},
-				"tail2": {
-					"rotation": [0, "0+math.sin(q.anim_time*90*2-90)*-7.5", 0]
-				},
-				"eye_angry_left": {
-					"position": [0, 0, -0.1]
-				},
-				"eye_angry_right": {
-					"position": [0, 0, -0.1]
+					"rotation": [0, -7.5, 0]
 				}
 			}
 		},
 		"animation.mudkip.cry": {
-			"animation_length": 1.75,
-			"bones": {
-				"torso": {
-					"rotation": {
-						"0.0": [0, 0, 0],
-						"0.2917": [5, 0, 0],
-						"0.5": [0, 0, 0],
-						"1.0": [-2.5, 0, 0],
-						"1.5": [0, 0, 0]
-					}
-				},
-				"head": {
-					"rotation": {
-						"0.0": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.2083": {
-							"post": [10, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.375": {
-							"post": [10, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.5833": {
-							"post": [-10, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.7083": {
-							"post": [-10, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.0833": {
-							"post": [-17.5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.2917": {
-							"post": [-3, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.625": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						}
-					}
-				},
-				"jaw": {
-					"rotation": {
-						"0.0": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.3333": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.625": {
-							"post": [35, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.7083": {
-							"post": [15, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.0": {
-							"post": [60, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.0833": {
-							"post": [60, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.3333": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						}
-					}
-				},
-				"fin": {
-					"rotation": {
-						"0.0": [0, 0, 0],
-						"0.25": [6, 0, 0],
-						"1.0": [-5, 0, 0],
-						"1.5": [0, 0, 0]
-					}
-				},
-				"cheek_left2": {
-					"rotation": {
-						"0.375": {
-							"pre": [0, 0, 0],
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.75": {
-							"post": [0, 0, -12.5],
-							"lerp_mode": "catmullrom"
-						},
-						"0.8333": {
-							"post": [0, 0, -12.5],
-							"lerp_mode": "catmullrom"
-						},
-						"1.5": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						}
-					}
-				},
-				"cheek_right2": {
-					"rotation": {
-						"0.375": {
-							"pre": [0, 0, 0],
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.75": {
-							"post": [0, 0, 12.5],
-							"lerp_mode": "catmullrom"
-						},
-						"0.8333": {
-							"post": [0, 0, 12.5],
-							"lerp_mode": "catmullrom"
-						},
-						"1.5": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						}
-					}
-				},
-				"tail": {
-					"rotation": {
-						"0.0": [0, 0, 0],
-						"0.625": [0, "0+math.sin(q.anim_time*90*12-90)*-25", 0],
-						"1.625": [0, 0, 0]
-					}
-				}
-			},
+			"animation_length": 1.2,
 			"sound_effects": {
-				"0.5417": {
+				"0.04": {
 					"effect": "pokemon.mudkip.cry"
 				}
 			}
@@ -423,14 +207,6 @@
 					"position": [-0.1, 0, -0.1]
 				}
 			}
-		},
-		"animation.mudkip.WALKSPEED_TEST": {
-			"loop": true,
-			"bones": {
-				"body": {
-					"position": [0, 0, "q.anim_time*90*-0.07"]
-				}
-			}
 		}
 	}
 }

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0259_marshtomp/marshtomp.animation.json

@@ -3,173 +3,83 @@
 	"animations": {
 		"animation.marshtomp.ground_idle": {
 			"loop": true,
-			"animation_length": 4,
 			"bones": {
 				"torso": {
-					"rotation": ["0+math.sin(q.anim_time*90*4)*-1", "math.sin(q.anim_time*90*2)*2", "math.sin(q.anim_time*90*2)*-1"],
-					"position": [0, "math.sin(q.anim_time*90*4-30)*-0.05", 0]
+					"rotation": [0, 0, 0]
 				},
 				"chest": {
-					"rotation": ["0+math.sin(q.anim_time*90*4-30)*-1", "math.sin(q.anim_time*90*2-30)*1", "math.sin(q.anim_time*90*2-30)*-0.5"]
-				},
-				"neck": {
-					"rotation": ["0+math.sin(q.anim_time*90*4-30)*2.5", 0, 0]
+					"rotation": [-2.5, 0, 0]
 				},
 				"head": {
-					"rotation": ["5+math.sin(q.anim_time*90*4-30)*-3", "math.sin(q.anim_time*90*2-30)*1", "math.sin(q.anim_time*90*2-30)*-1.5"]
-				},
-				"head_fin": {
-					"rotation": ["0+math.sin(q.anim_time*90*4-30)*-1.5", 0, 0]
+					"rotation": [5, 0, 0]
 				},
 				"arm_left": {
-					"rotation": [7.5, 0, "37.5+math.sin(q.anim_time*90*2)*-5"]
+					"rotation": [7.5, 0, 27.5]
 				},
 				"arm_left2": {
-					"rotation": [0, "15+math.sin(q.anim_time*90*2-30)*5", "2.5+math.sin(q.anim_time*90*2-60)*-5"]
+					"rotation": [0, 15, 2.5]
 				},
 				"hand_left": {
-					"rotation": [0, "0+math.sin(q.anim_time*90*2-120)*3", "10+math.sin(q.anim_time*90*2-150)*-2.5"]
+					"rotation": [0, 0, 5]
 				},
 				"finger_front_left": {
-					"rotation": [0, 0, "10+math.sin(q.anim_time*90*2-60)*-5"]
+					"rotation": [0, 2.5, 15]
 				},
 				"finger_middle_left": {
-					"rotation": [0, 0, "10+math.sin(q.anim_time*90*2-120)*-5"]
+					"rotation": [0, 0, 10]
 				},
 				"finger_back_left": {
-					"rotation": [0, 0, "10+math.sin(q.anim_time*90*2-180)*-5"]
+					"rotation": [0, -5, 20]
 				},
 				"arm_right": {
-					"rotation": [7.5, 0, "-37.5+math.sin(q.anim_time*90*2)*-5"]
+					"rotation": [7.5, 0, -27.5]
 				},
 				"arm_right2": {
-					"rotation": [0, "-15+math.sin(q.anim_time*90*2-30)*5", "-2.5+math.sin(q.anim_time*90*2-60)*-5"]
+					"rotation": [0, -15, -2.5]
 				},
 				"hand_right": {
-					"rotation": [0, "0+math.sin(q.anim_time*90*2-120)*3", "-10+math.sin(q.anim_time*90*2-150)*-2.5"]
+					"rotation": [0, 0, -5]
 				},
 				"finger_front_right": {
-					"rotation": [0, 0, "-10+math.sin(q.anim_time*90*2-60)*-5"]
+					"rotation": [0, -2.5, -15]
 				},
 				"finger_middle_right": {
-					"rotation": [0, 0, "-10+math.sin(q.anim_time*90*2-120)*-5"]
+					"rotation": [0, 0, -10]
 				},
 				"finger_back_right": {
-					"rotation": [0, 0, "-10+math.sin(q.anim_time*90*2-180)*-5"]
+					"rotation": [0, 5, -20]
 				},
 				"tail_fin_left": {
-					"rotation": [-5, "45+math.sin(q.anim_time*90*2)*-12", 0]
+					"rotation": [-5, 45, 0]
 				},
 				"tail_fin_right": {
-					"rotation": [-5, "-45+math.sin(q.anim_time*90*2)*12", 0]
+					"rotation": [-5, -45, 0]
 				},
 				"leg_left": {
-					"rotation": ["-2.5+math.sin(q.anim_time*90*2)*2.5", 0, 0],
-					"position": [0, "-0.05+math.sin(q.anim_time*90*2)*0.1", "0+math.sin(q.anim_time*90*2)*-0.1"]
-				},
-				"leg_left2": {
-					"rotation": ["2.5+math.sin(q.anim_time*90*2)*-2.5", 0, 0]
-				},
-				"leg_right": {
-					"rotation": ["-2.5+math.sin(q.anim_time*90*2)*-2.5", 0, 0],
-					"position": [0, "-0.05+math.sin(q.anim_time*90*2)*-0.1", "0+math.sin(q.anim_time*90*2)*0.1"]
-				},
-				"leg_right2": {
-					"rotation": ["2.5+math.sin(q.anim_time*90*2)*2.5", 0, 0]
-				}
-			}
-		},
-		"animation.marshtomp.battle_idle": {
-			"loop": true,
-			"animation_length": 4,
-			"bones": {
-				"torso": {
-					"rotation": ["0+math.sin(q.anim_time*90*4)*-2", "math.sin(q.anim_time*90*2)*4", "math.sin(q.anim_time*90*2)*-2"],
-					"position": [0, "math.sin(q.anim_time*90*4)*0.05", 0]
-				},
-				"chest": {
-					"rotation": ["-2.5+math.sin(q.anim_time*90*4-30)*-1", "math.sin(q.anim_time*90*2-30)*4", "math.sin(q.anim_time*90*2-30)*-2.5"]
-				},
-				"head": {
-					"rotation": ["5+math.sin(q.anim_time*90*4-30)*-3", "math.sin(q.anim_time*90*2-30)*-6", "math.sin(q.anim_time*90*2-30)*5"]
-				},
-				"arm_left": {
-					"rotation": [7.5, 0, "27.5+math.sin(q.anim_time*90*2)*-7.5"]
-				},
-				"arm_left2": {
-					"rotation": [0, "15+math.sin(q.anim_time*90*2-30)*5", "2.5+math.sin(q.anim_time*90*2-30)*-5"]
-				},
-				"hand_left": {
-					"rotation": [0, "0+math.sin(q.anim_time*90*2-90)*5", "5+math.sin(q.anim_time*90*2-90)*-7.5"]
-				},
-				"finger_front_left": {
-					"rotation": [0, 2.5, "15+math.sin(q.anim_time*90*2-120)*-10"]
-				},
-				"finger_middle_left": {
-					"rotation": [0, 0, "10+math.sin(q.anim_time*90*2-150)*-10"]
-				},
-				"finger_back_left": {
-					"rotation": [0, -5, "20+math.sin(q.anim_time*90*2-180)*-10"]
-				},
-				"arm_right": {
-					"rotation": [7.5, 0, "-27.5+math.sin(q.anim_time*90*2)*-7.5"]
-				},
-				"arm_right2": {
-					"rotation": [0, "-15+math.sin(q.anim_time*90*2-30)*5", "-2.5+math.sin(q.anim_time*90*2-30)*-5"]
-				},
-				"hand_right": {
-					"rotation": [0, "0+math.sin(q.anim_time*90*2-90)*5", "-5+math.sin(q.anim_time*90*2-90)*-7.5"]
-				},
-				"finger_front_right": {
-					"rotation": [0, -2.5, "-15+math.sin(q.anim_time*90*2-120)*-10"]
-				},
-				"finger_middle_right": {
-					"rotation": [0, 0, "-10+math.sin(q.anim_time*90*2-150)*-10"]
-				},
-				"finger_back_right": {
-					"rotation": [0, 5, "-20+math.sin(q.anim_time*90*2-180)*-10"]
-				},
-				"tail_fin_left": {
-					"rotation": [-5, "45+math.sin(q.anim_time*90*2)*-12", 0]
-				},
-				"tail_fin_right": {
-					"rotation": [-5, "-45+math.sin(q.anim_time*90*2)*12", 0]
-				},
-				"leg_left": {
-					"rotation": [2.4905, "0.2178+math.sin(q.anim_time*90*2)*1.5", -2.49527]
+					"rotation": [2.5, 0, -2.5]
 				},
 				"leg_left2": {
 					"rotation": [5, 0, 0]
 				},
 				"foot_left": {
-					"rotation": [-7.47178, "0.6518+math.sin(q.anim_time*90*2)*-1.5", 2.45744]
+					"rotation": [-7.5, 0, 2.5]
 				},
 				"leg_right": {
-					"rotation": [2.4905, "-0.2178+math.sin(q.anim_time*90*2)*1.5", 2.49527]
+					"rotation": [2.5, 0, 2.5]
 				},
 				"leg_right2": {
 					"rotation": [5, 0, 0]
 				},
 				"foot_right": {
-					"rotation": [-7.47178, "-0.6518+math.sin(q.anim_time*90*2)*-1.5", -2.45744]
-				},
-				"body": {
-					"position": [0, -0.15, 0]
-				},
-				"neck": {
-					"rotation": ["0+math.sin(q.anim_time*90*4-30)*2.5", 0, 0]
-				},
-				"head_fin": {
-					"rotation": ["0+math.sin(q.anim_time*90*4-30)*-1.5", 0, 0]
-				},
-				"eye_angry_left": {
-					"position": [0, 0, -0.1]
-				},
-				"eye_angry_right": {
-					"position": [0, 0, -0.1]
-				},
-				"jaw": {
-					"rotation": ["5+math.sin(q.anim_time*90*4-30)*-5", 0, 0]
+					"rotation": [-7.5, 0, -2.5]
+				}
+			}
+		},
+		"animation.marshtomp.cry": {
+			"animation_length": 1.2,
+			"sound_effects": {
+				"0.04": {
+					"effect": "pokemon.marshtomp.cry"
 				}
 			}
 		},
@@ -252,108 +162,6 @@
 					"position": [0, 0, -0.1]
 				}
 			}
-		},
-		"animation.marshtomp.cry": {
-			"animation_length": 2,
-			"bones": {
-				"chest": {
-					"rotation": {
-						"0.0": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.125": {
-							"post": [5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.5": {
-							"post": [-2.5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.7917": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.0833": {
-							"post": [-2.5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.5833": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						}
-					}
-				},
-				"head": {
-					"rotation": {
-						"0.0": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.125": {
-							"post": [7.5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.4167": {
-							"post": [-12.5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.625": {
-							"post": [-5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.8333": {
-							"post": [-12.5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.0417": {
-							"post": [-12.5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.4583": {
-							"post": [-1.53, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.7083": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						}
-					}
-				},
-				"jaw": {
-					"rotation": {
-						"0.0": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.2083": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.5": {
-							"post": [27.5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.75": {
-							"post": [17.5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.0833": {
-							"post": [40, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.4583": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						}
-					}
-				}
-			},
-			"sound_effects": {
-				"0.4167": {
-					"effect": "pokemon.marshtomp.cry"
-				}
-			}
 		}
 	}
 }

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0260_swampert/swampert.animation.json

@@ -3,33 +3,30 @@
 	"animations": {
 		"animation.swampert.ground_idle": {
 			"loop": true,
-			"animation_length": 4,
 			"bones": {
 				"body": {
 					"position": [0, 1.75, 0]
 				},
 				"chest2": {
-					"rotation": ["-12.5+math.sin(q.anim_time*90*2-60)*0.75", 0, 0]
+					"rotation": [-12.5, 0, 0]
 				},
 				"neck": {
-					"rotation": ["-5+math.sin(q.anim_time*90*2-90)*1", "0+math.sin(q.anim_time*90*1-90)*-1", 0]
+					"rotation": [-5, 0, 0]
 				},
 				"leg_left": {
-					"rotation": ["8.7765+math.sin(q.anim_time*90*2)*-1.5", -12.0131, -53.28718],
-					"position": [0, "0+math.sin(q.anim_time*90*2)*-0.1", "0+math.sin(q.anim_time*90*2)*0.15"]
+					"rotation": [8.77647, -12.0131, -53.28718]
 				},
 				"leg_left2": {
-					"rotation": [4.5416, -0.2127, 45.09046]
+					"rotation": [4.54163, -0.2127, 45.09046]
 				},
 				"leg_left3": {
 					"rotation": [9.83802, -2.51058, 9.95791]
 				},
 				"foot_left": {
-					"rotation": [-27.58324, "-3.5552+math.sin(q.anim_time*90*2)*-1.5", 20.16242]
+					"rotation": [-27.58324, -3.55523, 20.16242]
 				},
 				"leg_right": {
-					"rotation": ["8.7765+math.sin(q.anim_time*90*2)*-1.5", 12.0131, 53.2872],
-					"position": [0, "0+math.sin(q.anim_time*90*2)*-0.1", "0+math.sin(q.anim_time*90*2)*0.15"]
+					"rotation": [8.77647, 12.0131, 53.2872]
 				},
 				"leg_right2": {
 					"rotation": [4.54163, 0.2127, -45.0905]
@@ -38,155 +35,16 @@
 					"rotation": [9.83802, 2.5106, -9.9579]
 				},
 				"foot_right": {
-					"rotation": [-27.58324, "3.5552+math.sin(q.anim_time*90*2)*1.5", -20.1624]
+					"rotation": [-27.58324, 3.5552, -20.1624]
 				},
 				"arm_left2": {
-					"rotation": [-4.36302, -31.26463, "17.6253+math.sin(q.anim_time*90*2-90)*2"]
+					"rotation": [-4.36302, -31.26463, 17.62528]
 				},
 				"arm_left3": {
-					"rotation": [1.80384, 2.38704, "35.4291+math.sin(q.anim_time*90*2-120)*2.5"]
+					"rotation": [1.80384, 2.38704, 35.42915]
 				},
 				"arm_left": {
-					"rotation": [-13.31914, "-14.6364+math.sin(q.anim_time*90*2-60)*2", 12.92638]
-				},
-				"finger_front_left": {
-					"rotation": [0, "-37.5+math.sin(q.anim_time*90*2-120)*-2.5", 20]
-				},
-				"finger_middle_left": {
-					"rotation": [0, "-32.5+math.sin(q.anim_time*90*2-120)*-2.5", 0]
-				},
-				"finger_back_left": {
-					"rotation": [0, "-30+math.sin(q.anim_time*90*2-120)*-2.5", -27.5]
-				},
-				"fingers_left": {
-					"rotation": [0, 37.5, 0]
-				},
-				"arm_right": {
-					"rotation": [-13.31914, "14.6364+math.sin(q.anim_time*90*2-60)*-2", -12.9264]
-				},
-				"arm_right2": {
-					"rotation": [-4.33052, "31.2647+math.sin(q.anim_time*90*2-90)*2", -17.60892]
-				},
-				"arm_right3": {
-					"rotation": [1.80384, -2.387, "-35.4292+math.sin(q.anim_time*90*2-120)*-2.5"]
-				},
-				"fingers_right": {
-					"rotation": [0, -37.5, 0]
-				},
-				"finger_front_right": {
-					"rotation": [0, "37.5+math.sin(q.anim_time*90*2-120)*2.5", -20]
-				},
-				"finger_middle_right": {
-					"rotation": [0, "32.5+math.sin(q.anim_time*90*2-120)*2.5", 0]
-				},
-				"finger_back_right": {
-					"rotation": [0, "30+math.sin(q.anim_time*90*2-120)*2.5", 27.5]
-				},
-				"torso": {
-					"rotation": ["-5+math.sin(q.anim_time*90*2)*0.5", 0, 0],
-					"position": [0, "0+math.sin(q.anim_time*90*2+30)*-0.4", 0]
-				},
-				"chest": {
-					"rotation": ["-7.5+math.sin(q.anim_time*90*2-30)*1.5", 0, 0]
-				},
-				"hand_left": {
-					"rotation": [0, "-17.5+math.sin(q.anim_time*90*2-90)*-5", 0]
-				},
-				"finger_front_left2": {
-					"rotation": [0, "-12.5+math.sin(q.anim_time*90*2-150)*-5", 0]
-				},
-				"finger_middle_left2": {
-					"rotation": [0, "-10+math.sin(q.anim_time*90*2-150)*-5", 0]
-				},
-				"finger_back_left2": {
-					"rotation": [0, "-15+math.sin(q.anim_time*90*2-150)*-5", 0]
-				},
-				"hand_right": {
-					"rotation": [0, "17.5+math.sin(q.anim_time*90*2-90)*5", 0]
-				},
-				"finger_front_right2": {
-					"rotation": [0, "12.5+math.sin(q.anim_time*90*2-150)*5", 0]
-				},
-				"finger_middle_right2": {
-					"rotation": [0, "10+math.sin(q.anim_time*90*2-150)*5", 0]
-				},
-				"finger_back_right2": {
-					"rotation": [0, "15+math.sin(q.anim_time*90*2-150)*5", 0]
-				},
-				"check_left_spike_front": {
-					"rotation": [0, "0+math.sin(q.anim_time*90*2-30)*3", 0]
-				},
-				"check_left_spike_back": {
-					"rotation": [0, "0+math.sin(q.anim_time*90*2-30)*3", 0]
-				},
-				"check_right_spike_front": {
-					"rotation": [0, "0+math.sin(q.anim_time*90*2-30)*-3", 0]
-				},
-				"check_right_spike_back": {
-					"rotation": [0, "0+math.sin(q.anim_time*90*2-30)*-3", 0]
-				},
-				"eyebrow_left": {
-					"rotation": [0, "-2.5+math.sin(q.anim_time*90*2-60)*-2.5", 0]
-				},
-				"eyebrow_right": {
-					"rotation": [0, "2.5-math.sin(q.anim_time*90*2-60)*-2.5", 0]
-				},
-				"tail": {
-					"rotation": ["0+math.sin(q.anim_time*90*2-30)*-2.5", 0, 0]
-				},
-				"head": {
-					"rotation": ["12.5+math.sin(q.anim_time*90*2-90)*-2.5", "-0+math.sin(q.anim_time*90*1-90)*-0.5", 0]
-				}
-			}
-		},
-		"animation.swampert.battle_idle": {
-			"loop": true,
-			"animation_length": 4,
-			"bones": {
-				"body": {
-					"position": [0, 1.75, 0]
-				},
-				"chest2": {
-					"rotation": ["-12.5+math.sin(q.anim_time*90*2-60)*0.75", 0, 0]
-				},
-				"neck": {
-					"rotation": ["-5+math.sin(q.anim_time*90*2-90)*1", "0+math.sin(q.anim_time*90*1-90)*-1", 0]
-				},
-				"leg_left": {
-					"rotation": ["8.7765+math.sin(q.anim_time*90*2)*-1.5", -12.0131, -53.28718],
-					"position": [0, "0+math.sin(q.anim_time*90*2)*-0.1", "0+math.sin(q.anim_time*90*2)*0.15"]
-				},
-				"leg_left2": {
-					"rotation": [4.5416, -0.2127, 45.09046]
-				},
-				"leg_left3": {
-					"rotation": [9.83802, -2.51058, 9.95791]
-				},
-				"foot_left": {
-					"rotation": [-27.58324, "-3.5552+math.sin(q.anim_time*90*2)*-1.5", 20.16242]
-				},
-				"leg_right": {
-					"rotation": ["8.7765+math.sin(q.anim_time*90*2)*-1.5", 12.0131, 53.2872],
-					"position": [0, "0+math.sin(q.anim_time*90*2)*-0.1", "0+math.sin(q.anim_time*90*2)*0.15"]
-				},
-				"leg_right2": {
-					"rotation": [4.54163, 0.2127, -45.0905]
-				},
-				"leg_right3": {
-					"rotation": [9.83802, 2.5106, -9.9579]
-				},
-				"foot_right": {
-					"rotation": [-27.58324, "3.5552+math.sin(q.anim_time*90*2)*1.5", -20.1624]
-				},
-				"arm_left2": {
-					"rotation": [-4.71002, "-12.8789-math.sin(q.anim_time*90*2-90)*2", 28.88472]
-				},
-				"arm_left3": {
-					"rotation": [1.81234, "10.1983-math.sin(q.anim_time*90*2-30)*-5", 25.6704]
-				},
-				"arm_left": {
-					"rotation": [-33.31914, "-14.6364-math.sin(q.anim_time*90*2-60)*-2", 12.9264],
-					"position": [0, "0-math.sin(q.anim_time*90*2-30)*-0.3", 0]
+					"rotation": [-13.31914, -14.63639, 12.92638]
 				},
 				"finger_front_left": {
 					"rotation": [0, -37.5, 20]
@@ -201,14 +59,13 @@
 					"rotation": [0, 37.5, 0]
 				},
 				"arm_right": {
-					"rotation": [-33.31914, "14.6364+math.sin(q.anim_time*90*2-60)*-2", -12.9264],
-					"position": [0, "0-math.sin(q.anim_time*90*2-30)*-0.3", 0]
+					"rotation": [-13.31914, 14.6364, -12.9264]
 				},
 				"arm_right2": {
-					"rotation": [-4.71002, "12.8789+math.sin(q.anim_time*90*2-90)*2", -28.88472]
+					"rotation": [-4.36302, 31.2646, -17.6253]
 				},
 				"arm_right3": {
-					"rotation": [1.81234, "-10.1983+math.sin(q.anim_time*90*2-30)*-5", -25.6704]
+					"rotation": [1.80384, -2.387, -35.4292]
 				},
 				"fingers_right": {
 					"rotation": [0, -37.5, 0]
@@ -223,65 +80,37 @@
 					"rotation": [0, 30, 27.5]
 				},
 				"torso": {
-					"rotation": ["12.5+math.sin(q.anim_time*90*2)*0.5", 0, 0],
-					"position": [0, "0+math.sin(q.anim_time*90*2+30)*-0.4", 0]
+					"rotation": [-2.5, 0, 0]
 				},
 				"chest": {
-					"rotation": ["-0+math.sin(q.anim_time*90*2-30)*1.5", 0, 0]
+					"rotation": [-7.5, 0, 0]
 				},
 				"hand_left": {
-					"rotation": [0, "-17.5-math.sin(q.anim_time*90*2-60)*-2", 0]
+					"rotation": [0, -17.5, 0]
 				},
 				"finger_front_left2": {
-					"rotation": [0, "-12.5+math.sin(q.anim_time*90*2-150)*-5", 0]
+					"rotation": [0, -12.5, 0]
 				},
 				"finger_middle_left2": {
-					"rotation": [0, "-10+math.sin(q.anim_time*90*2-150)*-5", 0]
+					"rotation": [0, -10, 0]
 				},
 				"finger_back_left2": {
-					"rotation": [0, "-15+math.sin(q.anim_time*90*2-150)*-5", 0]
+					"rotation": [0, -15, 0]
+				},
+				"head_angle": {
+					"rotation": [12.5, 0, 0]
 				},
 				"hand_right": {
-					"rotation": [0, "17.5+math.sin(q.anim_time*90*2-60)*-2", 0]
+					"rotation": [0, 17.5, 0]
 				},
 				"finger_front_right2": {
-					"rotation": [0, "12.5+math.sin(q.anim_time*90*2-150)*5", 0]
+					"rotation": [0, 12.5, 0]
 				},
 				"finger_middle_right2": {
-					"rotation": [0, "10+math.sin(q.anim_time*90*2-150)*5", 0]
+					"rotation": [0, 10, 0]
 				},
 				"finger_back_right2": {
-					"rotation": [0, "15+math.sin(q.anim_time*90*2-150)*5", 0]
-				},
-				"check_left_spike_front": {
-					"rotation": [0, "0+math.sin(q.anim_time*90*2-30)*3", 0]
-				},
-				"check_left_spike_back": {
-					"rotation": [0, "0+math.sin(q.anim_time*90*2-30)*3", 0]
-				},
-				"check_right_spike_front": {
-					"rotation": [0, "0+math.sin(q.anim_time*90*2-30)*-3", 0]
-				},
-				"check_right_spike_back": {
-					"rotation": [0, "0+math.sin(q.anim_time*90*2-30)*-3", 0]
-				},
-				"eyebrow_left": {
-					"rotation": [0, "-2.5+math.sin(q.anim_time*90*2-60)*-2.5", 0]
-				},
-				"eyebrow_right": {
-					"rotation": [0, "2.5-math.sin(q.anim_time*90*2-60)*-2.5", 0]
-				},
-				"tail": {
-					"rotation": ["0+math.sin(q.anim_time*90*2-30)*-2.5", 0, 0]
-				},
-				"head": {
-					"rotation": ["-5+math.sin(q.anim_time*90*2-90)*-2.5", "math.sin(q.anim_time*90*1-90)*-0.5", 0]
-				},
-				"eye_angry_left": {
-					"position": [0, -0.1, 0]
-				},
-				"eye_angry_right": {
-					"position": [0, -0.1, 0]
+					"rotation": [0, 15, 0]
 				}
 			}
 		},
@@ -404,6 +233,14 @@
 				}
 			}
 		},
+		"animation.swampert.cry": {
+			"animation_length": 1.2,
+			"sound_effects": {
+				"0.04": {
+					"effect": "pokemon.swampert.cry"
+				}
+			}
+		},
 		"animation.swampert.blink": {
 			"animation_length": 0.1667,
 			"bones": {
@@ -485,158 +322,6 @@
 					"position": [0, -0.1, 0]
 				}
 			}
-		},
-		"animation.swampert.cry": {
-			"animation_length": 2.5,
-			"bones": {
-				"chest2": {
-					"rotation": {
-						"0.0": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.2917": {
-							"post": [7.5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.625": {
-							"post": [-5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.5417": {
-							"post": [-6, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"2.0417": {
-							"post": [-1, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"2.5": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						}
-					}
-				},
-				"neck": {
-					"rotation": {
-						"0.0": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.2917": {
-							"post": [7.5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.625": {
-							"post": [-5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.5417": {
-							"post": [-6, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"2.0417": {
-							"post": [-1, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"2.5": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						}
-					}
-				},
-				"head": {
-					"rotation": {
-						"0.0": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.25": {
-							"post": [7.5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.5833": {
-							"post": [-5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.5": {
-							"post": [-6, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"2.0": {
-							"post": [1, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"2.5": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						}
-					}
-				},
-				"eyelid_left": {
-					"position": {
-						"0.0": [0, 0, 0],
-						"0.25": {
-							"pre": [0, 0, 0],
-							"post": [0, -0.1, 0]
-						},
-						"0.4167": {
-							"pre": [0, -0.1, 0],
-							"post": [0, 0, 0]
-						}
-					}
-				},
-				"eyelid_right": {
-					"position": {
-						"0.0": [0, 0, 0],
-						"0.25": {
-							"pre": [0, 0, 0],
-							"post": [0, -0.1, 0]
-						},
-						"0.4167": {
-							"pre": [0, -0.1, 0],
-							"post": [0, 0, 0]
-						}
-					}
-				},
-				"jaw": {
-					"rotation": {
-						"0.0": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.3333": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.6667": {
-							"post": [30, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.9167": {
-							"post": [15, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.4167": {
-							"post": [40, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.8333": {
-							"post": [40, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"2.1667": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						}
-					}
-				}
-			},
-			"sound_effects": {
-				"0.4167": {
-					"effect": "pokemon.swampert.cry"
-				}
-			}
 		}
 	}
 }

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0265_wurmple/wurmple.animation.json

@@ -364,14 +364,6 @@
 					"rotation": [-22.5, 0, 0]
 				}
 			}
-		},
-		"animation.wurmple.cry": {
-			"animation_length": 1.25,
-			"sound_effects": {
-				"0.0": {
-					"effect": "pokemon.wurmple.cry"
-				}
-			}
 		}
 	}
 }

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0266_silcoon/silcoon.animation.json

@@ -212,14 +212,6 @@
 					"position": [0, 0, -0.1]
 				}
 			}
-		},
-		"animation.silcoon.cry": {
-			"animation_length": 1.25,
-			"sound_effects": {
-				"0.0": {
-					"effect": "pokemon.silcoon.cry"
-				}
-			}
 		}
 	}
 }