Add riding scraper script

CHANGELOG.md

@@ -44,29 +44,16 @@
 - Some Pokémon now pitch their bodies in the direction they're moving.
 - Added new advancements Didn't Stop To Think, We Need To Cook, and Pokémon Jockey!.
 - Berries can now be smelted into their respective dyes.
-- Added Syrupy Apples.
 - Added `/runmolang <molang> [<npc>|<player>|<pokemon>]` command that executes a MoLang expression with the provided options as environment variables, as well as the entity (as `q.entity`) that executed the command.
 
 ### Pokémon Added
 
 #### Gen 2
-- Marill
-- Azumarill
-- Hoppip
-- Skiploom
-- Jumpluff
 - Dunsparce
 
 #### Gen 3
-- Azurill
-- Meditite
-- Medicham
-- Electrike
-- Manectric
 - Spoink
 - Grumpig
-- Swablu
-- Altaria
 - Snorunt
 - Glalie
 - Latias
@@ -80,8 +67,6 @@
 - Froslass
 - Glameow
 - Purugly
-- Skorupi
-- Drapion
 
 #### Gen 5
 - Pansage
@@ -104,20 +89,10 @@
 - Solosis
 - Duosion
 - Reuniclus
-- Tynamo
-- Eelektrik
-- Eelektross
 - Mienfoo
 - Mienshao
-- Sewaddle
-- Swadloon
-- Leavanny
 
 #### Gen 6
-- Skiddo
-- Gogoat
-- Espurr
-- Meowstic
 - Inkay
 - Malamar
 - Hawlucha
@@ -126,25 +101,13 @@
 - Noivern
 
 #### Gen 7
-- Yungoos
-- Gumshoos
 - Drampa
-- Alolan Grimer
-- Alolan Muk
-- Togedemaru
 
 #### Gen 8
-- Skwovet
-- Greedent
-- Toxel
-- Toxtricity
-- Morpeko
 - Silicobra
 - Sandaconda
 - Sinistea
 - Polteageist
-- Galarian Corsola
-- Cursola
 
 #### Gen 9
 - Smoliv
@@ -157,12 +120,6 @@
 - Cyclizar
 - Poltchageist
 - Sinistcha
-- Capsakid
-- Scovillain
-- Tadbulb
-- Bellibolt
-- Toedscool
-- Toedscruel
 
 ### Animation updates for the following Pokémon
 - Garchomp
@@ -184,13 +141,6 @@
 - Dratini
 - Dragonair
 - Dragonite
-- G. Corsola
-- Cursola
-- Dunsparce
-- Dudunsparce (both forms)
-- Porygon
-- Porygon2
-- Porygon-Z
 
 ### Model updates for the following Pokémon
 - Gyarados
@@ -238,21 +188,12 @@
 - Cacturne
 - Taillow
 - Swellow
+- Added Syrupy Apples.
 - Seel
 - Dewgong
 - Honedge
 - Doublade
 - Aegislash
-- Drowzee
-- Hypno
-- Mudkip
-- Marshtomp
-- Swampert
-- Shelmet
-- Escavalier
-- Klink
-- Klank
-- Klinklang
 
 ### Changes
 - Changed pokemon caught and seen count to update based on the current pokedex being looked
@@ -306,7 +247,6 @@
 - Updated Pokémon state icons shown in party interfaces
 - MoLang `face` function can now be run on any `PosableEntity` (Like Pokémon!) instead of just NPCs.
 - MoLang `run_action_effect` now works on Pokémon.
-- Changed MoLang entity function `is_standing_on` to allow for block tags in the list.
 - Changed MoLang entity function `is_standing_on` to allow for block tags in the list. 
 - Added entity (as `q.entity`) that executed the command to the `executemolangscript` command.
 
@@ -352,8 +292,8 @@
 - Fix issue where locator X axis was not aligned with blockbench.
 - Fix issue where particle effects that play on frame 1 on sendout would never play (Gastly)
 - The Wiglett line will now sink in water again.
-- Fixed the Sprigatito line's portraits being zoomed in too far.
-- Fixed Floragato's battle cry animation from breaking.
+- Fixed the Sprigatito line's portraits being zoomed in too far. 
+- Fixed Floragato's battle cry animation from breaking. 
 - Fixed the block texture name for the Pep-Up Flower being inaccurate
 - Fixed issue where the restoration tank would not accept valid items from a hopper.
 - Fixed energy root not being shearable
@@ -371,12 +311,8 @@
 - Improved flyers avoiding getting stuck on fence posts.
 - Fixed air balloon battle text not correctly displaying the Pokémon or item name
 - Fixed an issue where items retrieved from a Display case would disappear if a player's inventory is full
-- Fixed Pokédex Scanner not respecting the "Invert Mouse" option
-- Fixed recoil eyes on Shellder & Cloyster.
-- Fixed Shroomish spinning at lightning speed when fainting (no longer allowed to let it rip.)
 - Fixed Pokédex Scanner not respecting the "Invert Mouse" option.
 - Fixed a crash due to a ConcurrentModificationException that could occur during world generation.
-- Fixed Quaxly's animations showing hidden wing sets
 - Fixed Moon Ball moon phase logic to actually work correctly
 - Fixed `/pokedex printcalculations` to now show the correct percentage completed of the Pokedex
 - Fixed mod incompatibility with the `Raised` mod
@@ -393,7 +329,7 @@
 - Renamed Cobblemon's creative tabs to start with "Cobblemon: " to distinguish Cobblemon's tabs from tabs for other mods.
 - Various items now have a rarity value.
 - Reworked observable handling in `Pokemon.kt` to cut down on RAM usage and clarify the file.
-  - Note: This will break mods that used our observable functionality there or in MoveSet, IVs, EVs, or BenchedMoves.
+  - Note: This will break mods that used our observable functionality there or in MoveSet, IVs, EVs, or BenchedMoves. 
   - Using `Pokemon#onChange()` is now the way to mark a Pokémon as needing a save.
   - Using `[Pokemon].changeObservable` is now the way to get an `Observable` for any save-worthy changes.
 - Updated NPCEntity beam positioning to properly account for the baseScale property.
@@ -424,7 +360,7 @@
 - Added `Pokemon#hyperTrainIV()` and `IVs#setHyperTrainedIV(Stat, Int)`
 - `ElementalType` now implements `ShowdownIdentifiable` to ensure the communcation with showdown stays consistent (also in regards to TeraTypes)
 - Pokemon no longer have a change observable
-
+  
 ### MoLang & Datapacks
 - The following usages for item predicates can now use item conditions like advancements do, you can learn about them in the [Minecraft wiki](https://minecraft.wiki/w/Advancement_definition#minecraft:filled_bucket)
   - The `requiredContext` for an item interaction evolution
@@ -486,7 +422,7 @@
 - Added optional box argument to the /pc command.
 - Pokédex and Dialogue screens now close when the inventory keybind is pressed.
 - Added config setting `maxPokedexScanningDetectionRange` to control from what distance the player can scan Pokémon using the Pokédex.
-- Added config setting `hideUnimplementedPokemonInThePokedex` which hides unimplemented Pokémon from the Pokédex when set to true.
+- Added config setting `hideUnimplementedPokemonInThePokedex` which hides unimplemented Pokémon from the Pokédex when set to true. 
 - Added debug renderer for posable entity locators.
 - Added crossover paintings from Close Combat, Premonition, Altar, Slumber, and Nomad.
 - Added optional box argument to the /pc command
@@ -640,7 +576,7 @@
 - Fixed Vivichoke Dip and Leek & Potato Stew not returning a bowl upon consumption.
 - Fixed Fossil Restoration Tank not accepting Hay Bales as organic material.
 - Fixed Potion items applying double their intended healing value.
-- Fixed Fast Ball capture bonuses applying to all Pokémon, making it the Best Ball instead of the Mediocre Edge-Case Ball.
+- Fixed Fast Ball capture bonuses applying to all Pokémon, making it the Best Ball instead of the Mediocre Edge-Case Ball. 
 - Fixed "learned new move" messages appearing for already-known moves on Pokémon evolutions.
 - Fixed Pokémon Item Models breaking shadows nearby when being placed in Display Cases or Item Frames.
 - Fixed berries not giving bonus yields when planted in their preferred biomes. I'm sure we've fixed that 5 times now.
@@ -649,7 +585,7 @@
 - Fixed players with shouldered Pokémon not being able to rejoin their 1.5.2 worlds using 1.6.
 - Fixed `PokemonProperties` utilizing `ability=<some ability>` being treated as a forced ability even when it is a legal ability for the Pokémon.
 - Fixed type formatting in Pokédex scanner mode when dual types require two lines.
-- Fixed trading sometimes crashing the game or server.
+- Fixed trading sometimes crashing the game or server. 
 - Fixed Wild shiny sounds not respecting the `shinyNoticeParticlesDistance` config setting.
 - Fixed Pokémon being able to evolve mid-battle.
 - Fixed NPC held items being able to be stolen by players. Don't be a thief!
@@ -743,7 +679,7 @@
 - Stonjourner Henge Ruins, Luna Henge Ruins, and Sol Henge Ruins.
 - Submerged Shipwreck Cove and Lush Shipwreck Cove.
 - Pokémon Centers to all 5 village types.
-
+ 
 ### Pokémon Added
 #### Gen 1
 - Alola Bias Cubone (built-in resource pack)
@@ -1066,7 +1002,7 @@
 - Big Roots and Energy Roots now share the same sounds as intended.
 - Fixed sounds made by blocks playing at a lower pitch than intended.
 - Fixed Chimchar and Monferno comically T posing whenever they sleep.
-- Fixed Cetitan's cry breaking its walk and sleep animations.
+- Fixed Cetitan's cry breaking its walk and sleep animations. 
 - Fixed the Magby line not having any placeholder walk animations.
 - Fixed Duskull and Dusclops using skylight levels for their nether spawn data. There is no sun in the Nether!
 - Fixed Hisuian Zoroark using base Zoroark stats.
@@ -1082,7 +1018,7 @@
 - Fixed Trevenant T-posing after 8 seconds of sleeping. I also do that.
 - Fixed Bewear T-posing for a bit if a wild one faints where you can see.
 - Fixed Noctowl's placeholder fly animation.
-- Corrected Lotad blinking animation.
+- Corrected Lotad blinking animation. 
 - Fixed reviving items causing errors when used in battle.
 - Fixed messages for Focus Sash, Confusion, Mummy, Ice Face, Own Tempo, and Revive.
 - Improve error handling when loading spawn-sets to ensure invalid configurations don't crash the server.
@@ -1172,7 +1108,7 @@
 - Added a new universal locator called "top".
 - Added `eggs_collected` and `eggs_hatched` Advancement triggers.
 - Added missing `minYaw` configuration to the `q.look()` function for JSON posers.
-- Some pose condition names have been changed:
+- Some pose condition names have been changed: 
   - `isTouchingWaterOrRain` has been changed to `isInWaterOrRain`
   - `isSubermegedInWater` has been changed to `isUnderWater`
 

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

@@ -19,6 +19,8 @@ import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.entity.EntityRendererProvider;
 import net.minecraft.client.renderer.entity.LivingEntityRenderer;
 import net.minecraft.client.renderer.entity.player.PlayerRenderer;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.entity.player.Player;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -31,9 +33,9 @@ public abstract class PlayerRendererMixin extends LivingEntityRenderer<AbstractC
         super(context, model, shadowRadius);
     }
 
-    @Inject(method = "render", at = @At(value = "TAIL"))
-    public void renderPlayer(AbstractClientPlayer player, float f, float g, PoseStack poseStack, MultiBufferSource multiBufferSource, int i, CallbackInfo ci) {
-        ClientPlayerIcon.Companion.onRenderPlayer(player);
+    @Inject(method = "render(Lnet/minecraft/world/entity/LivingEntity;FFLcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;I)V", at = @At(value = "TAIL"))
+    public void cobblemon$clientPlayerIcon(LivingEntity entity, float entityYaw, float partialTicks, PoseStack poseStack, MultiBufferSource buffer, int packedLight, CallbackInfo ci) {
+        ClientPlayerIcon.Companion.onRenderPlayer((Player) entity);
     }
 
     @WrapOperation(method = "getRenderOffset(Lnet/minecraft/client/player/AbstractClientPlayer;F)Lnet/minecraft/world/phys/Vec3;", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/player/AbstractClientPlayer;isCrouching()Z"))

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

@@ -522,7 +522,7 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<
     @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()))
+    val HEARTY_GRAINS = this.create("hearty_grains", HeartyGrainsBlock(BlockBehaviour.Properties.of().pushReaction(PushReaction.DESTROY).ignitedByLava().mapColor(MapColor.PLANT).noCollission().randomTicks().instabreak().sound(CobblemonSounds.VIVICHOKE_SOUNDS)))
 
     @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)))
@@ -545,11 +545,11 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<
     val POTTED_SACCHARINE_SAPLING = this.create("potted_saccharine_sapling", BlocksInvoker.createFlowerPotBlock(SACCHARINE_SAPLING))
 
     @JvmField
-    val HEARTY_GRAIN_BALE = this.create("hearty_grain_bale", BaleBlock(BlockBehaviour.Properties.of().mapColor(MapColor.PLANT).instrument(NoteBlockInstrument.BANJO).strength(0.5F).sound(CobblemonSounds.HEARTY_GRAIN_BALE_SOUNDS)))
+    val HEARTY_GRAIN_BALE = this.create("hearty_grain_bale", BaleBlock(BlockBehaviour.Properties.of().mapColor(MapColor.PLANT).instrument(NoteBlockInstrument.BANJO).strength(0.5F).sound(SoundType.GRASS)))
     @JvmField
-    val TATAMI_BLOCK = this.create("tatami_block", HorizontalRotationalBlock(BlockBehaviour.Properties.of().ignitedByLava().mapColor(MapColor.PLANT).strength(0.1F).sound(CobblemonSounds.TATAMI_BLOCK_SOUNDS)))
+    val TATAMI_BLOCK = this.create("tatami_block", HorizontalRotationalBlock(BlockBehaviour.Properties.of().ignitedByLava().mapColor(MapColor.PLANT).strength(0.1F).sound(SoundType.MOSS_CARPET)))
     @JvmField
-    val TATAMI_MAT = this.create("tatami_mat", HorizontalRotationCarpetBlock(BlockBehaviour.Properties.of().ignitedByLava().mapColor(MapColor.PLANT).strength(0.1F).sound(CobblemonSounds.TATAMI_MAT_SOUNDS)))
+    val TATAMI_MAT = this.create("tatami_mat", HorizontalRotationCarpetBlock(BlockBehaviour.Properties.of().ignitedByLava().mapColor(MapColor.PLANT).strength(0.1F).sound(SoundType.MOSS_CARPET)))
 
     /**
      * Returns a map of all the blocks that can be stripped with an axe in the format of input - output.

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

@@ -204,19 +204,6 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, ResourceKey<Regi
     @JvmField
     val EVOLUTION_STONE_BLOCK_STEP = this.create("block.evolution_stone_block.step")
 
-    @JvmField
-    val TATAMI_BLOCK_BREAK = this.create("block.tatami.break")
-    @JvmField
-    val TATAMI_BLOCK_HIT = this.create("block.tatami.hit")
-    @JvmField
-    val TATAMI_BLOCK_PLACE = this.create("block.tatami.place")
-    @JvmField
-    val TATAMI_BLOCK_STEP = this.create("block.tatami.step")
-    @JvmField
-    val TATAMI_MAT_BREAK = this.create("block.tatami_mat.break")
-    @JvmField
-    val TATAMI_MAT_PLACE = this.create("block.tatami_mat.place")
-
     @JvmField
     val GIMMIGHOUL_GIVE_ITEM = this.create("pokemon.gimmighoul.give_item")
     @JvmField
@@ -243,24 +230,6 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, ResourceKey<Regi
     @JvmField
     val VIVICHOKE_PLACE = this.create("block.vivichoke.place")
 
-    @JvmField
-    val HEARTY_GRAIN_BALE_BREAK = this.create("block.hearty_grain_bale.break")
-    @JvmField
-    val HEARTY_GRAIN_BALE_PLACE = this.create("block.hearty_grain_bale.place")
-    @JvmField
-    val HEARTY_GRAIN_BALE_HIT = this.create("block.hearty_grain_bale.hit")
-    @JvmField
-    val HEARTY_GRAIN_BALE_STEP = this.create("block.hearty_grain_bale.step")
-
-    @JvmField
-    val HEARTY_GRAINS_BREAK = this.create("block.hearty_grains.break")
-    @JvmField
-    val HEARTY_GRAINS_PLACE = this.create("block.hearty_grains.place")
-    @JvmField
-    val HEARTY_GRAINS_BREAK_WATER = this.create("block.hearty_grains.break_water")
-    @JvmField
-    val HEARTY_GRAINS_PLACE_WATER = this.create("block.hearty_grains.place_water")
-
     @JvmField
     val MINT_BREAK = this.create("block.mint.break")
     @JvmField
@@ -355,8 +324,8 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, ResourceKey<Regi
     @JvmField
     val IMPACT_WATER = this.create("impact.water")
 
-    // Note to self or whoever's peeking, block sounds have to be at 1.1f pitch
-    // For some reason, the game pitches them down and compensating for it here returns them to normal
+
+
     @JvmField
     val TUMBLESTONE_SOUNDS = SoundType(1f, 1.1f,
         TUMBLESTONE_BREAK,
@@ -374,7 +343,6 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, ResourceKey<Regi
         TUMBLESTONE_HIT,
         TUMBLESTONE_STEP
     )
-
     @JvmField
     val EVOLUTION_STONE_BLOCK_SOUNDS = SoundType(1f, 1.1f,
         EVOLUTION_STONE_BLOCK_BREAK,
@@ -384,23 +352,6 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, ResourceKey<Regi
         EVOLUTION_STONE_BLOCK_STEP
     )
 
-    @JvmField
-    val TATAMI_BLOCK_SOUNDS = SoundType(1f, 1.1f,
-        TATAMI_BLOCK_BREAK,
-        TATAMI_BLOCK_STEP,
-        TATAMI_BLOCK_PLACE,
-        TATAMI_BLOCK_HIT,
-        TATAMI_BLOCK_STEP
-    )
-
-    @JvmField
-    val TATAMI_MAT_SOUNDS = SoundType(1f, 1.1f,
-        TATAMI_MAT_BREAK,
-        TATAMI_BLOCK_STEP,
-        TATAMI_MAT_PLACE,
-        TATAMI_BLOCK_HIT,
-        TATAMI_BLOCK_STEP
-    )
 
     @JvmField
     val BERRY_BUSH_SOUNDS = SoundType(0.8f, 1.1f,
@@ -447,33 +398,6 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, ResourceKey<Regi
         SoundEvents.GRASS_FALL
     )
 
-    @JvmField
-    val HEARTY_GRAIN_BALE_SOUNDS = SoundType(0.6f, 1.1f,
-        HEARTY_GRAIN_BALE_BREAK,
-        HEARTY_GRAIN_BALE_STEP,
-        HEARTY_GRAIN_BALE_PLACE,
-        HEARTY_GRAIN_BALE_HIT,
-        HEARTY_GRAIN_BALE_STEP
-    )
-
-    @JvmField
-    val HEARTY_GRAINS_SOUNDS = SoundType(0.6f, 1.1f,
-        HEARTY_GRAINS_BREAK,
-        HEARTY_GRAIN_BALE_STEP,
-        HEARTY_GRAINS_PLACE,
-        HEARTY_GRAIN_BALE_HIT,
-        HEARTY_GRAIN_BALE_STEP
-    )
-
-    @JvmField
-    val HEARTY_GRAINS_WATER_SOUNDS = SoundType(0.6f, 1.1f,
-        HEARTY_GRAINS_BREAK_WATER,
-        SoundEvents.GRASS_STEP,
-        HEARTY_GRAINS_PLACE_WATER,
-        SoundEvents.GRASS_HIT,
-        SoundEvents.GRASS_FALL
-    )
-
     @JvmField
     val MINT_SOUNDS = SoundType(0.6f, 1.1f,
         MINT_BREAK,
@@ -513,6 +437,7 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, ResourceKey<Regi
     val DISPLAY_CASE_PLACE = this.create("block.display_case.place")
     @JvmField
     val DISPLAY_CASE_STEP = this.create("block.display_case.step")
+
     @JvmField
     val DISPLAY_CASE_SOUNDS = SoundType(1f, 1f,
         DISPLAY_CASE_BREAK,
@@ -523,7 +448,7 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, ResourceKey<Regi
     )
 
     @JvmField
-    val CAMPFIRE_POT_SET = this.create("block.campfire_pot.set")
+    val CAMPFIRE_POT_PLACE_CAMPFIRE = this.create("block.campfire_pot.place_campfire")
     @JvmField
     val CAMPFIRE_POT_RETRIEVE = this.create("block.campfire_pot.retrieve")
     @JvmField
@@ -531,14 +456,12 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, ResourceKey<Regi
     @JvmField
     val CAMPFIRE_POT_CLOSE = this.create("block.campfire_pot.close")
     @JvmField
-    val CAMPFIRE_POT_TAKE_ITEM = this.create("block.campfire_pot.take_item")
-    @JvmField
-    val CAMPFIRE_POT_ACTIVE = this.create("block.campfire_pot.active")
-    @JvmField
-    val CAMPFIRE_POT_AMBIENT = this.create("block.campfire_pot.ambient")
+    val CAMPFIRE_POT_USE = this.create("block.campfire_pot.use")
     @JvmField
     val CAMPFIRE_POT_COOK = this.create("block.campfire_pot.cook")
     @JvmField
+    val CAMPFIRE_POT_CRAFT = this.create("block.campfire_pot.craft")
+    @JvmField
     val CAMPFIRE_POT_PLACE = this.create("block.campfire_pot.place")
     @JvmField
     val CAMPFIRE_POT_BREAK = this.create("block.campfire_pot.break")

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

@@ -101,19 +101,4 @@ interface RidingBehaviour<Settings : RidingBehaviourSettings, State : RidingBeha
      * Calculate the damage a horizontal collision will do to a ridden Pokémon. This is only relevant to fast flying behaviours, fall damage is separate!
      */
     fun damageOnCollision(settings: Settings, state: State, vehicle: PokemonEntity, impactVec: Vec3): Boolean = false
-
-
-    /**
-     * Internal helpers to help behaviour specific calculations
-     */
-    companion object {
-        /**
-         *  Scales a given value between a min and a max.
-         *  The result is clamped between 0.0 and 1.0, where 0.0 represents x is at or below min
-         *  and 1.0 represents x is at or above it.
-         */
-        internal fun scaleToRange(x: Double, min: Double, max: Double): Double {
-            return ((x - min) / (max - min)).coerceIn(0.0, 1.0)
-        }
-    }
 }

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

@@ -243,7 +243,7 @@ class BirdBehaviour : RidingBehaviour<BirdSettings, BirdState> {
         val topSpeed = vehicle.runtime.resolveDouble(settings.speedExpr)
         //This rotation limit will be used to know if the ride has exceeded it and its needs correcting.
         val rotMin = 15.0
-        val rotLimit = max(handling * sqrt(RidingBehaviour.scaleToRange(state.rideVelocity.get().length(), 0.0, topSpeed)), rotMin)
+        val rotLimit = max(handling * sqrt(normalizeVal(state.rideVelocity.get().length(), 0.0, topSpeed)), rotMin)
 
         var yawDeltaDeg =  deltaTime * handling * sin(Math.toRadians(controller.roll.toDouble())) //sin(Math.toRadians(controller.roll.toDouble())) * abs(cos(Math.toRadians(controller.pitch.toDouble())))
         val trueYawDelt = yawDeltaDeg * abs(cos(Math.toRadians(controller.pitch.toDouble())))
@@ -299,7 +299,7 @@ class BirdBehaviour : RidingBehaviour<BirdSettings, BirdState> {
         //modulated by speed so that when flapping idle in air you are ont wobbling around to look around
         val rotMin = 15.0
         var rollForce = xInput
-        val rotLimit = max(90 * sqrt(RidingBehaviour.scaleToRange(state.rideVelocity.get().length(), 0.0, topSpeed)), rotMin)
+        val rotLimit = max(90 * sqrt(normalizeVal(state.rideVelocity.get().length(), 0.0, topSpeed)), rotMin)
 
         //Limit roll by non linearly decreasing inputs towards
         // a rotation limit based on the current distance from
@@ -315,7 +315,7 @@ class BirdBehaviour : RidingBehaviour<BirdSettings, BirdState> {
         }
 
         //Give the ability to yaw with x mouse input when at low speeds.
-        val yawForce =  xInput * ( 1.0 - sqrt(RidingBehaviour.scaleToRange(state.rideVelocity.get().length(), 0.0, topSpeed)))
+        val yawForce =  xInput * ( 1.0 - sqrt(normalizeVal(state.rideVelocity.get().length(), 0.0, topSpeed)))
 
         //Yaw locally a bit when up or down so that its more intuitive to make it out of a dive or a straight vertical
         //climb
@@ -343,6 +343,16 @@ class BirdBehaviour : RidingBehaviour<BirdSettings, BirdState> {
         return Vec3(0.0, 0.0, rollForce)
     }
 
+    /*
+    *  Normalizes the given value between a min and a max.
+    *  The result is clamped between 0.0 and 1.0, where 0.0 represents x is at or below min
+    *  and 1.0 represents x is at or above it.
+    */
+    private fun normalizeVal(x: Double, min: Double, max: Double): Double {
+        require(max > min) { "max must be greater than min" }
+        return ((x - min) / (max - min)).coerceIn(0.0, 1.0)
+    }
+
     override fun canJump(
         settings: BirdSettings,
         state: BirdState,
@@ -390,7 +400,7 @@ class BirdBehaviour : RidingBehaviour<BirdSettings, BirdState> {
         val glideTopSpeed = vehicle.runtime.resolveDouble(settings.glidespeedExpr)
 
         //Must I ensure that topspeed is greater than minimum?
-        val normalizedGlideSpeed = RidingBehaviour.scaleToRange(state.rideVelocity.get().length(), topSpeed, glideTopSpeed)
+        val normalizedGlideSpeed = normalizeVal(state.rideVelocity.get().length(), topSpeed, glideTopSpeed)
 
         //Only ever want the fov change to be a max of 0.2 and for it to have non linear scaling.
         return 1.0f + normalizedGlideSpeed.pow(2).toFloat() * 0.2f

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

@@ -229,7 +229,7 @@ class BirdNoRollBehaviour : RidingBehaviour<BirdNoRollSettings, BirdNoRollState>
         val topSpeed = vehicle.runtime.resolveDouble(settings.speedExpr)
         //This rotation limit will be used to know if the ride has exceeded it and its needs correcting.
         val rotMin = 15.0
-        val rotLimit = max(handling * sqrt(RidingBehaviour.scaleToRange(state.rideVelocity.get().length(), 0.0, topSpeed)), rotMin)
+        val rotLimit = max(handling * sqrt(normalizeVal(state.rideVelocity.get().length(), 0.0, topSpeed)), rotMin)
 
         var yawDeltaDeg =  deltaTime * handling * sin(Math.toRadians(controller.roll.toDouble())) //sin(Math.toRadians(controller.roll.toDouble())) * abs(cos(Math.toRadians(controller.pitch.toDouble())))
         val trueYawDelt = yawDeltaDeg * abs(cos(Math.toRadians(controller.pitch.toDouble())))
@@ -283,7 +283,7 @@ class BirdNoRollBehaviour : RidingBehaviour<BirdNoRollSettings, BirdNoRollState>
         val yInput = mouseYSmoother.getNewDeltaValue(mouseYc * 0.1 * invertPitch, deltaTime * smoothingSpeed);
 
         //Give the ability to yaw with x mouse input when at low speeds.
-        val yawForce =  xInput * ( 1.0 - min(sqrt(RidingBehaviour.scaleToRange(state.rideVelocity.get().length(), 0.0, topSpeed)), 0.5))
+        val yawForce =  xInput * ( 1.0 - min(sqrt(normalizeVal(state.rideVelocity.get().length(), 0.0, topSpeed)), 0.5))
 
         //Apply yaw globally as we don't want roll or pitch changes due to local yaw when looking up or down.
 
@@ -303,6 +303,16 @@ class BirdNoRollBehaviour : RidingBehaviour<BirdNoRollSettings, BirdNoRollState>
         return Vec3.ZERO
     }
 
+    /*
+    *  Normalizes the given value between a min and a max.
+    *  The result is clamped between 0.0 and 1.0, where 0.0 represents x is at or below min
+    *  and 1.0 represents x is at or above it.
+    */
+    private fun normalizeVal(x: Double, min: Double, max: Double): Double {
+        require(max > min) { "max must be greater than min" }
+        return ((x - min) / (max - min)).coerceIn(0.0, 1.0)
+    }
+
     override fun canJump(
         settings: BirdNoRollSettings,
         state: BirdNoRollState,
@@ -350,7 +360,7 @@ class BirdNoRollBehaviour : RidingBehaviour<BirdNoRollSettings, BirdNoRollState>
         val glideTopSpeed = vehicle.runtime.resolveDouble(settings.glidespeedExpr)
 
         //Must I ensure that topspeed is greater than minimum?
-        val normalizedGlideSpeed = RidingBehaviour.scaleToRange(state.rideVelocity.get().length(), topSpeed, glideTopSpeed)
+        val normalizedGlideSpeed = normalizeVal(state.rideVelocity.get().length(), topSpeed, glideTopSpeed)
 
         //Only ever want the fov change to be a max of 0.2 and for it to have non linear scaling.
         return 1.0f + normalizedGlideSpeed.pow(2).toFloat() * 0.2f

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

@@ -104,7 +104,7 @@ class HoverBehaviour : RidingBehaviour<HoverSettings, HoverState> {
         val rotAmount = 10.0f
 
         //Take the inverse so that you turn more at higher speeds
-        val normSpeed = 1.0f - 0.5f*RidingBehaviour.scaleToRange(state.rideVelocity.get().length(), 0.0, topSpeed).toFloat()
+        val normSpeed = 1.0f - 0.5f*normalizeVal(state.rideVelocity.get().length(), 0.0, topSpeed).toFloat()
 
         //driver.yRot += (entity.riding.deltaRotation.y - turnAmount)
         //driver.setYHeadRot(driver.yHeadRot + (entity.riding.deltaRotation.y) - turnAmount)
@@ -164,7 +164,7 @@ class HoverBehaviour : RidingBehaviour<HoverSettings, HoverState> {
         val rotDiffMod = (sqrt(abs(rotDiffNorm)) * rotDiffNorm.sign)
 
         //Take the inverse so that you turn less at higher speeds
-        val normSpeed = 1.0f // = 1.0f - 0.5f*RidingBehaviour.scaleToRange(state.rideVelocityocity.length(), 0.0, topSpeed).toFloat()
+        val normSpeed = 1.0f // = 1.0f - 0.5f*normalizeVal(state.rideVelocityocity.length(), 0.0, topSpeed).toFloat()
 
         val turnRate = (handling.toFloat() / 20.0f)
 
@@ -308,6 +308,15 @@ class HoverBehaviour : RidingBehaviour<HoverSettings, HoverState> {
         return newVelocity
     }
 
+    /*
+    *  Normalizes the current speed between minSpeed and maxSpeed.
+    *  The result is clamped between 0.0 and 1.0, where 0.0 represents minSpeed and 1.0 represents maxSpeed.
+    */
+    private fun normalizeVal(currSpeed: Double, minSpeed: Double, maxSpeed: Double): Double {
+        require(maxSpeed > minSpeed) { "maxSpeed must be greater than minSpeed" }
+        return ((currSpeed - minSpeed) / (maxSpeed - minSpeed)).coerceIn(0.0, 1.0)
+    }
+
     override fun angRollVel(
         settings: HoverSettings,
         state: HoverState,

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

@@ -80,7 +80,7 @@ class JetBehaviour : RidingBehaviour<JetSettings, JetState> {
 //            //Calculate stamina loss due to speed
 //            //At max speed it will tick down 0.1 a second so the stamina will last ten seconds
 //            //There has got to be a better way to express this equation. It interpolates between 0.5 and 1.0
-//            var staminaRate = (RidingBehaviour.scaleToRange(state.rideVelocity.get().length(), minSpeed, topSpeed))
+//            var staminaRate = (normalizeSpeed(state.rideVelocity.get().length(), minSpeed, topSpeed))
 //
 //            //interpolate between 0.25 and 1.0 so that you always have at least a min of 0.25 stam loss
 //            staminaRate = 0.25 + (0.75 * staminaRate.pow(3))
@@ -95,6 +95,16 @@ class JetBehaviour : RidingBehaviour<JetSettings, JetState> {
         return state.rideVelocity.get().length().toFloat()
     }
 
+    //TODO: Move these functions to a riding util class.
+    /*
+    *  Normalizes the current speed between minSpeed and maxSpeed.
+    *  The result is clamped between 0.0 and 1.0, where 0.0 represents minSpeed and 1.0 represents maxSpeed.
+    */
+    private fun normalizeSpeed(currSpeed: Double, minSpeed: Double, maxSpeed: Double): Double {
+        require(maxSpeed > minSpeed) { "maxSpeed must be greater than minSpeed" }
+        return ((currSpeed - minSpeed) / (maxSpeed - minSpeed)).coerceIn(0.0, 1.0)
+    }
+
     override fun rotation(
         settings: JetSettings,
         state: JetState,
@@ -150,7 +160,7 @@ class JetBehaviour : RidingBehaviour<JetSettings, JetState> {
         //speed up and slow down based on input
         if (driver.zza > 0.0 && speed < topSpeed && state.stamina.get() > 0.0f) {
             //modify acceleration to be slower when at closer speeds to top speed
-            val accelMod = max(-(RidingBehaviour.scaleToRange(speed, minSpeed, topSpeed)) + 1, 0.0)
+            val accelMod = max(-(normalizeSpeed(speed, minSpeed, topSpeed)) + 1, 0.0)
             state.rideVelocity.set(
                 Vec3(
                     state.rideVelocity.get().x,
@@ -168,7 +178,7 @@ class JetBehaviour : RidingBehaviour<JetSettings, JetState> {
             )
         } else if (driver.zza < 0.0 && speed > minSpeed) {
             //modify deccel to be slower when at closer speeds to minimum speed
-            val deccelMod = max((RidingBehaviour.scaleToRange(speed, minSpeed, topSpeed) - 1).pow(2) * 4, 0.1)
+            val deccelMod = max((normalizeSpeed(speed, minSpeed, topSpeed) - 1).pow(2) * 4, 0.1)
 
             //Decelerate currently always a constant half of max acceleration.
             state.rideVelocity.set(
@@ -314,7 +324,7 @@ class JetBehaviour : RidingBehaviour<JetSettings, JetState> {
         val minSpeed = vehicle.runtime.resolveDouble(settings.minSpeed)
 
         //Must I ensure that topspeed is greater than minimum?
-        val normalizedSpeed = RidingBehaviour.scaleToRange(state.rideVelocity.get().length(), minSpeed, topSpeed)
+        val normalizedSpeed = normalizeSpeed(state.rideVelocity.get().length(), minSpeed, topSpeed)
 
         //TODO: Determine if this should be based on max possible speed instead of top speed.
         //Only ever want the fov change to be a max of 0.2 and for it to have non linear scaling.

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

@@ -80,6 +80,16 @@ class JetNoRollBehaviour : RidingBehaviour<JetNoRollSettings, JetNoRollState> {
         return state.rideVelocity.get().length().toFloat()
     }
 
+    //TODO: Move these functions to a riding util class.
+    /*
+    *  Normalizes the current speed between minSpeed and maxSpeed.
+    *  The result is clamped between 0.0 and 1.0, where 0.0 represents minSpeed and 1.0 represents maxSpeed.
+    */
+    private fun normalizeSpeed(currSpeed: Double, minSpeed: Double, maxSpeed: Double): Double {
+        require(maxSpeed > minSpeed) { "maxSpeed must be greater than minSpeed" }
+        return ((currSpeed - minSpeed) / (maxSpeed - minSpeed)).coerceIn(0.0, 1.0)
+    }
+
     override fun rotation(
         settings: JetNoRollSettings,
         state: JetNoRollState,
@@ -136,7 +146,7 @@ class JetNoRollBehaviour : RidingBehaviour<JetNoRollSettings, JetNoRollState> {
         //speed up and slow down based on input
         if (driver.zza > 0.0 && speed < topSpeed && state.stamina.get() > 0.0f) {
             //modify acceleration to be slower when at closer speeds to top speed
-            val accelMod = max(-(RidingBehaviour.scaleToRange(speed, minSpeed, topSpeed)) + 1, 0.0)
+            val accelMod = max(-(normalizeSpeed(speed, minSpeed, topSpeed)) + 1, 0.0)
             state.rideVelocity.set(
                 Vec3(
                     state.rideVelocity.get().x,
@@ -154,7 +164,7 @@ class JetNoRollBehaviour : RidingBehaviour<JetNoRollSettings, JetNoRollState> {
             )
         } else if (driver.zza < 0.0 && speed > minSpeed) {
             //modify deccel to be slower when at closer speeds to minimum speed
-            val deccelMod = max((RidingBehaviour.scaleToRange(speed, minSpeed, topSpeed) - 1).pow(2) * 4, 0.1)
+            val deccelMod = max((normalizeSpeed(speed, minSpeed, topSpeed) - 1).pow(2) * 4, 0.1)
 
             //Decelerate currently always a constant half of max acceleration.
             state.rideVelocity.set(
@@ -298,7 +308,7 @@ class JetNoRollBehaviour : RidingBehaviour<JetNoRollSettings, JetNoRollState> {
         val minSpeed = vehicle.runtime.resolveDouble(settings.minSpeed)
 
         //Must I ensure that topspeed is greater than minimum?
-        val normalizedSpeed = RidingBehaviour.scaleToRange(state.rideVelocity.get().length(), minSpeed, topSpeed)
+        val normalizedSpeed = normalizeSpeed(state.rideVelocity.get().length(), minSpeed, topSpeed)
 
         //TODO: Determine if this should be based on max possible speed instead of top speed.
         //Only ever want the fov change to be a max of 0.2 and for it to have non linear scaling.

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

@@ -285,6 +285,15 @@ class RocketBehaviour : RidingBehaviour<RocketSettings, RocketState> {
         return newVelocity
     }
 
+    /*
+    *  Normalizes the current speed between minSpeed and maxSpeed.
+    *  The result is clamped between 0.0 and 1.0, where 0.0 represents minSpeed and 1.0 represents maxSpeed.
+    */
+    private fun normalizeVal(currSpeed: Double, minSpeed: Double, maxSpeed: Double): Double {
+        require(maxSpeed > minSpeed) { "maxSpeed must be greater than minSpeed" }
+        return ((currSpeed - minSpeed) / (maxSpeed - minSpeed)).coerceIn(0.0, 1.0)
+    }
+
     override fun angRollVel(
         settings: RocketSettings,
         state: RocketState,
@@ -365,7 +374,7 @@ class RocketBehaviour : RidingBehaviour<RocketSettings, RocketState> {
             //val exceededSpeed = max(vehicle.deltaMovement.length() - topSpeed, 0.0)
 
             //TODO: Remove this magic number and get a better comparison for boost top speed
-            val normalizedBoostSpeed = RidingBehaviour.scaleToRange(state.rideVelocity.get().length(), topSpeed, topSpeed * 3)
+            val normalizedBoostSpeed = normalizeVal(state.rideVelocity.get().length(), topSpeed, topSpeed * 3)
             return 1.0f + normalizedBoostSpeed.pow(2).toFloat() * 0.2f
         } else {
             return 1.0f

common/src/main/kotlin/com/cobblemon/mod/common/api/riding/behaviour/types/land/HorseBehaviour.kt

@@ -174,7 +174,7 @@ class HorseBehaviour : RidingBehaviour<HorseSettings, HorseState> {
         val normSpeed = 1.0f
 
         // TurnRate should always be quick if not sprinting
-        val invRelSpeed = (RidingBehaviour.scaleToRange(vehicle.deltaMovement.horizontalDistance(), 0.0, topSpeed ).pow(0.5) - 1.0f) * -1.0f
+        val invRelSpeed = (inverseLerp(vehicle.deltaMovement.horizontalDistance(), 0.0, topSpeed ).pow(0.5) - 1.0f) * -1.0f
         val turnRate = ((handling.toFloat() / 20.0f) * max(walkHandlingBoost * invRelSpeed, 1.0)).toFloat()
 
         //Ensure you only ever rotate as much difference as there is between the angles.
@@ -202,17 +202,19 @@ class HorseBehaviour : RidingBehaviour<HorseSettings, HorseState> {
         vehicle: PokemonEntity,
         driver: Player
     ): Vec3 {
-        val canSprint = vehicle.runtime.resolveBoolean(settings.canSprint)
-        val canJump = vehicle.runtime.resolveBoolean(settings.canJump)
-        val rideTopSpeed = vehicle.runtime.resolveDouble(settings.speedExpr) * 1.3
+
+        // Check to see if the ride should be walking or sprinting
         val walkSpeed = getWalkSpeed(vehicle)
-        val topSpeed = if(canSprint && state.sprinting.get()) rideTopSpeed else walkSpeed
+        val rideTopSpeed = vehicle.runtime.resolveDouble(settings.speedExpr) * 1.3
+        val topSpeed = if(state.sprinting.get()) rideTopSpeed else walkSpeed
+
         val accel = vehicle.runtime.resolveDouble(settings.accelerationExpr) * 2
 
         //Flag for determining if player is actively inputting
         var activeInput = false
 
         var newVelocity = Vec3(state.rideVelocity.get().x, state.rideVelocity.get().y, state.rideVelocity.get().z).normalize().scale(vehicle.deltaMovement.length())
+        //var newVelocity = vehicle.deltaMovement.normalize()
 
         //speed up and slow down based on input
         if (driver.zza != 0.0f && state.stamina.get() > 0.0) {
@@ -235,6 +237,9 @@ class HorseBehaviour : RidingBehaviour<HorseSettings, HorseState> {
         if (vehicle.onGround()) {
             newVelocity = Vec3(newVelocity.x, 0.0, newVelocity.z)
         } else {
+            //TODO: Should we just go back to standard minecraft gravity or do the lerp modifications prevent that?
+            //I think minecrafts gravity logic is also too harsh and isn't gamefied enough for mounts maybe? Need
+            //to do some testing and get other's opinions
             val gravity = (9.8 / ( 20.0)) * 0.2 * 0.8
             val terminalVel = 2.0
 
@@ -248,12 +253,18 @@ class HorseBehaviour : RidingBehaviour<HorseSettings, HorseState> {
         }
 
         //TODO: Change this so its tied to a jumping stat and representative of the amount of jumps
+        val canJump = vehicle.runtime.resolveBoolean(settings.canJump)
         //Jump the thang!
         if (driver.jumping && vehicle.onGround() && canJump) {
             val jumpForce = 1.0
             val velMag = newVelocity.length()
 
             newVelocity = newVelocity.add(0.0, jumpForce, 0.0)
+
+            val test = 0.0
+            //Ensure this doesn't add unwanted forward velocity
+            //val mag = if(newVelocity.length() < rideTopSpeed) newVelocity.length() else rideTopSpeed
+            //newVelocity = newVelocity.normalize().scale(mag)
         }
 
         //Zero out lateral velocity possibly picked up from a controller transition
@@ -262,6 +273,15 @@ class HorseBehaviour : RidingBehaviour<HorseSettings, HorseState> {
         return newVelocity
     }
 
+    /*
+    *  lerps the current val between minVal and maxVal.
+    *  The result is clamped between 0.0 and 1.0, where 0.0 represents minVal and 1.0 represents maxVal.
+    */
+    private fun inverseLerp(currVal: Double, minVal: Double, maxVal: Double): Double {
+        require(maxVal > minVal) { "minVal must be greater than maxVal" }
+        return ((currVal - minVal) / (maxVal - minVal)).coerceIn(0.0, 1.0)
+    }
+
     private fun getWalkSpeed( vehicle: PokemonEntity ): Double {
         val walkspeed = vehicle.runtime.resolveDouble(vehicle.behaviour.moving.walk.walkSpeed)
         val movementSpeed = vehicle.attributes.getValue(Attributes.MOVEMENT_SPEED)
@@ -435,9 +455,6 @@ class HorseSettings : RidingBehaviourSettings {
     var canJump = "true".asExpression()
         private set
 
-    var canSprint = "true".asExpression()
-        private set
-
     var speedExpr: Expression = "q.get_ride_stats('SPEED', 'LAND', 1.0, 0.3)".asExpression()
         private set
 

common/src/main/kotlin/com/cobblemon/mod/common/api/riding/behaviour/types/land/MinekartBehaviour.kt

@@ -147,7 +147,7 @@ class MinekartBehaviour : RidingBehaviour<MinekartSettings, MinekartState> {
         val turnInput =  (driver.xxa *-1.0f) * turningAcceleration
         val driftInput = turnInput * 0.25f
 
-        val lowSpeedTurnBoost = (RidingBehaviour.scaleToRange(vehicle.deltaMovement.horizontalDistance(), 0.0, topSpeed ).pow(0.5) - 2.0f) * -1.0f
+        val lowSpeedTurnBoost = (inverseLerp(vehicle.deltaMovement.horizontalDistance(), 0.0, topSpeed ).pow(0.5) - 2.0f) * -1.0f
         val forcedDriftTurnMomentum = (80.0f / 20.0f) * lowSpeedTurnBoost
         val maxTurnMomentum = (60.0f / 20.0f) * lowSpeedTurnBoost
         val maxDriftMomentum = forcedDriftTurnMomentum * 0.6f
@@ -293,6 +293,15 @@ class MinekartBehaviour : RidingBehaviour<MinekartSettings, MinekartState> {
         return newVelocity
     }
 
+    /*
+    *  lerps the current val between minVal and maxVal.
+    *  The result is clamped between 0.0 and 1.0, where 0.0 represents minVal and 1.0 represents maxVal.
+    */
+    private fun inverseLerp(currVal: Double, minVal: Double, maxVal: Double): Double {
+        require(maxVal > minVal) { "minVal must be greater than maxVal" }
+        return ((currVal - minVal) / (maxVal - minVal)).coerceIn(0.0, 1.0)
+    }
+
     override fun angRollVel(
         settings: MinekartSettings,
         state: MinekartState,

common/src/main/kotlin/com/cobblemon/mod/common/api/riding/behaviour/types/land/VehicleBehaviour.kt

@@ -221,6 +221,9 @@ class VehicleBehaviour : RidingBehaviour<VehicleSettings, VehicleState> {
         if (vehicle.onGround()) {
             newVelocity = Vec3(newVelocity.x, 0.0, newVelocity.z)
         } else {
+            //TODO: Should we just go back to standard minecraft gravity or do the lerp modifications prevent that?
+            //I think minecrafts gravity logic is also too harsh and isn't gamefied enough for mounts maybe? Need
+            //to do some testing and get other's opinions
             val gravity = (9.8 / ( 20.0)) * 0.2 * 0.25 * 3.0
             val terminalVel = 2.0
 

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

@@ -195,7 +195,7 @@ class DolphinBehaviour : RidingBehaviour<DolphinSettings, DolphinState> {
         // Yaw
         // TODO:move all magic numbers to handling expression
         val yawSpeed = handling * deltaTime * 0.25
-        val yawForce =  sin(controller.roll.toRadians()) * yawSpeed * ( 1.0 - min(sqrt(RidingBehaviour.scaleToRange(state.rideVelocity.get().length(), 0.0, topSpeed)), 0.5))
+        val yawForce =  sin(controller.roll.toRadians()) * yawSpeed * ( 1.0 - min(sqrt(normalizeVal(state.rideVelocity.get().length(), 0.0, topSpeed)), 0.5))
         //Apply yaw globally as we don't want roll or pitch changes due to local yaw when looking up or down.
         controller.applyGlobalYaw(yawForce.toFloat())
 
@@ -211,6 +211,16 @@ class DolphinBehaviour : RidingBehaviour<DolphinSettings, DolphinState> {
         return Vec3.ZERO
     }
 
+    /*
+    *  Normalizes the given value between a min and a max.
+    *  The result is clamped between 0.0 and 1.0, where 0.0 represents x is at or below min
+    *  and 1.0 represents x is at or above it.
+    */
+    private fun normalizeVal(x: Double, min: Double, max: Double): Double {
+        require(max > min) { "max must be greater than min" }
+        return ((x - min) / (max - min)).coerceIn(0.0, 1.0)
+    }
+
     override fun canJump(
         settings: DolphinSettings,
         state: DolphinState,

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

@@ -25,6 +25,7 @@ import com.cobblemon.mod.common.pokemon.Pokemon
 import com.cobblemon.mod.common.util.DataKeys
 import com.cobblemon.mod.common.util.server
 import com.google.gson.JsonObject
+import java.util.Collections
 import java.util.UUID
 import net.minecraft.core.RegistryAccess
 import net.minecraft.nbt.CompoundTag
@@ -258,15 +259,9 @@ open class PartyStore(override val uuid: UUID) : PokemonStore<PartyPosition>() {
                 BattlePokemon.playerOwned(it)
             }.also { if (healPokemon) it.effectedPokemon.heal() }
         }.toMutableList()
-
-        // reposition lead to front of the party
-        if (leadingPokemon != null && result.first().uuid != leadingPokemon) {
-            result.find { it.uuid == leadingPokemon }?.let { lead ->
-                result.remove(lead)
-                result.add(0, lead)
-            }
+        if (leadingPokemon != null) {
+            Collections.rotate(result, result.size - this.indexOfFirst { it.uuid == leadingPokemon })
         }
-
         return result
     }
     fun clearParty() {

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

@@ -16,9 +16,6 @@ import com.cobblemon.mod.common.api.battles.interpreter.BattleContext
  * @author Segfault Guy
  * @since April 10th, 2023
  */
-@Deprecated(message =
-    "This was designed before Doubles and Multi battle formats were introduce and has not been maintained since." +
-    "Accurate context for formats other than Singles is not guaranteed. This will be replaced in the near future.")
 class ContextManager {
 
     /** [BattleContext.Type] buckets containing [BattleContexts] of that type. */

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

@@ -10,7 +10,6 @@ package com.cobblemon.mod.common.block
 
 import com.cobblemon.mod.common.CobblemonBlocks
 import com.cobblemon.mod.common.CobblemonItems
-import com.cobblemon.mod.common.CobblemonSounds
 import com.cobblemon.mod.common.api.tags.CobblemonBlockTags
 import com.mojang.serialization.MapCodec
 import net.minecraft.core.BlockPos
@@ -26,7 +25,6 @@ import net.minecraft.world.level.block.Block
 import net.minecraft.world.level.block.Blocks
 import net.minecraft.world.level.block.CropBlock
 import net.minecraft.world.level.block.SimpleWaterloggedBlock
-import net.minecraft.world.level.block.SoundType
 import net.minecraft.world.level.block.state.BlockState
 import net.minecraft.world.level.block.state.StateDefinition
 import net.minecraft.world.level.block.state.properties.BlockStateProperties
@@ -224,8 +222,4 @@ class HeartyGrainsBlock(settings: Properties) : CropBlock(settings), SimpleWater
 
     private fun isLower(state: BlockState): Boolean =
         state.`is`(CobblemonBlocks.HEARTY_GRAINS) && state.getValue(HALF) == DoubleBlockHalf.LOWER
-
-    override fun getSoundType(state: BlockState): SoundType? {
-        return if (state.getValue(WATERLOGGED)) CobblemonSounds.HEARTY_GRAINS_WATER_SOUNDS else CobblemonSounds.HEARTY_GRAINS_SOUNDS
-    }
 }

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

@@ -236,8 +236,8 @@ class CookingPotMenu : RecipeBookMenu<CraftingInput, CookingPotRecipeBase>, Cont
                 slot.onQuickCraft(slotItemStack, itemStack);
             } else if (index in CampfireBlockEntity.Companion.PLAYER_INVENTORY_SLOTS || index in CampfireBlockEntity.Companion.PLAYER_HOTBAR_SLOTS) {
                 if (Seasonings.isSeasoning(slotItemStack)) {
-                    if (!this.moveItemStackTo(slotItemStack, CampfireBlockEntity.Companion.CRAFTING_GRID_SLOTS.first, CampfireBlockEntity.Companion.CRAFTING_GRID_SLOTS.last + 1, false) &&
-                        !this.moveItemStackTo(slotItemStack, CampfireBlockEntity.Companion.SEASONING_SLOTS.first, CampfireBlockEntity.Companion.SEASONING_SLOTS.last + 1, false)
+                    if (!this.moveItemStackTo(slotItemStack, CampfireBlockEntity.Companion.SEASONING_SLOTS.first, CampfireBlockEntity.Companion.SEASONING_SLOTS.last + 1, false) &&
+                        !this.moveItemStackTo(slotItemStack, CampfireBlockEntity.Companion.CRAFTING_GRID_SLOTS.first, CampfireBlockEntity.Companion.CRAFTING_GRID_SLOTS.last + 1, false)
                     ) {
                         return ItemStack.EMPTY
                     }

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

@@ -31,7 +31,7 @@ class CookingPotResultSlot(
         val menu = player.containerMenu
         if (menu is CookingPotMenu) {
             menu.broadcastChanges()
-            player.playNotifySound(CobblemonSounds.CAMPFIRE_POT_TAKE_ITEM, SoundSource.MASTER, 1.0f, 1.0f)
+            player.playNotifySound(CobblemonSounds.CAMPFIRE_POT_USE, SoundSource.MASTER, 1.0f, 1.0f)
         }
 
         super.onTake(player, stack)

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

@@ -91,21 +91,15 @@ class CampfireBlockEntity(pos: BlockPos, state: BlockState) : BaseContainerBlock
             if (!level.isClientSide) return
 
             val isLit = campfireBlockEntity.dataAccess.get(COOKING_PROGRESS_INDEX) > 0
-            val isRunningSoundActive = BlockEntitySoundTracker.isActive(pos, campfireBlockEntity.runningSound.location)
-            val isAmbientSoundActive = BlockEntitySoundTracker.isActive(pos, campfireBlockEntity.ambientSound.location)
-            val containsItems = campfireBlockEntity.getSeasonings().isNotEmpty() || campfireBlockEntity.getIngredients().isNotEmpty()
+            val isSoundActive = BlockEntitySoundTracker.isActive(pos, campfireBlockEntity.runningSound.location)
 
-            if (containsItems) {
-                if (isLit) {
-                    BlockEntitySoundTracker.stop(pos, campfireBlockEntity.ambientSound.location)
-                    if (!isRunningSoundActive) BlockEntitySoundTracker.play(pos, CancellableSoundInstance(campfireBlockEntity.runningSound, pos, true, 1.0f, 1.0f))
-                } else {
-                    BlockEntitySoundTracker.stop(pos, campfireBlockEntity.runningSound.location)
-                    if (!isAmbientSoundActive) BlockEntitySoundTracker.play(pos, CancellableSoundInstance(campfireBlockEntity.ambientSound, pos, true, 1.0f, 1.0f))
-                }
-            } else {
+            if (isLit && !isSoundActive) {
+                BlockEntitySoundTracker.play(
+                    pos,
+                    CancellableSoundInstance(campfireBlockEntity.runningSound, pos, true, 0.8f, 1.0f)
+                )
+            } else if (!isLit && isSoundActive) {
                 BlockEntitySoundTracker.stop(pos, campfireBlockEntity.runningSound.location)
-                BlockEntitySoundTracker.stop(pos, campfireBlockEntity.ambientSound.location)
             }
 
             campfireBlockEntity.brothColor =
@@ -200,7 +194,7 @@ class CampfireBlockEntity(pos: BlockPos, state: BlockState) : BaseContainerBlock
 
                     level.playSoundServer(
                         position = pos.bottomCenter,
-                        sound = CobblemonSounds.CAMPFIRE_POT_COOK,
+                        sound = CobblemonSounds.CAMPFIRE_POT_CRAFT,
                     )
 
                     setChanged(level, pos, state);
@@ -209,8 +203,7 @@ class CampfireBlockEntity(pos: BlockPos, state: BlockState) : BaseContainerBlock
         }
     }
 
-    private val runningSound = CobblemonSounds.CAMPFIRE_POT_ACTIVE
-    private val ambientSound = CobblemonSounds.CAMPFIRE_POT_AMBIENT
+    private val runningSound = CobblemonSounds.CAMPFIRE_POT_COOK
     private var cookingProgress: Int = 0
     private var cookingTotalTime: Int = COOKING_TOTAL_TIME
     private var isLidOpen: Boolean = true
@@ -438,7 +431,6 @@ class CampfireBlockEntity(pos: BlockPos, state: BlockState) : BaseContainerBlock
 
         if (level?.isClientSide == true) {
             BlockEntitySoundTracker.stop(blockPos, runningSound.location)
-            BlockEntitySoundTracker.stop(blockPos, ambientSound.location)
         }
     }
 

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

@@ -11,7 +11,6 @@ package com.cobblemon.mod.common.client.gui.cookingpot
 import com.cobblemon.mod.common.CobblemonNetwork.sendToServer
 import com.cobblemon.mod.common.api.gui.blitk
 import com.cobblemon.mod.common.block.campfirepot.CookingPotMenu
-import com.cobblemon.mod.common.block.campfirepot.SeasoningSlot
 import com.cobblemon.mod.common.block.entity.CampfireBlockEntity.Companion.IS_LID_OPEN_INDEX
 import com.cobblemon.mod.common.integration.jei.CobblemonJeiPlugin
 import com.cobblemon.mod.common.integration.jei.cooking.CampfirePotRecipeCategory
@@ -198,15 +197,6 @@ class CookingPotScreen(
         this.recipeBookComponent.renderTooltip(context, this.leftPos, this.topPos, mouseX, mouseY)
     }
 
-    override fun renderSlot(guiGraphics: GuiGraphics, slot: Slot) {
-        if (slot is SeasoningSlot && !menu.carried.isEmpty && !slot.mayPlace(menu.carried)) {
-            val x = slot.x
-            val y = slot.y
-            guiGraphics.fill(x,y,x+16,y+16,822018048)
-        }
-        super.renderSlot(guiGraphics, slot)
-    }
-
     override fun recipesUpdated() {
         this.recipeBookComponent.recipesUpdated()
     }

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

@@ -17,7 +17,6 @@ import net.minecraft.client.gui.GuiGraphics
 import net.minecraft.client.gui.components.Button
 import net.minecraft.client.resources.sounds.SimpleSoundInstance
 import net.minecraft.client.sounds.SoundManager
-import net.minecraft.network.chat.Component
 import net.minecraft.network.chat.MutableComponent
 import net.minecraft.resources.ResourceLocation
 
@@ -26,7 +25,7 @@ class SummaryTab(
     val label: MutableComponent? = null,
     val icon: ResourceLocation? = null,
     onPress: OnPress
-): Button(pX, pY, WIDTH, HEIGHT, label ?: Component.empty(), onPress, DEFAULT_NARRATION), CobblemonRenderable {
+): Button(pX, pY, WIDTH, HEIGHT, label, onPress, DEFAULT_NARRATION), CobblemonRenderable {
     companion object {
         private const val WIDTH = 39
         private const val HEIGHT = 13

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

@@ -8,26 +8,17 @@
 
 package com.cobblemon.mod.common.client.render.models.blockbench
 
-import com.cobblemon.mod.common.client.render.models.blockbench.PosableModel.Companion.getOrMakeShard
 import com.cobblemon.mod.common.client.render.models.blockbench.repository.RenderContext
-import com.cobblemon.mod.common.client.render.shader.CobblemonShaders
 import com.cobblemon.mod.common.entity.PosableEntity
-import com.cobblemon.mod.common.util.cobblemonResource
-import com.google.common.collect.ImmutableList
-import com.mojang.blaze3d.systems.RenderSystem
-import com.mojang.blaze3d.vertex.DefaultVertexFormat
 import net.minecraft.client.renderer.texture.OverlayTexture
 import net.minecraft.client.renderer.RenderType
 import com.mojang.blaze3d.vertex.VertexConsumer
 import net.minecraft.client.renderer.entity.LivingEntityRenderer
 import com.mojang.blaze3d.vertex.PoseStack
-import com.mojang.blaze3d.vertex.VertexFormat
 import net.minecraft.client.model.EntityModel
-import net.minecraft.client.renderer.RenderStateShard
 import net.minecraft.world.entity.Entity
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.resources.ResourceLocation
-import org.apache.commons.lang3.tuple.Triple
 
 /**
  * A wrapping around a [PosableModel] that presents as an [EntityModel]. This is used to continue using
@@ -38,46 +29,13 @@ import org.apache.commons.lang3.tuple.Triple
  * @since January 5th, 2024
  */
 abstract class PosableEntityModel<T : Entity>(
-    renderTypeFunc: (ResourceLocation) -> RenderType = {
-        val textures = ImmutableList.of(
-            Triple.of(it, false, false),
-            Triple.of(cobblemonResource("textures/tera_layer.png"), false, false),
-            Triple.of(cobblemonResource("textures/tera_layer.png"), false, false),
-            Triple.of(cobblemonResource("textures/tera_layer.png"), false, false),
-            Triple.of(cobblemonResource("textures/tera_layer.png"), false, false),
-        )
-        makeLayer(RenderStateShard.MultiTextureStateShard(textures), false, false, false)
-    }
+    renderTypeFunc: (ResourceLocation) -> RenderType = RenderType::entityCutout
 ) : EntityModel<T>(renderTypeFunc) {
     val context: RenderContext = RenderContext().also {
         it.put(RenderContext.RENDER_STATE, RenderContext.RenderState.WORLD)
     }
     lateinit var posableModel: PosableModel
 
-    companion object {
-        fun makeLayer(texture: RenderStateShard.EmptyTextureStateShard, emissive: Boolean, translucent: Boolean, translucentCull: Boolean): RenderType {
-            val multiPhaseParameters: RenderType.CompositeState = RenderType.CompositeState.builder()
-                .setShaderState(getOrMakeShard() as RenderStateShard.ShaderStateShard)
-                .setTextureState(texture)
-                .setTransparencyState(if (translucent) RenderStateShard.TRANSLUCENT_TRANSPARENCY else RenderStateShard.NO_TRANSPARENCY)
-                .setLightmapState(if (!emissive) RenderStateShard.LIGHTMAP else RenderStateShard.LightmapStateShard(false))
-                .setCullState(RenderStateShard.CULL)
-                .setWriteMaskState(RenderStateShard.COLOR_DEPTH_WRITE)
-                .setOverlayState(RenderStateShard.OVERLAY)
-                .createCompositeState(false)
-
-            return RenderType.create(
-                "cobblemon_entity_layer",
-                DefaultVertexFormat.NEW_ENTITY,
-                VertexFormat.Mode.QUADS,
-                256,
-                true,
-                translucent,
-                multiPhaseParameters
-            )
-        }
-    }
-
     override fun renderToBuffer(
         stack: PoseStack,
         buffer: VertexConsumer,
@@ -91,7 +49,6 @@ abstract class PosableEntityModel<T : Entity>(
             // We're using the living entity renderer, ergo we need to apply a Y offset of 24 model units (1.5 blocks) for reasons only God can tell us.
             stack.translate(0.0, 1.5, 0.0)
         }
-//        RenderSystem.setShader { CobblemonShaders.OVERLAY }
         posableModel.render(context, stack, buffer, packedLight, overlay, color)
     }
 

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

@@ -17,7 +17,6 @@ import com.cobblemon.mod.common.api.molang.MoLangFunctions.addFunctions
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.setup
 import com.cobblemon.mod.common.client.ClientMoLangFunctions.animationFunctions
 import com.cobblemon.mod.common.client.ClientMoLangFunctions.setupClient
-import com.cobblemon.mod.common.client.CobblemonClient
 import com.cobblemon.mod.common.client.entity.PokemonClientDelegate
 import com.cobblemon.mod.common.client.render.AnimatedModelTextureSupplier
 import com.cobblemon.mod.common.client.render.ModelLayer
@@ -34,7 +33,6 @@ import com.cobblemon.mod.common.client.render.models.blockbench.quirk.ModelQuirk
 import com.cobblemon.mod.common.client.render.models.blockbench.quirk.SimpleQuirk
 import com.cobblemon.mod.common.client.render.models.blockbench.repository.RenderContext
 import com.cobblemon.mod.common.client.render.models.blockbench.wavefunction.WaveFunction
-import com.cobblemon.mod.common.client.render.shader.CobblemonShaders
 import com.cobblemon.mod.common.entity.PosableEntity
 import com.cobblemon.mod.common.entity.PoseType
 import com.cobblemon.mod.common.entity.generic.GenericBedrockEntity
@@ -42,33 +40,26 @@ import com.cobblemon.mod.common.entity.npc.NPCEntity
 import com.cobblemon.mod.common.entity.pokeball.EmptyPokeBallEntity
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.util.asExpressionLike
-import com.cobblemon.mod.common.util.cobblemonResource
 import com.cobblemon.mod.common.util.plus
 import com.cobblemon.mod.common.util.toRGBA
-import com.google.common.collect.ImmutableList
 import com.mojang.blaze3d.systems.RenderSystem
 import com.mojang.blaze3d.vertex.DefaultVertexFormat
 import com.mojang.blaze3d.vertex.PoseStack
 import com.mojang.blaze3d.vertex.VertexConsumer
 import com.mojang.blaze3d.vertex.VertexFormat
 import com.mojang.math.Axis
-import net.minecraft.client.Minecraft
 import net.minecraft.client.model.geom.ModelPart
-import net.minecraft.client.renderer.GameRenderer
 import net.minecraft.client.renderer.MultiBufferSource
 import net.minecraft.client.renderer.RenderStateShard
 import net.minecraft.client.renderer.RenderType
-import net.minecraft.client.renderer.ShaderInstance
 import net.minecraft.client.renderer.texture.DynamicTexture
 import net.minecraft.resources.ResourceLocation
 import net.minecraft.util.Mth
 import net.minecraft.world.entity.Entity
 import net.minecraft.world.item.ItemDisplayContext
 import net.minecraft.world.phys.Vec3
-import org.apache.commons.lang3.tuple.Triple
 import org.joml.Matrix4f
 import org.joml.Vector3f
-import java.lang.reflect.Constructor
 
 /**
  * A model that can be posed and animated using [PoseAnimation]s and [ActiveAnimation]s. This
@@ -423,7 +414,6 @@ open class PosableModel(@Transient override val rootPart: Bone) : ModelFrame {
     /** Needed a custom one, so I can make it take in a dynamic texture instead of resource location */
     class DynamicStateShard(texture: DynamicTexture) : RenderStateShard.EmptyTextureStateShard(Runnable {
         RenderSystem.setShaderTexture(0, texture.id)
-        RenderSystem.setShaderTexture(1, cobblemonResource("textures/tera_layer.png"))
     }, Runnable {
         texture.close() // Cleanup
     })
@@ -463,14 +453,13 @@ open class PosableModel(@Transient override val rootPart: Bone) : ModelFrame {
         if (provider != null) {
             for (layer in currentLayers) {
                 var renderLayer : RenderType
-                var texture: ResourceLocation? = null
                 if (layer.texture is AnimatedModelTextureSupplier && layer.texture.interpolation) {
                     //Handle Interpolation
                     val texture = layer.texture.interpolatedTexture(currentState ?: FloatingState()) ?: continue
                     renderLayer = makeLayer(DynamicStateShard(texture), layer.emissive, layer.translucent, layer.translucent_cull)
                 }
                 else {
-                    texture = layer.texture?.invoke(currentState ?: FloatingState()) ?: continue
+                    val texture = layer.texture?.invoke(currentState ?: FloatingState()) ?: continue
                     renderLayer = getLayer(texture, layer.emissive, layer.translucent, layer.translucent_cull)
                 }
                 val consumer = provider.getBuffer(renderLayer)
@@ -501,21 +490,18 @@ open class PosableModel(@Transient override val rootPart: Bone) : ModelFrame {
         return ItemDisplayContext.valueOf(displayContextString)
     }
 
-    companion object {
-        var test: Any? = null
-
-        fun getOrMakeShard(): Any {
-            if (test == null) {
-                test = RenderStateShard.ShaderStateShard({ CobblemonShaders.OVERLAY })
-            }
-            return test!!
-        }
-    }
-
     /** Generates a [RenderType] by the power of god and anime. Only possible thanks to 100 access wideners. */
     fun makeLayer(texture: RenderStateShard.EmptyTextureStateShard, emissive: Boolean, translucent: Boolean, translucentCull: Boolean): RenderType {
         val multiPhaseParameters: RenderType.CompositeState = RenderType.CompositeState.builder()
-            .setShaderState(getOrMakeShard() as RenderStateShard.ShaderStateShard)
+            .setShaderState(
+                when {
+                    emissive && translucent -> RenderStateShard.RENDERTYPE_ENTITY_TRANSLUCENT_EMISSIVE_SHADER
+                    !emissive && translucent && translucentCull -> RenderStateShard.RENDERTYPE_ENTITY_TRANSLUCENT_CULL_SHADER
+                    !emissive && translucent -> RenderStateShard.RENDERTYPE_ENTITY_TRANSLUCENT_SHADER
+                    !emissive && !translucent -> RenderStateShard.RENDERTYPE_ENTITY_CUTOUT_SHADER
+                    else -> RenderStateShard.RENDERTYPE_ENTITY_TRANSLUCENT_EMISSIVE_SHADER // This one should be changed to maybe a custom shader? Translucent stuffs with things
+                }
+            )
             .setTextureState(texture)
             .setTransparencyState(if (translucent) RenderStateShard.TRANSLUCENT_TRANSPARENCY else RenderStateShard.NO_TRANSPARENCY)
             .setLightmapState(if (!emissive) RenderStateShard.LIGHTMAP else RenderStateShard.LightmapStateShard(false))
@@ -542,14 +528,7 @@ open class PosableModel(@Transient override val rootPart: Bone) : ModelFrame {
         } else if (!emissive && !translucentCull) {
             RenderType.entityTranslucent(texture)
         } else {
-            val texture = RenderStateShard.MultiTextureStateShard(ImmutableList.of(
-                Triple.of(texture, false, false),
-                Triple.of(cobblemonResource("textures/tera_layer.png"), false, false),
-                Triple.of(cobblemonResource("textures/tera_layer.png"), false, false),
-                Triple.of(cobblemonResource("textures/tera_layer.png"), false, false),
-                Triple.of(cobblemonResource("textures/tera_layer.png"), false, false),
-            ))
-            makeLayer(texture, emissive = emissive, translucent = translucent, translucentCull = translucentCull)
+            makeLayer(RenderStateShard.TextureStateShard(texture, false, false), emissive = emissive, translucent = translucent, translucentCull = translucentCull)
         }
     }
 

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

@@ -0,0 +1,88 @@
+/*
+ * 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.gen1
+
+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.PokemonPosableModel
+import com.cobblemon.mod.common.client.render.models.blockbench.pose.Pose
+import com.cobblemon.mod.common.entity.PoseType
+import com.cobblemon.mod.common.entity.PoseType.Companion.MOVING_POSES
+import com.cobblemon.mod.common.entity.PoseType.Companion.STATIONARY_POSES
+import com.cobblemon.mod.common.entity.PoseType.Companion.UI_POSES
+import com.cobblemon.mod.common.util.isBattling
+import net.minecraft.client.model.geom.ModelPart
+import net.minecraft.world.phys.Vec3
+
+class DrowzeeModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame, BipedFrame {
+    override val rootPart = root.registerChildWithAllChildren("drowzee")
+    override val head = getPart("head")
+
+    override val leftLeg = getPart("left_leg")
+    override val rightLeg = getPart("right_leg")
+
+    override var portraitScale = 2.4F
+    override var portraitTranslation = Vec3(0.0, -0.1, 0.0)
+
+    override var profileScale = 0.9F
+    override var profileTranslation = Vec3(0.0, 0.4, 0.0)
+
+    lateinit var standing: Pose
+    lateinit var walk: Pose
+    lateinit var sleep: Pose
+    lateinit var battleidle: Pose
+
+    override fun registerPoses() {
+        val blink = quirk { bedrockStateful("drowzee", "blink")}
+        sleep = registerPose(
+            poseType = PoseType.SLEEP,
+            animations = arrayOf(bedrock("drowzee", "sleep"))
+        )
+
+        standing = registerPose(
+            poseName = "standing",
+            poseTypes = STATIONARY_POSES + UI_POSES,
+            transformTicks = 10,
+            condition = { !it.isBattling },
+            quirks = arrayOf(blink),
+            animations = arrayOf(
+                singleBoneLook(),
+                bedrock("drowzee", "ground_idle")
+            )
+        )
+
+        walk = registerPose(
+            poseName = "walk",
+            poseTypes = MOVING_POSES,
+            transformTicks = 10,
+            quirks = arrayOf(blink),
+            animations = arrayOf(
+                singleBoneLook(),
+                bedrock("drowzee", "ground_walk")
+            )
+        )
+
+        battleidle = registerPose(
+            poseName = "battle_idle",
+            poseTypes = PoseType.STATIONARY_POSES,
+            transformTicks = 10,
+            quirks = arrayOf(blink),
+            condition = { it.isBattling },
+            animations = arrayOf(
+                singleBoneLook(),
+                bedrock("drowzee", "battle_idle")
+            )
+        )
+    }
+
+//    override fun getFaintAnimation(
+//        pokemonEntity: PokemonEntity,
+//        state: PosableState<PokemonEntity>
+//    ) = if (state.isPosedIn(standing, walk)) bedrockStateful("drowzee", "faint") else null
+}

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

@@ -0,0 +1,86 @@
+/*
+ * 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.gen1
+
+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.PokemonPosableModel
+import com.cobblemon.mod.common.client.render.models.blockbench.pose.Pose
+import com.cobblemon.mod.common.entity.PoseType
+import com.cobblemon.mod.common.entity.PoseType.Companion.MOVING_POSES
+import com.cobblemon.mod.common.entity.PoseType.Companion.STATIONARY_POSES
+import com.cobblemon.mod.common.entity.PoseType.Companion.UI_POSES
+import com.cobblemon.mod.common.util.isBattling
+import net.minecraft.client.model.geom.ModelPart
+import net.minecraft.world.phys.Vec3
+
+class HypnoModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame, BipedFrame {
+    override val rootPart = root.registerChildWithAllChildren("hypno")
+    override val head = getPart("head")
+
+    override val leftLeg = getPart("left_upper_leg")
+    override val rightLeg = getPart("right_upper_leg")
+
+    override var portraitScale = 2.1F
+    override var portraitTranslation = Vec3(-0.3, 0.6, 0.0)
+
+    override var profileScale = 0.8F
+    override var profileTranslation = Vec3(-0.05, 0.5, 0.0)
+
+    lateinit var standing: Pose
+    lateinit var walk: Pose
+    lateinit var sleep: Pose
+    lateinit var battleidle: Pose
+
+    override fun registerPoses() {
+        val blink = quirk { bedrockStateful("hypno", "blink")}
+        sleep = registerPose(
+            poseType = PoseType.SLEEP,
+            animations = arrayOf(bedrock("hypno", "sleep"))
+        )
+
+        standing = registerPose(
+            poseName = "standing",
+            poseTypes = STATIONARY_POSES + UI_POSES,
+            quirks = arrayOf(blink),
+            condition = { !it.isBattling },
+            animations = arrayOf(
+                singleBoneLook(),
+                bedrock("hypno", "ground_idle")
+            )
+        )
+
+        walk = registerPose(
+            poseName = "walk",
+            poseTypes = MOVING_POSES,
+            quirks = arrayOf(blink),
+            animations = arrayOf(
+                singleBoneLook(),
+                bedrock("hypno", "ground_walk")
+            )
+        )
+
+        battleidle = registerPose(
+            poseName = "battle_idle",
+            poseTypes = PoseType.STATIONARY_POSES,
+            transformTicks = 10,
+            quirks = arrayOf(blink),
+            condition = { it.isBattling },
+            animations = arrayOf(
+                singleBoneLook(),
+                bedrock("hypno", "battle_idle")
+            )
+        )
+    }
+
+//    override fun getFaintAnimation(
+//        pokemonEntity: PokemonEntity,
+//        state: PosableState<PokemonEntity>
+//    ) = if (state.isPosedIn(standing, walk)) bedrockStateful("hypno", "faint") else null
+}

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

@@ -262,6 +262,7 @@ object VaryingModelRepository {
         inbuilt("ditto", ::DittoModel)
         inbuilt("dodrio", ::DodrioModel)
         inbuilt("doduo", ::DoduoModel)
+        inbuilt("drowzee", ::DrowzeeModel)
         inbuilt("electabuzz", ::ElectabuzzModel)
         inbuilt("exeggcute", ::ExeggcuteModel)
         inbuilt("exeggutor", ::ExeggutorModel)
@@ -278,6 +279,7 @@ object VaryingModelRepository {
         inbuilt("growlithe", ::GrowlitheModel)
         inbuilt("hitmonchan", ::HitmonchanModel)
         inbuilt("hitmonlee", ::HitmonleeModel)
+        inbuilt("hypno", ::HypnoModel)
         inbuilt("jynx", ::JynxModel)
         inbuilt("kabuto", ::KabutoModel)
         inbuilt("kabutops", ::KabutopsModel)

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

@@ -20,7 +20,6 @@ object CobblemonShaders {
     lateinit var PARTICLE_BLEND: ShaderInstance
     // This is Material.ALPHA. Weird internal name for "alphatest" shader.
     lateinit var PARTICLE_CUTOUT: ShaderInstance
-    lateinit var OVERLAY: ShaderInstance
 
     private fun registerShader(shader: (ResourceProvider) -> ShaderRegistryData, callback: Consumer<ShaderInstance>){
         SHADERS_TO_REGISTER.add(Pair(shader, callback))
@@ -32,8 +31,5 @@ object CobblemonShaders {
         registerShader({rm: ResourceProvider -> ShaderRegistryData(rm, cobblemonResource("particle_cutout"), DefaultVertexFormat.POSITION_COLOR_TEX_LIGHTMAP) }) {
             PARTICLE_CUTOUT = it
         }
-        registerShader({rm: ResourceProvider -> ShaderRegistryData(rm, cobblemonResource("overlay"), DefaultVertexFormat.NEW_ENTITY) }) {
-            OVERLAY = it
-        }
     }
 }

common/src/main/kotlin/com/cobblemon/mod/common/integration/jei/cooking/CampfirePotRecipeCategory.kt

@@ -10,7 +10,6 @@ package com.cobblemon.mod.common.integration.jei.cooking
 
 import com.cobblemon.mod.common.CobblemonItems
 import com.cobblemon.mod.common.api.berry.Berries
-import com.cobblemon.mod.common.api.cooking.Seasonings
 import com.cobblemon.mod.common.block.entity.CampfireBlockEntity
 import com.cobblemon.mod.common.block.entity.CampfireBlockEntity.Companion.CRAFTING_GRID_WIDTH
 import com.cobblemon.mod.common.block.entity.CampfireBlockEntity.Companion.SEASONING_SLOTS
@@ -33,7 +32,6 @@ import mezz.jei.api.recipe.category.IRecipeCategory
 import mezz.jei.api.registration.IRecipeCategoryRegistration
 import net.minecraft.client.Minecraft
 import net.minecraft.client.gui.GuiGraphics
-import net.minecraft.core.registries.BuiltInRegistries
 import net.minecraft.network.chat.Component
 import net.minecraft.resources.ResourceLocation
 import net.minecraft.world.item.crafting.Ingredient
@@ -49,7 +47,7 @@ class CampfirePotRecipeCategory(registration: IRecipeCategoryRegistration) : IRe
         const val WIDTH = 146
         const val HEIGHT = 59
 
-        val EXAMPLE_SEASONINGS = BuiltInRegistries.ITEM.map { it.defaultInstance }.filter { Seasonings.isSeasoning(it) }
+        val EXAMPLE_SEASONINGS = Berries.all().map { it.item()?.defaultInstance }
     }
 
     val guiHelper: IGuiHelper = registration.jeiHelpers.guiHelper
@@ -82,25 +80,11 @@ class CampfirePotRecipeCategory(registration: IRecipeCategoryRegistration) : IRe
             builder.addSlot(RecipeIngredientRole.INPUT, x, y).addIngredients(ingredient)
         }
 
-        if (recipe.seasoningProcessors.isNotEmpty()) {
-            val processedSeasonings = EXAMPLE_SEASONINGS.filter { item ->
-                var valid = true
-                recipe.seasoningProcessors.forEach {
-                    if (!it.consumesItem(item)) {
-                        valid = false
-                        return@forEach
-                    }
-                }
-                valid
-            }
+        for ((index, _) in SEASONING_SLOTS.withIndex()) {
+            val x = 93 + index * 18
+            val y = 1
 
-            for ((index, _) in SEASONING_SLOTS.withIndex()) {
-                val x = 93 + index * 18
-                val y = 1
-
-                builder.addSlot(RecipeIngredientRole.INPUT, x, y)
-                    .addIngredients(VanillaTypes.ITEM_STACK, processedSeasonings.shuffled())
-            }
+            builder.addSlot(RecipeIngredientRole.INPUT, x, y).addIngredients(VanillaTypes.ITEM_STACK, EXAMPLE_SEASONINGS.shuffled())
         }
 
         val registryAccess = Minecraft.getInstance().level?.registryAccess() ?: throw IllegalStateException("Registry access not found")

common/src/main/kotlin/com/cobblemon/mod/common/item/CampfirePotItem.kt

@@ -65,7 +65,7 @@ class CampfirePotItem(block: Block): BlockItem(block, Properties()) {
                     if (newBlockEntity.getPotItem() == null || newBlockEntity.getPotItem()!!.isEmpty) {
                         newBlockEntity.setPotItem(ItemStack(this).split(1))
                         context.itemInHand.consume(1, player)
-                        world.playSound(null, blockPos, CobblemonSounds.CAMPFIRE_POT_SET, SoundSource.BLOCKS, 1.0F, 1.0F)
+                        world.playSound(null, blockPos, CobblemonSounds.CAMPFIRE_POT_PLACE_CAMPFIRE, SoundSource.BLOCKS, 0.7F, 1.0F)
                         return InteractionResult.SUCCESS
                     }
                 }

common/src/main/kotlin/com/cobblemon/mod/common/item/crafting/BaitSeasoningProcessor.kt

@@ -36,6 +36,6 @@ object BaitSeasoningProcessor : SeasoningProcessor {
 
     override fun consumesItem(seasoning: ItemStack): Boolean {
         val seasoningData = Seasonings.getFromItemStack(seasoning)
-        return seasoningData != null && (!seasoningData.baitEffects.isNullOrEmpty() || SpawnBaitEffects.getBaitIdentifiersFromItem(seasoning.itemHolder).isNotEmpty())
+        return seasoningData != null && !seasoningData.baitEffects.isNullOrEmpty()
     }
 }

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0089_muk/muk_alolan.animation.json

@@ -1,181 +0,0 @@
-{
-	"format_version": "1.8.0",
-	"animations": {
-		"animation.muk_alolan.ground_idle": {
-			"loop": true,
-			"bones": {
-				"body": {
-					"scale": [1.2, 1, 1]
-				},
-				"body2": {
-					"rotation": [0, 0, 2.5],
-					"scale": [0.8, 1, 1]
-				},
-				"arm_left": {
-					"rotation": [-2.4905, 0.21782, 4.99527]
-				},
-				"arm_left2": {
-					"rotation": [2.06319, 1.18242, -4.91091]
-				},
-				"arm_left3": {
-					"rotation": [4.98107, 0.43523, -4.98107]
-				},
-				"hand_left": {
-					"rotation": [5, 0, 0]
-				},
-				"finger_inner_left": {
-					"rotation": [0, -15, 0]
-				},
-				"finger_middle_left": {
-					"rotation": [17.25002, 2.99318, -9.54589]
-				},
-				"finger_outer_left": {
-					"rotation": [0, 10, 0]
-				},
-				"arm_right": {
-					"rotation": [34.89743, 2.86544, -4.09918]
-				},
-				"arm_right2": {
-					"rotation": [40, 0, 0]
-				},
-				"arm_right3": {
-					"rotation": [25, 0, 0]
-				},
-				"hand_right": {
-					"rotation": [12.5, 0, 0]
-				},
-				"finger_inner_right": {
-					"rotation": [0, 7.5, 0]
-				},
-				"finger_middle_right": {
-					"rotation": [20, 0, 0]
-				},
-				"finger_outer_right": {
-					"rotation": [0, -5, 0]
-				},
-				"muzzle": {
-					"rotation": [2.5, 0, 0]
-				},
-				"mouth_sludge": {
-					"rotation": [0, -2.5, 0]
-				},
-				"jaw": {
-					"rotation": [-2.5, 0, 0]
-				},
-				"mouth_sludge2": {
-					"rotation": [-5.00474, -2.49048, 0.21803]
-				},
-				"body_base_left": {
-					"scale": [1.2, 1, 1]
-				},
-				"body_base_left2": {
-					"scale": [1.2, 1, 1]
-				},
-				"body_base_right": {
-					"scale": [1.2, 1, 1]
-				},
-				"body_base_right2": {
-					"scale": [1.2, 1, 1]
-				},
-				"slime_left": {
-					"rotation": [-10, 0, 0]
-				},
-				"slime_right2": {
-					"rotation": [-112.5, 0, 0]
-				}
-			}
-		},
-		"animation.muk_alolan.blink": {
-			"animation_length": 0.1667,
-			"bones": {
-				"eyelid_left": {
-					"position": {
-						"0.0": [0.1, 0, -0.1],
-						"0.125": [0.1, 0, -0.1],
-						"0.1667": [0, 0, 0]
-					}
-				},
-				"eyelid_right": {
-					"position": {
-						"0.0": [-0.1, 0, -0.1],
-						"0.125": [-0.1, 0, -0.1],
-						"0.1667": [0, 0, 0]
-					}
-				}
-			}
-		},
-		"animation.muk_alolan.shock": {
-			"loop": true,
-			"bones": {
-				"pupil_left": {
-					"scale": [0.7, 0.7, 1]
-				},
-				"eye_detail_left2": {
-					"position": [0, 0.5, 0]
-				},
-				"pupil_right": {
-					"scale": [0.7, 0.7, 1]
-				},
-				"eye_detail_right2": {
-					"position": [0, 0.5, 0]
-				}
-			}
-		},
-		"animation.muk_alolan.neutral": {
-			"loop": true,
-			"bones": {
-				"eye_detail_left1": {
-					"position": [0, -0.25, 0]
-				},
-				"eye_detail_left2": {
-					"position": [0, 0.25, 0]
-				},
-				"eye_detail_right1": {
-					"position": [0, -0.25, 0]
-				},
-				"eye_detail_right2": {
-					"position": [0, 0.25, 0]
-				}
-			}
-		},
-		"animation.muk_alolan.sad": {
-			"loop": true,
-			"bones": {
-				"eye_detail_left1": {
-					"position": [0, -0.5, 0]
-				},
-				"eye_detail_left2": {
-					"position": [0, 0.5, 0]
-				},
-				"eye_detail_right1": {
-					"position": [0, -0.5, 0]
-				},
-				"eye_detail_right2": {
-					"position": [0, 0.5, 0]
-				}
-			}
-		},
-		"animation.muk_alolan.happy": {
-			"loop": true,
-			"bones": {
-				"eyelid_happy_left": {
-					"position": [0.1, 0, -0.1]
-				},
-				"eyelid_happy_right": {
-					"position": [-0.1, 0, -0.1]
-				}
-			}
-		},
-		"animation.muk_alolan.hurt": {
-			"loop": true,
-			"bones": {
-				"eyelid_recoil_left": {
-					"position": [0.1, 0, -0.1]
-				},
-				"eyelid_recoil_right": {
-					"position": [-0.1, 0, -0.1]
-				}
-			}
-		}
-	}
-}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0090_shellder/shellder.animation.json

@@ -439,7 +439,7 @@
 			}
 		},
 		"animation.shellder.recoil": {
-			"animation_length": 0.5,
+			"loop": true,
 			"bones": {
 				"eyelid_recoil_left": {
 					"position": [0, 0, -0.1]

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0091_cloyster/cloyster.animation.json

@@ -460,7 +460,7 @@
 			}
 		},
 		"animation.cloyster.recoil": {
-			"animation_length": 0.5,
+			"loop": true,
 			"bones": {
 				"mouth_smile": {
 					"position": [0, 0, 0.1]

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0122_mrmime/mr_mime_galarian.animation.json

@@ -1,211 +0,0 @@
-{
-	"format_version": "1.8.0",
-	"animations": {
-		"animation.mr_mime_galarian.ground_idle": {
-			"loop": true,
-			"bones": {
-				"body": {
-					"position": [0, -0.5, 0]
-				},
-				"torso": {
-					"rotation": [-5, 0, 0]
-				},
-				"shoulder_right": {
-					"rotation": [-2.35804, 4.97826, -21.06027]
-				},
-				"arm_right": {
-					"rotation": [53.76961, -6.91198, -26.80104]
-				},
-				"arm_right3": {
-					"rotation": [0, -115, 0]
-				},
-				"wrist_right": {
-					"rotation": [-30.90686, -10.58927, 0.43512]
-				},
-				"fingers_right": {
-					"rotation": [0, 0, -22.5]
-				},
-				"fingers_right2": {
-					"rotation": [0, 0, -5]
-				},
-				"thumb_right_rotation": {
-					"rotation": [2.62262, 7.32408, -4.69095]
-				},
-				"thumb_right2": {
-					"rotation": [0, 0, 0]
-				},
-				"shoulder_left": {
-					"rotation": [-2.35804, -4.97826, 21.06027]
-				},
-				"arm_left": {
-					"rotation": [53.76961, 6.91198, 26.80104]
-				},
-				"arm_left3": {
-					"rotation": [0, 115, 0]
-				},
-				"wrist_left": {
-					"rotation": [-30.90686, 10.58927, -0.43512]
-				},
-				"fingers_left": {
-					"rotation": [0, 0, 22.5]
-				},
-				"fingers_left2": {
-					"rotation": [0, 0, 5]
-				},
-				"thumb_left_rotation": {
-					"rotation": [2.62262, -7.32408, 4.69095]
-				},
-				"thumb_left2": {
-					"rotation": [0, 0, 0]
-				},
-				"head": {
-					"rotation": [7.5, 0, 0]
-				},
-				"ear_right": {
-					"rotation": [0, 0, 0]
-				},
-				"ear_left": {
-					"rotation": [0, 0, 0]
-				},
-				"leg_right": {
-					"rotation": [2.5, 12.5, 0]
-				},
-				"leg_right2": {
-					"rotation": [17.5, 0, 0]
-				},
-				"foot_right": {
-					"rotation": [-17.5, 0, 0]
-				},
-				"foot_right2": {
-					"rotation": [-7.5, 0, 0]
-				},
-				"foot_right3": {
-					"rotation": [5, 0, 0]
-				},
-				"leg_left": {
-					"rotation": [2.5, -12.5, 0]
-				},
-				"leg_left2": {
-					"rotation": [17.5, 0, 0]
-				},
-				"foot_left": {
-					"rotation": [-17.5, 0, 0]
-				},
-				"foot_left2": {
-					"rotation": [-7.5, 0, 0]
-				},
-				"foot_left3": {
-					"rotation": [5, 0, 0]
-				}
-			}
-		},
-		"animation.mr_mime_galarian.blink": {
-			"animation_length": 0.1667,
-			"bones": {
-				"eyelid_left": {
-					"position": {
-						"0.0": [0, 0, -0.1],
-						"0.125": [0, 0, -0.1],
-						"0.1667": [0, 0, 0]
-					}
-				},
-				"eyelid_right": {
-					"position": {
-						"0.0": [0, 0, -0.1],
-						"0.125": [0, 0, -0.1],
-						"0.1667": [0, 0, 0]
-					}
-				}
-			}
-		},
-		"animation.mr_mime_galarian.cry": {
-			"animation_length": 1.5,
-			"bones": {
-				"mouth_closed": {
-					"position": {
-						"0.0": [0, 0, 0],
-						"0.25": {"pre": [0, 0, 0], "post": [0, 0, 0.1]},
-						"1.25": {"pre": [0, 0, 0.1], "post": [0, 0, 0.1]},
-						"1.5": {"pre": [0, 0, 0.1], "post": [0, 0, 0]}
-					}
-				},
-				"mouth_open": {
-					"position": {
-						"0.0": [0, 0, 0],
-						"0.25": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
-						"1.25": {"pre": [0, 0, -0.1], "post": [0, 0, -0.1]},
-						"1.5": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}
-					}
-				}
-			}
-		},
-		"animation.mr_mime_galarian.render": {
-			"loop": true,
-			"bones": {
-				"torso": {
-					"rotation": [-2.5, -5, -2.5]
-				},
-				"shoulder_right": {
-					"rotation": [0, 0, 7.5]
-				},
-				"arm_right": {
-					"rotation": [-80.45411, 2.99318, -17.25002]
-				},
-				"arm_right3": {
-					"rotation": [0, -75, 0]
-				},
-				"wrist_right": {
-					"rotation": [-25, 0, 10]
-				},
-				"fingers_right": {
-					"rotation": [0, 0, -17.5]
-				},
-				"head": {
-					"rotation": [5.03742, 4.92385, 0.87038]
-				},
-				"thumb_right2": {
-					"rotation": [0, 0, -35]
-				},
-				"shoulder_left": {
-					"rotation": [0, 0, -7.5]
-				},
-				"arm_left": {
-					"rotation": [-80.00933, -0.43399, 2.46207]
-				},
-				"arm_left3": {
-					"rotation": [0, 30, 0]
-				},
-				"wrist_left": {
-					"rotation": [-25, 0, -10]
-				},
-				"fingers_left": {
-					"rotation": [0, 0, 17.5]
-				},
-				"thumb_left2": {
-					"rotation": [0, 0, 35]
-				},
-				"leg_right": {
-					"rotation": [7.41547, 7.38542, -1.30962]
-				},
-				"leg_right2": {
-					"rotation": [12.5, 0, 0]
-				},
-				"foot_right": {
-					"rotation": [-9.99067, 0.43399, 2.46207]
-				},
-				"foot_right2": {
-					"rotation": [-7.5, 0, 0]
-				},
-				"leg_left": {
-					"rotation": [-52.74164, -34.34495, 2.42059]
-				},
-				"leg_left2": {
-					"rotation": [2.5, 0, 0]
-				},
-				"foot_left": {
-					"rotation": [-10, 0, 0]
-				}
-			}
-		}
-	}
-}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0183_marill/marill.animation.json

@@ -1,246 +0,0 @@
-{
-	"format_version": "1.8.0",
-	"animations": {
-		"animation.marill.ground_idle": {
-			"loop": true,
-			"bones": {
-				"foot_right": {
-					"rotation": [0, 17.5, 0]
-				},
-				"foot_left": {
-					"rotation": [0, -17.5, 0]
-				},
-				"ear_right": {
-					"rotation": [0, 15, -20]
-				},
-				"ear_left": {
-					"rotation": [0, -15, 20]
-				},
-				"arm_left": {
-					"rotation": [20, -12.5, 0]
-				},
-				"hand_left": {
-					"rotation": [0, 27.5, 0],
-					"position": [0.1, 0, 0.45]
-				},
-				"arm_right": {
-					"rotation": [20, 12.5, 0]
-				},
-				"hand_right": {
-					"rotation": [0, -27.5, 0],
-					"position": [-0.1, 0, 0.45]
-				},
-				"tail": {
-					"rotation": [10, 0, 0]
-				},
-				"tail2": {
-					"rotation": [-57.5, 0, 0]
-				},
-				"tail3": {
-					"rotation": [100, 0, 0]
-				},
-				"tail4": {
-					"rotation": [-90, 0, 0]
-				},
-				"tail5": {
-					"rotation": [85, 0, 0]
-				},
-				"tail6": {
-					"rotation": [-85, 0, 0]
-				},
-				"tail7": {
-					"rotation": [85, 0, 0]
-				},
-				"tail_ball": {
-					"rotation": [-47.5, 0, 0]
-				}
-			}
-		},
-		"animation.marill.water_idle": {
-			"loop": true,
-			"bones": {
-				"foot_right": {
-					"rotation": [0, 17.5, 0]
-				},
-				"foot_left": {
-					"rotation": [0, -17.5, 0]
-				},
-				"ear_right": {
-					"rotation": [0, 15, -20]
-				},
-				"ear_left": {
-					"rotation": [0, -15, 20]
-				},
-				"arm_left": {
-					"rotation": [30, -60, 0]
-				},
-				"hand_left": {
-					"rotation": [-22.5, 0, 0],
-					"position": [0, -0.05, 0.375]
-				},
-				"arm_right": {
-					"rotation": [30, 60, 0]
-				},
-				"hand_right": {
-					"rotation": [-22.5, 0, 0],
-					"position": [0, -0.05, 0.375]
-				},
-				"tail": {
-					"rotation": [0, 0, 0]
-				},
-				"tail2": {
-					"rotation": [-57.5, 0, 0]
-				},
-				"tail3": {
-					"rotation": [100, 0, 0]
-				},
-				"tail4": {
-					"rotation": [-90, 0, 0]
-				},
-				"tail5": {
-					"rotation": [85, 0, 0]
-				},
-				"tail6": {
-					"rotation": [-85, 0, 0]
-				},
-				"tail7": {
-					"rotation": [85, 0, 0]
-				},
-				"tail_ball": {
-					"rotation": [-47.5, 0, 0]
-				},
-				"feet": {
-					"rotation": [35, 0, 0],
-					"position": [0, 1, 0]
-				},
-				"torso": {
-					"rotation": [5, 0, 0]
-				}
-			}
-		},
-		"animation.marill.blink": {
-			"animation_length": 0.1667,
-			"bones": {
-				"eye_left": {
-					"position": {
-						"0.0": [0, 0, 0.1],
-						"0.1667": {
-							"pre": [0, 0, 0.1],
-							"post": [0, 0, 0]
-						}
-					}
-				},
-				"eye_right": {
-					"position": {
-						"0.0": [0, 0, 0.1],
-						"0.1667": {
-							"pre": [0, 0, 0.1],
-							"post": [0, 0, 0]
-						}
-					}
-				},
-				"eyelid_right": {
-					"position": {
-						"0.0": [0, 0, -0.1],
-						"0.1667": {
-							"pre": [0, 0, -0.1],
-							"post": [0, 0, 0]
-						}
-					}
-				},
-				"eyelid_left": {
-					"position": {
-						"0.0": [0, 0, -0.1],
-						"0.1667": {
-							"pre": [0, 0, -0.1],
-							"post": [0, 0, 0]
-						}
-					}
-				}
-			}
-		},
-		"animation.marill.sleep": {
-			"loop": true,
-			"bones": {
-				"ear_right": {
-					"rotation": [0, 15, -20]
-				},
-				"ear_left": {
-					"rotation": [0, -15, 20]
-				},
-				"eye_left": {
-					"position": [0, 0, 0.1]
-				},
-				"eye_right": {
-					"position": [0, 0, 0.1]
-				},
-				"mouth_closed_smile": {
-					"position": [0, 0, 0.1]
-				},
-				"mouth_closed_frown_small": {
-					"position": [0, 0, -0.1]
-				},
-				"eyelid_right": {
-					"position": [0, 0, -0.1]
-				},
-				"eyelid_left": {
-					"position": [0, 0, -0.1]
-				},
-				"body": {
-					"rotation": [-12.5, 0, 0],
-					"position": [0, -1, 0]
-				},
-				"feet": {
-					"position": [0, -0.5, -8.5]
-				},
-				"foot_left": {
-					"rotation": [-52.5, -30, 25]
-				},
-				"foot_right": {
-					"rotation": [-52.5, 30, -25]
-				},
-				"torso": {
-					"position": [0, -0.5, 0]
-				},
-				"tail": {
-					"rotation": [32.5, 45, 0]
-				},
-				"tail2": {
-					"rotation": [-45, 0, 0]
-				},
-				"tail3": {
-					"rotation": [45, 67.5, 0]
-				},
-				"tail4": {
-					"rotation": [-90, 0, 0]
-				},
-				"tail5": {
-					"rotation": [67.5, 45, 0]
-				},
-				"tail6": {
-					"rotation": [-67.5, 0, 0]
-				},
-				"tail7": {
-					"rotation": [45, 0, 0]
-				},
-				"tail_ball": {
-					"rotation": [-18, 40.5, 25]
-				},
-				"arm_left": {
-					"rotation": [30, -22.5, 0]
-				},
-				"hand_left": {
-					"rotation": [0, 45, 0],
-					"position": [0.275, 0, 0.725]
-				},
-				"arm_right": {
-					"rotation": [30, 22.5, 0]
-				},
-				"hand_right": {
-					"rotation": [0, -45, 0],
-					"position": [-0.275, 0, 0.725]
-				}
-			}
-		}
-	}
-}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0184_azumarill/azumarill.animation.json

@@ -1,285 +0,0 @@
-{
-	"format_version": "1.8.0",
-	"animations": {
-		"animation.azumarill.ground_idle": {
-			"loop": true,
-			"bones": {
-				"foot_left": {
-					"rotation": [10, -25, 0]
-				},
-				"foot_right": {
-					"rotation": [10, 25, 0]
-				},
-				"arm_left": {
-					"rotation": [0, 15, 45]
-				},
-				"hand_left": {
-					"rotation": [0, 0, -25],
-					"position": [-0.4, -0.1, 0]
-				},
-				"arm_right": {
-					"rotation": [0, -15, -45]
-				},
-				"hand_right": {
-					"rotation": [0, 0, 25],
-					"position": [0.4, -0.1, 0]
-				},
-				"tail2": {
-					"rotation": [-67.5, 0, 0]
-				},
-				"tail3": {
-					"rotation": [115, 0, 0]
-				},
-				"tail4": {
-					"rotation": [-90, 0, 0]
-				},
-				"tail5": {
-					"rotation": [112.5, 0, 0]
-				},
-				"tail6": {
-					"rotation": [-112.5, 0, 0]
-				},
-				"tail7": {
-					"rotation": [110, 0, 0]
-				},
-				"tail_ball": {
-					"rotation": [-57.5, 0, 0]
-				},
-				"body": {
-					"position": [0, 0.5, 0]
-				},
-				"toes_left": {
-					"rotation": [-10, 0, 0],
-					"position": [0, 0, 0.25]
-				},
-				"toes_right": {
-					"rotation": [-10, 0, 0],
-					"position": [0, 0, 0.25]
-				},
-				"tail": {
-					"rotation": [-10, 0, 0]
-				},
-				"ear_left": {
-					"rotation": [0, -15, 15]
-				},
-				"ear_left2": {
-					"rotation": [45, 0, 0]
-				},
-				"ear_right": {
-					"rotation": [0, 15, -15]
-				},
-				"ear_right2": {
-					"rotation": [95, 0, 0]
-				}
-			}
-		},
-		"animation.azumarill.water_idle": {
-			"loop": true,
-			"bones": {
-				"tail_active": {
-					"position": [0, 0, 0.1],
-					"scale": 0.1
-				},
-				"feet": {
-					"rotation": [45, 0, 0],
-					"position": [0, 1, 0]
-				},
-				"foot_left": {
-					"rotation": [0, -17.5, 0]
-				},
-				"foot_right": {
-					"rotation": [0, 17.5, 0]
-				},
-				"torso": {
-					"rotation": [5, 0, 0]
-				},
-				"tail": {
-					"rotation": [-5, 0, 0]
-				},
-				"tail2": {
-					"rotation": [-57.5, 0, 0]
-				},
-				"tail3": {
-					"rotation": [100, 0, 0]
-				},
-				"tail4": {
-					"rotation": [-90, 0, 0]
-				},
-				"tail5": {
-					"rotation": [85, 0, 0]
-				},
-				"tail6": {
-					"rotation": [-85, 0, 0]
-				},
-				"tail7": {
-					"rotation": [85, 0, 0]
-				},
-				"tail_ball": {
-					"rotation": [-47.5, 0, 0]
-				},
-				"ear_left": {
-					"rotation": [0, -15, 15]
-				},
-				"ear_left2": {
-					"rotation": [45, 0, 0]
-				},
-				"ear_right": {
-					"rotation": [0, 15, -15]
-				},
-				"ear_right2": {
-					"rotation": [90, 0, 0]
-				},
-				"arm_left": {
-					"rotation": [0, 25, 35]
-				},
-				"hand_left": {
-					"rotation": [0, 0, -25],
-					"position": [-0.4, -0.1, 0]
-				},
-				"arm_right": {
-					"rotation": [0, -25, -35]
-				},
-				"hand_right": {
-					"rotation": [0, 0, 25],
-					"position": [0.4, -0.1, 0]
-				}
-			}
-		},
-		"animation.azumarill.sleep": {
-			"loop": true,
-			"bones": {
-				"feet": {
-					"rotation": [-40, 0, 0],
-					"position": [0, 0, -6]
-				},
-				"foot_left": {
-					"rotation": [-10, -25, 0]
-				},
-				"toes_left": {
-					"rotation": [17.5, 0, 0],
-					"position": [0, 0, 0.25]
-				},
-				"foot_right": {
-					"rotation": [-10, 25, 0]
-				},
-				"toes_right": {
-					"rotation": [17.5, 0, 0],
-					"position": [0, 0, 0.25]
-				},
-				"torso": {
-					"rotation": [-17.5, 0, 0],
-					"position": [0, -2, 0]
-				},
-				"tail": {
-					"rotation": [45, 0, 0]
-				},
-				"tail2": {
-					"rotation": [-45, 45, 0]
-				},
-				"tail3": {
-					"rotation": [67.5, 0, 0]
-				},
-				"tail4": {
-					"rotation": [-67.5, 37.5, 0]
-				},
-				"tail5": {
-					"rotation": [67.5, 0, 0]
-				},
-				"tail6": {
-					"rotation": [0, 45, 0]
-				},
-				"tail7": {
-					"rotation": [67.5, 0, 0]
-				},
-				"tail_ball": {
-					"rotation": [-25, 0, -55]
-				},
-				"arm_left": {
-					"rotation": [0, 27.5, 50]
-				},
-				"hand_left": {
-					"rotation": [0, 20, 0],
-					"position": [-0.5, 0, -0.05]
-				},
-				"arm_right": {
-					"rotation": [0, -27.5, -50]
-				},
-				"hand_right": {
-					"rotation": [0, -20, 0],
-					"position": [0.5, 0, -0.05]
-				},
-				"eye_left": {
-					"position": [0, 0, 0.1]
-				},
-				"eye_right": {
-					"position": [0, 0, 0.1]
-				},
-				"mouth_closed_smile": {
-					"position": [0, 0, 0.1]
-				},
-				"eyelid_left": {
-					"position": [0, 0, -0.1]
-				},
-				"eyelid_right": {
-					"position": [0, 0, -0.1]
-				},
-				"mouth_closed_frown_small": {
-					"position": [0, 0, -0.1]
-				},
-				"ear_left": {
-					"rotation": [20, -15, 25]
-				},
-				"ear_left2": {
-					"rotation": [80, 0, 0]
-				},
-				"ear_right": {
-					"rotation": [20, 15, -25]
-				},
-				"ear_right2": {
-					"rotation": [110, 0, 0]
-				}
-			}
-		},
-		"animation.azumarill.blink": {
-			"animation_length": 0.1667,
-			"bones": {
-				"eye_left": {
-					"position": {
-						"0.0": [0, 0, 0.1],
-						"0.1667": {
-							"pre": [0, 0, 0.1],
-							"post": [0, 0, 0]
-						}
-					}
-				},
-				"eye_right": {
-					"position": {
-						"0.0": [0, 0, 0.1],
-						"0.1667": {
-							"pre": [0, 0, 0.1],
-							"post": [0, 0, 0]
-						}
-					}
-				},
-				"eyelid_right": {
-					"position": {
-						"0.0": [0, 0, -0.1],
-						"0.1667": {
-							"pre": [0, 0, -0.1],
-							"post": [0, 0, 0]
-						}
-					}
-				},
-				"eyelid_left": {
-					"position": {
-						"0.0": [0, 0, -0.1],
-						"0.1667": {
-							"pre": [0, 0, -0.1],
-							"post": [0, 0, 0]
-						}
-					}
-				}
-			}
-		}
-	}
-}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0187_hoppip/hoppip.animation.json

@@ -1,792 +0,0 @@
-{
-	"format_version": "1.8.0",
-	"animations": {
-		"animation.hoppip.ground_idle": {
-			"loop": true,
-			"animation_length": 4,
-			"bones": {
-				"leg_left": {
-					"rotation": ["math.abs(math.sin(q.anim_time*90*1)*8)", -22.5, 0],
-					"position": [-0.25, "math.abs(math.sin(q.anim_time*90*1)*0.25)", 0]
-				},
-				"leg_right": {
-					"rotation": ["math.abs(math.sin(q.anim_time*90*1)*8)", 22.5, 0],
-					"position": [0.25, "math.abs(math.sin(q.anim_time*90*1)*0.25)", 0]
-				},
-				"arm_left": {
-					"rotation": ["45+math.sin(q.anim_time*90*2-55)*4", 0, -25]
-				},
-				"arm_right": {
-					"rotation": ["45+math.sin(q.anim_time*90*2-55)*4", 0, 25]
-				},
-				"ear_right": {
-					"rotation": [0, 0, "-60-math.sin(q.anim_time*90*2-35)*2"],
-					"position": [0, "-math.sin(q.anim_time*90*2-35)*0.05", 0]
-				},
-				"leaf_right4": {
-					"rotation": [0, 0, "-7.5-math.sin(q.anim_time*90*2-240)*4"]
-				},
-				"leaf_right5": {
-					"rotation": [0, 0, "-10-math.sin(q.anim_time*90*2-300)*4"]
-				},
-				"leaf_left4": {
-					"rotation": [0, 0, "7.5+math.sin(q.anim_time*90*2-240)*4"]
-				},
-				"leaf_left5": {
-					"rotation": [0, 0, "10+math.sin(q.anim_time*90*2-300)*4"]
-				},
-				"ear_left": {
-					"rotation": [0, 0, "60+math.sin(q.anim_time*90*2-35)*2"],
-					"position": [0, "-math.sin(q.anim_time*90*2-35)*0.05", 0]
-				},
-				"tail": {
-					"rotation": ["-20-math.sin(q.anim_time*90*2-15)*4", "math.sin(q.anim_time*90*1-45)*16", 0]
-				},
-				"tail2": {
-					"rotation": ["10-math.sin(q.anim_time*90*2-90)*4", "math.sin(q.anim_time*90*1-135)*16", 0],
-					"position": [0, 0, -0.2]
-				},
-				"body": {
-					"position": [0, 0, "-math.abs(math.sin(q.anim_time*90*1)*0.1)"]
-				},
-				"torso": {
-					"rotation": ["-math.abs(math.sin(q.anim_time*90*1)*1.75)", 0, 0],
-					"position": [0, "math.abs(math.sin(q.anim_time*90*1)*0.3)", 0]
-				},
-				"leaf_right": {
-					"rotation": [0, 0, "-2.5-math.sin(q.anim_time*90*2-75)*2"]
-				},
-				"leaf_right2": {
-					"rotation": [0, 0, "-2.5-(math.sin(q.anim_time*90*2-130)*4)"]
-				},
-				"leaf_right3": {
-					"rotation": [0, 0, "-2.5-math.sin(q.anim_time*90*2-185)*4"]
-				},
-				"leaf_left": {
-					"rotation": [0, 0, "2.5+math.sin(q.anim_time*90*2-75)*2"]
-				},
-				"leaf_left2": {
-					"rotation": [0, 0, "2.5+math.sin(q.anim_time*90*2-130)*4"]
-				},
-				"leaf_left3": {
-					"rotation": [0, 0, "2.5+math.sin(q.anim_time*90*2-185)*4"]
-				}
-			}
-		},
-		"animation.hoppip.ground_walk": {
-			"loop": true,
-			"animation_length": 1,
-			"bones": {
-				"leg_left": {
-					"rotation": ["math.clamp(math.sin(q.anim_time*90*4)*10,0,180)", "math.sin(q.anim_time*90*4)*4", "-math.clamp(-math.sin(q.anim_time*90*4)*6,0,180)"],
-					"position": [
-						0,
-						"math.clamp(-math.sin(q.anim_time*90*4)*0.8,0,180)+math.clamp(math.sin(q.anim_time*90*4)*0.35,0,180)",
-						"-1+math.sin(q.anim_time*90*4-90)*1"
-					]
-				},
-				"leg_right": {
-					"rotation": ["math.clamp(-math.sin(q.anim_time*90*4)*10,0,180)", "math.sin(q.anim_time*90*4)*4", "math.clamp(math.sin(q.anim_time*90*4)*6,0,180)"],
-					"position": [
-						0,
-						"math.clamp(math.sin(q.anim_time*90*4)*0.8,0,180)+math.clamp(-math.sin(q.anim_time*90*4)*0.35,0,180)",
-						"-0.75-math.sin(q.anim_time*90*4-90)*1"
-					]
-				},
-				"arm_left": {
-					"rotation": ["27.7622+math.sin(q.anim_time*90*8)*8", -1.16546, -2.12878]
-				},
-				"arm_right": {
-					"rotation": ["27.7622+math.sin(q.anim_time*90*8)*8", 1.16546, 2.12878]
-				},
-				"ear_right": {
-					"rotation": [0, 0, "-60-math.sin(q.anim_time*90*8-35)*3"],
-					"position": [0, "-math.sin(q.anim_time*90*8-35)*0.1", 0]
-				},
-				"leaf_right4": {
-					"rotation": [0, 0, "-2.5-math.sin(q.anim_time*90*4-140)*5"]
-				},
-				"leaf_right5": {
-					"rotation": [0, 0, "-10-math.sin(q.anim_time*90*4-180)*6"]
-				},
-				"leaf_left4": {
-					"rotation": [0, 0, "2.5-math.sin(q.anim_time*90*4-140)*5"]
-				},
-				"leaf_left5": {
-					"rotation": [0, 0, "10-math.sin(q.anim_time*90*4-180)*6"]
-				},
-				"ear_left": {
-					"rotation": [0, 0, "60+math.sin(q.anim_time*90*8-35)*3"],
-					"position": [0, "-math.sin(q.anim_time*90*8-35)*0.1", 0]
-				},
-				"tail": {
-					"rotation": ["-12.5-math.sin(q.anim_time*90*8+30)*6", "math.sin(q.anim_time*90*4+70)*22", 0]
-				},
-				"tail2": {
-					"rotation": ["7.5-math.sin(q.anim_time*90*8-50)*8", "0+math.sin(q.anim_time*90*4-20)*26", 0],
-					"position": [0, 0, -0.2]
-				},
-				"body": {
-					"rotation": [0, "-math.sin(q.anim_time*90*4)*4", 0],
-					"position": [0, 0, 0]
-				},
-				"torso": {
-					"rotation": ["-2.5-math.sin(q.anim_time*90*8-45)*2", "-math.sin(q.anim_time*90*4)*1.5", "math.sin(q.anim_time*90*4-25)*5"],
-					"position": ["math.sin(q.anim_time*90*4)*0.05", "math.abs(math.sin(q.anim_time*90*4)*0.7)", 0]
-				},
-				"leaf_right": {
-					"rotation": [0, 0, "-5-math.sin(q.anim_time*90*4-20)*8"]
-				},
-				"leaf_right2": {
-					"rotation": [0, 0, "-2.5-math.sin(q.anim_time*90*4-60)*4"]
-				},
-				"leaf_right3": {
-					"rotation": [0, 0, "-7.5-math.sin(q.anim_time*90*4-100)*5"]
-				},
-				"leaf_left": {
-					"rotation": [0, 0, "5-math.sin(q.anim_time*90*4-20)*8"]
-				},
-				"leaf_left2": {
-					"rotation": [0, 0, "2.5-math.sin(q.anim_time*90*4-60)*4"]
-				},
-				"leaf_left3": {
-					"rotation": [0, 0, "7.5-math.sin(q.anim_time*90*4-100)*5"]
-				},
-				"leaves": {
-					"rotation": [0, "math.sin(q.anim_time*90*4+120)*3", 0]
-				}
-			}
-		},
-		"animation.hoppip.battle_idle": {
-			"loop": true,
-			"animation_length": 2,
-			"bones": {
-				"leg_left": {
-					"rotation": ["math.abs(math.sin(q.anim_time*90*2)*12)", -22.5, 0],
-					"position": [-0.25, "math.abs(math.sin(q.anim_time*90*2)*0.45)", 0]
-				},
-				"leg_right": {
-					"rotation": ["math.abs(math.sin(q.anim_time*90*2)*12)", 22.5, 0],
-					"position": [0.25, "math.abs(math.sin(q.anim_time*90*2)*0.45)", 0]
-				},
-				"arm_left": {
-					"rotation": ["31.1416+math.sin(q.anim_time*90*4-55)*6", -12.82077, -11.98004]
-				},
-				"arm_right": {
-					"rotation": ["31.1416+math.sin(q.anim_time*90*4-55)*6", 12.82077, 11.98004]
-				},
-				"ear_right": {
-					"rotation": [0, 0, "-60-math.sin(q.anim_time*90*4-35)*3"],
-					"position": [0, "-math.sin(q.anim_time*90*4-35)*0.1", 0]
-				},
-				"leaf_right4": {
-					"rotation": [0, 0, "-2.5-math.sin(q.anim_time*90*4-240)*5"]
-				},
-				"leaf_right5": {
-					"rotation": [0, 0, "-10-math.sin(q.anim_time*90*4-300)*4"]
-				},
-				"leaf_left4": {
-					"rotation": [0, 0, "2.5+math.sin(q.anim_time*90*4-240)*5"]
-				},
-				"leaf_left5": {
-					"rotation": [0, 0, "10+math.sin(q.anim_time*90*4-300)*4"]
-				},
-				"ear_left": {
-					"rotation": [0, 0, "60+math.sin(q.anim_time*90*4-35)*3"],
-					"position": [0, "-math.sin(q.anim_time*90*4-35)*0.1", 0]
-				},
-				"tail": {
-					"rotation": ["-20-math.sin(q.anim_time*90*4-15)*6", "math.sin(q.anim_time*90*2-45)*22", "math.sin(q.anim_time*90*4-15)*1"]
-				},
-				"tail2": {
-					"rotation": ["10-math.sin(q.anim_time*90*4-90)*4", "math.sin(q.anim_time*90*2-135)*22", 0],
-					"position": [0, 0, -0.2]
-				},
-				"body": {
-					"position": [0, 0, "-math.abs(math.sin(q.anim_time*90*1)*0.1)"]
-				},
-				"torso": {
-					"rotation": ["-math.abs(math.sin(q.anim_time*90*2)*2)", "math.sin(q.anim_time*90*2)*1.75", 0],
-					"position": ["-math.sin(q.anim_time*90*2)*0.05", "math.abs(math.sin(q.anim_time*90*2)*0.6)", 0]
-				},
-				"leaf_right": {
-					"rotation": [0, 0, "-5-math.sin(q.anim_time*90*4-75)*4"]
-				},
-				"leaf_right2": {
-					"rotation": [0, 0, "-2.5-(math.sin(q.anim_time*90*4-130)*7)"]
-				},
-				"leaf_right3": {
-					"rotation": [0, 0, "-7.5-math.sin(q.anim_time*90*4-185)*5"]
-				},
-				"leaf_left": {
-					"rotation": [0, 0, "5+math.sin(q.anim_time*90*4-75)*4"]
-				},
-				"leaf_left2": {
-					"rotation": [0, 0, "2.5+math.sin(q.anim_time*90*4-130)*7"]
-				},
-				"leaf_left3": {
-					"rotation": [0, 0, "7.5+math.sin(q.anim_time*90*4-185)*5"]
-				}
-			}
-		},
-		"animation.hoppip.air_idle": {
-			"loop": true,
-			"bones": {
-				"body": {
-					"rotation": ["math.sin(q.anim_time*90*2+90)*1", "-math.sin(q.anim_time*90*2+90)*0.5", 0],
-					"position": ["math.sin(q.anim_time*90*2+90)*0.05", "2+math.sin(q.anim_time*90*2)*0.25", 0]
-				},
-				"leg_left": {
-					"rotation": ["112.5-math.sin(q.anim_time*90*2+45)*4", 22.5, 0]
-				},
-				"leg_right": {
-					"rotation": ["112.5-math.sin(q.anim_time*90*2+45)*4", -22.5, 0]
-				},
-				"tail": {
-					"rotation": ["-25+math.sin(q.anim_time*90*2)*6", "math.sin(q.anim_time*90*1-90)*20", "-math.sin(q.anim_time*90*1-90)*6"],
-					"position": ["math.sin(q.anim_time*90*1-90)*0.1", -0.1, 0]
-				},
-				"tail2": {
-					"rotation": [10, "math.sin(q.anim_time*90*1-210)*28", 0],
-					"position": [0, -0.025, -0.2]
-				},
-				"leaf_right4": {
-					"rotation": [0, 0, -12.5]
-				},
-				"leaf_right5": {
-					"rotation": [0, 0, -12.5]
-				},
-				"leaf_left4": {
-					"rotation": [0, 0, 12.5]
-				},
-				"leaf_left5": {
-					"rotation": [0, 0, 12.5]
-				},
-				"arm_left": {
-					"rotation": ["45.1907+math.sin(q.anim_time*90*2)*3", "1.7608+math.sin(q.anim_time*90*2)*1", -19.69503]
-				},
-				"ear_right": {
-					"rotation": [0, 0, "-65-math.sin(q.anim_time*90*2+45)*3"],
-					"position": [0, "-math.sin(q.anim_time*90*2+45)*0.1", 0]
-				},
-				"arm_right": {
-					"rotation": ["45.1907+math.sin(q.anim_time*90*2)*3", "-1.7608-math.sin(q.anim_time*90*2)*1", 19.69503]
-				},
-				"ear_left": {
-					"rotation": [0, 0, "65+math.sin(q.anim_time*90*2+45)*3"],
-					"position": [0, "-math.sin(q.anim_time*90*2+45)*0.1", 0]
-				},
-				"legs": {
-					"position": [0, 0, 1]
-				},
-				"leaf_right": {
-					"rotation": [0, 0, -2.5]
-				},
-				"leaf_right2": {
-					"rotation": [0, 0, -7.5]
-				},
-				"leaf_left": {
-					"rotation": [0, 0, 2.5]
-				},
-				"leaf_left2": {
-					"rotation": [0, 0, 7.5]
-				},
-				"leaf_right3": {
-					"rotation": [0, 0, -7.5]
-				},
-				"leaf_left3": {
-					"rotation": [0, 0, 7.5]
-				}
-			}
-		},
-		"animation.hoppip.air_fly": {
-			"loop": true,
-			"bones": {
-				"body": {
-					"rotation": ["10+math.sin(q.anim_time*90*2+90)*1", 0, 0],
-					"position": [0, "1.85+math.sin(q.anim_time*90*2)*0.25", 0]
-				},
-				"leg_left": {
-					"rotation": ["130-math.sin(q.anim_time*90*2+45)*4", 22.5, 0],
-					"position": [0, -0.3, 0.4]
-				},
-				"leg_right": {
-					"rotation": ["130-math.sin(q.anim_time*90*2+45)*4", -22.5, 0],
-					"position": [0, -0.3, 0.4]
-				},
-				"tail": {
-					"rotation": ["-15+math.sin(q.anim_time*90*2)*6", "math.sin(q.anim_time*90*1-90)*20", "-math.sin(q.anim_time*90*1-90)*6"],
-					"position": ["math.sin(q.anim_time*90*1-90)*0.1", -0.1, 0]
-				},
-				"tail2": {
-					"rotation": [10, "math.sin(q.anim_time*90*1-210)*28", 0],
-					"position": [0, -0.025, -0.2]
-				},
-				"leaf_right4": {
-					"rotation": [0, 0, -10]
-				},
-				"leaf_right5": {
-					"rotation": [0, 0, -10]
-				},
-				"leaf_left4": {
-					"rotation": [0, 0, 10]
-				},
-				"leaf_left5": {
-					"rotation": [0, 0, 10]
-				},
-				"arm_left": {
-					"rotation": ["45.1907+math.sin(q.anim_time*90*2)*3", "1.7608+math.sin(q.anim_time*90*2)*1", -19.69503]
-				},
-				"ear_right": {
-					"rotation": [-15.01365, 2.41476, "-65.6474-math.sin(q.anim_time*90*2+45)*3"],
-					"position": [0, "-math.sin(q.anim_time*90*2+45)*0.1", 0]
-				},
-				"arm_right": {
-					"rotation": ["45.1907+math.sin(q.anim_time*90*2)*3", "-1.7608-math.sin(q.anim_time*90*2)*1", 19.69503]
-				},
-				"ear_left": {
-					"rotation": [-15.01365, -2.41476, "65.6474+math.sin(q.anim_time*90*2+45)*3"],
-					"position": [0, "-math.sin(q.anim_time*90*2+45)*0.1", 0]
-				},
-				"legs": {
-					"position": [0, 0, 1]
-				},
-				"leaf_right": {
-					"rotation": [0, 0, 0]
-				},
-				"leaf_right2": {
-					"rotation": [0, 0, -10]
-				},
-				"leaf_left": {
-					"rotation": [0, 0, 0]
-				},
-				"leaf_left2": {
-					"rotation": [0, 0, 10]
-				},
-				"leaf_right3": {
-					"rotation": [0, 0, -10]
-				},
-				"leaf_left3": {
-					"rotation": [0, 0, 10]
-				},
-				"locator_item_hat": {
-					"rotation": [0, 0, 0]
-				}
-			}
-		},
-		"animation.hoppip.fly_overlay": {
-			"loop": true,
-			"bones": {
-				"leaves": {
-					"rotation": [0, "math.mod(q.anim_time*1.5, 1)*360", 0]
-				}
-			}
-		},
-		"animation.hoppip.sleep": {
-			"loop": true,
-			"bones": {
-				"leg_left": {
-					"rotation": [0, -22.5, 0]
-				},
-				"leg_right": {
-					"rotation": [0, 22.5, 0]
-				},
-				"arm_left": {
-					"rotation": ["0+Math.cos(query.anim_time*90*1)*-1", -22.5, 0]
-				},
-				"arm_right": {
-					"rotation": ["0+Math.cos(query.anim_time*90*1)*-1", 22.5, 0]
-				},
-				"ear_right": {
-					"rotation": [0, 0, -60]
-				},
-				"leaf_right4": {
-					"rotation": ["0+Math.cos(query.anim_time*90*1-180)*2", 0, -15]
-				},
-				"leaf_right5": {
-					"rotation": ["0+Math.cos(query.anim_time*90*1-210)*2", 0, -15]
-				},
-				"leaf_left4": {
-					"rotation": ["0+Math.cos(query.anim_time*90*1-180)*2", 0, 15]
-				},
-				"leaf_left5": {
-					"rotation": ["0+Math.cos(query.anim_time*90*1-210)*2", 0, 15]
-				},
-				"ear_left": {
-					"rotation": [0, 0, 60]
-				},
-				"tail": {
-					"rotation": ["-32+Math.cos(query.anim_time*90*1)*-3", 0, 0]
-				},
-				"tail2": {
-					"rotation": [22.5, 0, 0],
-					"position": [0, 0, -0.2]
-				},
-				"legs": {
-					"rotation": [170, 0, 0],
-					"position": [0, -0.75, 3]
-				},
-				"torso": {
-					"rotation": ["5+Math.cos(query.anim_time*90*1)*1", 0, 0],
-					"position": [0, -1, 0]
-				},
-				"eye_right": {
-					"position": [0, 0, 0.1]
-				},
-				"eyelid_right": {
-					"position": [0, 0, -0.1]
-				},
-				"eye_left": {
-					"position": [0, 0, 0.1]
-				},
-				"eyelid_left": {
-					"position": [0, 0, -0.1]
-				},
-				"mouth_closed": {
-					"position": [0, 0, 0.1]
-				},
-				"mouth_open_small": {
-					"position": [0, 0, -0.1]
-				},
-				"leaf_right": {
-					"rotation": ["0+Math.cos(query.anim_time*90*1-90)*2", 0, -15]
-				},
-				"leaf_right2": {
-					"rotation": ["0+Math.cos(query.anim_time*90*1-120)*2", 0, -7.5]
-				},
-				"leaf_right3": {
-					"rotation": ["0+Math.cos(query.anim_time*90*1-150)*2", 0, -5]
-				},
-				"leaf_left": {
-					"rotation": ["0+Math.cos(query.anim_time*90*1-90)*2", 0, 15]
-				},
-				"leaf_left2": {
-					"rotation": ["0+Math.cos(query.anim_time*90*1-120)*2", 0, 7.5]
-				},
-				"leaf_left3": {
-					"rotation": ["0+Math.cos(query.anim_time*90*1-150)*2", 0, 5]
-				}
-			}
-		},
-		"animation.hoppip.air_sleep": {
-			"loop": true,
-			"bones": {
-				"body": {
-					"rotation": ["math.sin(q.anim_time*90*2+90)*0.5", "math.sin(q.anim_time*90*2-90)*0.2", 0],
-					"position": ["math.sin(q.anim_time*90*2-90)*0.05", "1.85+math.sin(q.anim_time*90*2)*0.125", 0]
-				},
-				"leg_left": {
-					"rotation": ["100-math.sin(q.anim_time*90*2+45)*2", 22.5, 0]
-				},
-				"leg_right": {
-					"rotation": ["100-math.sin(q.anim_time*90*2+45)*2", -22.5, 0]
-				},
-				"tail": {
-					"rotation": ["-60-math.sin(q.anim_time*90*2+90)*1", "math.sin(q.anim_time*90*1)*3", "-math.sin(q.anim_time*90*1)*2"],
-					"position": ["math.sin(q.anim_time*90*1)*0.05", -0.5, 0]
-				},
-				"tail2": {
-					"rotation": [20, "math.sin(q.anim_time*90*1-90)*4", 0],
-					"position": [0, -0.025, -0.2]
-				},
-				"leaf_right4": {
-					"rotation": [0, 0, -15]
-				},
-				"leaf_right5": {
-					"rotation": [0, 0, -15]
-				},
-				"leaf_left4": {
-					"rotation": [0, 0, 15]
-				},
-				"leaf_left5": {
-					"rotation": [0, 0, 15]
-				},
-				"arm_left": {
-					"rotation": ["45.1907+math.sin(q.anim_time*90*2)*3", "1.7608+math.sin(q.anim_time*90*2)*1", -19.69503]
-				},
-				"ear_right": {
-					"rotation": [0, 0, "-65-math.sin(q.anim_time*90*2+45)*3"],
-					"position": [0, "-math.sin(q.anim_time*90*2+45)*0.1", 0]
-				},
-				"arm_right": {
-					"rotation": ["45.1907+math.sin(q.anim_time*90*2)*3", "-1.7608+math.sin(q.anim_time*90*2)*1", 19.69503]
-				},
-				"ear_left": {
-					"rotation": [0, 0, "65+math.sin(q.anim_time*90*2+45)*3"],
-					"position": [0, "-math.sin(q.anim_time*90*2+45)*0.1", 0]
-				},
-				"legs": {
-					"position": [0, 0, 1]
-				},
-				"torso": {
-					"rotation": [7.5, 0, 0],
-					"position": [0, -0.5, 0]
-				},
-				"eye_right": {
-					"position": [0, 0, 0.1]
-				},
-				"eyelid_right": {
-					"position": [0, 0, -0.1]
-				},
-				"eye_left": {
-					"position": [0, 0, 0.1]
-				},
-				"eyelid_left": {
-					"position": [0, 0, -0.1]
-				},
-				"mouth_closed": {
-					"position": [0, 0, 0.1]
-				},
-				"mouth_open_small": {
-					"position": [0, 0, -0.1]
-				},
-				"leaves": {
-					"rotation": [0, "-math.mod(q.anim_time*0.5, 1)*360", 0]
-				},
-				"leaf_right": {
-					"rotation": [0, 0, -7.5]
-				},
-				"leaf_right2": {
-					"rotation": [0, 0, -10]
-				},
-				"leaf_right3": {
-					"rotation": [0, 0, -12.5]
-				},
-				"leaf_left": {
-					"rotation": [0, 0, 7.5]
-				},
-				"leaf_left2": {
-					"rotation": [0, 0, 10]
-				},
-				"leaf_left3": {
-					"rotation": [0, 0, 12.5]
-				}
-			}
-		},
-		"animation.hoppip.cry": {
-			"animation_length": 1,
-			"bones": {
-				"torso": {
-					"rotation": {
-						"0.0": [0, 0, 0],
-						"0.0833": [-2.5, 0, 0],
-						"0.1667": [2.5, 0, 0],
-						"0.25": [-5, 0, 0],
-						"0.375": [-1.67, 0, 0],
-						"0.5": [0, 0, 0]
-					}
-				},
-				"mouth_closed": {
-					"position": {
-						"0.0": [0, 0, 0],
-						"0.0833": {
-							"pre": [0, 0, 0],
-							"post": [0, 0, 1]
-						},
-						"0.4167": {
-							"pre": [0, 0, 1],
-							"post": [0, 0, 0]
-						}
-					}
-				},
-				"mouth_open": {
-					"position": {
-						"0.0": [0, 0, 0],
-						"0.0833": {
-							"pre": [0, 0, 0],
-							"post": [0, 0, -0.1]
-						},
-						"0.1667": {
-							"pre": [0, 0, -0.1],
-							"post": [0, 0, 0]
-						},
-						"0.25": {
-							"pre": [0, 0, 0],
-							"post": [0, 0, -0.1]
-						},
-						"0.4167": {
-							"pre": [0, 0, -0.1],
-							"post": [0, 0, 0]
-						}
-					}
-				},
-				"mouth_open_big": {
-					"position": {
-						"0.0": [0, 0, 0],
-						"0.1667": {
-							"pre": [0, 0, 0],
-							"post": [0, 0, -0.12]
-						},
-						"0.25": [0, 0, -0.12],
-						"0.4167": {
-							"pre": [0, 0, -0.12],
-							"post": [0, 0, 0]
-						}
-					}
-				}
-			},
-			"sound_effects": {
-				"0.0": {
-					"effect": "pokemon.hoppip.cry"
-				}
-			}
-		},
-		"animation.hoppip.blink": {
-			"animation_length": 0.1667,
-			"bones": {
-				"eyelid_right": {
-					"position": {
-						"0.0": [0, 0, -0.1],
-						"0.1667": {
-							"pre": [0, 0, -0.1],
-							"post": [0, 0, 0]
-						}
-					}
-				},
-				"eyelid_left": {
-					"position": {
-						"0.0": [0, 0, -0.1],
-						"0.1667": {
-							"pre": [0, 0, -0.1],
-							"post": [0, 0, 0]
-						}
-					}
-				},
-				"eye_right": {
-					"position": {
-						"0.0": [0, 0, 0.1],
-						"0.1667": {
-							"pre": [0, 0, 0.1],
-							"post": [0, 0, 0]
-						}
-					}
-				},
-				"eye_left": {
-					"position": {
-						"0.0": [0, 0, 0.1],
-						"0.1667": {
-							"pre": [0, 0, 0.1],
-							"post": [0, 0, 0]
-						}
-					}
-				}
-			}
-		},
-		"animation.hoppip.shock": {
-			"loop": true,
-			"bones": {
-				"mouth_closed": {
-					"position": [0, 0, 0.1]
-				},
-				"mouth_open": {
-					"position": [0, 0, 0]
-				},
-				"mouth_open_tall": {
-					"position": [0, 0, -0.1]
-				}
-			}
-		},
-		"animation.hoppip.angry": {
-			"loop": true,
-			"bones": {
-				"eye_right": {
-					"rotation": [0, 0, 15]
-				},
-				"eye_left": {
-					"rotation": [0, 0, -15]
-				},
-				"mouth_closed": {
-					"position": [0, 0, 0.1]
-				},
-				"mouth_open_big": {
-					"position": [0, 0, -0.1]
-				},
-				"mouth_frown": {
-					"position": [0, 0, 0]
-				}
-			}
-		},
-		"animation.hoppip.sad": {
-			"loop": true,
-			"bones": {
-				"eye_right": {
-					"rotation": [0, 0, -15]
-				},
-				"eye_left": {
-					"rotation": [0, 0, 15]
-				},
-				"mouth_closed": {
-					"position": [0, 0, 0.1]
-				},
-				"mouth_frown": {
-					"position": [0, 0, -0.1]
-				}
-			}
-		},
-		"animation.hoppip.happy": {
-			"loop": true,
-			"bones": {
-				"mouth_closed": {
-					"position": [0, 0, 0.1]
-				},
-				"mouth_open": {
-					"position": [0, 0, -0.1]
-				},
-				"eye_right": {
-					"position": [0, 0, 0.1]
-				},
-				"eye_left": {
-					"position": [0, 0, 0.1]
-				},
-				"eyelid_happy_left": {
-					"position": [0, 0, -0.1]
-				},
-				"eyelid_happy_right": {
-					"position": [0, 0, -0.1]
-				}
-			}
-		},
-		"animation.hoppip.unamused": {
-			"loop": true,
-			"bones": {
-				"_&/3%6-7A": {
-					"position": [0, 0, -0.1]
-				},
-				"mouth_straight": {
-					"position": [0, 0, -0.1]
-				},
-				"mouth_closed": {
-					"position": [0, 0, 0.1]
-				}
-			}
-		},
-		"animation.hoppip.hurt": {
-			"loop": true,
-			"bones": {
-				"mouth_closed": {
-					"position": [0, 0, 0.1]
-				},
-				"eye_right": {
-					"position": [0, 0, 0.1]
-				},
-				"eye_left": {
-					"position": [0, 0, 0.1]
-				},
-				"mouth_frown": {
-					"position": [0, 0, 0]
-				},
-				"eyelid_happy_left": {
-					"rotation": [0, 0, -90],
-					"position": [0.4, 0.5, -0.1]
-				},
-				"eyelid_happy_right": {
-					"rotation": [0, 0, 90],
-					"position": [-0.4, 0.5, -0.1]
-				},
-				"mouth_open_frown": {
-					"position": [0, 0, -0.1]
-				}
-			}
-		}
-	}
-}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0188_skiploom/skiploom.animation.json

@@ -1,819 +0,0 @@
-{
-	"format_version": "1.8.0",
-	"animations": {
-		"animation.skiploom.ground_idle": {
-			"loop": true,
-			"animation_length": 4,
-			"bones": {
-				"foot_right": {
-					"rotation": ["10+math.sin(q.anim_time*90*2)*10", 22.5, 0],
-					"position": ["-math.sin(q.anim_time*90*2)*0.1", "0.4+math.sin(q.anim_time*90*2)*0.4", 0]
-				},
-				"foot_left": {
-					"rotation": ["10+math.sin(q.anim_time*90*2)*10", -22.5, 0],
-					"position": ["math.sin(q.anim_time*90*2)*0.1", "0.4+math.sin(q.anim_time*90*2)*0.4", 0]
-				},
-				"arm_right": {
-					"rotation": ["30.7072+math.sin(q.anim_time*90*2+90)*4", 10.06228, 3.74072],
-					"position": [0, "-math.sin(q.anim_time*90*2+90)*0.05", 0]
-				},
-				"arm_left": {
-					"rotation": ["30.7072+math.sin(q.anim_time*90*2+90)*4", -10.06228, -3.74072],
-					"position": [0, "-math.sin(q.anim_time*90*2+90)*0.05", 0]
-				},
-				"tail": {
-					"rotation": ["-17.5-math.sin(q.anim_time*90*2+110)*6", "math.sin(q.anim_time*90*1+55)*12", 0]
-				},
-				"tail2": {
-					"rotation": [12.5, "math.sin(q.anim_time*90*1-30)*12", 0],
-					"position": [0, 0, -0.25]
-				},
-				"ear_left": {
-					"rotation": [0, 0, "25+math.sin(q.anim_time*90*2+20)*4"],
-					"position": [0, "-0.1-math.sin(q.anim_time*90*2+20)*0.1", 0]
-				},
-				"petal_front_right": {
-					"rotation": ["70+math.sin(q.anim_time*90*2+10)*4", 0, 0]
-				},
-				"petal_front_left": {
-					"rotation": [0, 0, "70+math.sin(q.anim_time*90*2+10)*4"]
-				},
-				"petal_back_left": {
-					"rotation": ["-70-math.sin(q.anim_time*90*2+10)*4", 0, 0]
-				},
-				"ear_right": {
-					"rotation": [0, 0, "-25-math.sin(q.anim_time*90*2+20)*4"],
-					"position": [0, "-0.1-math.sin(q.anim_time*90*2+20)*0.1", 0]
-				},
-				"petal_back_right": {
-					"rotation": [0, 0, "-70-math.sin(q.anim_time*90*2+10)*4"]
-				},
-				"body": {
-					"position": [0, 0, "-math.sin(q.anim_time*90*2)*0.3"]
-				},
-				"torso": {
-					"rotation": ["-2+math.sin(q.anim_time*90*2+65)*1.7", 0, 0],
-					"position": [0, "0.5+math.sin(q.anim_time*90*2)*0.4", 0]
-				},
-				"toe_left": {
-					"rotation": ["-10-math.sin(q.anim_time*90*2)*10", 0, 0]
-				},
-				"toe_right": {
-					"rotation": ["-10-math.sin(q.anim_time*90*2)*10", 0, 0]
-				}
-			}
-		},
-		"animation.skiploom.ground_walk": {
-			"loop": true,
-			"animation_length": 1,
-			"bones": {
-				"leg_left": {
-					"rotation": ["math.clamp(math.sin(q.anim_time*90*4)*10,0,180)", "math.sin(q.anim_time*90*4)*4", "-math.clamp(-math.sin(q.anim_time*90*4)*6,0,180)"],
-					"position": [
-						0,
-						"math.clamp(-math.sin(q.anim_time*90*4)*0.8,0,180)+math.clamp(math.sin(q.anim_time*90*4)*0.35,0,180)",
-						"-1+math.sin(q.anim_time*90*4-90)*1"
-					]
-				},
-				"leg_right": {
-					"rotation": ["math.clamp(-math.sin(q.anim_time*90*4)*10,0,180)", "math.sin(q.anim_time*90*4)*4", "math.clamp(math.sin(q.anim_time*90*4)*6,0,180)"],
-					"position": [
-						0,
-						"math.clamp(math.sin(q.anim_time*90*4)*0.8,0,180)+math.clamp(-math.sin(q.anim_time*90*4)*0.35,0,180)",
-						"-0.75-math.sin(q.anim_time*90*4-90)*1"
-					]
-				},
-				"leaf_right4": {
-					"rotation": [0, 0, "-2.5-math.sin(q.anim_time*90*4-140)*5"]
-				},
-				"leaf_right5": {
-					"rotation": [0, 0, "-10-math.sin(q.anim_time*90*4-180)*6"]
-				},
-				"leaf_left4": {
-					"rotation": [0, 0, "2.5-math.sin(q.anim_time*90*4-140)*5"]
-				},
-				"leaf_left5": {
-					"rotation": [0, 0, "10-math.sin(q.anim_time*90*4-180)*6"]
-				},
-				"leaf_right": {
-					"rotation": [0, 0, "-5-math.sin(q.anim_time*90*4-20)*8"]
-				},
-				"leaf_right2": {
-					"rotation": [0, 0, "-2.5-math.sin(q.anim_time*90*4-60)*4"]
-				},
-				"leaf_right3": {
-					"rotation": [0, 0, "-7.5-math.sin(q.anim_time*90*4-100)*5"]
-				},
-				"leaf_left": {
-					"rotation": [0, 0, "5-math.sin(q.anim_time*90*4-20)*8"]
-				},
-				"leaf_left2": {
-					"rotation": [0, 0, "2.5-math.sin(q.anim_time*90*4-60)*4"]
-				},
-				"leaf_left3": {
-					"rotation": [0, 0, "7.5-math.sin(q.anim_time*90*4-100)*5"]
-				},
-				"leaves": {
-					"rotation": [0, "math.sin(q.anim_time*90*4+120)*3", 0]
-				},
-				"body": {
-					"rotation": [0, "-math.sin(q.anim_time*90*4)*4", 0],
-					"position": [0, "math.abs(math.sin(q.anim_time*90*4)*0.08)", 0]
-				},
-				"torso": {
-					"rotation": ["-2.5-math.sin(q.anim_time*90*8-45)*2", "-math.sin(q.anim_time*90*4)*1.5", "math.sin(q.anim_time*90*4-25)*3"],
-					"position": ["math.sin(q.anim_time*90*4)*0.05", "math.abs(math.sin(q.anim_time*90*4)*0.6)", 0]
-				},
-				"petal_front_right": {
-					"rotation": ["70+math.sin(q.anim_time*90*8-90)*4", 0, 0]
-				},
-				"petal_front_left": {
-					"rotation": [0, 0, "70+math.sin(q.anim_time*90*8-90)*4"]
-				},
-				"petal_back_left": {
-					"rotation": ["-70-math.sin(q.anim_time*90*8-90)*4", 0, 0]
-				},
-				"petal_back_right": {
-					"rotation": [0, 0, "-70-math.sin(q.anim_time*90*8-90)*4"]
-				},
-				"arm_left": {
-					"rotation": ["27.7622+math.sin(q.anim_time*90*8)*8", -1.16546, -2.12878]
-				},
-				"arm_right": {
-					"rotation": ["27.7622+math.sin(q.anim_time*90*8)*8", 1.16546, 2.12878]
-				},
-				"tail": {
-					"rotation": ["-12.5-math.sin(q.anim_time*90*8+30)*4", "math.sin(q.anim_time*90*4+70)*14", 0]
-				},
-				"tail2": {
-					"rotation": ["7.5-math.sin(q.anim_time*90*8-50)*6", "0+math.sin(q.anim_time*90*4-20)*12", 0],
-					"position": [0, 0, -0.2]
-				},
-				"ear_left": {
-					"rotation": [0, 0, "22.5+math.sin(q.anim_time*90*8-35)*3"],
-					"position": [0, "-0.1-math.sin(q.anim_time*90*8-35)*0.1", 0]
-				},
-				"ear_right": {
-					"rotation": [0, 0, "-22.5-math.sin(q.anim_time*90*8-35)*3"],
-					"position": [0, "-0.1-math.sin(q.anim_time*90*8-35)*0.1", 0]
-				},
-				"foot_left": {
-					"rotation": [
-						"0+math.clamp(math.sin(q.anim_time*90*4)*10,0,180)",
-						"-5+math.sin(q.anim_time*90*4)*4",
-						"0-math.clamp(-math.sin(q.anim_time*90*4)*6,0,180)+math.clamp(-math.sin(q.anim_time*90*4)*2,0,180)"
-					],
-					"position": [
-						0,
-						"math.clamp(-math.sin(q.anim_time*90*4)*0.8,0,180)+math.clamp(math.sin(q.anim_time*90*4)*0.35,0,180)",
-						"-1+math.sin(q.anim_time*90*4-90)*1"
-					]
-				},
-				"toe_left": {
-					"rotation": ["-math.clamp(math.sin(q.anim_time*90*4)*10,0,180)", 0, 0]
-				},
-				"foot_right": {
-					"rotation": [
-						"math.clamp(-math.sin(q.anim_time*90*4)*10,0,180)",
-						"5+math.sin(q.anim_time*90*4)*4",
-						"math.clamp(math.sin(q.anim_time*90*4)*6,0,180)-math.clamp(math.sin(q.anim_time*90*4)*2,0,180)"
-					],
-					"position": [
-						0,
-						"math.clamp(math.sin(q.anim_time*90*4)*0.8,0,180)+math.clamp(-math.sin(q.anim_time*90*4)*0.35,0,180)",
-						"-0.75-math.sin(q.anim_time*90*4-90)*1"
-					]
-				},
-				"toe_right": {
-					"rotation": ["-math.clamp(-math.sin(q.anim_time*90*4)*10,0,180)", 0, 0]
-				}
-			}
-		},
-		"animation.skiploom.battle_idle": {
-			"loop": true,
-			"animation_length": 2,
-			"bones": {
-				"foot_right": {
-					"rotation": ["15+math.sin(q.anim_time*90*4)*14", 22.5, 0],
-					"position": ["-math.sin(q.anim_time*90*4)*0.2", "0.4+math.sin(q.anim_time*90*4)*0.5", 0]
-				},
-				"foot_left": {
-					"rotation": ["15+math.sin(q.anim_time*90*4)*14", -22.5, 0],
-					"position": ["math.sin(q.anim_time*90*4)*0.2", "0.4+math.sin(q.anim_time*90*4)*0.5", 0]
-				},
-				"arm_right": {
-					"rotation": ["20.7072+math.sin(q.anim_time*90*4+90)*6", 10.06228, 3.74072],
-					"position": [0, "-math.sin(q.anim_time*90*2+90)*0.07", 0]
-				},
-				"arm_left": {
-					"rotation": ["20.7072+math.sin(q.anim_time*90*4+90)*6", -10.06228, -3.74072],
-					"position": [0, "-math.sin(q.anim_time*90*2+90)*0.07", 0]
-				},
-				"tail": {
-					"rotation": ["-17.5-math.sin(q.anim_time*90*4+110)*6", "math.sin(q.anim_time*90*2+55)*16", 0]
-				},
-				"tail2": {
-					"rotation": [12.5, "math.sin(q.anim_time*90*2-30)*16", 0],
-					"position": [0, 0, -0.25]
-				},
-				"ear_left": {
-					"rotation": [0, 0, "25+math.sin(q.anim_time*90*4+20)*6"],
-					"position": [0, "-0.1-math.sin(q.anim_time*90*4+20)*0.1", 0]
-				},
-				"petal_front_right": {
-					"rotation": ["72.5+math.sin(q.anim_time*90*4+10)*6", 0, 0]
-				},
-				"petal_front_left": {
-					"rotation": [0, 0, "72.5+math.sin(q.anim_time*90*4+10)*6"]
-				},
-				"petal_back_left": {
-					"rotation": ["-72.5-math.sin(q.anim_time*90*4+10)*6", 0, 0]
-				},
-				"ear_right": {
-					"rotation": [0, 0, "-25-math.sin(q.anim_time*90*4+20)*6"],
-					"position": [0, "-0.1-math.sin(q.anim_time*90*4+20)*0.1", 0]
-				},
-				"petal_back_right": {
-					"rotation": [0, 0, "-72.5-math.sin(q.anim_time*90*4+10)*6"]
-				},
-				"body": {
-					"position": [0, 0.1, "-math.sin(q.anim_time*90*4)*0.5"]
-				},
-				"torso": {
-					"rotation": ["-1.5+math.sin(q.anim_time*90*4+65)*1.7", "math.sin(q.anim_time*90*2+45)*2", 0],
-					"position": [0, "0.5+math.sin(q.anim_time*90*4)*0.5", 0]
-				},
-				"toe_left": {
-					"rotation": ["-15-math.sin(q.anim_time*90*4)*14", 0, 0]
-				},
-				"toe_right": {
-					"rotation": ["-15-math.sin(q.anim_time*90*4)*14", 0, 0]
-				}
-			}
-		},
-		"animation.skiploom.air_idle": {
-			"loop": true,
-			"bones": {
-				"body": {
-					"rotation": ["-1.5-math.sin(q.anim_time*90*2+65)*1.25", "-math.sin(q.anim_time*90*2+90)*0.5", 0],
-					"position": ["math.sin(q.anim_time*90*2+90)*0.075", "2.75+math.sin(q.anim_time*90*2)*0.65", 0]
-				},
-				"foot_right": {
-					"rotation": ["70+math.sin(q.anim_time*90*2+55)*5", 5, 10]
-				},
-				"foot_left": {
-					"rotation": ["70+math.sin(q.anim_time*90*2+55)*5", -5, -10]
-				},
-				"tail": {
-					"rotation": ["-30-math.sin(q.anim_time*90*2+65)*6", "-math.sin(q.anim_time*90*2+125)*4", 0],
-					"position": [0, "-0.3-math.sin(q.anim_time*90*2+65)*0.05", 0]
-				},
-				"ear_left": {
-					"rotation": [0, 0, "10-math.sin(q.anim_time*90*2-155)*18"],
-					"position": [0, "-0.2+math.sin(q.anim_time*90*2-90)*0.2", 0]
-				},
-				"arm_right": {
-					"rotation": ["40.754+math.sin(q.anim_time*90*2+75)*8", 3.57613, 5.45586],
-					"position": [0, "-0.1-math.sin(q.anim_time*90*2+75)*0.05", 0.2]
-				},
-				"arm_left": {
-					"rotation": ["40.754+math.sin(q.anim_time*90*2+75)*8", -3.57613, -5.45586],
-					"position": [0, "-0.1-math.sin(q.anim_time*90*2+75)*0.05", 0.2]
-				},
-				"tail2": {
-					"rotation": ["5-math.sin(q.anim_time*90*2-35)*12", "-math.sin(q.anim_time*90*2+45)*8", 0],
-					"position": [0, 0, -0.2]
-				},
-				"petal_front_right": {
-					"rotation": ["75+math.sin(q.anim_time*90*2+45)*6", 0, 0]
-				},
-				"petal_front_left": {
-					"rotation": [0, 0, "75+math.sin(q.anim_time*90*2+45)*6"]
-				},
-				"petal_back_left": {
-					"rotation": ["-75-math.sin(q.anim_time*90*2+45)*6", 0, 0]
-				},
-				"feet": {
-					"position": [0, 1, 1]
-				},
-				"ear_right": {
-					"rotation": [0, 0, "-10+math.sin(q.anim_time*90*2-165)*18"],
-					"position": [0, "-0.2+math.sin(q.anim_time*90*2-90)*0.2", 0]
-				},
-				"petal_back_right": {
-					"rotation": [0, 0, "-75-math.sin(q.anim_time*90*2+45)*6"]
-				}
-			}
-		},
-		"animation.skiploom.air_fly": {
-			"loop": true,
-			"bones": {
-				"body": {
-					"rotation": ["11-math.sin(q.anim_time*90*2+65)*1.25", "0-math.sin(q.anim_time*90*2+90)*0.5", 0],
-					"position": ["math.sin(q.anim_time*90*2+90)*0.075", "2.75+math.sin(q.anim_time*90*2)*0.75", -0.5]
-				},
-				"foot_right": {
-					"rotation": ["122.3451+math.sin(q.anim_time*90*2+55)*5", -1.03055, 5.53628],
-					"position": [0, -1, 0]
-				},
-				"foot_left": {
-					"rotation": ["122.3451+math.sin(q.anim_time*90*2+55)*5", 1.03055, -5.53628],
-					"position": [0, -1, 0]
-				},
-				"tail": {
-					"rotation": ["-15-math.sin(q.anim_time*90*2+65)*6", "0-math.sin(q.anim_time*90*2+125)*4", 0],
-					"position": [0, "-math.sin(q.anim_time*90*2+65)*0.05", 0]
-				},
-				"ear_left": {
-					"rotation": [0, -10, "10-math.sin(q.anim_time*90*2-155)*18"],
-					"position": ["math.sin(q.anim_time*90*2-180)*0.1", "-0.2+math.sin(q.anim_time*90*2-90)*0.2", 0]
-				},
-				"arm_right": {
-					"rotation": ["40.754+math.sin(q.anim_time*90*2+75)*8", 3.57613, 5.45586],
-					"position": [0, "-0.1-math.sin(q.anim_time*90*2+75)*0.05", 0.2]
-				},
-				"arm_left": {
-					"rotation": ["40.754+math.sin(q.anim_time*90*2+75)*8", -3.57613, -5.45586],
-					"position": [0, "-0.1-math.sin(q.anim_time*90*2+75)*0.05", 0.2]
-				},
-				"tail2": {
-					"rotation": ["5-math.sin(q.anim_time*90*2-35)*12", "-math.sin(q.anim_time*90*2+45)*8", 0],
-					"position": [0, 0, -0.2]
-				},
-				"petal_front_right": {
-					"rotation": ["75+math.sin(q.anim_time*90*2+45)*6", 0, 0]
-				},
-				"petal_front_left": {
-					"rotation": [0, 0, "75+math.sin(q.anim_time*90*2+45)*6"]
-				},
-				"petal_back_left": {
-					"rotation": ["-75-math.sin(q.anim_time*90*2+45)*6", 0, 0]
-				},
-				"feet": {
-					"position": [0, 1, 1]
-				},
-				"ear_right": {
-					"rotation": [0, 10, "-10+math.sin(q.anim_time*90*2-165)*18"],
-					"position": ["-math.sin(q.anim_time*90*2-180)*0.1", "-0.2+math.sin(q.anim_time*90*2-90)*0.2", 0]
-				},
-				"petal_back_right": {
-					"rotation": [0, 0, "-75-math.sin(q.anim_time*90*2+45)*6"]
-				},
-				"torso": {
-					"rotation": [-5, 0, 0]
-				}
-			}
-		},
-		"animation.skiploom.fly_overlay": {
-			"loop": true,
-			"bones": {
-				"leaves": {
-					"rotation": [0, "math.mod(q.anim_time*1.5, 1)*360", 0]
-				},
-				"flower": {
-					"rotation": [0, "-math.mod(q.anim_time*1, 1)*360", 0]
-				}
-			}
-		},
-		"animation.skiploom.sleep": {
-			"loop": true,
-			"bones": {
-				"foot_right": {
-					"rotation": [0, 22.5, 0]
-				},
-				"foot_left": {
-					"rotation": [0, -22.5, 0]
-				},
-				"torso": {
-					"rotation": ["5+Math.cos(query.anim_time*90*1)*1", 0, 0],
-					"position": [0, -1.25, 0]
-				},
-				"arm_right": {
-					"rotation": ["5+Math.cos(query.anim_time*90*1)*-2", 22.5, 0]
-				},
-				"arm_left": {
-					"rotation": ["5+Math.cos(query.anim_time*90*1)*-2", -22.5, 0]
-				},
-				"eye_right": {
-					"position": [0, 0, 0.1]
-				},
-				"eyelid_right": {
-					"position": [0, 0, -0.1]
-				},
-				"eye_left": {
-					"position": [0, 0, 0.1]
-				},
-				"eyelid_left": {
-					"position": [0, 0, -0.1]
-				},
-				"mouth_closed": {
-					"position": [0, 0, 0.1]
-				},
-				"tail": {
-					"rotation": ["-42.5+Math.cos(query.anim_time*90*1)*-3", 0, 0]
-				},
-				"tail2": {
-					"rotation": [35, 0, 0],
-					"position": [0, -0.25, -0.5]
-				},
-				"ear_left": {
-					"rotation": [0, "0+Math.cos(query.anim_time*90*1-90)*2", 45],
-					"position": [-0.25, 0, 0]
-				},
-				"petal_front_right": {
-					"rotation": [80, 0, 0]
-				},
-				"petal_front_left": {
-					"rotation": [0, 0, 80]
-				},
-				"petal_back_left": {
-					"rotation": [-80, 0, 0]
-				},
-				"mouth_straight": {
-					"position": [0, 0, -0.1]
-				},
-				"feet": {
-					"rotation": [170, 0, 0],
-					"position": [0, -1.5, 3]
-				},
-				"ear_right": {
-					"rotation": [0, "0+Math.cos(query.anim_time*90*1-90)*-2", -45],
-					"position": [0.25, 0, 0]
-				},
-				"petal_back_right": {
-					"rotation": [0, 0, -80]
-				},
-				"flower": {
-					"rotation": ["0+Math.cos(query.anim_time*90*1-90)*2", 0, "0+Math.cos(query.anim_time*90*1-90)*2"]
-				}
-			}
-		},
-		"animation.skiploom.air_sleep": {
-			"loop": true,
-			"bones": {
-				"body": {
-					"rotation": ["8.5-math.sin(q.anim_time*90*2+65)*1.25", "-math.sin(q.anim_time*90*2+90)*0.5", 0],
-					"position": ["math.sin(q.anim_time*90*2+90)*0.05", "2.25+math.sin(q.anim_time*90*2)*0.45", 0]
-				},
-				"foot_right": {
-					"rotation": ["82.5+math.sin(q.anim_time*90*2+55)*5", 5, 10]
-				},
-				"foot_left": {
-					"rotation": ["82.5+math.sin(q.anim_time*90*2+55)*5", -5, -10]
-				},
-				"tail": {
-					"rotation": ["-60-math.sin(q.anim_time*90*2+65)*6", "-math.sin(q.anim_time*90*2+125)*4", 0],
-					"position": [0, "-0.3-math.sin(q.anim_time*90*2+65)*0.05", -0.5]
-				},
-				"ear_left": {
-					"rotation": [0, 0, "20-math.sin(q.anim_time*90*2-155)*15"],
-					"position": [0, "-0.2+math.sin(q.anim_time*90*2-90)*0.1", 0]
-				},
-				"arm_right": {
-					"rotation": ["46.5338+math.sin(q.anim_time*90*2+75)*8", -9.82298, -9.46315],
-					"position": [0, "-0.1-math.sin(q.anim_time*90*2+75)*0.05", 0.5]
-				},
-				"arm_left": {
-					"rotation": ["46.5338+math.sin(q.anim_time*90*2+75)*8", 9.82298, 9.46315],
-					"position": [0, "-0.1-math.sin(q.anim_time*90*2+75)*0.05", 0.5]
-				},
-				"tail2": {
-					"rotation": ["5-math.sin(q.anim_time*90*2-35)*12", "-math.sin(q.anim_time*90*2+45)*8", 0],
-					"position": [0, 0, -0.2]
-				},
-				"petal_front_right": {
-					"rotation": ["75+math.sin(q.anim_time*90*2+45)*6", 0, 0]
-				},
-				"petal_front_left": {
-					"rotation": [0, 0, "75+math.sin(q.anim_time*90*2+45)*6"]
-				},
-				"petal_back_left": {
-					"rotation": ["-75-math.sin(q.anim_time*90*2+45)*6", 0, 0]
-				},
-				"feet": {
-					"position": [0, 1, 1]
-				},
-				"ear_right": {
-					"rotation": [0, 0, "-20+math.sin(q.anim_time*90*2-165)*15"],
-					"position": [0, "-0.2+math.sin(q.anim_time*90*2-90)*0.1", 0]
-				},
-				"petal_back_right": {
-					"rotation": [0, 0, "-75-math.sin(q.anim_time*90*2+45)*6"]
-				},
-				"mouth_closed": {
-					"position": [0, 0, 0.1]
-				},
-				"mouth_straight": {
-					"position": [0, 0, -0.1]
-				},
-				"eye_left": {
-					"position": [0, 0, 0.1]
-				},
-				"eyelid_left": {
-					"position": [0, 0, -0.1]
-				},
-				"eye_right": {
-					"position": [0, 0, 0.1]
-				},
-				"eyelid_right": {
-					"position": [0, 0, -0.1]
-				}
-			}
-		},
-		"animation.skiploom.blink": {
-			"animation_length": 0.1667,
-			"bones": {
-				"eyelid_right": {
-					"position": {
-						"0.0": [0, 0, -0.1],
-						"0.1667": {
-							"pre": [0, 0, -0.1],
-							"post": [0, 0, 0]
-						}
-					}
-				},
-				"eyelid_left": {
-					"position": {
-						"0.0": [0, 0, -0.1],
-						"0.1667": {
-							"pre": [0, 0, -0.1],
-							"post": [0, 0, 0]
-						}
-					}
-				},
-				"eye_right": {
-					"position": {
-						"0.0": [0, 0, 0.1],
-						"0.1667": {
-							"pre": [0, 0, 0.1],
-							"post": [0, 0, 0]
-						}
-					}
-				},
-				"eye_left": {
-					"position": {
-						"0.0": [0, 0, 0.1],
-						"0.1667": {
-							"pre": [0, 0, 0.1],
-							"post": [0, 0, 0]
-						}
-					}
-				}
-			}
-		},
-		"animation.skiploom.cry": {
-			"animation_length": 1,
-			"bones": {
-				"mouth_open_big": {
-					"position": {
-						"0.0": [0, 0, 0],
-						"0.1667": {
-							"pre": [0, 0, 0],
-							"post": [0, 0, -0.12]
-						},
-						"0.25": {
-							"pre": [0, 0, -0.12],
-							"post": [0, 0, -0.12]
-						},
-						"0.4167": {
-							"pre": [0, 0, -0.12],
-							"post": [0, 0, 0]
-						}
-					}
-				},
-				"torso": {
-					"rotation": {
-						"0.0": [0, 0, 0],
-						"0.0833": [-2.5, 0, 0],
-						"0.2083": [2.5, 0, 0],
-						"0.3333": [-5, 0, 0],
-						"0.5": [-1.67, 0, 0],
-						"0.6667": [0, 0, 0]
-					}
-				},
-				"mouth_closed": {
-					"position": {
-						"0.0": [0, 0, 0],
-						"0.0833": {
-							"pre": [0, 0, 0],
-							"post": [0, 0, 1]
-						},
-						"0.625": {
-							"pre": [0, 0, 1],
-							"post": [0, 0, 0]
-						}
-					}
-				},
-				"mouth_open": {
-					"position": {
-						"0.0": [0, 0, 0],
-						"0.0833": {
-							"pre": [0, 0, 0],
-							"post": [0, 0, -0.1]
-						},
-						"0.2083": {
-							"pre": [0, 0, -0.1],
-							"post": [0, 0, 0]
-						},
-						"0.2917": {
-							"pre": [0, 0, 0],
-							"post": [0, 0, -0.1]
-						},
-						"0.625": {
-							"pre": [0, 0, -0.1],
-							"post": [0, 0, 0]
-						}
-					}
-				},
-				"mouth_open_small": {
-					"position": {
-						"0.0": [0, 0, 0],
-						"0.2083": {
-							"pre": [0, 0, 0],
-							"post": [0, 0, -0.1]
-						},
-						"0.2917": {
-							"pre": [0, 0, -0.1],
-							"post": [0, 0, 0]
-						}
-					}
-				},
-				"petal_front_right": {
-					"rotation": {
-						"0.0": [0, 0, 0],
-						"0.0833": [5, 0, 0],
-						"0.2083": [-5, 0, 0],
-						"0.25": [0, 0, 0],
-						"0.2917": [5, 0, 0],
-						"0.375": [1, 0, 0],
-						"0.4583": [0, 0, 0]
-					}
-				},
-				"petal_front_left": {
-					"rotation": {
-						"0.0": [0, 0, 0],
-						"0.0833": [0, 0, 5],
-						"0.2083": [0, 0, -5],
-						"0.25": [0, 0, 0],
-						"0.2917": [0, 0, 5],
-						"0.375": [0, 0, 1],
-						"0.4583": [0, 0, 0]
-					}
-				},
-				"petal_back_left": {
-					"rotation": {
-						"0.0": [0, 0, 0],
-						"0.0833": [-5, 0, 0],
-						"0.2083": [5, 0, 0],
-						"0.25": [0, 0, 0],
-						"0.2917": [-5, 0, 0],
-						"0.375": [-1, 0, 0],
-						"0.4583": [0, 0, 0]
-					}
-				},
-				"petal_back_right": {
-					"rotation": {
-						"0.0": [0, 0, 0],
-						"0.0833": [0, 0, -5],
-						"0.2083": [0, 0, 5],
-						"0.25": [0, 0, 0],
-						"0.2917": [0, 0, -5],
-						"0.375": [0, 0, -1],
-						"0.4583": [0, 0, 0]
-					}
-				},
-				"ear_left": {
-					"rotation": {
-						"0.0": [0, 0, 0],
-						"0.0417": [0, 0, 5],
-						"0.125": [0, 0, 2.5],
-						"0.2083": [0, 0, -5],
-						"0.2917": [0, 0, -2.5],
-						"0.3333": [0, 0, 5],
-						"0.5": [0, 0, 0]
-					}
-				},
-				"ear_right": {
-					"rotation": {
-						"0.0": [0, 0, 0],
-						"0.0417": [0, 0, -5],
-						"0.125": [0, 0, -2.5],
-						"0.2083": [0, 0, 5],
-						"0.2917": [0, 0, 2.5],
-						"0.3333": [0, 0, -5],
-						"0.5": [0, 0, 0]
-					}
-				}
-			},
-			"sound_effects": {
-				"0.0": {
-					"effect": "pokemon.skiploom.cry"
-				}
-			}
-		},
-		"animation.skiploom.shock": {
-			"loop": true,
-			"bones": {
-				"mouth_closed": {
-					"position": [0, 0, 0.1]
-				},
-				"mouth_open_tall": {
-					"position": [0, 0, -0.1]
-				}
-			}
-		},
-		"animation.skiploom.angry": {
-			"loop": true,
-			"bones": {
-				"eye_left": {
-					"rotation": [0, 0, -12.5]
-				},
-				"eye_right": {
-					"rotation": [0, 0, 12.5]
-				},
-				"mouth_open_frown": {
-					"position": [0, 0, -0.1]
-				},
-				"mouth_closed": {
-					"position": [0, 0, 0.1]
-				}
-			}
-		},
-		"animation.skiploom.sad": {
-			"loop": true,
-			"bones": {
-				"eye_left": {
-					"rotation": [0, 0, 10]
-				},
-				"eye_right": {
-					"rotation": [0, 0, -10]
-				},
-				"mouth_closed": {
-					"position": [0, 0, 0.1]
-				},
-				"mouth_frown": {
-					"position": [0, 0, -0.1]
-				}
-			}
-		},
-		"animation.skiploom.happy": {
-			"loop": true,
-			"bones": {
-				"eye_left": {
-					"position": [0, 0, 0.1]
-				},
-				"eye_right": {
-					"position": [0, 0, 0.1]
-				},
-				"mouth_open": {
-					"position": [0, 0, -0.1]
-				},
-				"mouth_closed": {
-					"position": [0, 0, 0.1]
-				},
-				"eyelid_happy_left": {
-					"position": [0, 0, -0.1]
-				},
-				"eyelid_happy_right": {
-					"position": [0, 0, -0.1]
-				}
-			}
-		},
-		"animation.skiploom.unamused": {
-			"loop": true,
-			"bones": {
-				"mouth_closed": {
-					"position": [0, 0, 0.1]
-				},
-				"mouth_straight": {
-					"position": [0, 0, -0.1]
-				}
-			}
-		},
-		"animation.skiploom.hurt": {
-			"loop": true,
-			"bones": {
-				"eye_left": {
-					"position": [0, 0, 0.1]
-				},
-				"eye_right": {
-					"position": [0, 0, 0.1]
-				},
-				"mouth_closed": {
-					"position": [0, 0, 0.1]
-				},
-				"mouth_frown": {
-					"position": [0, 0, -0.1]
-				},
-				"eyelid_happy_left": {
-					"rotation": [0, 0, -90],
-					"position": [0.5, 0.5, -0.1]
-				},
-				"eyelid_happy_right": {
-					"rotation": [0, 0, 90],
-					"position": [-0.5, 0.5, -0.1]
-				}
-			}
-		}
-	}
-}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0189_jumpluff/jumpluff.animation.json

@@ -1,588 +0,0 @@
-{
-	"format_version": "1.8.0",
-	"animations": {
-		"animation.jumpluff.ground_idle": {
-			"loop": true,
-			"animation_length": 2,
-			"bones": {
-				"foot_right": {
-					"rotation": ["math.clamp(-math.sin(q.anim_time*90*2)*12,0,180)+math.clamp(math.sin(q.anim_time*90*2)*2,0,180)", 22.5, 0],
-					"position": [
-						0,
-						"math.clamp(-math.sin(q.anim_time*90*2)*0.4,0,180)+math.clamp(math.sin(q.anim_time*90*2)*0.05,0,180)",
-						"-math.clamp(-math.sin(q.anim_time*90*2)*0.15,0,180)"
-					]
-				},
-				"foot_left": {
-					"rotation": ["math.clamp(math.sin(q.anim_time*90*2)*12,0,180)+math.clamp(-math.sin(q.anim_time*90*2)*2,0,180)", -22.5, 0],
-					"position": [
-						0,
-						"math.clamp(math.sin(q.anim_time*90*2)*0.4,0,180)+math.clamp(-math.sin(q.anim_time*90*2)*0.05,0,180)",
-						"-math.clamp(math.sin(q.anim_time*90*2)*0.15,0,180)"
-					]
-				},
-				"tail": {
-					"rotation": ["-12.5+math.sin(q.anim_time*90*4)*1.5", "math.sin(q.anim_time*90*2+120)*6", 0],
-					"position": [0, 0, 0]
-				},
-				"arm_left": {
-					"rotation": [2.95732, "27.6641-math.sin(q.anim_time*90*4-90)*2", "12.4441-math.sin(q.anim_time*90*2-90)*2"],
-					"position": [0.5, 0.1, -1.4]
-				},
-				"arm_right": {
-					"rotation": [2.95732, "-27.6641+math.sin(q.anim_time*90*4-90)*2", "-12.4441-math.sin(q.anim_time*90*2-90)*2"],
-					"position": [-0.5, 0.1, -1.4]
-				},
-				"torso": {
-					"rotation": ["-2.5+math.sin(q.anim_time*90*4)*1", 0, "0-math.sin(q.anim_time*90*2)*2"],
-					"position": [0, "math.abs(math.sin(q.anim_time*90*2)*0.2)", 0]
-				},
-				"leaf_left": {
-					"rotation": [0, 0, "-math.sin(q.anim_time*90*4+90)*4"]
-				},
-				"leaf_right": {
-					"rotation": [0, 0, "math.sin(q.anim_time*90*4+90)*4"]
-				},
-				"leaf_back": {
-					"rotation": ["math.sin(q.anim_time*90*4+90)*4", 0, 0]
-				},
-				"puff_stalk": {
-					"rotation": ["-2.5+math.sin(q.anim_time*90*4-90)*1", 0, "0-math.sin(q.anim_time*90*2-90)*2"]
-				}
-			}
-		},
-		"animation.jumpluff.ground_walk": {
-			"loop": true,
-			"animation_length": 2,
-			"bones": {
-				"foot_right": {
-					"rotation": ["-math.sin(q.anim_time*90*4)*60", 5, "math.sin(q.anim_time*90*4-70)*3"],
-					"position": [
-						-0.25,
-						"math.clamp(math.sin(q.anim_time*90*4)*0.5,0,180)+math.clamp(math.sin(q.anim_time*90*4)*0.35,-180,0)",
-						"-1.25-(math.sin(q.anim_time*90*4)*3.25)-math.clamp(-math.sin(q.anim_time*90*4)*1.5,0,180)"
-					]
-				},
-				"foot_left": {
-					"rotation": ["math.sin(q.anim_time*90*4)*60", -5, "math.sin(q.anim_time*90*4-70)*3"],
-					"position": [
-						0.25,
-						"math.clamp(-math.sin(q.anim_time*90*4)*0.5,0,180)+math.clamp(-math.sin(q.anim_time*90*4)*0.35,-180,0)",
-						"-1.25+(math.sin(q.anim_time*90*4)*3.25)-math.clamp(math.sin(q.anim_time*90*4)*1.5,0,180)"
-					]
-				},
-				"tail": {
-					"rotation": ["-5-math.sin(q.anim_time*90*8-45)*8", "math.sin(q.anim_time*90*4-25)*4", 0],
-					"position": [0, 0, 0]
-				},
-				"arm_left": {
-					"rotation": ["-5.2812+math.sin(q.anim_time*90*8-60)*4", 39.37446, "(math.sin(q.anim_time*90*8-60)*6)"],
-					"position": [0.5, 0.1, -2.6]
-				},
-				"arm_right": {
-					"rotation": ["-5.2812+math.sin(q.anim_time*90*8-60)*4", -39.37446, "-(math.sin(q.anim_time*90*8-60)*6)"],
-					"position": [-0.5, 0.1, -2.6]
-				},
-				"torso": {
-					"rotation": ["-1-math.abs(math.sin(q.anim_time*90*4-30)*6)", 0, 0],
-					"position": [0, 0, 0]
-				},
-				"leaf_left": {
-					"rotation": [0, 0, "math.sin(q.anim_time*90*8-45)*4"]
-				},
-				"leaf_right": {
-					"rotation": [0, 0, "-math.sin(q.anim_time*90*8-45)*4"]
-				},
-				"leaf_back": {
-					"rotation": ["-math.sin(q.anim_time*90*8-45)*4", 0, 0]
-				},
-				"puff_stalk": {
-					"rotation": ["math.sin(q.anim_time*90*8-50)*4", 0, "0+math.sin(q.anim_time*90*4-10)*4"]
-				},
-				"body": {
-					"rotation": ["math.sin(q.anim_time*90*8)*1", "math.sin(q.anim_time*90*4-70)*1.3", "-math.sin(q.anim_time*90*4-70)*2"],
-					"position": ["-math.sin(q.anim_time*90*4-90)*0.5", "-0.4+math.clamp(math.abs(math.sin(q.anim_time*90*4)*3.5),0.4,180)", 0]
-				}
-			}
-		},
-		"animation.jumpluff.battle_idle": {
-			"loop": true,
-			"animation_length": 2,
-			"bones": {
-				"foot_right": {
-					"rotation": ["-math.sin(q.anim_time*90*2)*60", 5, "math.sin(q.anim_time*90*2-70)*3"],
-					"position": [
-						-0.25,
-						"math.clamp(math.sin(q.anim_time*90*2)*0.5,0,180)+math.clamp(math.sin(q.anim_time*90*2)*0.35,-180,0)",
-						"-1.25-(math.sin(q.anim_time*90*2)*3.25)-math.clamp(-math.sin(q.anim_time*90*2)*1.5,0,180)"
-					]
-				},
-				"foot_left": {
-					"rotation": ["math.sin(q.anim_time*90*2)*60", -5, "math.sin(q.anim_time*90*2-70)*3"],
-					"position": [
-						0.25,
-						"math.clamp(-math.sin(q.anim_time*90*2)*0.5,0,180)+math.clamp(-math.sin(q.anim_time*90*2)*0.35,-180,0)",
-						"-1.25+(math.sin(q.anim_time*90*2)*3.25)-math.clamp(math.sin(q.anim_time*90*2)*1.5,0,180)"
-					]
-				},
-				"tail": {
-					"rotation": ["-5-math.sin(q.anim_time*90*4-45)*16", "math.sin(q.anim_time*90*2-25)*8", 0],
-					"position": [0, 0, 0]
-				},
-				"arm_left": {
-					"rotation": ["-5.2812+math.sin(q.anim_time*90*4-60)*8", 39.37446, "(math.sin(q.anim_time*90*4-60)*12)"],
-					"position": [0.5, 0.1, -2.6]
-				},
-				"arm_right": {
-					"rotation": ["-5.2812+math.sin(q.anim_time*90*4-60)*8", -39.37446, "-(math.sin(q.anim_time*90*4-60)*12)"],
-					"position": [-0.5, 0.1, -2.6]
-				},
-				"torso": {
-					"rotation": ["-1-math.abs(math.sin(q.anim_time*90*2-30)*3)", 0, 0],
-					"position": [0, 0, 0]
-				},
-				"leaf_left": {
-					"rotation": [0, 0, "math.sin(q.anim_time*90*4-45)*8"]
-				},
-				"leaf_right": {
-					"rotation": [0, 0, "-math.sin(q.anim_time*90*4-45)*8"]
-				},
-				"leaf_back": {
-					"rotation": ["-math.sin(q.anim_time*90*4-45)*8", 0, 0]
-				},
-				"puff_stalk": {
-					"rotation": ["math.sin(q.anim_time*90*4-50)*4", 0, "0+math.sin(q.anim_time*90*2-10)*5"]
-				},
-				"body": {
-					"rotation": ["math.sin(q.anim_time*90*4)*1", "math.sin(q.anim_time*90*2-70)*0.3", "-math.sin(q.anim_time*90*2-70)*2"],
-					"position": ["-math.sin(q.anim_time*90*2-90)*0.5", "-0.4+math.clamp(math.abs(math.sin(q.anim_time*90*2)*8.5),0.4,180)", 0]
-				}
-			}
-		},
-		"animation.jumpluff.air_idle": {
-			"loop": true,
-			"bones": {
-				"body": {
-					"rotation": ["-2.5+math.sin(q.anim_time*90*2+30)*1", 0, "0+math.sin(q.anim_time*90*1+75)*1"],
-					"position": ["math.sin(q.anim_time*90*1)*0.2", "2.5+math.sin(q.anim_time*90*2)*0.425", 0]
-				},
-				"foot_right": {
-					"rotation": ["17.5745+math.sin(q.anim_time*90*2+90)*3", 19.99035, 0.23179],
-					"position": [-0.5, 0.4, 0]
-				},
-				"foot_left": {
-					"rotation": ["17.5745+math.sin(q.anim_time*90*2+90)*3", -19.99035, -0.23179],
-					"position": [0.5, 0.4, 0]
-				},
-				"tail": {
-					"rotation": ["-25+math.sin(q.anim_time*90*2-120)*6", "0+math.sin(q.anim_time*90*1-120)*4", "0-math.sin(q.anim_time*90*1-120)*2"],
-					"position": [0, 0, -0.2]
-				},
-				"arm_right": {
-					"rotation": [1.31845, "5-math.sin(q.anim_time*90*2-70)*1", "-15-math.sin(q.anim_time*90*2+45)*6"]
-				},
-				"feet": {
-					"rotation": [-72.5, 0, 0],
-					"position": [0, 1, -5]
-				},
-				"arm_left": {
-					"rotation": [1.31845, "-5+math.sin(q.anim_time*90*2-70)*1", "15+math.sin(q.anim_time*90*2+45)*6"]
-				},
-				"torso": {
-					"rotation": [0, 0, 0]
-				},
-				"leaf_left": {
-					"rotation": [0, 0, "math.sin(q.anim_time*90*2+45)*7"]
-				},
-				"leaf_right": {
-					"rotation": [0, 0, "-math.sin(q.anim_time*90*2+45)*7"]
-				},
-				"leaf_back": {
-					"rotation": ["-math.sin(q.anim_time*90*2+45)*7", 0, 0]
-				},
-				"puff_stalk": {
-					"rotation": ["math.sin(q.anim_time*90*2-70)*2", 0, "math.sin(q.anim_time*90*1-100)*3"]
-				},
-				"hand_left": {
-					"rotation": [0, 0, "math.sin(q.anim_time*90*2-45)*1"]
-				},
-				"hand_right": {
-					"rotation": [0, 0, "-math.sin(q.anim_time*90*2-45)*1"]
-				}
-			}
-		},
-		"animation.jumpluff.air_fly": {
-			"loop": true,
-			"bones": {
-				"body": {
-					"rotation": ["12.5+math.sin(q.anim_time*90*2+30)*2", 0, "math.sin(q.anim_time*90*1+75)*2"],
-					"position": ["math.sin(q.anim_time*90*1)*0.6", "2.75+math.sin(q.anim_time*90*2)*0.85", 0]
-				},
-				"foot_right": {
-					"rotation": ["124.1252-math.sin(q.anim_time*90*2+90)*6", -6.04499, 16.45354],
-					"position": [-0.2, -0.4, -0.25]
-				},
-				"foot_left": {
-					"rotation": ["124.1252-math.sin(q.anim_time*90*2+90)*6", 6.04499, -16.45354],
-					"position": [0.2, -0.4, -0.25]
-				},
-				"tail": {
-					"rotation": ["-17.5+math.sin(q.anim_time*90*2-120)*6", "0+math.sin(q.anim_time*90*1-120)*4", "0-math.sin(q.anim_time*90*1-120)*2"],
-					"position": [0, 0, -0.2]
-				},
-				"arm_right": {
-					"rotation": [4.63647, "-18.9839-math.sin(q.anim_time*90*2-70)*2", "-2.3829-math.sin(q.anim_time*90*2+45)*10"],
-					"position": [-0.6, 0, -1]
-				},
-				"arm_left": {
-					"rotation": [4.63647, "18.9839+math.sin(q.anim_time*90*2-70)*2", "2.3829+math.sin(q.anim_time*90*2+45)*10"],
-					"position": [0.6, 0, -1]
-				},
-				"torso": {
-					"rotation": [0, 0, 0]
-				},
-				"leaf_left": {
-					"rotation": [0, 0, "math.sin(q.anim_time*90*2+45)*7"]
-				},
-				"leaf_right": {
-					"rotation": [0, 0, "-math.sin(q.anim_time*90*2+45)*7"]
-				},
-				"leaf_back": {
-					"rotation": ["-5-math.sin(q.anim_time*90*2+45)*7", 0, 0],
-					"position": [0, 0, 0.1]
-				},
-				"puff_stalk": {
-					"rotation": ["-5+math.sin(q.anim_time*90*2-70)*2", 0, "math.sin(q.anim_time*90*1-100)*5"],
-					"position": [0, 0.3, 0.1]
-				},
-				"hand_left": {
-					"rotation": [0, 0, "math.sin(q.anim_time*90*2-45)*1"]
-				},
-				"hand_right": {
-					"rotation": [0, 0, "-math.sin(q.anim_time*90*2-45)*1"]
-				}
-			}
-		},
-		"animation.jumpluff.sleep": {
-			"loop": true,
-			"bones": {
-				"foot_right": {
-					"rotation": [0, 22.5, 0]
-				},
-				"foot_left": {
-					"rotation": [0, -22.5, 0]
-				},
-				"tail": {
-					"rotation": [-27.5, 0, 0]
-				},
-				"arm_left": {
-					"rotation": ["10+Math.cos(query.anim_time*90*1)*-2", 22.5, 22.5]
-				},
-				"hand_left": {
-					"rotation": [0, 0, -15]
-				},
-				"arm_right": {
-					"rotation": ["10+Math.cos(query.anim_time*90*1)*-2", -22.5, -22.5]
-				},
-				"hand_right": {
-					"rotation": [0, 0, 15]
-				},
-				"torso": {
-					"rotation": ["5+Math.cos(query.anim_time*90*1)*1", 0, 0],
-					"position": [0, -0.25, 0]
-				},
-				"puff_stalk": {
-					"rotation": ["-12.5+Math.cos(query.anim_time*90*1-90)*3", 0, 0]
-				},
-				"eye_left": {
-					"position": [0, 0, 0.1]
-				},
-				"eyelid_left": {
-					"position": [0, 0, -0.1]
-				},
-				"eye_right": {
-					"position": [0, 0, 0.1]
-				},
-				"eyelid_right": {
-					"position": [0, 0, -0.1]
-				}
-			}
-		},
-		"animation.jumpluff.air_sleep": {
-			"loop": true,
-			"bones": {
-				"body": {
-					"rotation": ["10+math.sin(q.anim_time*90*2+30)*1", 0, "0+math.sin(q.anim_time*90*1+75)*1"],
-					"position": ["math.sin(q.anim_time*90*1)*0.2", "3+math.sin(q.anim_time*90*2)*0.425", 0]
-				},
-				"foot_right": {
-					"rotation": ["7.5745+math.sin(q.anim_time*90*2+90)*3", 19.99035, 0.23179],
-					"position": [-0.4, 0.4, 0]
-				},
-				"foot_left": {
-					"rotation": ["7.5745+math.sin(q.anim_time*90*2+90)*3", -19.99035, -0.23179],
-					"position": [0.4, 0.4, 0]
-				},
-				"tail": {
-					"rotation": ["-32.5+math.sin(q.anim_time*90*2-120)*6", "0+math.sin(q.anim_time*90*1-120)*4", "0-math.sin(q.anim_time*90*1-120)*2"]
-				},
-				"arm_right": {
-					"rotation": ["9.4903+math.sin(q.anim_time*90*2+45)*1", -37.78486, "-22.0384-math.sin(q.anim_time*90*2+45)*3"],
-					"position": [-0.2, 0, -0.8]
-				},
-				"feet": {
-					"rotation": [-72.5, 0, 0],
-					"position": [0, 1, -5]
-				},
-				"arm_left": {
-					"rotation": ["9.4903+math.sin(q.anim_time*90*2+45)*1", 37.78486, "22.0384+math.sin(q.anim_time*90*2+45)*3"],
-					"position": [0.2, 0, -0.8]
-				},
-				"puff_stalk": {
-					"rotation": ["-10+math.sin(q.anim_time*90*2-70)*2", 0, "math.sin(q.anim_time*90*1-100)*3"]
-				},
-				"eye_left": {
-					"position": [0, 0, 0.1]
-				},
-				"eyelid_left": {
-					"position": [0, 0, -0.1]
-				},
-				"eye_right": {
-					"position": [0, 0, 0.1]
-				},
-				"eyelid_right": {
-					"position": [0, 0, -0.1]
-				},
-				"leaf_left": {
-					"rotation": [0, 0, "math.sin(q.anim_time*90*2+45)*7"]
-				},
-				"leaf_right": {
-					"rotation": [0, 0, "-math.sin(q.anim_time*90*2+45)*7"]
-				},
-				"leaf_back": {
-					"rotation": ["-5-math.sin(q.anim_time*90*2+45)*7", 0, 0]
-				}
-			}
-		},
-		"animation.jumpluff.blink": {
-			"animation_length": 0.1667,
-			"bones": {
-				"flame_left": {
-					"position": {
-						"0.0": [-2, 0, 1],
-						"0.125": [-2, 0, 1],
-						"0.1667": [0, 0, 0]
-					}
-				},
-				"flame_right": {
-					"position": {
-						"0.0": [2, 0, 1],
-						"0.125": [2, 0, 1],
-						"0.1667": [0, 0, 0]
-					}
-				},
-				"eyelid_right": {
-					"position": {
-						"0.0": [0, 0, -0.1],
-						"0.1667": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}
-					}
-				},
-				"eyelid_left": {
-					"position": {
-						"0.0": [0, 0, -0.1],
-						"0.1667": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}
-					}
-				},
-				"eye_left": {
-					"position": {
-						"0.0": [0, 0, 0.1],
-						"0.1667": {"pre": [0, 0, 0.1], "post": [0, 0, 0]}
-					}
-				},
-				"eye_right": {
-					"position": {
-						"0.0": [0, 0, 0.1],
-						"0.1667": {"pre": [0, 0, 0.1], "post": [0, 0, 0]}
-					}
-				}
-			}
-		},
-		"animation.jumpluff.cry": {
-			"animation_length": 1,
-			"bones": {
-				"torso": {
-					"rotation": {
-						"0.0": [0, 0, 0],
-						"0.0833": [-2.5, 0, 0],
-						"0.1667": [-1.25, 0, 0],
-						"0.2083": [1.25, 0, 0],
-						"0.2917": [2.5, 0, 0],
-						"0.375": [-3.12, 0, 0],
-						"0.4583": [-2.83, 0, 0],
-						"0.5833": [-1.67, 0, 0],
-						"0.75": [0, 0, 0]
-					}
-				},
-				"mouth_closed": {
-					"position": {
-						"0.0": [0, 0, 0],
-						"0.0833": {"pre": [0, 0, 0], "post": [0, 0, 1]},
-						"0.6667": {"pre": [0, 0, 1], "post": [0, 0, 0]}
-					}
-				},
-				"mouth_open": {
-					"position": {
-						"0.0": [0, 0, 0],
-						"0.2083": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
-						"0.375": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}
-					}
-				},
-				"mouth_open_tall": {
-					"position": {
-						"0.0": [0, 0, 0],
-						"0.0833": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
-						"0.2083": {"pre": [0, 0, -0.1], "post": [0, 0, 0]},
-						"0.375": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
-						"0.6667": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}
-					}
-				},
-				"puff_stalk": {
-					"rotation": {
-						"0.0": [0, 0, 0],
-						"0.0833": [4.38, 0, 0],
-						"0.2083": [-4.58, 0, 0],
-						"0.2917": [1.25, 0, 0],
-						"0.3333": [2.5, 0, 0],
-						"0.4167": [-3.12, 0, 0],
-						"0.625": [-0.83, 0, 0],
-						"0.7083": [0, 0, 0]
-					}
-				},
-				"arm_left": {
-					"rotation": {
-						"0.0": [0, 0, 0],
-						"0.0833": [0, 0, "-(math.sin(q.anim_time*90*24)*8)"],
-						"0.2083": [0, 0, "-(math.sin(q.anim_time*90*24)*4)"],
-						"0.375": [0, 0, 0]
-					}
-				},
-				"arm_right": {
-					"rotation": {
-						"0.0": [0, 0, 0],
-						"0.0833": [0, 0, "math.sin(q.anim_time*90*24)*8"],
-						"0.2083": [0, 0, "math.sin(q.anim_time*90*24)*4"],
-						"0.375": [0, 0, 0]
-					}
-				}
-			},
-			"sound_effects": {
-				"0.0": {
-					"effect": "pokemon.jumpluff.cry"
-				}
-			}
-		},
-		"animation.jumpluff.shocked": {
-			"loop": true,
-			"bones": {
-				"mouth_open_tall": {
-					"position": [0, 0, -0.1]
-				},
-				"mouth_closed": {
-					"position": [0, 0, 0.1]
-				}
-			}
-		},
-		"animation.jumpluff.angry": {
-			"loop": true,
-			"bones": {
-				"eye_right": {
-					"rotation": [0, 0, 15]
-				},
-				"eye_left": {
-					"rotation": [0, 0, -15]
-				}
-			}
-		},
-		"animation.jumpluff.sad": {
-			"loop": true,
-			"bones": {
-				"eye_left": {
-					"rotation": [0, 0, 15]
-				},
-				"eye_right": {
-					"rotation": [0, 0, -15]
-				},
-				"mouth_closed": {
-					"position": [0, 0, 0.1]
-				},
-				"mouth_open_frown": {
-					"position": [0, 0, -0.1]
-				}
-			}
-		},
-		"animation.jumpluff.unamused": {
-			"loop": true,
-			"bones": {
-				"mouth_closed": {
-					"position": [0, 0, 0.1]
-				},
-				"mouth_straight": {
-					"position": [0, 0, -0.1]
-				}
-			}
-		},
-		"animation.jumpluff.happy": {
-			"loop": true,
-			"bones": {
-				"mouth_closed": {
-					"position": [0, 0, 0.1]
-				},
-				"mouth_open": {
-					"position": [0, 0, -0.1]
-				},
-				"eye_right": {
-					"position": [0, 0, 0.1]
-				},
-				"eye_left": {
-					"position": [0, 0, 0.1]
-				},
-				"eye_left_happy": {
-					"position": [0, 0, -0.1]
-				},
-				"eye_right_happy": {
-					"position": [0, 0, -0.1]
-				}
-			}
-		},
-		"animation.jumpluff.smile": {
-			"loop": true,
-			"bones": {
-				"mouth_closed": {
-					"position": [0, 0, 0.1]
-				},
-				"mouth_smile": {
-					"position": [0, 0, -0.1]
-				}
-			}
-		},
-		"animation.jumpluff.hurt": {
-			"loop": true,
-			"bones": {
-				"eye_left": {
-					"position": [0, 0, 0.1]
-				},
-				"eye_left_happy": {
-					"rotation": [0, 0, -90],
-					"position": [0, 0.1, -0.1]
-				},
-				"eye_right": {
-					"position": [0, 0, 0.1]
-				},
-				"eye_right_happy": {
-					"rotation": [0, 0, 90],
-					"position": [0, 0.1, -0.1]
-				}
-			}
-		}
-	}
-}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0222_corsola/corsola_galarian.animation.json

@@ -1,875 +0,0 @@
-{
-	"format_version": "1.8.0",
-	"animations": {
-		"animation.corsola_galarian.ground_idle": {
-			"loop": true,
-			"animation_length": 4,
-			"bones": {
-				"horn": {
-					"scale": 0
-				},
-				"spine_front_right": {
-					"scale": 0
-				},
-				"spine_back_right": {
-					"scale": 0
-				},
-				"arm_front_right": {
-					"scale": 0
-				},
-				"spine_front_left": {
-					"scale": 0
-				},
-				"spine_back_left": {
-					"scale": 0
-				},
-				"eyes": {
-					"position": [0, 0, 0.8]
-				},
-				"arm_front_left": {
-					"scale": 0
-				}
-			}
-		},
-		"animation.corsola_galarian.ground_walk": {
-			"loop": true,
-			"animation_length": 4,
-			"bones": {
-				"horn": {
-					"scale": 0
-				},
-				"spine_front_right": {
-					"scale": 0
-				},
-				"spine_back_right": {
-					"scale": 0
-				},
-				"arm_front_right": {
-					"scale": 0
-				},
-				"spine_front_left": {
-					"scale": 0
-				},
-				"spine_back_left": {
-					"scale": 0
-				},
-				"eyes": {
-					"position": [0, 0, 0.8]
-				},
-				"arm_front_left": {
-					"scale": 0
-				},
-				"body": {
-					"rotation": ["2.5+math.sin(q.anim_time*90*1-60)*-1", 0, "0+math.sin(q.anim_time*90*2)*0.5"],
-					"position": [0, "3.7+math.sin(q.anim_time*90*1)*0.7", 0]
-				}
-			}
-		},
-		"animation.corsola_galarian.battle_idle": {
-			"loop": true,
-			"animation_length": 4,
-			"bones": {
-				"body": {
-					"rotation": ["0+math.sin(q.anim_time*90*1-60)*-1.5", 0, "0+math.sin(q.anim_time*90*2)*0.8"],
-					"position": [0, "3.5+math.sin(q.anim_time*90*1)*0.5", "0+math.sin(q.anim_time*90*2-30)*0.05"]
-				},
-				"head_angle": {
-					"rotation": [2, 0, 0]
-				},
-				"locator_top": {
-					"position": [0, 3, 0]
-				},
-				"locator_target": {
-					"position": [0, 0, 0]
-				}
-			}
-		},
-		"animation.corsola_galarian.sleep": {
-			"loop": true,
-			"bones": {
-				"horn": {
-					"scale": 0
-				},
-				"spine_front_right": {
-					"scale": 0
-				},
-				"spine_back_right": {
-					"scale": 0
-				},
-				"arm_front_right": {
-					"scale": 0
-				},
-				"spine_front_left": {
-					"scale": 0
-				},
-				"spine_back_left": {
-					"scale": 0
-				},
-				"eyes": {
-					"position": [0, 0, 0.8]
-				},
-				"arm_front_left": {
-					"scale": 0
-				}
-			}
-		},
-		"animation.corsola_galarian.blink": {
-			"animation_length": 0.1667,
-			"bones": {
-				"eyes": {
-					"position": {
-						"0.0": [0, 0, 0.8],
-						"0.1667": {
-							"pre": [0, 0, 0.8],
-							"post": [0, 0, 0]
-						}
-					}
-				}
-			}
-		},
-		"animation.corsola_galarian.branchless": {
-			"loop": true,
-			"bones": {
-				"horn": {
-					"scale": 0
-				},
-				"spine_front_right": {
-					"scale": 0
-				},
-				"spine_back_right": {
-					"scale": 0
-				},
-				"arm_front_right": {
-					"scale": 0
-				},
-				"spine_front_left": {
-					"scale": 0
-				},
-				"spine_back_left": {
-					"scale": 0
-				},
-				"arm_front_left": {
-					"scale": 0
-				}
-			}
-		},
-		"animation.corsola_galarian.battle_intro": {
-			"animation_length": 3,
-			"bones": {
-				"horn": {
-					"scale": {
-						"0.0": [0, 0, 0],
-						"2.125": [0, 0, 0],
-						"2.2083": [1, 1.75, 1],
-						"2.2917": [1.3, 1.3, 0.7],
-						"2.5833": [1, 1, 1]
-					}
-				},
-				"spine_front_right": {
-					"scale": {
-						"0.0": [0, 0, 0],
-						"2.125": [0, 0, 0],
-						"2.2083": [1, 1.75, 1],
-						"2.2917": [1.3, 0.7, 1.3],
-						"2.5833": [1, 1, 1]
-					}
-				},
-				"spine_back_right": {
-					"scale": {
-						"0.0": [0, 0, 0],
-						"2.125": [0, 0, 0],
-						"2.2083": [1, 1.75, 1],
-						"2.2917": [1.3, 0.7, 1.3],
-						"2.5833": [1, 1, 1]
-					}
-				},
-				"arm_front_right": {
-					"scale": {
-						"0.0": [0, 0, 0],
-						"0.9583": [0, 0, 0],
-						"1.0417": [1, 1.75, 1],
-						"1.0833": [1.3, 0.9, 1.3],
-						"1.1667": [1, 1, 1],
-						"2.125": [1, 1, 1],
-						"2.2083": [1, 1.75, 1],
-						"2.2917": [1.3, 0.7, 1.3],
-						"2.5833": [1, 1, 1]
-					}
-				},
-				"spine_front_left": {
-					"scale": {
-						"0.0417": [0, 0, 0],
-						"0.125": [1, 1.75, 1],
-						"0.1667": [1.3, 0.9, 1.3],
-						"0.25": [1, 1, 1],
-						"2.125": [1, 1, 1],
-						"2.2083": [1, 1.75, 1],
-						"2.2917": [1.3, 0.7, 1.3],
-						"2.5833": [1, 1, 1]
-					}
-				},
-				"spine_back_left": {
-					"scale": {
-						"0.0": [0, 0, 0],
-						"2.125": [0, 0, 0],
-						"2.2083": [1, 1.75, 1],
-						"2.2917": [1.3, 0.7, 1.3],
-						"2.5833": [1, 1, 1]
-					}
-				},
-				"arm_front_left": {
-					"scale": {
-						"0.0": [0, 0, 0],
-						"2.125": [0, 0, 0],
-						"2.2083": [1, 1.75, 1],
-						"2.2917": [1.3, 0.7, 1.3],
-						"2.5833": [1, 1, 1]
-					}
-				},
-				"body": {
-					"rotation": {
-						"0.0": [0, 0, 0],
-						"0.0833": [-2.5, -7.5, -2.5],
-						"0.3333": [0, -10, 0],
-						"0.9167": [0, -10, 0],
-						"1.0417": [-5, 7.5, 2],
-						"1.125": [-2, 9.5, 0],
-						"1.25": [0, 12.5, 0],
-						"1.6667": [0, 12.5, 0],
-						"1.9167": ["0+math.sin(q.anim_time*90*24)*0.5", 12.5, "0+math.sin(q.anim_time*90*32)*0.5"],
-						"2.0833": ["0+math.sin(q.anim_time*90*24)*0.5", 12.5, "0+math.sin(q.anim_time*90*32)*0.5"],
-						"2.2083": {
-							"pre": [0, 12.5, 0],
-							"post": [0, 12.5, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"2.375": {
-							"post": [-6.5, 9, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"2.7083": {
-							"post": [2.92, 3.92, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"3.0": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						}
-					},
-					"position": {
-						"0.0": [0, 0, 0],
-						"0.125": [0.25, 0.5, 0],
-						"0.25": [1, "0+math.sin(q.anim_time*90*24)*0.1", 0],
-						"0.5": [1, 0, 0],
-						"0.9167": [1, 0, 0],
-						"1.0417": [-0.25, 1, 0],
-						"1.1667": [-0.5, "0+math.sin(q.anim_time*90*24)*0.1", 0],
-						"1.4167": [-0.5, 0, 0],
-						"1.6667": [-0.5, 0, 0],
-						"1.9167": [-0.5, 0, 0],
-						"2.0833": [-0.5, 0, 0],
-						"2.2083": {
-							"pre": [-0.5, 4, 0],
-							"post": [-0.5, 4, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"2.5": {
-							"post": [0, 2, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"3.0": {
-							"post": [0, 3, 0],
-							"lerp_mode": "catmullrom"
-						}
-					}
-				},
-				"eyes": {
-					"position": {
-						"0.0": [0, 0, 0.8],
-						"2.25": {
-							"pre": [0, 0, 0.8],
-							"post": [0, 0, 0]
-						}
-					}
-				},
-				"mouth_closed": {
-					"position": {
-						"0.0": [0, 0, 0],
-						"2.25": {
-							"pre": [0, 0, 0],
-							"post": [0, 0, 0.1]
-						},
-						"2.6667": {
-							"pre": [0, 0, 0.1],
-							"post": [0, 0, 0]
-						}
-					}
-				},
-				"mouth_open": {
-					"position": {
-						"0.0": [0, 0, 0],
-						"2.25": {
-							"pre": [0, 0, 0],
-							"post": [0, 0, -1.1]
-						},
-						"2.6667": {
-							"pre": [0, 0, -1.1],
-							"post": [0, 0, 0]
-						}
-					}
-				},
-				"head_angle": {
-					"rotation": {
-						"0.0": [0, 0, 0],
-						"2.75": [0, 0, 0],
-						"3.0": [2, 0, 0]
-					}
-				}
-			},
-			"sound_effects": {
-				"2.25": {
-					"effect": "pokemon.galarian_corsola.cry"
-				}
-			}
-		},
-		"animation.corsola_galarian.render": {
-			"loop": true,
-			"bones": {
-				"body": {
-					"position": [0, 1, 0]
-				},
-				"head_angle": {
-					"rotation": [10, -35, 0]
-				}
-			}
-		},
-		"animation.corsola_galarian.quirk": {
-			"animation_length": 3,
-			"bones": {
-				"body": {
-					"rotation": {
-						"0.0": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.2083": {
-							"post": [5, 0, "0+math.sin(q.anim_time*90*16)*2"],
-							"lerp_mode": "catmullrom"
-						},
-						"0.5417": {
-							"post": [-2.5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.875": {
-							"post": [-1.5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.75": {
-							"post": [-1.5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"2.2917": {
-							"post": [-4, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"2.5": [3.75, 0, 0],
-						"2.625": [-1.64, 0, 0],
-						"2.9583": [0, 0, 0]
-					},
-					"position": {
-						"0.0": [0, 0, 0],
-						"0.2083": [0, 2.55, 0],
-						"0.375": [0, "3+math.sin(q.anim_time*90*1)*0.5", 0],
-						"2.25": [0, "3+math.sin(q.anim_time*90*1)*0.5", 0],
-						"2.3333": {
-							"pre": [0, 3, 0],
-							"post": [0, 3, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"2.4167": {
-							"post": [0, 0.01, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"2.4583": [0, -0.23, 0],
-						"2.5833": [0, "0+math.sin(q.anim_time*90*24)*0.1", 0],
-						"2.875": [0, 0, 0]
-					}
-				},
-				"eyes": {
-					"position": {
-						"0.0": [0, 0, 0],
-						"0.25": {
-							"pre": [0, 0, 0],
-							"post": [0, 0, -0.8]
-						},
-						"0.7917": {
-							"pre": [0, 0, -0.8],
-							"post": [0, 0, 0]
-						},
-						"1.0": {
-							"pre": [0, 0, 0],
-							"post": [0, 0, -0.8]
-						},
-						"1.25": {
-							"pre": [0, 0, -0.8],
-							"post": [0, 0, 0]
-						},
-						"1.4583": {
-							"pre": [0, 0, 0],
-							"post": [0, 0, -0.8]
-						},
-						"2.5": {
-							"pre": [0, 0, -0.8],
-							"post": [0, 0, 0]
-						}
-					}
-				}
-			}
-		},
-		"animation.corsola_galarian.cry": {
-			"animation_length": 0.7917,
-			"bones": {
-				"body": {
-					"rotation": {
-						"0.0": [0, 0, 0],
-						"0.0833": [0, 0, "math.sin(q.anim_time*90*32)*2"],
-						"0.1667": [0, 0, "math.sin(q.anim_time*90*32)*2"],
-						"0.25": [0, 0, 0],
-						"0.3333": [-3.33, 0, 0],
-						"0.4167": [-5, 0, 0],
-						"0.5833": [-4.29, 0, 0],
-						"0.6667": [0, 0, 0]
-					},
-					"position": {
-						"0.0": [0, 0, 0],
-						"0.0833": ["math.sin(q.anim_time*90*32)*0.14", "math.abs(math.sin(q.anim_time*90*32)*0.12)", 0],
-						"0.1667": ["math.sin(q.anim_time*90*32)*0.14", "math.abs(math.sin(q.anim_time*90*32)*0.12)", 0],
-						"0.25": [0, 0, 0],
-						"0.3333": [0, 0.07, 0.33],
-						"0.4167": [0, 0.1, 0.5],
-						"0.5833": [0, 0.09, 0.43],
-						"0.6667": [0, 0, 0]
-					}
-				},
-				"mouth": {
-					"position": {
-						"0.0": [0, 0, 0],
-						"0.0417": {
-							"pre": [0, 0, 0],
-							"post": [0, 0, 0.04]
-						},
-						"0.1667": {
-							"pre": [0, 0, 0.04],
-							"post": [0, 0, 0.04]
-						},
-						"0.2083": {
-							"pre": [0, 0, 0.04],
-							"post": [0, 0, 0]
-						},
-						"0.25": {
-							"pre": [0, 0, 0],
-							"post": [0, 0, 0.04]
-						},
-						"0.625": {
-							"pre": [0, 0, 0.04],
-							"post": [0, 0, 0.04]
-						},
-						"0.6667": {
-							"pre": [0, 0, 0.04],
-							"post": [0, 0, 0]
-						}
-					}
-				},
-				"mouth_open": {
-					"position": {
-						"0.0": [0, 0, 0],
-						"0.0417": {
-							"pre": [0, 0, 0],
-							"post": [0, 0, -1.2]
-						},
-						"0.1667": {
-							"pre": [0, 0, -1.2],
-							"post": [0, 0, -1.2]
-						},
-						"0.2083": {
-							"pre": [0, 0, -1.2],
-							"post": [0, 0, 0]
-						},
-						"0.25": {
-							"pre": [0, 0, 0],
-							"post": [0, 0, -1.2]
-						},
-						"0.625": {
-							"pre": [0, 0, -1.2],
-							"post": [0, 0, -1.2]
-						},
-						"0.6667": {
-							"pre": [0, 0, -1.2],
-							"post": [0, 0, 0]
-						}
-					}
-				}
-			},
-			"sound_effects": {
-				"0.0417": {
-					"effect": "pokemon.galarian_corsola.cry"
-				}
-			}
-		},
-		"animation.corsola_galarian.battle_cry": {
-			"animation_length": 1.5,
-			"bones": {
-				"body": {
-					"rotation": {
-						"0.0": [0, 0, 0],
-						"0.0833": [0, 0, "math.sin(q.anim_time*90*32)*2"],
-						"0.1667": [0, 0, "math.sin(q.anim_time*90*32)*2"],
-						"0.25": [0, 0, 0],
-						"0.3333": {
-							"pre": [-3.33, 0, 0],
-							"post": [-3.33, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.4167": {
-							"post": [-5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.5833": {
-							"post": [-4.29, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.8333": {
-							"post": [0.36, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.375": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						}
-					},
-					"position": {
-						"0.0": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.0833": {
-							"post": [0, -0.75, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.3333": {
-							"post": [0, -0.25, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.5": {
-							"post": [0, 0.5, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.9167": {
-							"post": [0, -0.11, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.5": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						}
-					}
-				},
-				"mouth": {
-					"position": {
-						"0.0": [0, 0, 0],
-						"0.0417": {
-							"pre": [0, 0, 0],
-							"post": [0, 0, 0.04]
-						},
-						"0.1667": {
-							"pre": [0, 0, 0.04],
-							"post": [0, 0, 0.04]
-						},
-						"0.2083": {
-							"pre": [0, 0, 0.04],
-							"post": [0, 0, 0]
-						},
-						"0.25": {
-							"pre": [0, 0, 0],
-							"post": [0, 0, 0.04]
-						},
-						"0.625": {
-							"pre": [0, 0, 0.04],
-							"post": [0, 0, 0.04]
-						},
-						"0.6667": {
-							"pre": [0, 0, 0.04],
-							"post": [0, 0, 0]
-						}
-					}
-				},
-				"mouth_open": {
-					"position": {
-						"0.0": [0, 0, 0],
-						"0.0417": {
-							"pre": [0, 0, 0],
-							"post": [0, 0, -1.2]
-						},
-						"0.1667": {
-							"pre": [0, 0, -1.2],
-							"post": [0, 0, -1.2]
-						},
-						"0.2083": {
-							"pre": [0, 0, -1.2],
-							"post": [0, 0, 0]
-						},
-						"0.25": {
-							"pre": [0, 0, 0],
-							"post": [0, 0, -1.2]
-						},
-						"0.625": {
-							"pre": [0, 0, -1.2],
-							"post": [0, 0, -1.2]
-						},
-						"0.6667": {
-							"pre": [0, 0, -1.2],
-							"post": [0, 0, 0]
-						}
-					}
-				}
-			},
-			"sound_effects": {
-				"0.0417": {
-					"effect": "pokemon.galarian_corsola.cry"
-				}
-			}
-		},
-		"animation.corsola_galarian.ectoplasma_overlay": {
-			"loop": true,
-			"bones": {
-				"arm_front_right": {
-					"scale": ["1+math.sin(q.anim_time*90*4)*-0.01", "1+math.sin(q.anim_time*90*4+30)*0.03", "1+math.sin(q.anim_time*90*4-30)*-0.01"]
-				},
-				"arm_front_left": {
-					"scale": ["1+math.sin(q.anim_time*90*4)*-0.01", "1+math.sin(q.anim_time*90*4+30)*0.03", "1+math.sin(q.anim_time*90*4-30)*-0.01"]
-				},
-				"horn": {
-					"scale": ["1+math.sin(q.anim_time*90*4-30)*-0.01", "1+math.sin(q.anim_time*90*4)*0.03", "1+math.sin(q.anim_time*90*4-60)*-0.01"]
-				},
-				"spine_front_right": {
-					"scale": ["1+math.sin(q.anim_time*90*4-60)*-0.01", "1+math.sin(q.anim_time*90*4-30)*0.03", "1+math.sin(q.anim_time*90*4-90)*-0.01"]
-				},
-				"spine_front_left": {
-					"scale": ["1+math.sin(q.anim_time*90*4-60)*-0.01", "1+math.sin(q.anim_time*90*4-30)*0.03", "1+math.sin(q.anim_time*90*4-90)*-0.01"]
-				},
-				"spine_back_right": {
-					"scale": ["1+math.sin(q.anim_time*90*4-90)*-0.01", "1+math.sin(q.anim_time*90*4-60)*0.03", "1+math.sin(q.anim_time*90*4-120)*-0.01"]
-				},
-				"spine_back_left": {
-					"scale": ["1+math.sin(q.anim_time*90*4-90)*-0.01", "1+math.sin(q.anim_time*90*4-60)*0.03", "1+math.sin(q.anim_time*90*4-120)*-0.01"]
-				}
-			}
-		},
-		"animation.corsola_galarian.faint": {
-			"animation_length": 3,
-			"bones": {
-				"body": {
-					"rotation": {
-						"0.0": [5, 0, 0],
-						"0.0833": ["0+math.sin(q.anim_time*90*24-30)*2", 0, "0+math.sin(q.anim_time*90*32)*5"],
-						"1.2083": [-5, 0, 0],
-						"1.5": {
-							"pre": [-10, 0, 0],
-							"post": [-10, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.6667": {
-							"post": [-5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.75": {
-							"post": [-7.5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.8333": {
-							"post": [5, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.9167": {
-							"post": [10.675, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"2.0417": [6.55, 0, 0],
-						"2.0833": [2.5, 0, 0],
-						"2.2083": {
-							"pre": [-1.75, 0, 0],
-							"post": [-1.75, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"2.3333": {
-							"post": [0.35, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"2.5": [0, 0, 0]
-					},
-					"position": {
-						"0.0": [0, 3, 0],
-						"0.5": {
-							"pre": [0, 6, 0],
-							"post": [0, 6, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.0": {
-							"post": [0, 7, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.3333": {
-							"post": [0, 7.89, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.625": {
-							"post": [0, 7.25, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.7083": [0, 3.205, 0.5],
-						"1.75": [0, -0.21, 0.75],
-						"1.8333": {
-							"pre": [0, 1.565, 0],
-							"post": [0, 1.565, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.9583": {
-							"post": [0, 1.75, -0.5],
-							"lerp_mode": "catmullrom"
-						},
-						"2.0417": {
-							"post": [0, -0.1, -1.5],
-							"lerp_mode": "catmullrom"
-						},
-						"2.125": {
-							"post": [0, 0.15, -0.5],
-							"lerp_mode": "catmullrom"
-						},
-						"2.2083": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"2.3333": {
-							"post": [0, 0, -0.55],
-							"lerp_mode": "catmullrom"
-						},
-						"2.5": [0, 0, -0.29]
-					}
-				},
-				"head": {
-					"position": {
-						"0.0": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.25": {
-							"post": [1, 0, 0.75],
-							"lerp_mode": "catmullrom"
-						},
-						"0.4583": {
-							"post": [0, -1, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"0.625": {
-							"post": [0, 0, 0.5],
-							"lerp_mode": "catmullrom"
-						},
-						"0.75": {
-							"post": [0, 0, -1],
-							"lerp_mode": "catmullrom"
-						},
-						"0.9583": {
-							"post": [0, -1, 0],
-							"lerp_mode": "catmullrom"
-						},
-						"1.2083": {
-							"post": [0, -0.5, -1],
-							"lerp_mode": "catmullrom"
-						},
-						"1.3333": {
-							"post": [0, -0.5, 1.5],
-							"lerp_mode": "catmullrom"
-						},
-						"1.5417": {
-							"post": [0, 0.28, -0.22],
-							"lerp_mode": "catmullrom"
-						},
-						"1.7083": {
-							"post": [0, 0, 0],
-							"lerp_mode": "catmullrom"
-						}
-					}
-				},
-				"arm_front_right": {
-					"scale": {
-						"0.0": [1, 1, 1],
-						"0.125": [0.7, 0.7, 1.8],
-						"0.2083": [0, 0, 0]
-					}
-				},
-				"arm_front_left": {
-					"scale": {
-						"0.3333": [1, 1, 1],
-						"0.4583": [0.7, 0.7, 1.8],
-						"0.5417": [0, 0, 0]
-					}
-				},
-				"eyes": {
-					"position": {
-						"0.0": [0, 0, 0],
-						"1.2917": {"pre": [0, 0, 0], "post": [0, 0, 0.8]}
-					}
-				},
-				"mouth_closed": {
-					"position": {
-						"0.0": [0, 0, 0],
-						"0.1667": {"pre": [0, 0, 0], "post": [0, 0, 0.1]},
-						"1.2917": {"pre": [0, 0, 0.1], "post": [0, 0, 0]}
-					}
-				},
-				"mouth_open": {
-					"position": {
-						"0.0": [0, 0, 0],
-						"0.2083": {"pre": [0, 0, 0], "post": [0, 0, -1.1]},
-						"1.2917": {"pre": [0, 0, -1.1], "post": [0, 0, 0]}
-					}
-				},
-				"horn": {
-					"scale": {
-						"1.0833": [1, 1, 1],
-						"1.2083": [0.7, 0.7, 1.8],
-						"1.2917": [0, 0, 0]
-					}
-				},
-				"spine_front_right": {
-					"scale": {
-						"0.2083": [1, 1, 1],
-						"0.3333": [0.7, 1.8, 0.7],
-						"0.4167": [0, 0, 0]
-					}
-				},
-				"spine_front_left": {
-					"scale": {
-						"0.6667": [1, 1, 1],
-						"0.7917": [0.7, 1.8, 0.7],
-						"0.875": [0, 0, 0]
-					}
-				},
-				"spine_back_right": {
-					"scale": {
-						"0.4167": [1, 1, 1],
-						"0.5417": [0.7, 1.8, 0.7],
-						"0.625": [0, 0, 0]
-					}
-				},
-				"spine_back_left": {
-					"scale": {
-						"0.9583": [1, 1, 1],
-						"1.0833": [0.7, 1.8, 0.7],
-						"1.1667": [0, 0, 0]
-					}
-				}
-			}
-		}
-	}
-}

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

@@ -4,38 +4,36 @@
 		"animation.mudkip.ground_idle": {
 			"loop": true,
 			"bones": {
-				"head": {
-					"rotation": [2.5, 0, 0]
-				},
 				"fin2": {
-					"rotation": [2.5, 0, 0]
-				},
-				"cheek_left2": {
-					"rotation": [0, -7.5, 0]
+					"rotation": [-2.5, 0, 0]
 				},
 				"leg_front_left": {
-					"rotation": [7.5, 5, 0]
+					"rotation": [7.60455, 8.0755, 1.11739],
+					"position": [0, -0.5, 0]
 				},
 				"leg_front_left2": {
-					"rotation": [-7.5, 0, 0]
+					"rotation": [-12.5, 0, 0]
 				},
 				"leg_front_right": {
-					"rotation": [7.5, -5, 0]
+					"rotation": [7.60455, -8.0755, -1.11739],
+					"position": [0, -0.5, 0]
 				},
 				"leg_front_right2": {
-					"rotation": [-7.5, 0, 0]
+					"rotation": [-12.5, 0, 0]
 				},
 				"leg_back_left": {
-					"rotation": [5, -5, 0]
+					"rotation": [-9.41212, -17.88645, -1.67647],
+					"position": [0, -0.25, 0]
 				},
 				"leg_back_left2": {
-					"rotation": [-5, 0, 0]
+					"rotation": [10, 0, 0]
 				},
 				"leg_back_right": {
-					"rotation": [5, 5, 0]
+					"rotation": [-9.41212, 17.88645, 1.67647],
+					"position": [0, -0.25, 0]
 				},
 				"leg_back_right2": {
-					"rotation": [-5, 0, 0]
+					"rotation": [10, 0, 0]
 				},
 				"body": {
 					"position": [0, -0.1, 0]
@@ -43,11 +41,71 @@
 				"tail": {
 					"rotation": [5, 0, 0]
 				},
+				"torso": {
+					"rotation": [-5, 0, 0]
+				},
+				"head": {
+					"rotation": [7.5, 0, 0]
+				}
+			}
+		},
+		"animation.mudkip.pose": {
+			"loop": true,
+			"bones": {
+				"atenna_right": {
+					"rotation": [0, 0, -7.5]
+				},
+				"body": {
+					"rotation": [-42.5, 0, 0]
+				},
+				"torso": {
+					"rotation": [5, 0, 0]
+				},
+				"head": {
+					"rotation": [36.59922, -16.06248, -2.04046]
+				},
 				"fin": {
+					"rotation": [0, 0, 5]
+				},
+				"fin2": {
+					"rotation": [0, 0, 5]
+				},
+				"tail": {
+					"rotation": [58.69575, 31.16686, 30.49835]
+				},
+				"tail2": {
 					"rotation": [2.5, 0, 0]
 				},
-				"cheek_right2": {
-					"rotation": [0, -7.5, 0]
+				"leg_front_left": {
+					"rotation": [48.93694, 12.62449, 12.16507],
+					"position": [0, -1.98125, 0.79822]
+				},
+				"leg_front_left2": {
+					"rotation": [-5, 0, 0]
+				},
+				"leg_back_left": {
+					"rotation": [-59.94697, -29.38804, -11.62273],
+					"position": [0, -0.76812, 1.38202]
+				},
+				"leg_back_left2": {
+					"rotation": [17.5, 0, 0]
+				},
+				"leg_back_right": {
+					"rotation": [-59.94697, 29.38804, 11.62273],
+					"position": [0, -0.76812, 1.38202]
+				},
+				"leg_back_right2": {
+					"rotation": [17.5, 0, 0]
+				},
+				"leg_front_right": {
+					"rotation": [48.93694, -12.62449, -12.16507],
+					"position": [0, -1.98125, 0.79822]
+				},
+				"leg_front_right2": {
+					"rotation": [-5, 0, 0]
+				},
+				"jaw": {
+					"rotation": [-5, 0, 0]
 				}
 			}
 		},
@@ -65,15 +123,15 @@
 				"eyelid_left": {
 					"position": {
 						"0.0": [0, 0, -0.1],
-						"0.125": [0, 0, -0.1],
-						"0.1667": [0, 0, 0]
+						"0.125": {"pre": [0, 0, -0.1], "post": [0, 0, -0.1]},
+						"0.1667": {"pre": [0, 0, -0.1], "post": [0, 0, -0.1]}
 					}
 				},
 				"eyelid_right": {
 					"position": {
 						"0.0": [0, 0, -0.1],
-						"0.125": [0, 0, -0.1],
-						"0.1667": [0, 0, 0]
+						"0.125": {"pre": [0, 0, -0.1], "post": [0, 0, -0.1]},
+						"0.1667": {"pre": [0, 0, -0.1], "post": [0, 0, -0.1]}
 					}
 				}
 			}
@@ -81,14 +139,14 @@
 		"animation.mudkip.shock": {
 			"loop": true,
 			"bones": {
-				"pupil_left": {
-					"scale": [0.5, 0.5, 1]
-				},
 				"jaw": {
 					"rotation": [32.5, 0, 0]
 				},
-				"pupil_right": {
-					"scale": [0.5, 0.5, 1]
+				"eye_left": {
+					"scale": 0.9
+				},
+				"eye_right": {
+					"scale": 0.9
 				}
 			}
 		},
@@ -125,12 +183,6 @@
 				},
 				"eyelid_happy_right": {
 					"position": [0, 0, -0.1]
-				},
-				"smile_left": {
-					"position": [0.1, 0, -0.1]
-				},
-				"smile_right": {
-					"position": [-0.1, 0, -0.1]
 				}
 			}
 		},
@@ -144,69 +196,6 @@
 					"position": [0, 0, -0.1]
 				}
 			}
-		},
-		"animation.mudkip.render": {
-			"loop": true,
-			"bones": {
-				"body": {
-					"rotation": [0, -37.5, 0]
-				},
-				"torso": {
-					"rotation": [0, 0, -5],
-					"position": [0, 0.5, 0]
-				},
-				"head": {
-					"rotation": [-12.49917, 4.77745, -5.21302]
-				},
-				"jaw": {
-					"rotation": [40, 0, 0]
-				},
-				"fin": {
-					"rotation": [-7.38733, 1.29876, 9.91615]
-				},
-				"fin2": {
-					"rotation": [5, 0, 0]
-				},
-				"tail": {
-					"rotation": [10, -20, 0]
-				},
-				"tail2": {
-					"rotation": [0, -10, 0]
-				},
-				"leg_front_left": {
-					"rotation": [-60.60058, -19.84302, -10.82777],
-					"position": [0, 0.5, -1]
-				},
-				"leg_front_left2": {
-					"rotation": [-7.5, 0, 0]
-				},
-				"leg_front_right": {
-					"rotation": [0, 10, 7.5],
-					"position": [-0.25, 0, 0]
-				},
-				"leg_front_right2": {
-					"rotation": [0, 0, -5]
-				},
-				"leg_back_left": {
-					"rotation": [0.6574, -7.4713, -5.04292]
-				},
-				"leg_back_left2": {
-					"rotation": [0, 0, 2.5]
-				},
-				"leg_back_right": {
-					"rotation": [12.71994, 19.82169, 7.97532],
-					"position": [0, 0, 0.5]
-				},
-				"leg_back_right2": {
-					"rotation": [-5, 0, 0]
-				},
-				"smile_left": {
-					"position": [0.1, 0, -0.1]
-				},
-				"smile_right": {
-					"position": [-0.1, 0, -0.1]
-				}
-			}
 		}
 	}
 }

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

@@ -8,109 +8,88 @@
 					"position": [0, 1.75, 0]
 				},
 				"chest2": {
-					"rotation": [-12.5, 0, 0]
+					"rotation": [-5, 0, 0]
 				},
 				"neck": {
 					"rotation": [-5, 0, 0]
 				},
 				"leg_left": {
-					"rotation": [8.77647, -12.0131, -53.28718]
+					"rotation": [-8.88927, -4.59902, -52.14233]
 				},
 				"leg_left2": {
-					"rotation": [4.54163, -0.2127, 45.09046]
+					"rotation": [4.53061, 0.3813, 37.61398]
 				},
 				"leg_left3": {
-					"rotation": [9.83802, -2.51058, 9.95791]
+					"rotation": [-0.16198, -2.51058, 9.95791]
 				},
 				"foot_left": {
-					"rotation": [-27.58324, -3.55523, 20.16242]
+					"rotation": [-20.2935, -0.06635, 26.80588]
 				},
 				"leg_right": {
-					"rotation": [8.77647, 12.0131, 53.2872]
+					"rotation": [-8.88927, 4.59902, 52.14233]
 				},
 				"leg_right2": {
-					"rotation": [4.54163, 0.2127, -45.0905]
+					"rotation": [4.53061, -0.3813, -37.61398]
 				},
 				"leg_right3": {
-					"rotation": [9.83802, 2.5106, -9.9579]
+					"rotation": [-0.16198, 2.51058, -9.95791]
 				},
 				"foot_right": {
-					"rotation": [-27.58324, 3.5552, -20.1624]
+					"rotation": [-20.2935, 0.06635, -26.80588]
 				},
 				"arm_left2": {
-					"rotation": [-4.36302, -31.26463, 17.62528]
+					"rotation": [-9.36302, -31.26463, 17.62528]
 				},
 				"arm_left3": {
-					"rotation": [1.80384, 2.38704, 35.42915]
+					"rotation": [2.99715, 2.95008, 7.90437]
 				},
 				"arm_left": {
-					"rotation": [-13.31914, -14.63639, 12.92638]
+					"rotation": [-33.64439, 0.22649, 37.96248]
+				},
+				"wrist_left": {
+					"rotation": [0, 15, 0]
 				},
 				"finger_front_left": {
-					"rotation": [0, -37.5, 20]
+					"rotation": [0, -7.5, 20]
 				},
 				"finger_middle_left": {
-					"rotation": [0, -32.5, 0]
+					"rotation": [0, -5, 0]
 				},
 				"finger_back_left": {
-					"rotation": [0, -30, -27.5]
+					"rotation": [0, -7.5, -27.5]
 				},
 				"fingers_left": {
 					"rotation": [0, 37.5, 0]
 				},
 				"arm_right": {
-					"rotation": [-13.31914, 14.6364, -12.9264]
+					"rotation": [-33.64439, -0.22649, -37.96248]
 				},
 				"arm_right2": {
-					"rotation": [-4.36302, 31.2646, -17.6253]
+					"rotation": [-9.36302, 31.26463, -17.62528]
 				},
 				"arm_right3": {
-					"rotation": [1.80384, -2.387, -35.4292]
+					"rotation": [2.99715, -2.95008, -7.90437]
+				},
+				"wrist_right": {
+					"rotation": [0, -15, 0]
 				},
 				"fingers_right": {
 					"rotation": [0, -37.5, 0]
 				},
 				"finger_front_right": {
-					"rotation": [0, 37.5, -20]
+					"rotation": [0, 7.5, -20]
 				},
 				"finger_middle_right": {
-					"rotation": [0, 32.5, 0]
+					"rotation": [0, 5, 0]
 				},
 				"finger_back_right": {
-					"rotation": [0, 30, 27.5]
+					"rotation": [0, 7.5, 27.5]
 				},
-				"torso": {
-					"rotation": [-2.5, 0, 0]
-				},
-				"chest": {
-					"rotation": [-7.5, 0, 0]
-				},
-				"hand_left": {
-					"rotation": [0, -17.5, 0]
-				},
-				"finger_front_left2": {
-					"rotation": [0, -12.5, 0]
-				},
-				"finger_middle_left2": {
-					"rotation": [0, -10, 0]
-				},
-				"finger_back_left2": {
-					"rotation": [0, -15, 0]
+				"head_correction": {
+					"rotation": [10, 0, 0]
 				},
 				"head_angle": {
-					"rotation": [12.5, 0, 0]
-				},
-				"hand_right": {
-					"rotation": [0, 17.5, 0]
-				},
-				"finger_front_right2": {
-					"rotation": [0, 12.5, 0]
-				},
-				"finger_middle_right2": {
-					"rotation": [0, 10, 0]
-				},
-				"finger_back_right2": {
-					"rotation": [0, 15, 0]
+					"rotation": [-10, 0, 0]
 				}
 			}
 		},
@@ -227,9 +206,6 @@
 				},
 				"tail_base": {
 					"rotation": [0, 0, 0]
-				},
-				"swampert": {
-					"rotation": [0, 52.5, 0]
 				}
 			}
 		},
@@ -264,14 +240,12 @@
 			"loop": true,
 			"bones": {
 				"pupil_left": {
-					"position": [0.5, 0, 0.25],
 					"scale": [0.8, 1, 0.8]
 				},
 				"jaw": {
-					"rotation": [25, 0, 0]
+					"rotation": [32.5, 0, 0]
 				},
 				"pupil_right": {
-					"position": [-0.5, 0, 0.25],
 					"scale": [0.8, 1, 0.8]
 				}
 			}
@@ -305,7 +279,7 @@
 					"position": [0, -0.1, 0]
 				},
 				"jaw": {
-					"rotation": [25, 0, 0]
+					"rotation": [32.5, 0, 0]
 				},
 				"eyelid_happy_right": {
 					"position": [0, -0.1, 0]

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0285_shroomish/shroomish.animation.json

@@ -104,160 +104,73 @@
 			}
 		},
 		"animation.shroomish.cry": {
-			"animation_length": 1.5,
+			"animation_length": 0.66667,
 			"bones": {
-				"neck": {
-					"rotation": {
-						"0.0": [0, 0, 0],
-						"0.25": [10, 0, 0],
-						"1.25": [10, 0, 0],
-						"1.5": [0, 0, 0]
-					}
-				},
-				"mouth": {
-					"position": {
-						"0.0": [0, 0, 0],
-						"0.25": [0, -2, 0],
-						"1.25": [0, -2, 0],
-						"1.5": [0, 0, 0]
-					}
-				},
-				"mouth2": {
-					"position": {
-						"0.0": [0, 0, 0],
-						"0.25": [0, -5, 0],
-						"1.25": [0, -5, 0],
-						"1.5": [0, 0, 0]
-					}
-				},
-				"jaw": {
-					"position": {
-						"0.0": [0, 0, 0],
-						"0.25": [0, -3, 0],
-						"1.25": [0, -3, 0],
-						"1.5": [0, 0, 0]
-					}
-				},
-				"head": {
-					"rotation": {
-						"0.0": [0, 0, 0],
-						"0.25": [-15, 0, 0],
-						"1.25": [-15, 0, 0],
-						"1.5": [0, 0, 0]
-					}
-				},
-				"head2": {
-					"rotation": {
-						"0.0": [0, 0, 0],
-						"0.25": [-15, 0, 0],
-						"1.25": [-15, 0, 0],
-						"1.5": [0, 0, 0]
-					}
-				},
-				"mouth_closed2": {
-					"position": {
-						"0.25": [0, 0, -0.1],
-						"0.3333": [0, 0, 0],
-						"1.1667": [0, 0, 0],
-						"1.25": [0, 0, -0.1]
-					}
-				},
-				"mouth_open2": {
-					"position": {
-						"0.0": [0, 0, 0.1],
-						"0.25": [0, 0, 0],
-						"1.25": [0, 0, 0],
-						"1.5": [0, 0, 0.1]
-					}
-				},
-				"head3": {
-					"rotation": {
-						"0.0": [0, 0, 0],
-						"0.25": [-15, 0, 0],
-						"1.25": [-15, 0, 0],
-						"1.5": [0, 0, 0]
-					}
-				},
-				"mouth_closed3": {
-					"position": {
-						"0.25": [0, 0, -0.1],
-						"0.3333": [0, 0, 0],
-						"1.1667": [0, 0, 0],
-						"1.25": [0, 0, -0.1]
-					}
-				},
-				"mouth_open3": {
-					"position": {
-						"0.0": [0, 0, 0.1],
-						"0.25": [0, 0, 0],
-						"1.25": [0, 0, 0],
-						"1.5": [0, 0, 0.1]
-					}
-				},
 				"torso": {
 					"rotation": {
 						"0.0": [0, 0, 0],
-						"0.25": {
+						"0.1667": {
 							"pre": [-7.5, 0, 0],
 							"post": [-7.5, 0, 0],
 							"lerp_mode": "catmullrom"
 						},
-						"1.1667": {
+						"0.5": {
 							"post": [-7.5, 0, 0],
 							"lerp_mode": "catmullrom"
 						},
-						"1.5": [0, 0, 0]
+						"0.6667": [0, 0, 0]
 					}
 				},
 				"mouth_closed": {
 					"position": {
-						"0.25": [0, 0, 0],
-						"0.3333": [0, 0, 0.1],
-						"1.1667": [0, 0, 0.1],
-						"1.25": [0, 0, 0]
+						"0.0833": [0, 0, 0],
+						"0.1667": [0, 0, 0.1],
+						"0.5": [0, 0, 0.1],
+						"0.5833": [0, 0, 0]
 					}
 				},
 				"mouth_open": {
 					"position": {
 						"0.0": [0, 0, 0],
-						"0.25": [0, 0, -0.1],
-						"1.25": [0, 0, -0.1],
-						"1.5": [0, 0, 0]
+						"0.0833": [0, 0, 0],
+						"0.1667": [0, 0, -0.1],
+						"0.5": [0, 0, -0.1],
+						"0.5833": [0, 0, 0]
 					}
 				},
 				"hair": {
 					"rotation": {
 						"0.0": [0, 0, 0],
-						"0.25": {
+						"0.1667": {
 							"pre": [-12.5, 0, 0],
 							"post": [-12.5, 0, 0],
 							"lerp_mode": "catmullrom"
 						},
-						"1.1667": {
+						"0.5": {
 							"post": [-12.5, 0, 0],
 							"lerp_mode": "catmullrom"
 						},
-						"1.5": [0, 0, 0]
+						"0.6667": [0, 0, 0]
 					}
 				},
 				"Eyebrow": {
 					"position": {
 						"0.0": [0, 0, 0],
-						"0.25": {
+						"0.1667": {
 							"pre": [0, 0.05, 0],
 							"post": [0, 0.05, 0],
 							"lerp_mode": "catmullrom"
 						},
-						"1.1667": {
+						"0.5": {
 							"post": [0, 0.4, 0],
 							"lerp_mode": "catmullrom"
 						},
-						"1.5": [0, 0, 0]
+						"0.6667": [0, 0, 0]
 					}
 				}
 			},
 			"sound_effects": {
-				"0.125": {
+				"0.0833": {
 					"effect": "pokemon.shroomish.cry"
 				}
 			}
@@ -297,7 +210,7 @@
 			}
 		},
 		"animation.shroomish.blink": {
-			"animation_length": 0.1667,
+			"animation_length": 0.16667,
 			"bones": {
 				"eyelid_left": {
 					"position": {
@@ -517,8 +430,8 @@
 					"rotation": {
 						"0.0": [0, -20, 0],
 						"0.1667": [0, -2, 0],
-						"0.2083": [0, 13.486, 0],
-						"1.6667": [-2, 783.343, 0],
+						"0.2083": [0, "-74+q.anim_time*420", 0],
+						"1.6667": [-2, "300+q.anim_time*290", 0],
 						"1.7083": [0, 804.57, 0],
 						"2.0": [49.25, 975.5, 0],
 						"2.25": {
@@ -538,8 +451,14 @@
 							"post": [172.96, 1142.75, -10.97],
 							"lerp_mode": "catmullrom"
 						},
-						"2.7917": [190.47335, 1149.92345, -2.60677],
-						"3.0": [190.47335, 1149.92345, -2.60677]
+						"2.7917": {
+							"post": [190.47335, 1149.92345, -2.60677],
+							"lerp_mode": "catmullrom"
+						},
+						"3.0": {
+							"post": [190.47335, 1149.92345, -2.60677],
+							"lerp_mode": "catmullrom"
+						}
 					},
 					"position": {
 						"0.0": [0, 0, 0],

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0298_azurill/azurill.animation.json

@@ -1,288 +0,0 @@
-{
-	"format_version": "1.8.0",
-	"animations": {
-		"animation.azurill.ground_idle": {
-			"loop": true,
-			"bones": {
-				"tail2": {
-					"rotation": [-95, 0, 0]
-				},
-				"tail3": {
-					"rotation": [100, 0, 0]
-				},
-				"tail4": {
-					"rotation": [-100, 0, 0]
-				},
-				"tail5": {
-					"rotation": [115, 0, 0]
-				},
-				"tail6": {
-					"rotation": [-115, 0, 0]
-				},
-				"tail7": {
-					"rotation": [112.5, 0, 0]
-				},
-				"mouth_closed_smile": {
-					"position": [0, 0, 0]
-				},
-				"torso": {
-					"rotation": [-5, 0, 0]
-				},
-				"ear_left": {
-					"rotation": [0, -15, 45]
-				},
-				"tail8": {
-					"rotation": [-45, 0, 0]
-				},
-				"foot_left": {
-					"rotation": [0, -25, 0]
-				},
-				"foot_right": {
-					"rotation": [0, 25, 0]
-				},
-				"ear_right": {
-					"rotation": [0, 0, -45]
-				},
-				"tail_ball": {
-					"rotation": [-12.5, 0, 0]
-				}
-			}
-		},
-		"animation.azurill.water_idle": {
-			"loop": true,
-			"bones": {
-				"tail2": {
-					"rotation": [-95, 0, 0]
-				},
-				"tail3": {
-					"rotation": [100, 0, 0]
-				},
-				"tail4": {
-					"rotation": [-100, 0, 0]
-				},
-				"tail5": {
-					"rotation": [115, 0, 0]
-				},
-				"tail6": {
-					"rotation": [-115, 0, 0]
-				},
-				"tail7": {
-					"rotation": [112.5, 0, 0]
-				},
-				"mouth_closed_smile": {
-					"position": [0, 0, 0]
-				},
-				"torso": {
-					"rotation": [5, 0, 0]
-				},
-				"ear_left": {
-					"rotation": [0, -15, 45]
-				},
-				"tail8": {
-					"rotation": [-45, 0, 0]
-				},
-				"foot_left": {
-					"rotation": [0, -25, 0]
-				},
-				"foot_right": {
-					"rotation": [0, 25, 0]
-				},
-				"ear_right": {
-					"rotation": [0, 0, -45]
-				},
-				"tail_ball": {
-					"rotation": [-12.5, 0, 0]
-				},
-				"body": {
-					"position": [0, 1, 0]
-				},
-				"feet": {
-					"rotation": [35, 0, 0]
-				},
-				"tail": {
-					"rotation": [-15, 0, 0]
-				}
-			}
-		},
-		"animation.azurill.battle_idle": {
-			"loop": true,
-			"bones": {
-				"body": {
-					"position": [0, 8, 0]
-				},
-				"foot_left": {
-					"rotation": [0, -25, 0]
-				},
-				"foot_right": {
-					"rotation": [0, 25, 0]
-				},
-				"tail2": {
-					"rotation": [-125, 0, 0]
-				},
-				"tail3": {
-					"rotation": [75, 0, 0]
-				},
-				"tail4": {
-					"rotation": [-107.5, 0, 0]
-				},
-				"tail5": {
-					"rotation": [65, 0, 0]
-				},
-				"tail6": {
-					"rotation": [-137.5, 0, 0]
-				},
-				"tail7": {
-					"rotation": [75, 0, 0]
-				},
-				"mouth_closed_smile": {
-					"position": [0, 0, -0.1]
-				},
-				"feet": {
-					"rotation": [12.5, 0, 0]
-				},
-				"tail": {
-					"rotation": [-15, 0, 0]
-				},
-				"ear_left": {
-					"rotation": [0, -10, 45]
-				},
-				"tail8": {
-					"rotation": [-95, 0, 0]
-				},
-				"torso2": {
-					"rotation": [-5, 0, 0]
-				},
-				"ear_right": {
-					"rotation": [0, 10, -45]
-				},
-				"mouth_closed": {
-					"position": [0, 0, 0.1]
-				},
-				"eye_left": {
-					"rotation": [0, 0, 2.5]
-				},
-				"eye_right": {
-					"rotation": [0, 0, -2.5]
-				},
-				"tail_ball": {
-					"rotation": [40, 0, 0]
-				},
-				"locator_top": {
-					"position": [0, 7, 0]
-				},
-				"locator_middle": {
-					"position": [0, -1, 0]
-				}
-			}
-		},
-		"animation.azurill.sleep": {
-			"loop": true,
-			"bones": {
-				"tail2": {
-					"rotation": [-95, 0, -45]
-				},
-				"tail3": {
-					"rotation": [100, 0, 0]
-				},
-				"tail4": {
-					"rotation": [-100, -45, 0]
-				},
-				"tail5": {
-					"rotation": [115, 0, 0]
-				},
-				"tail6": {
-					"rotation": [-115, -45, 0]
-				},
-				"tail7": {
-					"rotation": [112.5, 0, 0]
-				},
-				"mouth_closed_smile": {
-					"position": [0, 0, 0]
-				},
-				"ear_left": {
-					"rotation": [30, -15, 45]
-				},
-				"tail8": {
-					"rotation": [-55, -45, 0]
-				},
-				"foot_left": {
-					"rotation": [0, -25, 0],
-					"position": [0.5, 0, 0]
-				},
-				"foot_right": {
-					"rotation": [0, 25, 0],
-					"position": [-0.5, 0, 0]
-				},
-				"ear_right": {
-					"rotation": [0, 0, -45]
-				},
-				"tail_ball": {
-					"rotation": [-50.5, 16.5, -40]
-				},
-				"body": {
-					"position": [0, -1, 0]
-				},
-				"feet": {
-					"rotation": [-77.5, 0, 0],
-					"position": [0, 0.5, -4.75]
-				},
-				"torso2": {
-					"rotation": [-7.5, 0, 0]
-				},
-				"eye_left": {
-					"position": [0, 0, 0.1]
-				},
-				"eyelid_left": {
-					"position": [0, 0, -0.1]
-				},
-				"eye_right": {
-					"position": [0, 0, 0.1]
-				},
-				"eyelid_right": {
-					"position": [0, 0, -0.1]
-				}
-			}
-		},
-		"animation.azurill.blink": {
-			"animation_length": 0.1667,
-			"bones": {
-				"eye_left": {
-					"position": {
-						"0.0": [0, 0, 0.1],
-						"0.1667": {
-							"pre": [0, 0, 0.1],
-							"post": [0, 0, 0]
-						}
-					}
-				},
-				"eye_right": {
-					"position": {
-						"0.0": [0, 0, 0.1],
-						"0.1667": {
-							"pre": [0, 0, 0.1],
-							"post": [0, 0, 0]
-						}
-					}
-				},
-				"eyelid_right": {
-					"position": {
-						"0.0": [0, 0, -0.1],
-						"0.1667": {
-							"pre": [0, 0, -0.1],
-							"post": [0, 0, 0]
-						}
-					}
-				},
-				"eyelid_left": {
-					"position": {
-						"0.0": [0, 0, -0.1],
-						"0.1667": {
-							"pre": [0, 0, -0.1],
-							"post": [0, 0, 0]
-						}
-					}
-				}
-			}
-		}
-	}
-}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0307_meditite/meditite.animation.json

@@ -1,459 +0,0 @@
-{
-	"format_version": "1.8.0",
-	"animations": {
-		"animation.meditite.ground_idle": {
-			"loop": true,
-			"bones": {
-				"body": {
-					"rotation": [0, 7.5, 0]
-				},
-				"torso": {
-					"rotation": [0, -5, 0]
-				},
-				"arm_right": {
-					"rotation": [0, 12.5, -40]
-				},
-				"leg_left": {
-					"rotation": [2, 22.5, 5.5]
-				},
-				"leg_left2": {
-					"rotation": [10, 0, 0]
-				},
-				"foot_left": {
-					"rotation": [-0.6, 4.3, -8]
-				},
-				"toes_left": {
-					"rotation": [-10, 0, 0]
-				},
-				"arm_right2": {
-					"rotation": [0, -40, 0]
-				},
-				"hand_right": {
-					"rotation": [0, 0, -15]
-				},
-				"finger_front_right": {
-					"rotation": [1, -7.5, -7.5]
-				},
-				"finger_back_right": {
-					"rotation": [0, 0, -15]
-				},
-				"finger_thumb_right": {
-					"rotation": [17.5, 45, 0]
-				},
-				"finger_back_right2": {
-					"rotation": [0, 0, -22.5]
-				},
-				"finger_front_right2": {
-					"rotation": [0, 0, -12.5]
-				},
-				"leg_right": {
-					"rotation": [-0.5, -22.5, -5.5]
-				},
-				"leg_right2": {
-					"rotation": [7.5, 0, 0]
-				},
-				"foot_right": {
-					"rotation": [1.5, 7.5, 5]
-				},
-				"toes_right": {
-					"rotation": [-5, 0, 0]
-				},
-				"arm_left": {
-					"rotation": [0, -12.5, 40]
-				},
-				"arm_left2": {
-					"rotation": [0, 40, 0]
-				},
-				"hand_left": {
-					"rotation": [0, 0, 15]
-				},
-				"finger_thumb_left": {
-					"rotation": [17.5, -45, 0]
-				},
-				"finger_front_left": {
-					"rotation": [1, 7.5, 7.5]
-				},
-				"finger_front_left2": {
-					"rotation": [0, 0, 12.5]
-				},
-				"finger_back_left": {
-					"rotation": [0, 0, 15]
-				},
-				"finger_back_left2": {
-					"rotation": [0, 0, 22.5]
-				},
-				"head": {
-					"rotation": [0, -2.5, 0]
-				}
-			}
-		},
-		"animation.meditite.ground_idle_placeholder": {
-			"loop": true,
-			"bones": {
-				"body": {
-					"rotation": [0, 0, 0]
-				},
-				"torso": {
-					"rotation": [0, 0, 0]
-				},
-				"arm_right": {
-					"rotation": [0, 12.5, -40]
-				},
-				"leg_left": {
-					"rotation": [-0.5, 22.5, 5.5]
-				},
-				"leg_left2": {
-					"rotation": [7.5, 0, 0]
-				},
-				"foot_left": {
-					"rotation": [1.5, -7.5, -5]
-				},
-				"toes_left": {
-					"rotation": [-5, 0, 0]
-				},
-				"arm_right2": {
-					"rotation": [0, -40, 0]
-				},
-				"hand_right": {
-					"rotation": [0, 0, -15]
-				},
-				"finger_front_right": {
-					"rotation": [1, -7.5, -7.5]
-				},
-				"finger_back_right": {
-					"rotation": [0, 0, -15]
-				},
-				"finger_thumb_right": {
-					"rotation": [17.5, 45, 0]
-				},
-				"finger_back_right2": {
-					"rotation": [0, 0, -22.5]
-				},
-				"finger_front_right2": {
-					"rotation": [0, 0, -12.5]
-				},
-				"leg_right": {
-					"rotation": [-0.5, -22.5, -5.5]
-				},
-				"leg_right2": {
-					"rotation": [7.5, 0, 0]
-				},
-				"foot_right": {
-					"rotation": [1.5, 7.5, 5]
-				},
-				"toes_right": {
-					"rotation": [-5, 0, 0]
-				},
-				"arm_left": {
-					"rotation": [0, -12.5, 40]
-				},
-				"arm_left2": {
-					"rotation": [0, 40, 0]
-				},
-				"hand_left": {
-					"rotation": [0, 0, 15]
-				},
-				"finger_thumb_left": {
-					"rotation": [17.5, -45, 0]
-				},
-				"finger_front_left": {
-					"rotation": [1, 7.5, 7.5]
-				},
-				"finger_front_left2": {
-					"rotation": [0, 0, 12.5]
-				},
-				"finger_back_left": {
-					"rotation": [0, 0, 15]
-				},
-				"finger_back_left2": {
-					"rotation": [0, 0, 22.5]
-				},
-				"head": {
-					"rotation": [0, 0, 0]
-				}
-			}
-		},
-		"animation.meditite.air_idle": {
-			"loop": true,
-			"bones": {
-				"arm_right": {
-					"rotation": [5.5, -2.5, -32.5]
-				},
-				"arm_right2": {
-					"rotation": [0, -20, 0]
-				},
-				"hand_right": {
-					"rotation": [-138, -10, 6]
-				},
-				"finger_thumb_right": {
-					"rotation": [15, 15, 0]
-				},
-				"finger_front_right": {
-					"rotation": [0, -10, -32]
-				},
-				"finger_back_right": {
-					"rotation": [0, 15, -32.5]
-				},
-				"leg_left": {
-					"rotation": [-125, 6.5, -93],
-					"position": [-1.66, 0, -1.25]
-				},
-				"leg_left2": {
-					"rotation": [87.5, 0, 0]
-				},
-				"foot_left": {
-					"rotation": [36, -1, 3],
-					"position": [0, -1.5, 0]
-				},
-				"finger_front_right2": {
-					"rotation": [0, 0, -10]
-				},
-				"finger_back_right2": {
-					"rotation": [0, 0, -25]
-				},
-				"leg_right": {
-					"rotation": [-125, -6.5, 93],
-					"position": [1.66, 0, -1.25]
-				},
-				"leg_right2": {
-					"rotation": [87.5, 0, 0]
-				},
-				"foot_right": {
-					"rotation": [36, 1, -3],
-					"position": [0, -1.5, 0]
-				},
-				"arm_left": {
-					"rotation": [5.5, 2.5, 32.5]
-				},
-				"arm_left2": {
-					"rotation": [0, 20, 0]
-				},
-				"hand_left": {
-					"rotation": [-138, 10, -6]
-				},
-				"finger_thumb_left": {
-					"rotation": [15, -15, 0]
-				},
-				"finger_front_left": {
-					"rotation": [0, 10, 32]
-				},
-				"finger_front_left2": {
-					"rotation": [0, 0, 10]
-				},
-				"finger_back_left": {
-					"rotation": [0, -15, 32.5]
-				},
-				"finger_back_left2": {
-					"rotation": [0, 0, 25]
-				},
-				"head": {
-					"rotation": [2.5, 0, 0]
-				},
-				"locator_item": {
-					"rotation": [5, 0, 0],
-					"position": [0, 0, 0]
-				}
-			}
-		},
-		"animation.meditite.blink": {
-			"animation_length": 0.1667,
-			"bones": {
-				"eyelid_right": {
-					"position": {
-						"0.0": [0, 0, -0.1],
-						"0.1667": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}
-					}
-				},
-				"eyelid_left": {
-					"position": {
-						"0.0": [0, 0, -0.1],
-						"0.1667": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}
-					}
-				},
-				"eye_left": {
-					"position": {
-						"0.0": [0, 0, 0.1],
-						"0.1667": {"pre": [0, 0, 0.1], "post": [0, 0, 0]}
-					}
-				},
-				"eye_right": {
-					"position": {
-						"0.0": [0, 0, 0.1],
-						"0.1667": {"pre": [0, 0, 0.1], "post": [0, 0, 0]}
-					}
-				}
-			}
-		},
-		"animation.meditite.hold_item": {
-			"loop": true,
-			"bones": {
-				"finger_thumb_right": {
-					"rotation": [-12.5, -10, 0]
-				},
-				"finger_front_right": {
-					"rotation": [0, 0, -45]
-				},
-				"finger_front_right2": {
-					"rotation": [0, 0, -20]
-				},
-				"finger_back_right": {
-					"rotation": [0, 0, -35]
-				},
-				"finger_back_right2": {
-					"rotation": [0, 0, -10]
-				}
-			}
-		},
-		"animation.meditite.smile": {
-			"loop": true,
-			"bones": {
-				"mouth_closed": {
-					"rotation": [0, 0, 180],
-					"position": [0, 0.2, 0]
-				}
-			}
-		},
-		"animation.meditite.sad": {
-			"loop": true,
-			"bones": {
-				"eye_emote_left2": {
-					"position": [-0.45, 0, -0.01],
-					"scale": [0.7, 1, 1]
-				},
-				"pupil_left": {
-					"position": [0, 0, -0.01]
-				},
-				"eye_emote_right2": {
-					"position": [0.45, 0, -0.01],
-					"scale": [0.7, 1, 1]
-				},
-				"pupil_right": {
-					"position": [0, 0, -0.01]
-				},
-				"eye_emote_right": {
-					"scale": [1, 1.3, 1]
-				},
-				"eye_emote_left": {
-					"scale": [1, 1.3, 1]
-				}
-			}
-		},
-		"animation.meditite.angry": {
-			"loop": true,
-			"bones": {
-				"mouth_closed": {
-					"position": [0, 0, 0.1]
-				},
-				"mouth_open": {
-					"position": [0, -0.5, -0.1]
-				},
-				"eye_emote_left2": {
-					"position": [0.45, 0, 0],
-					"scale": [0.7, 1, 1]
-				},
-				"eye_emote_right2": {
-					"position": [-0.45, 0, 0],
-					"scale": [0.7, 1, 1]
-				},
-				"eyelid_right": {
-					"rotation": [0, 0, 180],
-					"position": [2, 1, -0.12]
-				},
-				"eyelid_left": {
-					"rotation": [0, 0, -180],
-					"position": [-2, 1, -0.12]
-				}
-			}
-		},
-		"animation.meditite.surprised": {
-			"loop": true,
-			"bones": {
-				"mouth_closed": {
-					"position": [0, 0, 0.1]
-				},
-				"mouth_open": {
-					"position": [0, -0.5, -0.1]
-				},
-				"pupil_left": {
-					"position": [0, -0.4, 0],
-					"scale": [0.6, 0.5, 1]
-				},
-				"pupil_right": {
-					"position": [0, -0.4, 0],
-					"scale": [0.6, 0.5, 1]
-				}
-			}
-		},
-		"animation.meditite.hurt": {
-			"loop": true,
-			"bones": {
-				"eye_left": {
-					"position": [0, 0, 0.1]
-				},
-				"eye_right": {
-					"position": [0, 0, 0.1]
-				},
-				"eyelid_hurt_right": {
-					"position": [0, 0, -0.1]
-				},
-				"eyelid_hurt_left": {
-					"position": [0, 0, -0.1]
-				}
-			}
-		},
-		"animation.meditite.unamused": {
-			"loop": true,
-			"bones": {
-				"eye_emote_left2": {
-					"position": [0, 0, 0.1]
-				},
-				"pupil_left": {
-					"position": [0, -0.935, 0],
-					"scale": [1, 0.34, 1]
-				},
-				"eye_emote_right2": {
-					"position": [0, 0, 0.1]
-				},
-				"pupil_right": {
-					"position": [0, -0.935, 0],
-					"scale": [1, 0.34, 1]
-				},
-				"eye_emote_left": {
-					"scale": [1, 1.3, 1]
-				},
-				"eye_emote_right": {
-					"scale": [1, 1.3, 1]
-				}
-			}
-		},
-		"animation.meditite.judgy": {
-			"loop": true,
-			"bones": {
-				"pupil_left": {
-					"position": [-0.2, 0, 0]
-				},
-				"eye_emote_right2": {
-					"position": [0, 0, 0.1]
-				},
-				"pupil_right": {
-					"position": [-0.7, -0.935, 0],
-					"scale": [1, 0.34, 1]
-				},
-				"eye_emote_right": {
-					"scale": [1, 1.3, 1]
-				}
-			}
-		},
-		"animation.meditite.mouth_open": {
-			"loop": true,
-			"bones": {
-				"mouth_closed": {
-					"position": [0, 0, 0.1]
-				},
-				"mouth_open": {
-					"position": [0, -0.5, -0.1]
-				}
-			}
-		}
-	}
-}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0308_medicham/medicham.animation.json

@@ -1,495 +0,0 @@
-{
-	"format_version": "1.8.0",
-	"animations": {
-		"animation.medicham.ground_idle": {
-			"loop": true,
-			"bones": {
-				"body": {
-					"position": [0, 0.5, 0]
-				},
-				"torso": {
-					"rotation": [-5, 0, 0]
-				},
-				"torso2": {
-					"rotation": [2.5, 0, 0]
-				},
-				"neck": {
-					"rotation": [0, 0, 0]
-				},
-				"bulb_right": {
-					"rotation": [0, -15, -35]
-				},
-				"bulb_left": {
-					"rotation": [0, 15, 35]
-				},
-				"arm_right": {
-					"rotation": [50, 12, -17.5]
-				},
-				"arm_right2": {
-					"rotation": [0, -48, 0]
-				},
-				"finger_thumb_right": {
-					"rotation": [20, 30, 0]
-				},
-				"finger_front_right": {
-					"rotation": [0, -5, -10]
-				},
-				"finger_back_right": {
-					"rotation": [0, 5, -10]
-				},
-				"arm_left": {
-					"rotation": [50, -12, 17.5]
-				},
-				"arm_left2": {
-					"rotation": [0, 48, 0]
-				},
-				"finger_thumb_left": {
-					"rotation": [20, -30, 0]
-				},
-				"finger_front_left": {
-					"rotation": [0, 5, 10]
-				},
-				"finger_back_left": {
-					"rotation": [0, -5, 10]
-				},
-				"left_leg_band": {
-					"rotation": [0, 0, 2.5]
-				},
-				"leg_left2": {
-					"rotation": [-2.5, -5, 10]
-				},
-				"leg_left3": {
-					"rotation": [5, 0, 15]
-				},
-				"foot_left": {
-					"rotation": [0, -12, 15]
-				},
-				"right_leg_band": {
-					"rotation": [0, 0, -2.5]
-				},
-				"leg_right2": {
-					"rotation": [-2.5, 5, -10]
-				},
-				"leg_right3": {
-					"rotation": [5, 0, -15]
-				},
-				"foot_right": {
-					"rotation": [0, 12, -15]
-				}
-			}
-		},
-		"animation.medicham.battle_idle": {
-			"loop": true,
-			"bones": {
-				"torso2": {
-					"rotation": [-7.5, 0, -12.5]
-				},
-				"leg_right4": {
-					"rotation": [7.5, 0, -12.5]
-				},
-				"foot_right": {
-					"rotation": [15, 0, 1.5]
-				},
-				"torso": {
-					"rotation": [-2.5, 0, 0],
-					"position": [0, 1.5, 0]
-				},
-				"neck": {
-					"rotation": [7.5, 0, 7.5]
-				},
-				"bulb_right": {
-					"rotation": [0, -15, -35]
-				},
-				"bulb_back": {
-					"rotation": [-0.9877, 10.07026, 1.32495]
-				},
-				"arm_right": {
-					"rotation": [210, 0, 20]
-				},
-				"arm_right2": {
-					"rotation": [25, -10, -70],
-					"position": [-0.6, 0, 0]
-				},
-				"hand_right": {
-					"rotation": [0, 0, -10]
-				},
-				"finger_front_right": {
-					"rotation": [0, -7.5, -15]
-				},
-				"finger_back_right": {
-					"rotation": [-10, 10, -20]
-				},
-				"finger_front_right2": {
-					"rotation": [0, 0, -7.5]
-				},
-				"finger_back_right2": {
-					"rotation": [0, 0, -17.5]
-				},
-				"finger_thumb_right": {
-					"rotation": [30, 25, 12.5]
-				},
-				"leg_right": {
-					"rotation": [-2.5, 44.5, -24.5],
-					"position": [0, 0, 0.5]
-				},
-				"leg_right3": {
-					"rotation": [15, 0, 0]
-				},
-				"bulb_left": {
-					"rotation": [0, 20, 45]
-				},
-				"body": {
-					"rotation": [0, 15, 0],
-					"position": [0, 0.9, 0]
-				},
-				"bulb_back2": {
-					"rotation": [-12.5, 0, 0]
-				},
-				"head": {
-					"rotation": [-1.5, -14, 6]
-				},
-				"toes_right": {
-					"rotation": [-24, 0, 0]
-				},
-				"leg_left": {
-					"rotation": [-42.5, -22.5, 5],
-					"position": [1, 0.75, -0.1]
-				},
-				"left_leg_band": {
-					"rotation": [15, 2, 0]
-				},
-				"leg_left2": {
-					"position": [0, -0.5, 0]
-				},
-				"leg_left3": {
-					"rotation": [52.5, 0, 5]
-				},
-				"leg_left4": {
-					"rotation": [5, 0, 0]
-				},
-				"foot_left": {
-					"rotation": [30, 0, 25]
-				},
-				"arm_left": {
-					"rotation": [-10, 0, 7.5]
-				},
-				"arm_left2": {
-					"rotation": [68.5, 60, 95],
-					"position": [0.5, 0, -1]
-				},
-				"hand_left": {
-					"rotation": [0, 0, 10]
-				},
-				"finger_thumb_left": {
-					"rotation": [0, -30, 0]
-				},
-				"finger_front_left": {
-					"rotation": [0, 7.5, 5]
-				},
-				"finger_front_left2": {
-					"rotation": [0, 0, 15]
-				},
-				"finger_back_left": {
-					"rotation": [0, -5, 30]
-				},
-				"finger_back_left2": {
-					"rotation": [0, 0, 20]
-				}
-			}
-		},
-		"animation.medicham.sleep": {
-			"loop": true,
-			"bones": {
-				"body": {
-					"position": [0, -1.5, 0]
-				},
-				"head": {
-					"rotation": [5, 0, 0]
-				},
-				"bulb_right": {
-					"rotation": [0, -15, -35]
-				},
-				"bulb_left": {
-					"rotation": [0, 15, 35]
-				},
-				"eye_right": {
-					"position": [0.1, 0, 0.1]
-				},
-				"eye_left": {
-					"position": [-0.1, 0, 0.1]
-				},
-				"eyelid_right": {
-					"position": [-0.1, 0, -0.1]
-				},
-				"eyelid_left": {
-					"position": [0.1, 0, -0.1]
-				},
-				"arms": {
-					"rotation": [15, 0, 0],
-					"position": [0, 0, -0.5]
-				},
-				"arm_right": {
-					"rotation": [10, -52.5, 0]
-				},
-				"arm_right2": {
-					"rotation": [0, -95, 0],
-					"position": [-0.25, 0, -1.9]
-				},
-				"hand_right": {
-					"rotation": [-32.5, 0, 99.5],
-					"position": [-0.48, 0, 0]
-				},
-				"finger_thumb_right": {
-					"rotation": [0, 75, 0],
-					"position": [-0.2, -0.5, -0.5]
-				},
-				"fingers_right": {
-					"position": [0, -0.45, 0]
-				},
-				"finger_front_right": {
-					"rotation": [0, -2.5, 0]
-				},
-				"finger_back_right": {
-					"rotation": [0, 2.5, 0]
-				},
-				"arm_left": {
-					"rotation": [10, 52.5, 0]
-				},
-				"arm_left2": {
-					"rotation": [0, 95, 0],
-					"position": [0.25, 0, -1.9]
-				},
-				"hand_left": {
-					"rotation": [-32.5, 0, -99.5],
-					"position": [0.48, 0, 0]
-				},
-				"finger_thumb_left": {
-					"rotation": [0, -75, 0],
-					"position": [0.2, -0.5, -0.5]
-				},
-				"fingers_left": {
-					"position": [0, -0.45, 0]
-				},
-				"finger_front_left": {
-					"rotation": [0, 2.5, 0]
-				},
-				"finger_back_left": {
-					"rotation": [0, -2.5, 0]
-				},
-				"left_leg_band": {
-					"rotation": [-13, 0, -2.5]
-				},
-				"leg_left2": {
-					"rotation": [-17.5, -5, -15],
-					"position": [-0.5, -1, 0]
-				},
-				"leg_left3": {
-					"rotation": [70, -90, 15],
-					"position": [4.25, -2.75, 2.5]
-				},
-				"foot_left": {
-					"rotation": [61.5, -17, -6],
-					"position": [0, -0.3, 0.9]
-				},
-				"right_leg_band": {
-					"rotation": [-13, 0, 2.5]
-				},
-				"leg_right2": {
-					"rotation": [-17.5, 5, 15],
-					"position": [0.5, -1, 0]
-				},
-				"leg_right3": {
-					"rotation": [70, 90, -15],
-					"position": [-4.25, -2.75, 2.5]
-				},
-				"foot_right": {
-					"rotation": [61.5, 17, 6],
-					"position": [0, -0.3, 0.9]
-				}
-			}
-		},
-		"animation.medicham.blink": {
-			"animation_length": 0.1667,
-			"bones": {
-				"eye_right": {
-					"position": {
-						"0.0": [0.1, 0, 0.1],
-						"0.1667": {"pre": [0.1, 0, 0.1], "post": [0, 0, 0]}
-					}
-				},
-				"eye_left": {
-					"position": {
-						"0.0": [-0.1, 0, 0.1],
-						"0.1667": {"pre": [-0.1, 0, 0.1], "post": [0, 0, 0]}
-					}
-				},
-				"eyelid_left": {
-					"position": {
-						"0.0": [0.1, 0, -0.1],
-						"0.1667": {"pre": [0.1, 0, -0.1], "post": [0, 0, 0]}
-					}
-				},
-				"eyelid_right": {
-					"position": {
-						"0.0": [-0.1, 0, -0.1],
-						"0.1667": {"pre": [-0.1, 0, -0.1], "post": [0, 0, 0]}
-					}
-				}
-			}
-		},
-		"animation.medicham.item_hold": {
-			"loop": true,
-			"bones": {
-				"hand_right": {
-					"rotation": [-15, 0, 0]
-				},
-				"finger_thumb_right": {
-					"rotation": [-17.5, -20, 0]
-				},
-				"finger_front_right": {
-					"rotation": [0, 0, -50]
-				},
-				"finger_front_right2": {
-					"rotation": [0, 0, -80]
-				},
-				"finger_back_right": {
-					"rotation": [0, 0, -55]
-				},
-				"finger_back_right2": {
-					"rotation": [0, 0, -70]
-				}
-			}
-		},
-		"animation.medicham.smile": {
-			"loop": true,
-			"bones": {
-				"mouth_closed_neutral": {
-					"position": [0, 0, 0.1]
-				},
-				"mouth_closed_smile": {
-					"position": [0, 0, -0.1]
-				}
-			}
-		},
-		"animation.medicham.sad": {
-			"loop": true,
-			"bones": {
-				"pupil_right": {
-					"position": [0, 0, 0]
-				},
-				"eye_left_emote": {
-					"position": [1.35, 0, -0.1],
-					"scale": [0.8, 1, 1]
-				},
-				"eye_right_emote": {
-					"position": [-1.35, 0, -0.1],
-					"scale": [0.8, 1, 1]
-				},
-				"mouth_closed_neutral": {
-					"position": [0, 0, 0.1]
-				},
-				"mouth_closed_smile": {
-					"rotation": [0, 0, 180],
-					"position": [0, -0.4, -0.1]
-				}
-			}
-		},
-		"animation.medicham.angry": {
-			"loop": true,
-			"bones": {
-				"mouth_closed": {
-					"position": [0, 0.1, 1]
-				},
-				"mouth_open": {
-					"position": [0, -1.1, -1]
-				},
-				"pupil_right": {
-					"position": [0, 0, 0]
-				},
-				"eye_left_emote": {
-					"position": [-0.2, 0, -0.1]
-				},
-				"eye_right_emote": {
-					"position": [0.2, 0, -0.1]
-				}
-			}
-		},
-		"animation.medicham.surprised": {
-			"loop": true,
-			"bones": {
-				"mouth_closed": {
-					"position": [0, 0.1, 1]
-				},
-				"headpiece": {
-					"rotation": [-6, 0, 0]
-				},
-				"bulb_right": {
-					"rotation": [0, 0, 57.5]
-				},
-				"bulb_left": {
-					"rotation": [0, 0, -57.5]
-				},
-				"pupil_right": {
-					"scale": [0.7, 0.7, 1]
-				},
-				"pupil_left": {
-					"scale": [0.7, 0.7, 1]
-				},
-				"mouth_open_wide": {
-					"position": [0, -1, -1]
-				},
-				"sweat_drop": {
-					"rotation": [0, 25, 0],
-					"position": [-2.2, 0, 0]
-				}
-			}
-		},
-		"animation.medicham.hurt": {
-			"loop": true,
-			"bones": {
-				"pupil_right": {
-					"position": [0.5, -0.5, 0],
-					"scale": [0.7, 0.6, 1]
-				},
-				"pupil_left": {
-					"position": [-0.5, -0.5, 0],
-					"scale": [0.7, 0.6, 1]
-				},
-				"pupil_emote_right": {
-					"position": [-1.4, 0.7, -0.1]
-				},
-				"pupil_emote_left": {
-					"position": [1.4, 0.7, -0.1]
-				}
-			}
-		},
-		"animation.medicham.disintrested": {
-			"loop": true,
-			"bones": {
-				"eye_right_emote": {
-					"position": [-0.6, 0.1, -0.1],
-					"scale": [2, 1, 1]
-				},
-				"eye_left_emote": {
-					"position": [0.6, 0.1, -0.1],
-					"scale": [2, 1, 1]
-				}
-			}
-		},
-		"animation.medicham.judgy": {
-			"loop": true,
-			"bones": {
-				"eye_right_emote": {
-					"position": [-0.6, 0.1, -0.1],
-					"scale": [2, 1, 1]
-				},
-				"pupil_right": {
-					"position": [-0.4, 0, 0]
-				},
-				"pupil_left": {
-					"position": [-0.4, 0, 0]
-				}
-			}
-		}
-	}
-}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0309_electrike/electrike.animation.json

@@ -1,158 +0,0 @@
-{
-	"format_version": "1.8.0",
-	"animations": {
-		"animation.electrike.ground_idle": {
-			"loop": true,
-			"bones": {
-				"torso": {
-					"rotation": [2.5, 0, 0]
-				},
-				"head_angle": {
-					"rotation": [2.5, 0, 0]
-				},
-				"tail": {
-					"rotation": [30, 0, 0]
-				},
-				"leg_front_left": {
-					"rotation": [5, 0, 0]
-				},
-				"leg_front_left2": {
-					"rotation": [-20, 0, 0]
-				},
-				"leg_front_left3": {
-					"rotation": [15, 0, 0]
-				},
-				"leg_front_right": {
-					"rotation": [5, 0, 0]
-				},
-				"leg_front_right2": {
-					"rotation": [-20, 0, 0]
-				},
-				"leg_front_right3": {
-					"rotation": [15, 0, 0]
-				},
-				"leg_back_right": {
-					"rotation": [5, 0, 0]
-				},
-				"leg_back_right2": {
-					"rotation": [-15, 0, 0]
-				},
-				"leg_back_right3": {
-					"rotation": [10, 0, 0]
-				},
-				"leg_back_left": {
-					"rotation": [5, 0, 0]
-				},
-				"leg_back_left2": {
-					"rotation": [-15, 0, 0]
-				},
-				"leg_back_left3": {
-					"rotation": [10, 0, 0]
-				},
-				"leg_fluff_back_left": {
-					"rotation": [15, 0, 0]
-				},
-				"leg_fluff_back_right": {
-					"rotation": [15, 0, 0]
-				}
-			}
-		},
-		"animation.electrike.blink": {
-			"animation_length": 0.1667,
-			"bones": {
-				"eyelid_left": {
-					"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]}
-					}
-				},
-				"eyelid_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]}
-					}
-				}
-			}
-		},
-		"animation.electrike.cry": {
-			"animation_length": 1.5,
-			"bones": {
-				"neck": {
-					"rotation": {
-						"0.0": [0, 0, 0],
-						"0.25": [10, 0, 0],
-						"1.25": [10, 0, 0],
-						"1.5": [0, 0, 0]
-					}
-				},
-				"jaw": {
-					"rotation": {
-						"0.0": [0, 0, 0],
-						"0.25": [42.5, 0, 0],
-						"1.25": [42.5, 0, 0],
-						"1.5": [0, 0, 0]
-					}
-				},
-				"head": {
-					"rotation": {
-						"0.0": [0, 0, 0],
-						"0.25": [-12.5, 0, 0],
-						"1.25": [-12.5, 0, 0],
-						"1.5": [0, 0, 0]
-					}
-				}
-			}
-		},
-		"animation.electrike.item_hold": {
-			"loop": true,
-			"bones": {
-				"jaw": {
-					"rotation": [15, 0, 0]
-				}
-			}
-		},
-		"animation.electrike.size": {
-			"loop": true,
-			"bones": {
-				"electrike": {
-					"scale": 0.85
-				}
-			}
-		},
-		"animation.electrike.hurt": {
-			"loop": true,
-			"bones": {
-				"eyelid_hurt_left": {
-					"position": [0.1, 0, -0.1]
-				},
-				"eyelid_hurt_right": {
-					"position": [-0.1, 0, -0.1]
-				}
-			}
-		},
-		"animation.electrike.angry": {
-			"loop": true,
-			"bones": {
-				"eyelid_emote_left": {
-					"position": [-0.9, -0.2, -0.1]
-				},
-				"eyelid_emote_right": {
-					"position": [0.9, -0.2, -0.1]
-				}
-			}
-		},
-		"animation.electrike.sad": {
-			"loop": true,
-			"bones": {
-				"eyelid_emote_left": {
-					"position": [0.1, 0, -0.1]
-				},
-				"eyelid_emote_right": {
-					"position": [-0.1, 0, -0.1]
-				}
-			}
-		}
-	}
-}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0310_manectric/manectric.animation.json

@@ -1,366 +0,0 @@
-{
-	"format_version": "1.8.0",
-	"animations": {
-		"animation.manectric.ground_idle": {
-			"loop": true,
-			"bones": {
-				"neck": {
-					"rotation": [15, 0, 0]
-				},
-				"head_angle": {
-					"rotation": [-12.5, 0, 0],
-					"position": [0, -0.96593, -0.25882]
-				},
-				"tail": {
-					"rotation": [47.5, 0, 0]
-				},
-				"tail2": {
-					"rotation": [67.5, 0, 0]
-				},
-				"tail4": {
-					"rotation": [0, 0, 0]
-				},
-				"jaw": {
-					"rotation": [0, 0, 0]
-				},
-				"leg_back_left2": {
-					"rotation": [47.5, 0, 0]
-				},
-				"leg_back_left3": {
-					"rotation": [-47.5, 0, 0]
-				},
-				"ankle_back_left": {
-					"rotation": [-35, 0, 0]
-				},
-				"foot_back_left": {
-					"rotation": [35, 0, 0]
-				},
-				"claw_back_outer_left": {
-					"rotation": [0, 22.5, 0]
-				},
-				"claw_back_inner_left": {
-					"rotation": [0, -22.5, 0]
-				},
-				"claw_outer_left": {
-					"rotation": [0, 22.5, 0]
-				},
-				"claw_inner_left": {
-					"rotation": [0, -22.5, 0]
-				},
-				"claw_outer_right": {
-					"rotation": [0, -22.5, 0]
-				},
-				"claw_inner_right": {
-					"rotation": [0, 22.5, 0]
-				},
-				"leg_back_right2": {
-					"rotation": [47.5, 0, 0]
-				},
-				"leg_back_right3": {
-					"rotation": [-47.5, 0, 0]
-				},
-				"ankle_back_right": {
-					"rotation": [-35, 0, 0]
-				},
-				"foot_back_right": {
-					"rotation": [35, 0, 0]
-				},
-				"claw_back_outer_right": {
-					"rotation": [0, -22.5, 0]
-				},
-				"claw_back_inner_right": {
-					"rotation": [0, 22.5, 0]
-				}
-			}
-		},
-		"animation.manectric.blink": {
-			"animation_length": 0.1667,
-			"bones": {
-				"eye_left": {
-					"position": [-0.1, 0, 0.1]
-				},
-				"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]}
-					}
-				},
-				"eyelid_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]}
-					}
-				},
-				"eyelid_left": {
-					"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]}
-					}
-				}
-			}
-		},
-		"animation.manectric.cry": {
-			"animation_length": 1.5,
-			"bones": {
-				"neck": {
-					"rotation": {
-						"0.0": [0, 0, 0],
-						"0.25": [7.5, 0, 0],
-						"1.25": [7.5, 0, 0],
-						"1.5": [0, 0, 0]
-					}
-				},
-				"head": {
-					"rotation": {
-						"0.0": [0, 0, 0],
-						"0.25": [-7.5, 0, 0],
-						"1.25": [-7.5, 0, 0],
-						"1.5": [0, 0, 0]
-					}
-				},
-				"jaw": {
-					"rotation": {
-						"0.0": [0, 0, 0],
-						"0.25": [42.5, 0, 0],
-						"1.25": [42.5, 0, 0],
-						"1.5": [0, 0, 0]
-					}
-				}
-			}
-		},
-		"animation.manectric.item_hold": {
-			"loop": true,
-			"bones": {
-				"jaw": {
-					"rotation": [15, 0, 0]
-				}
-			}
-		},
-		"animation.manectric.pose": {
-			"loop": true,
-			"bones": {
-				"neck": {
-					"rotation": [15.0547, -4.82922, -1.29717]
-				},
-				"head_angle": {
-					"rotation": [-21.85885, -29.21893, 7.12284],
-					"position": [0.03263, -1.43766, -0.42129]
-				},
-				"tail": {
-					"rotation": [47.5, 0, 0]
-				},
-				"tail2": {
-					"rotation": [67.5, 0, 0]
-				},
-				"tail4": {
-					"rotation": [0, 0, 0]
-				},
-				"jaw": {
-					"rotation": [0, 0, 0]
-				},
-				"leg_back_left2": {
-					"rotation": [47.5, 0, 0]
-				},
-				"leg_back_left3": {
-					"rotation": [-47.5, 0, 0]
-				},
-				"ankle_back_left": {
-					"rotation": [-35, 0, 0]
-				},
-				"foot_back_left": {
-					"rotation": [35, 0, 0]
-				},
-				"claw_back_outer_left": {
-					"rotation": [0, 22.5, 0]
-				},
-				"claw_back_inner_left": {
-					"rotation": [0, -22.5, 0]
-				},
-				"claw_outer_left": {
-					"rotation": [0, 22.5, 0]
-				},
-				"claw_inner_left": {
-					"rotation": [0, -22.5, 0]
-				},
-				"leg_front_right": {
-					"rotation": [0, 10, 0]
-				},
-				"claw_outer_right": {
-					"rotation": [0, -22.5, 0]
-				},
-				"claw_inner_right": {
-					"rotation": [0, 22.5, 0]
-				},
-				"leg_back_right": {
-					"rotation": [0, 5, 0]
-				},
-				"leg_back_right2": {
-					"rotation": [47.5, 0, 0]
-				},
-				"leg_back_right3": {
-					"rotation": [-47.5, 0, 0]
-				},
-				"ankle_back_right": {
-					"rotation": [-35, 0, 0]
-				},
-				"foot_back_right": {
-					"rotation": [35, 0, 0]
-				},
-				"claw_back_outer_right": {
-					"rotation": [0, -22.5, 0]
-				},
-				"claw_back_inner_right": {
-					"rotation": [0, 22.5, 0]
-				}
-			}
-		},
-		"animation.manectric.scale": {
-			"loop": true,
-			"bones": {
-				"body": {
-					"scale": 0.75
-				}
-			}
-		},
-		"animation.manectric.hurt": {
-			"loop": true,
-			"bones": {
-				"eye_left": {
-					"position": [-0.1, 0, 0.1]
-				},
-				"eye_right": {
-					"position": [0.1, 0, 0.1]
-				},
-				"eyelid_hurt_right": {
-					"position": [-0.1, 0, -0.1]
-				},
-				"eyelid_hurt_left": {
-					"position": [0.1, 0, -0.1]
-				}
-			}
-		},
-		"animation.manectric.sad": {
-			"loop": true,
-			"bones": {
-				"eyelid_emote_left": {
-					"position": [0.1, 0, -0.1]
-				},
-				"eyelid_emote_right": {
-					"position": [-0.1, 0, -0.1]
-				}
-			}
-		},
-		"animation.manectric.angry": {
-			"loop": true,
-			"bones": {
-				"eyelid_emote_left": {
-					"position": [-1, -0.1, -0.1]
-				},
-				"eyelid_emote_right": {
-					"position": [1, -0.1, -0.1]
-				}
-			}
-		},
-		"animation.manectric.fishe": {
-			"loop": true,
-			"bones": {
-				"torso": {
-					"scale": [1, 1.8, 1]
-				},
-				"torso2": {
-					"scale": [1, 0.8, 1]
-				},
-				"chest_fur": {
-					"rotation": [97.5, 0, 0],
-					"position": [0, -2.25, 28],
-					"scale": [0.1, 1.7, 1]
-				},
-				"neck": {
-					"scale": [1, 0.8, 1]
-				},
-				"head_angle": {
-					"rotation": [2.5, 0, 0],
-					"position": [0, -9.5, -2],
-					"scale": [1, 1.2, 1]
-				},
-				"snout": {
-					"rotation": [7.5, 0, 0],
-					"scale": [1, 1, 2.5]
-				},
-				"head_top": {
-					"rotation": [-40, 0, 0],
-					"position": [0, -0.9, -0.8]
-				},
-				"ear_left": {
-					"rotation": [-40, 0, 0],
-					"position": [0, -0.75, 4.75],
-					"scale": [1, 0.6, 0.6]
-				},
-				"ear_right": {
-					"rotation": [-40, 0, 0],
-					"position": [0, -0.75, 4.75],
-					"scale": [1, 0.6, 0.6]
-				},
-				"jaw": {
-					"scale": [1, 1, 2]
-				},
-				"tail": {
-					"position": [0, 0.5, 0]
-				},
-				"tail2": {
-					"position": [0, 0.75, 0],
-					"scale": [1, 1, 0.8]
-				},
-				"leg_front_right": {
-					"rotation": [35, 0, 20],
-					"position": [0, -0.75, 5],
-					"scale": [0.6, 1, 1]
-				},
-				"leg_front_right2": {
-					"rotation": [25, 0, 0],
-					"scale": [0, 1, 1]
-				},
-				"foot_front_right": {
-					"scale": 0
-				},
-				"foot_fur_right": {
-					"scale": 0
-				},
-				"leg_front_left": {
-					"rotation": [35, 0, -20],
-					"position": [0, -0.75, 5],
-					"scale": [0.6, 1, 1]
-				},
-				"leg_front_left2": {
-					"rotation": [25, 0, 0],
-					"scale": [0, 1, 1]
-				},
-				"foot_front_left": {
-					"scale": 0
-				},
-				"foot_fur_left": {
-					"scale": 0
-				},
-				"leg_back_left": {
-					"rotation": [-37.5, 0, 0],
-					"position": [-3, 0.75, 21.25],
-					"scale": [0.3, 0.9, 0.9]
-				},
-				"leg_back_left2": {
-					"scale": 0
-				},
-				"leg_back_right": {
-					"rotation": [17.5, 0, 0],
-					"position": [4, 5, 0],
-					"scale": [0.1, 1.2, 1.8]
-				},
-				"leg_back_right3": {
-					"scale": 0
-				}
-			}
-		}
-	}
-}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0357_tropius/tropius.animation.json

@@ -511,19 +511,13 @@
 				"eyelid_left": {
 					"position": {
 						"0.0": [0.1, 0, 0],
-						"0.1667": {
-							"pre": [0.1, 0, 0],
-							"post": [0, 0, 0]
-						}
+						"0.1667": {"pre": [0.1, 0, 0], "post": [0, 0, 0]}
 					}
 				},
 				"eyelid_right": {
 					"position": {
 						"0.0": [-0.1, 0, 0],
-						"0.1667": {
-							"pre": [-0.1, 0, 0],
-							"post": [0, 0, 0]
-						}
+						"0.1667": {"pre": [-0.1, 0, 0], "post": [0, 0, 0]}
 					}
 				}
 			}
@@ -718,75 +712,27 @@
 				"eyelid_left": {
 					"position": {
 						"0.5": [0, 0, 0],
-						"0.5417": {
-							"pre": [0, 0, 0],
-							"post": [0.1, 0, 0]
-						},
-						"0.7083": {
-							"pre": [0.1, 0, 0],
-							"post": [0, 0, 0]
-						},
-						"2.0417": {
-							"pre": [0, 0, 0],
-							"post": [0, 0, 0]
-						},
-						"2.0833": {
-							"pre": [0, 0, 0],
-							"post": [0.1, 0, 0]
-						},
-						"2.25": {
-							"pre": [0.1, 0, 0],
-							"post": [0, 0, 0]
-						},
-						"3.75": {
-							"pre": [0, 0, 0],
-							"post": [0, 0, 0]
-						},
-						"3.7917": {
-							"pre": [0, 0, 0],
-							"post": [0.1, 0, 0]
-						},
-						"3.9583": {
-							"pre": [0.1, 0, 0],
-							"post": [0, 0, 0]
-						}
+						"0.5417": {"pre": [0, 0, 0], "post": [0.1, 0, 0]},
+						"0.7083": {"pre": [0.1, 0, 0], "post": [0, 0, 0]},
+						"2.0417": {"pre": [0, 0, 0], "post": [0, 0, 0]},
+						"2.0833": {"pre": [0, 0, 0], "post": [0.1, 0, 0]},
+						"2.25": {"pre": [0.1, 0, 0], "post": [0, 0, 0]},
+						"3.75": {"pre": [0, 0, 0], "post": [0, 0, 0]},
+						"3.7917": {"pre": [0, 0, 0], "post": [0.1, 0, 0]},
+						"3.9583": {"pre": [0.1, 0, 0], "post": [0, 0, 0]}
 					}
 				},
 				"eyelid_right": {
 					"position": {
 						"0.5": [0, 0, 0],
-						"0.5417": {
-							"pre": [0, 0, 0],
-							"post": [-0.1, 0, 0]
-						},
-						"0.7083": {
-							"pre": [-0.1, 0, 0],
-							"post": [0, 0, 0]
-						},
-						"2.0417": {
-							"pre": [0, 0, 0],
-							"post": [0, 0, 0]
-						},
-						"2.0833": {
-							"pre": [0, 0, 0],
-							"post": [-0.1, 0, 0]
-						},
-						"2.25": {
-							"pre": [-0.1, 0, 0],
-							"post": [0, 0, 0]
-						},
-						"3.75": {
-							"pre": [0, 0, 0],
-							"post": [0, 0, 0]
-						},
-						"3.7917": {
-							"pre": [0, 0, 0],
-							"post": [-0.1, 0, 0]
-						},
-						"3.9583": {
-							"pre": [-0.1, 0, 0],
-							"post": [0, 0, 0]
-						}
+						"0.5417": {"pre": [0, 0, 0], "post": [-0.1, 0, 0]},
+						"0.7083": {"pre": [-0.1, 0, 0], "post": [0, 0, 0]},
+						"2.0417": {"pre": [0, 0, 0], "post": [0, 0, 0]},
+						"2.0833": {"pre": [0, 0, 0], "post": [-0.1, 0, 0]},
+						"2.25": {"pre": [-0.1, 0, 0], "post": [0, 0, 0]},
+						"3.75": {"pre": [0, 0, 0], "post": [0, 0, 0]},
+						"3.7917": {"pre": [0, 0, 0], "post": [-0.1, 0, 0]},
+						"3.9583": {"pre": [-0.1, 0, 0], "post": [0, 0, 0]}
 					}
 				},
 				"head": {
@@ -1510,7 +1456,11 @@
 				"leg_front_left": {
 					"rotation": {
 						"0.0": [20, -1, 0],
-						"0.25": [-42.47, 0, 0],
+						"0.25": {
+							"pre": [-42.47, 0, 0],
+							"post": [-42.47, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
 						"0.3333": [-25.43708, -0.29167, 0],
 						"0.4167": [0.80407, -0.74074, 0],
 						"0.5": [20, -1, 0]
@@ -1600,7 +1550,11 @@
 					"rotation": {
 						"0.0": [3.21, 0.74, 0],
 						"0.0833": [16, 1, 0],
-						"0.3333": [-42.47, 0, 0],
+						"0.3333": {
+							"pre": [-42.47, 0, 0],
+							"post": [-42.47, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
 						"0.5": [3.21, 0.74, 0]
 					},
 					"position": {
@@ -1675,10 +1629,7 @@
 							"post": [40, -1, 0],
 							"lerp_mode": "catmullrom"
 						},
-						"0.4167": {
-							"post": [40.63051, -0.53537, 0],
-							"lerp_mode": "catmullrom"
-						},
+						"0.4167": [40.63051, -0.53537, 0],
 						"0.5": [9.48, -0.16, 0]
 					},
 					"position": {
@@ -1932,7 +1883,7 @@
 			"loop": true,
 			"bones": {
 				"tropius": {
-					"position": [0, 0, "39-q.anim_time*90*0.12"]
+					"position": [0, 0, "39-q.anim_time*8.5"]
 				}
 			}
 		},
@@ -1940,7 +1891,10 @@
 			"loop": true,
 			"bones": {
 				"tropius": {
-					"position": [0, 0, "39-q.anim_time*90*0.88"]
+					"position": [0, 0, "39-q.anim_time*80"]
+				},
+				"neck": {
+					"rotation": [2.5, 0, 0]
 				}
 			}
 		},
@@ -2067,7 +2021,7 @@
 					"rotation": [0, 0, -20]
 				},
 				"wing_back_right3_upper": {
-					"rotation": [0, 0, 20]
+					"rotation": [0, 0, 7.5]
 				},
 				"toe_front_left": {
 					"rotation": [12.5, 0, 0]
@@ -2106,7 +2060,7 @@
 					"position": [0, 1, 0]
 				},
 				"neck": {
-					"rotation": ["17.5+math.sin(q.anim_time*90*2.25-30)*2", 0, 0]
+					"rotation": ["29+math.sin(q.anim_time*90*2.25-30)*2", 0, 0]
 				},
 				"neck2": {
 					"rotation": ["17.5+math.sin(q.anim_time*90*2.25-100)*2", 0, 0],
@@ -2143,16 +2097,16 @@
 					"rotation": [0, 0, "0+math.sin(q.anim_time*90*2.25-50)*30"]
 				},
 				"wing_back_left2": {
-					"rotation": [0, 0, "2.5+math.sin(q.anim_time*90*2.25-30)*3"]
+					"rotation": [0, 0, "2.5+math.sin(q.anim_time*90*2.25-30)*8"]
 				},
 				"wing_back_left3": {
-					"rotation": [0, 0, "32.5+math.sin(q.anim_time*90*2.25-70)*5"]
+					"rotation": [0, 0, "32.5+math.sin(q.anim_time*90*2.25-70)*3"]
 				},
 				"wing_back_left4": {
 					"rotation": [0, 0, "32.5+math.sin(q.anim_time*90*2.25-110)*4"]
 				},
 				"wing_back_left": {
-					"rotation": [31.64794, -31.06472, -21.18376]
+					"rotation": [26.74152, -33.01823, -15.16293]
 				},
 				"leg_front_right": {
 					"rotation": ["-22.5+math.sin(q.anim_time*90*2.25-260)*-5", 0, 0]
@@ -2192,26 +2146,26 @@
 					"rotation": [0, 0, -17.5]
 				},
 				"wing_back_right": {
-					"rotation": [31.64794, 31.06472, 21.18376]
+					"rotation": [21.21618, 38.00898, 12.8161]
 				},
 				"wing_back_right2": {
-					"rotation": [0, 0, "-2.5+math.sin(q.anim_time*90*2.25-30)*-3"]
+					"rotation": [0, 0, "-2.5+math.sin(q.anim_time*90*2.25-30)*-8"]
 				},
 				"wing_back_right3": {
-					"rotation": [0, 0, "-32.5+math.sin(q.anim_time*90*2.25-70)*-5"]
+					"rotation": [0, 0, "-25+math.sin(q.anim_time*90*2.25-70)*-3"]
 				},
 				"wing_back_right4_upper": {
 					"rotation": [0, 0, 17.5]
 				},
 				"body": {
-					"rotation": ["14.5+math.sin(q.anim_time*90*2.25-20)*2", 0, "math.sin(q.anim_time*90*0.666)*-1"],
-					"position": ["0+math.sin(q.anim_time*90*0.666)", "9+math.sin(q.anim_time*90*2.25-110)*4", "math.sin(q.anim_time*90*2.25-60)*-1"]
+					"rotation": ["math.sin(q.anim_time*90*2.25-20)*2", 0, "math.sin(q.anim_time*90*0.666)*-1"],
+					"position": ["0+math.sin(q.anim_time*90*0.666)", "9+math.sin(q.anim_time*90*2.25-110)*4", "1+math.sin(q.anim_time*90*2.25-60)*-1"]
 				},
 				"wing_back_left3_upper": {
 					"rotation": [0, 0, -20]
 				},
 				"wing_back_right3_upper": {
-					"rotation": [0, 0, 20]
+					"rotation": [0, 0, 7.5]
 				},
 				"toe_front_left": {
 					"rotation": [12.5, 0, 0]
@@ -2244,25 +2198,25 @@
 			"bones": {
 				"body": {
 					"rotation": ["14.5+math.sin(q.anim_time*90*0.43-90)*3", 0, "math.sin(q.anim_time*90*0.73-90)*-2"],
-					"position": ["0+math.sin(q.anim_time*90*0.73-90)*4", "7+math.sin(q.anim_time*90*1)*2", "0+math.sin(q.anim_time*90*0.43-90)*1"]
+					"position": ["0+math.sin(q.anim_time*90*0.73-90)*4", "7+math.sin(q.anim_time*90*1)*2", "0+math.sin(q.anim_time*90*0.43-90)*2"]
 				},
 				"neck": {
-					"rotation": ["25+math.sin(q.anim_time*90*0.43-90)*-3", 0, "math.sin(q.anim_time*90*0.73-130)*-2"]
+					"rotation": ["17.5+math.sin(q.anim_time*90*0.43-90)*-3", 0, "math.sin(q.anim_time*90*0.73-130)*-2"]
 				},
 				"neck2": {
-					"rotation": ["2.2151+math.sin(q.anim_time*90*0.43-130)*-3", 0.09443, "2.9287+math.sin(q.anim_time*90*0.73-170)*-2"]
+					"rotation": ["4.7151+math.sin(q.anim_time*90*0.43-130)*-3", 0.09443, "2.9287+math.sin(q.anim_time*90*0.73-170)*-2"]
 				},
 				"neck3": {
-					"rotation": ["15+math.sin(q.anim_time*90*0.43-170)*-3", 0, "math.sin(q.anim_time*90*0.73-210)*-2"]
+					"rotation": ["20+math.sin(q.anim_time*90*0.43-170)*-4", 0, "math.sin(q.anim_time*90*0.73-210)*-2"]
 				},
 				"neck4": {
-					"rotation": ["27.5+math.sin(q.anim_time*90*0.43-200)*-3", 0, "math.sin(q.anim_time*90*0.73-250)*-2"]
+					"rotation": ["32.5+math.sin(q.anim_time*90*0.43-200)*-4", 0, "math.sin(q.anim_time*90*0.73-250)*-2"]
 				},
 				"neck5": {
-					"rotation": ["17.5+math.sin(q.anim_time*90*0.43-240)*-3", 0, "math.sin(q.anim_time*90*0.73-290)*-2"]
+					"rotation": ["17.5+math.sin(q.anim_time*90*0.43-240)*-4", 0, "math.sin(q.anim_time*90*0.73-290)*-2"]
 				},
 				"head": {
-					"rotation": ["17.5+math.sin(q.anim_time*90*0.43-300)*-3", 0, "math.sin(q.anim_time*90*0.73-330)*-2"]
+					"rotation": ["17.5+math.sin(q.anim_time*90*0.43-300)*-4", 0, "math.sin(q.anim_time*90*0.73-330)*-2"]
 				},
 				"banana_middle": {
 					"rotation": ["0+math.sin(q.anim_time*90*0.43-40)*-15", 0, 0]
@@ -2292,25 +2246,25 @@
 					"rotation": [0, 0, "4.5-math.sin(q.anim_time*90*1-140)*6"]
 				},
 				"wing_back_left": {
-					"rotation": [19.55989, -21.69555, -27.00655]
+					"rotation": [15.77241, -22.91054, -21.63402]
 				},
 				"wing_back_left2": {
 					"rotation": ["0+math.sin(q.anim_time*90*16)*1", 0, "7.5+math.sin(q.anim_time*90*1)*3"]
 				},
 				"wing_back_left3": {
-					"rotation": [0, 0, "7+math.sin(q.anim_time*90*1-50)*3"]
+					"rotation": [0, 0, "3+math.sin(q.anim_time*90*1-50)*3"]
 				},
 				"wing_back_left4": {
 					"rotation": [0, 0, "15+math.sin(q.anim_time*90*1-100)*3"]
 				},
 				"wing_back_right": {
-					"rotation": [19.55989, 21.69555, 27.00655]
+					"rotation": [15.77241, 22.91054, 21.63402]
 				},
 				"wing_back_right2": {
 					"rotation": ["0+math.sin(q.anim_time*90*16)*1", 0, "-7.5+math.sin(q.anim_time*90*1)*-3"]
 				},
 				"wing_back_right3": {
-					"rotation": [0, 0, "-7+math.sin(q.anim_time*90*1-50)*-3"]
+					"rotation": [0, 0, "-3+math.sin(q.anim_time*90*1-50)*-3"]
 				},
 				"wing_back_right4": {
 					"rotation": [0, 0, "-15+math.sin(q.anim_time*90*1-100)*-3"]
@@ -2577,23 +2531,19 @@
 					"rotation": [0, 0, 27.5]
 				},
 				"leg_front_left": {
-					"rotation": [-78.8997, -13.75392, 4.78274],
-					"position": [0, 2, 0]
+					"rotation": [-78.8997, -13.75392, 4.78274]
 				},
 				"leg_front_right": {
-					"rotation": [-81.17768, 20.52872, -1.6317],
-					"position": [0, 1, 0]
+					"rotation": [-81.17768, 20.52872, -1.6317]
 				},
 				"leg_back_left": {
-					"rotation": [82.14048, 17.34551, -2.35666],
-					"position": [0, 2, 0]
+					"rotation": [82.14048, 17.34551, -2.35666]
 				},
 				"leg_back_left2": {
 					"rotation": [5, 0, 0]
 				},
 				"leg_back_right": {
-					"rotation": [84.82456, -14.94159, 1.3378],
-					"position": [0, 2, 0]
+					"rotation": [84.82456, -14.94159, 1.3378]
 				},
 				"leg_back_right2": {
 					"rotation": [5, 0, 0]
@@ -2619,7 +2569,7 @@
 				},
 				"neck": {
 					"rotation": [96.40868, 9.38063, 0.97369],
-					"position": [0, -3.4, 0]
+					"position": [0, -2, 4]
 				},
 				"neck2": {
 					"rotation": ["20.4907+math.sin(q.anim_time*90*0.5)*0.9", 0.36957, 6.39838],
@@ -2630,7 +2580,7 @@
 					"position": [0.775, -2.925, -0.7]
 				},
 				"neck4": {
-					"rotation": ["-5.757+math.sin(q.anim_time*90*0.5)*-0.9", -10.46977, -27.54476],
+					"rotation": ["-5.757+math.sin(q.anim_time*90*0.5)*-0.9", -10.46977, -23.04476],
 					"position": [-0.6, -3.775, -1]
 				},
 				"neck5": {
@@ -2667,16 +2617,19 @@
 					"rotation": [0, 0, "40+math.sin(q.anim_time*90*0.5)*0.9"]
 				},
 				"wing_front_left3": {
-					"rotation": [0, 0, "10-math.sin(q.anim_time*90*0.5)*0.9"]
+					"rotation": [0, 0, "10-math.sin(q.anim_time*90*0.5)*0.9"],
+					"position": [-2, 0, 0]
 				},
 				"wing_front_right": {
 					"rotation": [-2.83158, -35.08163, 4.61044]
 				},
 				"wing_front_right2": {
-					"rotation": [0, 0, -24.74881]
+					"rotation": [1.83368, -4.31076, -34.76983],
+					"position": [1, 0, 0]
 				},
 				"wing_front_right3": {
-					"rotation": [0, 0, "-10-math.sin(q.anim_time*90*0.5)*0.9"]
+					"rotation": [0, -7.13266, "8.6164248718+math.sin(q.anim_time*90*0.5)*-2.5"],
+					"position": [1, 0, 0]
 				},
 				"wing_back_left2": {
 					"rotation": [0, 0, 27.5]
@@ -3185,27 +3138,15 @@
 				"eyelid_left": {
 					"position": {
 						"0.0": [0, 0, 0],
-						"0.0417": {
-							"pre": [0, 0, 0],
-							"post": [0.1, 0, 0]
-						},
-						"0.2083": {
-							"pre": [0.1, 0, 0],
-							"post": [0, 0, 0]
-						}
+						"0.0417": {"pre": [0, 0, 0], "post": [0.1, 0, 0]},
+						"0.2083": {"pre": [0.1, 0, 0], "post": [0, 0, 0]}
 					}
 				},
 				"eyelid_right": {
 					"position": {
 						"0.0": [0, 0, 0],
-						"0.0417": {
-							"pre": [0, 0, 0],
-							"post": [-0.1, 0, 0]
-						},
-						"0.2083": {
-							"pre": [-0.1, 0, 0],
-							"post": [0, 0, 0]
-						}
+						"0.0417": {"pre": [0, 0, 0], "post": [-0.1, 0, 0]},
+						"0.2083": {"pre": [-0.1, 0, 0], "post": [0, 0, 0]}
 					}
 				}
 			}
@@ -4517,67 +4458,25 @@
 				"eyelid_left": {
 					"position": {
 						"0.0": [0, 0, 0],
-						"0.0417": {
-							"pre": [0, 0, 0],
-							"post": [0.1, 0, 0]
-						},
-						"0.2083": {
-							"pre": [0.1, 0, 0],
-							"post": [0, 0, 0]
-						},
-						"0.4583": {
-							"pre": [0, 0, 0],
-							"post": [0.1, 0, 0]
-						},
-						"0.9583": {
-							"pre": [0.1, 0, 0],
-							"post": [0, 0, 0]
-						},
-						"1.4583": {
-							"pre": [0, 0, 0],
-							"post": [0.1, 0, 0]
-						},
-						"1.7917": {
-							"pre": [0.1, 0, 0],
-							"post": [0, 0, 0]
-						},
-						"2.0833": {
-							"pre": [0, 0, 0],
-							"post": [0.1, 0, 0]
-						}
+						"0.0417": {"pre": [0, 0, 0], "post": [0.1, 0, 0]},
+						"0.2083": {"pre": [0.1, 0, 0], "post": [0, 0, 0]},
+						"0.4583": {"pre": [0, 0, 0], "post": [0.1, 0, 0]},
+						"0.9583": {"pre": [0.1, 0, 0], "post": [0, 0, 0]},
+						"1.4583": {"pre": [0, 0, 0], "post": [0.1, 0, 0]},
+						"1.7917": {"pre": [0.1, 0, 0], "post": [0, 0, 0]},
+						"2.0833": {"pre": [0, 0, 0], "post": [0.1, 0, 0]}
 					}
 				},
 				"eyelid_right": {
 					"position": {
 						"0.0": [0, 0, 0],
-						"0.0417": {
-							"pre": [0, 0, 0],
-							"post": [-0.1, 0, 0]
-						},
-						"0.2083": {
-							"pre": [-0.1, 0, 0],
-							"post": [0, 0, 0]
-						},
-						"0.4583": {
-							"pre": [0, 0, 0],
-							"post": [-0.1, 0, 0]
-						},
-						"0.9583": {
-							"pre": [-0.1, 0, 0],
-							"post": [0, 0, 0]
-						},
-						"1.4583": {
-							"pre": [0, 0, 0],
-							"post": [-0.1, 0, 0]
-						},
-						"1.7917": {
-							"pre": [-0.1, 0, 0],
-							"post": [0, 0, 0]
-						},
-						"2.0833": {
-							"pre": [0, 0, 0],
-							"post": [-0.1, 0, 0]
-						}
+						"0.0417": {"pre": [0, 0, 0], "post": [-0.1, 0, 0]},
+						"0.2083": {"pre": [-0.1, 0, 0], "post": [0, 0, 0]},
+						"0.4583": {"pre": [0, 0, 0], "post": [-0.1, 0, 0]},
+						"0.9583": {"pre": [-0.1, 0, 0], "post": [0, 0, 0]},
+						"1.4583": {"pre": [0, 0, 0], "post": [-0.1, 0, 0]},
+						"1.7917": {"pre": [-0.1, 0, 0], "post": [0, 0, 0]},
+						"2.0833": {"pre": [0, 0, 0], "post": [-0.1, 0, 0]}
 					}
 				},
 				"body": {

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0451_skorupi/skorupi.animation.json

@@ -1,186 +0,0 @@
-{
-	"format_version": "1.8.0",
-	"animations": {
-		"animation.skorupi.ground_idle": {
-			"loop": true,
-			"bones": {
-				"torso": {
-					"rotation": [2.5, 0, 0]
-				},
-				"tail": {
-					"rotation": [22.5193, 2.30959, 0.95723]
-				},
-				"tail2": {
-					"rotation": [35.02564, -2.04767, -1.43455]
-				},
-				"tail3": {
-					"rotation": [32.5, 0, 0]
-				},
-				"tail4": {
-					"rotation": [30.02363, 2.16489, 1.2506]
-				},
-				"tail_end": {
-					"rotation": [32.10382, -5.35355, 8.45862]
-				},
-				"leg_front_left": {
-					"rotation": [7.92945, 18.42031, 23.78773]
-				},
-				"leg_front_left2": {
-					"rotation": [0, 0, -12.5]
-				},
-				"leg_back_left": {
-					"rotation": [-10.11783, -22.9824, 24.56202]
-				},
-				"leg_back_left2": {
-					"rotation": [0, 0, -5]
-				},
-				"leg_front_right": {
-					"rotation": [7.92945, -18.42031, -23.78773]
-				},
-				"leg_front_right2": {
-					"rotation": [0, 0, 12.5]
-				},
-				"leg_back_right": {
-					"rotation": [-10.11783, 22.9824, -24.56202]
-				},
-				"leg_back_right2": {
-					"rotation": [0, 0, 5]
-				},
-				"head": {
-					"rotation": [-5, 0, 0]
-				},
-				"arm_left": {
-					"rotation": [0, 0, -7.5]
-				},
-				"arm_right": {
-					"rotation": [0, 0, 7.5]
-				},
-				"mouth_open": {
-					"position": [0, 0, 0]
-				}
-			}
-		},
-		"animation.skorupi.blink": {
-			"animation_length": 0.1667,
-			"bones": {
-				"pupil_left": {
-					"position": {
-						"0.0": [0, 0, 0.1],
-						"0.125": [0, 0, 0.1],
-						"0.1667": [0, 0, 0]
-					}
-				},
-				"pupil_closed_left": {
-					"position": {
-						"0.0": [0, 0, -0.1],
-						"0.125": [0, 0, -0.1],
-						"0.1667": [0, 0, 0]
-					}
-				},
-				"pupil_right": {
-					"position": {
-						"0.0": [0, 0, 0.1],
-						"0.125": [0, 0, 0.1],
-						"0.1667": [0, 0, 0]
-					}
-				},
-				"pupil_closed_right": {
-					"position": {
-						"0.0": [0, 0, -0.1],
-						"0.125": [0, 0, -0.1],
-						"0.1667": [0, 0, 0]
-					}
-				}
-			}
-		},
-		"animation.skorupi.shock": {
-			"loop": true,
-			"bones": {
-				"mouth_closed": {
-					"position": [0, 0, 0.1]
-				},
-				"mouth_open": {
-					"position": [0, 0, -0.1]
-				},
-				"pupil_left": {
-					"rotation": [0, 0, -25],
-					"scale": [0.5, 0.5, 1]
-				},
-				"pupil_right": {
-					"rotation": [0, 0, 25],
-					"scale": [0.5, 0.5, 1]
-				}
-			}
-		},
-		"animation.skorupi.angry": {
-			"loop": true,
-			"bones": {
-				"pupil_left": {
-					"rotation": [0, 0, -15]
-				},
-				"eye_expression_left": {
-					"position": [-0.5, 0, -0.1]
-				},
-				"pupil_right": {
-					"rotation": [0, 0, 15]
-				},
-				"eye_expression_right": {
-					"position": [0.5, 0, -0.1]
-				}
-			}
-		},
-		"animation.skorupi.sad": {
-			"loop": true,
-			"bones": {
-				"eye_expression_left": {
-					"position": [0.5, 0.25, -0.1]
-				},
-				"eye_expression_right": {
-					"position": [-0.5, 0.25, -0.1]
-				}
-			}
-		},
-		"animation.skorupi.happy": {
-			"loop": true,
-			"bones": {
-				"mouth_closed": {
-					"position": [0, 0, 0.1]
-				},
-				"mouth_open": {
-					"position": [0, 0, -0.1]
-				},
-				"pupil_left": {
-					"position": [0, 0, 0.1]
-				},
-				"pupil_happy_left": {
-					"position": [0, 0, -0.1]
-				},
-				"pupil_right": {
-					"position": [0, 0, 0.1]
-				},
-				"pupil_happy_right": {
-					"position": [0, 0, -0.1]
-				}
-			}
-		},
-		"animation.skorupi.hurt": {
-			"loop": true,
-			"bones": {
-				"pupil_left": {
-					"position": [0, 0, 0.1]
-				},
-				"pupil_closed_left": {
-					"rotation": [0, 0, -45],
-					"position": [0, 0, -0.1]
-				},
-				"pupil_right": {
-					"position": [0, 0, 0.1]
-				},
-				"pupil_closed_right": {
-					"rotation": [0, 0, 45],
-					"position": [0, 0, -0.1]
-				}
-			}
-		}
-	}
-}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0452_drapion/drapion.animation.json

@@ -1,223 +0,0 @@
-{
-	"format_version": "1.8.0",
-	"animations": {
-		"animation.drapion.ground_idle": {
-			"loop": true,
-			"bones": {
-				"torso": {
-					"rotation": [-5, 0, 0]
-				},
-				"neck": {
-					"rotation": [-27.51313, 0.23318, 0.28749]
-				},
-				"neck2": {
-					"rotation": [-17.5, 0, 0]
-				},
-				"neck3": {
-					"rotation": [-12.5, 0, 0]
-				},
-				"neck4": {
-					"rotation": [27.5, 0, 0]
-				},
-				"head": {
-					"rotation": [37.48636, -0.24814, 0.36242]
-				},
-				"tail": {
-					"rotation": [17.5193, 2.30959, 0.95723]
-				},
-				"tail2": {
-					"rotation": [24.49937, 2.93303, -1.90673]
-				},
-				"tail3": {
-					"rotation": [14.8369, -5.47408, 1.12804]
-				},
-				"tail4": {
-					"rotation": [17.43464, 0.4137, 3.27244]
-				},
-				"tail5": {
-					"rotation": [12.60443, -7.32123, -1.63219]
-				},
-				"arm_left": {
-					"rotation": [0, 0, -5]
-				},
-				"arm_left2": {
-					"rotation": [0, 7.5, 2.5]
-				},
-				"arm_left3": {
-					"rotation": [-0.32652, 2.4786, 27.49294]
-				},
-				"arm_left4": {
-					"rotation": [-0.88045, 9.96156, 29.92327]
-				},
-				"hand_left": {
-					"rotation": [14.33408, 7.08823, 22.2945]
-				},
-				"arm_right": {
-					"rotation": [0, 0, 5]
-				},
-				"arm_right2": {
-					"rotation": [0, -7.5, -2.5]
-				},
-				"arm_right3": {
-					"rotation": [-0.32652, -2.4786, -27.49294]
-				},
-				"arm_right4": {
-					"rotation": [-0.88045, -9.96156, -29.92327]
-				},
-				"leg_front_left": {
-					"rotation": [0, 22.5, 0]
-				},
-				"leg_back_left": {
-					"rotation": [0, -30, 0]
-				},
-				"leg_back_right": {
-					"rotation": [0, 30, 0]
-				},
-				"leg_front_right": {
-					"rotation": [0, -22.5, 0]
-				},
-				"hand_right": {
-					"rotation": [14.33408, -7.08823, -22.2945]
-				}
-			}
-		},
-		"animation.drapion.blink": {
-			"animation_length": 0.1667,
-			"bones": {
-				"pupil_left": {
-					"position": {
-						"0.0": [0, 0, 0.1],
-						"0.125": [0, 0, 0.1],
-						"0.1667": [0, 0, 0]
-					}
-				},
-				"pupil_closed_left": {
-					"position": {
-						"0.0": [0, 0, -0.1],
-						"0.125": [0, 0, -0.1],
-						"0.1667": [0, 0, 0]
-					}
-				},
-				"pupil_right": {
-					"position": {
-						"0.0": [0, 0, 0.1],
-						"0.125": [0, 0, 0.1],
-						"0.1667": [0, 0, 0]
-					}
-				},
-				"pupil_closed_right": {
-					"position": {
-						"0.0": [0, 0, -0.1],
-						"0.125": [0, 0, -0.1],
-						"0.1667": [0, 0, 0]
-					}
-				}
-			}
-		},
-		"animation.drapion.mouth_open": {
-			"loop": true,
-			"bones": {
-				"head_top": {
-					"rotation": [-15.5, 0, 0]
-				},
-				"head_bottom": {
-					"rotation": [37.5, 0, 0]
-				},
-				"teeth": {
-					"rotation": [12.5, 0, 0]
-				}
-			}
-		},
-		"animation.drapion.shock": {
-			"loop": true,
-			"bones": {
-				"head_top": {
-					"rotation": [-15.5, 0, 0]
-				},
-				"head_bottom": {
-					"rotation": [37.5, 0, 0]
-				},
-				"pupil_left": {
-					"rotation": [0, 0, 10],
-					"position": [0.4, 0.25, 0],
-					"scale": [0.6, 0.6, 1]
-				},
-				"teeth": {
-					"rotation": [12.5, 0, 0]
-				},
-				"pupil_right": {
-					"rotation": [0, 0, -10],
-					"position": [-0.4, 0.25, 0],
-					"scale": [0.6, 0.6, 1]
-				}
-			}
-		},
-		"animation.drapion.angry": {
-			"loop": true,
-			"bones": {
-				"eye_expression_left": {
-					"position": [-0.4, 0, -0.1]
-				},
-				"eye_expression_right": {
-					"position": [0.4, 0, -0.1]
-				}
-			}
-		},
-		"animation.drapion.sad": {
-			"loop": true,
-			"bones": {
-				"eye_expression_left": {
-					"position": [0.4, 0.15, -0.1]
-				},
-				"eye_expression_right": {
-					"position": [-0.4, 0.15, -0.1]
-				}
-			}
-		},
-		"animation.drapion.happy": {
-			"loop": true,
-			"bones": {
-				"head_top": {
-					"rotation": [-15.5, 0, 0]
-				},
-				"head_bottom": {
-					"rotation": [37.5, 0, 0]
-				},
-				"pupil_left": {
-					"position": [0, 0, 0.1]
-				},
-				"teeth": {
-					"rotation": [12.5, 0, 0]
-				},
-				"pupil_happy_left": {
-					"position": [0, 0, -0.1]
-				},
-				"pupil_right": {
-					"position": [0, 0, 0.1]
-				},
-				"pupil_happy_right": {
-					"position": [0, 0, -0.1]
-				}
-			}
-		},
-		"animation.drapion.hurt": {
-			"loop": true,
-			"bones": {
-				"pupil_left": {
-					"position": [0, 0, 0.1]
-				},
-				"pupil_closed_left": {
-					"rotation": [0, 0, -30],
-					"position": [0, 0, -0.1]
-				},
-				"pupil_right": {
-					"position": [0, 0, 0.1]
-				},
-				"pupil_closed_right": {
-					"rotation": [0, 0, 30],
-					"position": [0, 0, -0.1]
-				}
-			}
-		}
-	}
-}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0540_sewaddle/sewaddle.animation.json

@@ -1,136 +0,0 @@
-{
-	"format_version": "1.8.0",
-	"animations": {
-		"animation.sewaddle.ground_idle": {
-			"loop": true,
-			"bones": {
-				"torso3": {
-					"rotation": [-5, 0, 0]
-				},
-				"head": {
-					"rotation": [7.5, 0, 0]
-				},
-				"legs_front": {
-					"rotation": [5, 0, 0],
-					"position": [0, -0.08, 0]
-				}
-			}
-		},
-		"animation.sewaddle.blink": {
-			"animation_length": 0.1667,
-			"bones": {
-				"eyelid_left": {
-					"position": {
-						"0.0": [0, 0, -0.1],
-						"0.125": {
-							"pre": [0, 0, -0.1],
-							"post": [0, 0, -0.1]
-						},
-						"0.1667": {
-							"pre": [0, 0, -0.1],
-							"post": [0, 0, 0]
-						}
-					}
-				},
-				"eyelid_right": {
-					"position": {
-						"0.0": [0, 0, -0.1],
-						"0.125": {
-							"pre": [0, 0, -0.1],
-							"post": [0, 0, -0.1]
-						},
-						"0.1667": {
-							"pre": [0, 0, -0.1],
-							"post": [0, 0, 0]
-						}
-					}
-				},
-				"eye_left": {
-					"position": {
-						"0.0": [0, 0, 0.1],
-						"0.125": {
-							"pre": [0, 0, 0.1],
-							"post": [0, 0, 0.1]
-						},
-						"0.1667": {
-							"pre": [0, 0, 0.1],
-							"post": [0, 0, 0]
-						}
-					}
-				},
-				"eye_right": {
-					"position": {
-						"0.0": [0, 0, 0.1],
-						"0.125": {
-							"pre": [0, 0, 0.1],
-							"post": [0, 0, 0.1]
-						},
-						"0.1667": {
-							"pre": [0, 0, 0.1],
-							"post": [0, 0, 0]
-						}
-					}
-				}
-			}
-		},
-		"animation.sewaddle.angry": {
-			"loop": true,
-			"bones": {
-				"eye_expression_left": {
-					"position": [-0.5, 0, -0.1]
-				},
-				"eye_expression_right": {
-					"position": [0.5, 0, -0.1]
-				}
-			}
-		},
-		"animation.sewaddle.sad": {
-			"loop": true,
-			"bones": {
-				"eye_expression_left": {
-					"position": [0.5, 0.3, -0.1]
-				},
-				"eye_expression_right": {
-					"position": [-0.5, 0.3, -0.1]
-				}
-			}
-		},
-		"animation.sewaddle.happy": {
-			"loop": true,
-			"bones": {
-				"eyelid_happy_left": {
-					"position": [0, 0, -0.1]
-				},
-				"eyelid_happy_right": {
-					"position": [0, 0, -0.1]
-				},
-				"mouth_open": {
-					"position": [0, 0, -0.1]
-				},
-				"eye_left": {
-					"position": [0, 0, 0.1]
-				},
-				"eye_right": {
-					"position": [0, 0, 0.1]
-				}
-			}
-		},
-		"animation.sewaddle.hurt": {
-			"loop": true,
-			"bones": {
-				"eyelid_recoil_left": {
-					"position": [0, 0, -0.1]
-				},
-				"eyelid_recoil_right": {
-					"position": [0, 0, -0.1]
-				},
-				"eye_left": {
-					"position": [0, 0, 0.1]
-				},
-				"eye_right": {
-					"position": [0, 0, 0.1]
-				}
-			}
-		}
-	}
-}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0541_swadloon/swadloon.animation.json

@@ -1,267 +0,0 @@
-{
-	"format_version": "1.8.0",
-	"animations": {
-		"animation.swadloon.ground_idle": {
-			"loop": true,
-			"bones": {
-				"body2": {
-					"rotation": [0, 0, 0]
-				},
-				"leaf_cover_left2": {
-					"rotation": [0, 1, 5]
-				},
-				"leaf_cover_right2": {
-					"rotation": [0, 0, -5]
-				},
-				"body_bottom_back2": {
-					"rotation": [12.5, 0, 0]
-				},
-				"leaf_left": {
-					"rotation": [-5.35, -11.35, -19.5]
-				},
-				"leaf_left3": {
-					"rotation": [0, 0, -2.5]
-				},
-				"leaf_right": {
-					"rotation": [-5.35, 11.35, 19.5]
-				},
-				"leaf_right3": {
-					"rotation": [0, 0, 2.5]
-				},
-				"body": {
-					"rotation": [2.5, 0, 0],
-					"position": [0, 0.25, 0]
-				},
-				"body_bottom_back": {
-					"rotation": [-2.5, 0, 0]
-				},
-				"arm_left": {
-					"rotation": [0, 0, -17.5]
-				},
-				"arm_right": {
-					"rotation": [-1.29717, -4.82922, 15.0547],
-					"position": [0, 0, 0.1]
-				},
-				"leaf_left2": {
-					"rotation": [0, 0, -25]
-				},
-				"leaf_right2": {
-					"rotation": [0, 0, 25]
-				}
-			}
-		},
-		"animation.swadloon.blink": {
-			"animation_length": 0.1667,
-			"bones": {
-				"eyelid_left": {
-					"position": {
-						"0.0": [0, 0, -0.1],
-						"0.125": {
-							"pre": [0, 0, -0.1],
-							"post": [0, 0, -0.1]
-						},
-						"0.1667": {
-							"pre": [0, 0, -0.1],
-							"post": [0, 0, 0]
-						}
-					}
-				},
-				"eyelid_right": {
-					"position": {
-						"0.0": [0, 0, -0.1],
-						"0.125": {
-							"pre": [0, 0, -0.1],
-							"post": [0, 0, -0.1]
-						},
-						"0.1667": {
-							"pre": [0, 0, -0.1],
-							"post": [0, 0, 0]
-						}
-					}
-				},
-				"eye_left": {
-					"position": {
-						"0.0": [0, 0, 0.1],
-						"0.125": {
-							"pre": [0, 0, 0.1],
-							"post": [0, 0, 0.1]
-						},
-						"0.1667": {
-							"pre": [0, 0, 0.1],
-							"post": [0, 0, 0]
-						}
-					}
-				},
-				"eye_right": {
-					"position": {
-						"0.0": [0, 0, 0.1],
-						"0.125": {
-							"pre": [0, 0, 0.1],
-							"post": [0, 0, 0.1]
-						},
-						"0.1667": {
-							"pre": [0, 0, 0.1],
-							"post": [0, 0, 0]
-						}
-					}
-				}
-			}
-		},
-		"animation.swadloon.angry": {
-			"loop": true,
-			"bones": {
-				"eye_angry_left": {
-					"position": [0, 0, -0.1]
-				},
-				"eyebrow_left": {
-					"position": [0, 0, 0.1]
-				},
-				"eye_angry_right": {
-					"position": [0, 0, -0.1]
-				},
-				"eyebrow_right": {
-					"position": [0, 0, 0.1]
-				}
-			}
-		},
-		"animation.swadloon.sad": {
-			"loop": true,
-			"bones": {
-				"eye_sad_left": {
-					"position": [0, 0, -0.1]
-				},
-				"eyebrow_left": {
-					"position": [0, 0, 0.1]
-				},
-				"eye_sad_right": {
-					"position": [0, 0, -0.1]
-				},
-				"eyebrow_right": {
-					"position": [0, 0, 0.1]
-				},
-				"mouth_closed": {
-					"position": [0, -0.25, 0]
-				},
-				"mouth_closed2": {
-					"position": [0, 0.5, 0]
-				}
-			}
-		},
-		"animation.swadloon.happy": {
-			"loop": true,
-			"bones": {
-				"eyebrow_left": {
-					"position": [0, 0, 0.1]
-				},
-				"eyelid_happy_left": {
-					"position": [0, 0, -0.1]
-				},
-				"eyebrow_right": {
-					"position": [0, 0, 0.1]
-				},
-				"eyelid_happy_right": {
-					"position": [0, 0, -0.1]
-				},
-				"mouth_closed": {
-					"position": [0, 0, 0.1]
-				},
-				"mouth_open": {
-					"position": [0, 0, -0.1]
-				},
-				"eye_left": {
-					"position": [0, 0, 0.1]
-				},
-				"eye_right": {
-					"position": [0, 0, 0.1]
-				}
-			}
-		},
-		"animation.swadloon.hurt": {
-			"loop": true,
-			"bones": {
-				"eyebrow_left": {
-					"position": [0, 0, 0.1]
-				},
-				"eyelid_recoil_left": {
-					"position": [0, 0, -0.1]
-				},
-				"eyebrow_right": {
-					"position": [0, 0, 0.1]
-				},
-				"eyelid_recoil_right": {
-					"position": [0, 0, -0.1]
-				},
-				"eye_left": {
-					"position": [0, 0, 0.1]
-				},
-				"eye_right": {
-					"position": [0, 0, 0.1]
-				}
-			}
-		},
-		"animation.swadloon.render": {
-			"loop": true,
-			"bones": {
-				"body2": {
-					"rotation": [0, 0, 0]
-				},
-				"leaf_cover_left": {
-					"rotation": [0, 0, 2.5]
-				},
-				"leaf_cover_left2": {
-					"rotation": [0, 0, 2.5]
-				},
-				"leaf_cover_right": {
-					"rotation": [0, 0, -2.5]
-				},
-				"leaf_cover_right2": {
-					"rotation": [0.32902, -7.49282, -2.52154]
-				},
-				"body_bottom_back2": {
-					"rotation": [12.5, 0, 0]
-				},
-				"leaf_left": {
-					"rotation": [1.50929, 2.00424, -0.5315],
-					"position": [-0.5, 0, 0]
-				},
-				"leaf_left3": {
-					"rotation": [0, 0, -2.5]
-				},
-				"leaf_right": {
-					"rotation": [-8.90928, 8.80348, -0.68717]
-				},
-				"leaf_right3": {
-					"rotation": [0, 0, 7.5]
-				},
-				"body": {
-					"rotation": [2.75806, -24.97457, -1.16524]
-				},
-				"pupil_left": {
-					"position": [-0.25, 0, 0]
-				},
-				"body_bottom_back": {
-					"rotation": [-5, 0, 0]
-				},
-				"leaf_left2": {
-					"rotation": [0.29631, 4.98823, -0.16023]
-				},
-				"leaf_right2": {
-					"rotation": [0, 10, 0]
-				},
-				"head_leaf_right": {
-					"rotation": [0, 0, -10]
-				},
-				"pupil_right": {
-					"position": [-0.25, 0, 0]
-				},
-				"arm_left": {
-					"rotation": [0, 0, -17.5]
-				},
-				"arm_right": {
-					"rotation": [-1.29717, -4.82922, 15.0547],
-					"position": [0, 0, 0.1]
-				}
-			}
-		}
-	}
-}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0542_leavanny/leavanny.animation.json

@@ -1,183 +0,0 @@
-{
-	"format_version": "1.8.0",
-	"animations": {
-		"animation.leavanny.ground_idle": {
-			"loop": true,
-			"bones": {
-				"body": {
-					"position": [0, -0.35, 0]
-				},
-				"torso3": {
-					"rotation": [-2.5, 0, 0]
-				},
-				"arm_left": {
-					"rotation": [0, -12.5, 47.5]
-				},
-				"arm_left2": {
-					"rotation": [0, 22.5, -7.5]
-				},
-				"arm_left3": {
-					"rotation": [0, 5, 0]
-				},
-				"arm_right": {
-					"rotation": [0, 12.5, -47.5]
-				},
-				"arm_right2": {
-					"rotation": [0, -22.5, 7.5]
-				},
-				"arm_right3": {
-					"rotation": [0, -5, 0]
-				},
-				"left_antenna_rotation": {
-					"rotation": [0, 50, 25]
-				},
-				"left_antenna2": {
-					"rotation": [0, 0, 2.5]
-				},
-				"right_antenna_rotation": {
-					"rotation": [0, -50, -25]
-				},
-				"right_antenna2": {
-					"rotation": [0, 0, -2.5]
-				},
-				"leg_left": {
-					"rotation": [-7.7, -4, 8.3]
-				},
-				"leg_left2": {
-					"rotation": [19.98072, 0.95645, -2.30991]
-				},
-				"foot_left": {
-					"rotation": [0, 0, -2.5]
-				},
-				"foot_left2": {
-					"rotation": [-7.5, 0, 0]
-				},
-				"leg_right": {
-					"rotation": [-7.7, 4, -8.3]
-				},
-				"leg_right2": {
-					"rotation": [19.98072, -0.95645, 2.30991]
-				},
-				"foot_right": {
-					"rotation": [0, 0, 2.5]
-				},
-				"foot_right2": {
-					"rotation": [-7.5, 0, 0]
-				},
-				"head": {
-					"rotation": [5, 0, 0]
-				}
-			}
-		},
-		"animation.leavanny.blink": {
-			"animation_length": 0.1667,
-			"bones": {
-				"eyelid_left": {
-					"position": {
-						"0.0": [0, 0, -0.1],
-						"0.125": [0, 0, -0.1],
-						"0.1667": [0, 0, 0]
-					}
-				},
-				"eyelid_right": {
-					"position": {
-						"0.0": [0, 0, -0.1],
-						"0.125": [0, 0, -0.1],
-						"0.1667": [0, 0, 0]
-					}
-				}
-			}
-		},
-		"animation.leavanny.shock": {
-			"loop": true,
-			"bones": {
-				"eye_left": {
-					"scale": [0.8, 0.6, 1]
-				},
-				"eyeshine_left": {
-					"position": [0, 0, 0.1]
-				},
-				"eye_right": {
-					"scale": [0.8, 0.6, 1]
-				},
-				"eyeshine_right": {
-					"position": [0, 0, 0.1]
-				},
-				"mouth_closed": {
-					"position": [0, 0, 0.1]
-				},
-				"mouth_open": {
-					"position": [0, 0, -0.1]
-				}
-			}
-		},
-		"animation.leavanny.angry": {
-			"loop": true,
-			"bones": {
-				"eye_expression_left": {
-					"position": [-0.5, 0.45, -0.1]
-				},
-				"eye_expression_right": {
-					"position": [0.5, 0.45, -0.1]
-				},
-				"mouth_closed": {
-					"position": [0, 0.25, 0]
-				},
-				"mouth_closed2": {
-					"position": [0, -0.25, 0]
-				},
-				"mouth_closed3": {
-					"position": [0, -0.25, 0]
-				}
-			}
-		},
-		"animation.leavanny.sad": {
-			"loop": true,
-			"bones": {
-				"eye_expression_left": {
-					"position": [0.5, 0.5, -0.1]
-				},
-				"eye_expression_right": {
-					"position": [-0.5, 0.5, -0.1]
-				},
-				"mouth_closed": {
-					"position": [0, 1, 0]
-				},
-				"mouth_closed2": {
-					"position": [0, -0.75, 0]
-				},
-				"mouth_closed3": {
-					"position": [0, -0.75, 0]
-				}
-			}
-		},
-		"animation.leavanny.happy": {
-			"loop": true,
-			"bones": {
-				"eyelid_happy_left": {
-					"position": [0, 0, -0.1]
-				},
-				"eyelid_happy_right": {
-					"position": [0, 0, -0.1]
-				},
-				"mouth_closed": {
-					"position": [0, 0, 0.1]
-				},
-				"mouth_open": {
-					"position": [0, 0, -0.1]
-				}
-			}
-		},
-		"animation.leavanny.hurt": {
-			"loop": true,
-			"bones": {
-				"eyelid_recoil_left": {
-					"position": [0, 0, -0.1]
-				},
-				"eyelid_recoil_right": {
-					"position": [0, 0, -0.1]
-				}
-			}
-		}
-	}
-}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0589_escavalier/escavalier.animation.json

@@ -45,6 +45,67 @@
 					}
 				}
 			}
+		},
+		"animation.escavalier.shock": {
+			"loop": true,
+			"bones": {
+				"pupil_left": {
+					"scale": [1, 0.7, 0.7]
+				},
+				"pupil_right": {
+					"scale": [1, 0.7, 0.7]
+				},
+				"mouth_open": {
+					"position": [0, -0.1, 0]
+				}
+			}
+		},
+		"animation.escavalier.angry": {
+			"loop": true,
+			"bones": {
+				"eye_angry_left": {
+					"position": [0.1, -0.2, 0]
+				},
+				"eye_angry_right": {
+					"position": [-0.1, -0.2, 0]
+				}
+			}
+		},
+		"animation.escavalier.sad": {
+			"loop": true,
+			"bones": {
+				"eye_sad_left": {
+					"position": [0.1, -0.3, 0]
+				},
+				"eye_sad_right": {
+					"position": [-0.1, -0.3, 0]
+				}
+			}
+		},
+		"animation.escavalier.happy": {
+			"loop": true,
+			"bones": {
+				"mouth_open": {
+					"position": [0, -0.1, 0]
+				},
+				"eyelid_happy_left": {
+					"position": [0.1, 0, 0]
+				},
+				"eyelid_happy_right": {
+					"position": [-0.1, 0, 0]
+				}
+			}
+		},
+		"animation.escavalier.hurt": {
+			"loop": true,
+			"bones": {
+				"eyelid_recoil_left": {
+					"position": [0.1, 0, 0]
+				},
+				"eyelid_recoil_right": {
+					"position": [-0.1, 0, 0]
+				}
+			}
 		}
 	}
 }

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0602_tynamo/tynamo.animation.json

@@ -1,141 +0,0 @@
-{
-	"format_version": "1.8.0",
-	"animations": {
-		"animation.tynamo.ground_idle": {
-			"loop": true,
-			"bones": {
-				"body": {
-					"rotation": [0, 0, 0]
-				},
-				"head": {
-					"rotation": [2.5, 0, 0]
-				},
-				"body2": {
-					"rotation": [-2.5, 0, 0]
-				},
-				"body3": {
-					"rotation": [-2.5, 0, 0]
-				},
-				"body_fin3": {
-					"rotation": [0, 0, 0]
-				},
-				"body_fin4": {
-					"rotation": [-5.07435, -0.61884, -0.62342]
-				}
-			}
-		},
-		"animation.tynamo.blink": {
-			"animation_length": 0.1667,
-			"bones": {
-				"eyelid_left": {
-					"position": {
-						"0.0": [0.1, 0, 0],
-						"0.125": [0.1, 0, 0],
-						"0.1667": [0, 0, 0]
-					}
-				},
-				"eyelid_right": {
-					"position": {
-						"0.0": [-0.1, 0, 0],
-						"0.125": [-0.1, 0, 0],
-						"0.1667": [0, 0, 0]
-					}
-				}
-			}
-		},
-		"animation.tynamo.shock": {
-			"loop": true,
-			"bones": {
-				"eye_left": {
-					"rotation": [0, 0, -0.5],
-					"position": [-0.01, 0.5, 0],
-					"scale": [1, 0.8, 0.73]
-				},
-				"eye_right": {
-					"rotation": [0, 0, 0.5],
-					"position": [0.01, 0.5, 0],
-					"scale": [1, 0.8, 0.73]
-				}
-			}
-		},
-		"animation.tynamo.angry": {
-			"loop": true,
-			"bones": {
-				"eye_expression_left": {
-					"position": [0.1, 0, -0.65]
-				},
-				"eye_expression_right": {
-					"position": [-0.1, 0, -0.65]
-				}
-			}
-		},
-		"animation.tynamo.sad": {
-			"loop": true,
-			"bones": {
-				"eye_expression_left": {
-					"position": [0.1, 0.15, 0.75]
-				},
-				"mouth_open": {
-					"position": [0, 0, 0.1]
-				},
-				"eye_expression_right": {
-					"position": [-0.1, 0.15, 0.75]
-				},
-				"mouth_closed": {
-					"position": [0, 0, -0.2]
-				}
-			}
-		},
-		"animation.tynamo.happy": {
-			"loop": true,
-			"bones": {
-				"eyelid_happy_left": {
-					"position": [0.1, 0, 0]
-				},
-				"eyelid_happy_right": {
-					"position": [-0.1, 0, 0]
-				}
-			}
-		},
-		"animation.tynamo.hurt": {
-			"loop": true,
-			"bones": {
-				"eyelid_recoil_left": {
-					"position": [0.1, 0, 0]
-				},
-				"mouth_open": {
-					"position": [0, 0, 0.1]
-				},
-				"eyelid_recoil_right": {
-					"position": [-0.1, 0, 0]
-				},
-				"mouth_closed": {
-					"position": [0, 0, -0.2]
-				}
-			}
-		},
-		"animation.tynamo.render": {
-			"loop": true,
-			"bones": {
-				"body": {
-					"rotation": [0, 45, 0]
-				},
-				"head": {
-					"rotation": [-5, 0, 0]
-				},
-				"body2": {
-					"rotation": [-2.5, 0, 0]
-				},
-				"body3": {
-					"rotation": [-2.5, 0, 0]
-				},
-				"body_fin3": {
-					"rotation": [0, 0, 0]
-				},
-				"body_fin4": {
-					"rotation": [-5.07435, -0.61884, -0.62342]
-				}
-			}
-		}
-	}
-}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0603_eelektrik/eelektrik.animation.json

@@ -1,163 +0,0 @@
-{
-	"format_version": "1.8.0",
-	"animations": {
-		"animation.eelektrik.ground_idle": {
-			"loop": true,
-			"bones": {
-				"body": {
-					"position": [0, 10.5, 12]
-				},
-				"neck": {
-					"rotation": [-7.5, 0, 0]
-				},
-				"head": {
-					"rotation": [20, 0, 0]
-				},
-				"segment1": {
-					"rotation": [-57.52472, -1.34295, 2.10886]
-				},
-				"segment8": {
-					"rotation": [22.57734, 4.61854, 1.91757]
-				},
-				"segment2": {
-					"rotation": [-52.5, 0, 0]
-				},
-				"segment3": {
-					"rotation": [-47.47282, 1.84293, 1.68956]
-				},
-				"segment4": {
-					"rotation": [27.5, 0, 0]
-				},
-				"segment5": {
-					"rotation": [67.5, 0, 0]
-				},
-				"segment6": {
-					"rotation": [52.5, 0, 0]
-				},
-				"segment7": {
-					"rotation": [12.5, 0, 0]
-				},
-				"teeth_closed": {
-					"position": [0, 0, 1],
-					"scale": 1
-				}
-			}
-		},
-		"animation.eelektrik.blink": {
-			"animation_length": 0.1667,
-			"bones": {
-				"eyelid_left": {
-					"position": {
-						"0.0": [0.1, 0, 0],
-						"0.125": [0.1, 0, 0],
-						"0.1667": [0, 0, 0]
-					}
-				},
-				"eyelid_right": {
-					"position": {
-						"0.0": [-0.1, 0, 0],
-						"0.125": [-0.1, 0, 0],
-						"0.1667": [0, 0, 0]
-					}
-				}
-			}
-		},
-		"animation.eelektrik.shock": {
-			"loop": true,
-			"bones": {
-				"pupil_left": {
-					"scale": [1, 0.6, 0.6]
-				},
-				"teeth_open_left": {
-					"scale": [0.6, 0.6, 1]
-				},
-				"teeth_open_right": {
-					"scale": [0.6, 0.6, 1]
-				},
-				"teeth_open_top": {
-					"scale": [0.6, 0.6, 1]
-				},
-				"teeth_open_bottom": {
-					"scale": [0.6, 0.6, 1]
-				},
-				"teeth_closed": {
-					"position": [0, 0, 1]
-				},
-				"pupil_right": {
-					"scale": [1, 0.6, 0.6]
-				}
-			}
-		},
-		"animation.eelektrik.angry": {
-			"loop": true,
-			"bones": {
-				"teeth_closed": {
-					"position": [0, 0, 1]
-				},
-				"eye_expression_left": {
-					"position": [0.1, 0, -0.6]
-				},
-				"eye_expression_right": {
-					"position": [-0.1, 0, -0.6]
-				}
-			}
-		},
-		"animation.eelektrik.sad": {
-			"loop": true,
-			"bones": {
-				"teeth_open": {
-					"position": [0, 0, 1]
-				},
-				"teeth_closed": {
-					"position": [0, 0, 0]
-				},
-				"eye_expression_left": {
-					"position": [0.1, 0.5, 0.6]
-				},
-				"eye_expression_right": {
-					"position": [-0.1, 0.5, 0.6]
-				}
-			}
-		},
-		"animation.eelektrik.happy": {
-			"loop": true,
-			"bones": {
-				"teeth_open_left": {
-					"scale": [0.6, 0.6, 1]
-				},
-				"teeth_open_right": {
-					"scale": [0.6, 0.6, 1]
-				},
-				"teeth_open_top": {
-					"scale": [0.6, 0.6, 1]
-				},
-				"teeth_open_bottom": {
-					"scale": [0.6, 0.6, 1]
-				},
-				"teeth_closed": {
-					"position": [0, 0, 1]
-				},
-				"eyelid_happy_left": {
-					"position": [0.1, 0, 0]
-				},
-				"eyelid_happy_right": {
-					"position": [-0.1, 0, 0]
-				}
-			}
-		},
-		"animation.eelektrik.hurt": {
-			"loop": true,
-			"bones": {
-				"eyelid_recoil_left": {
-					"position": [0.1, 0, 0]
-				},
-				"teeth_open": {
-					"position": [0, 0, 1]
-				},
-				"eyelid_recoil_right": {
-					"position": [-0.1, 0, 0]
-				}
-			}
-		}
-	}
-}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0604_eelektross/eelektross.animation.json

@@ -1,376 +0,0 @@
-{
-	"format_version": "1.8.0",
-	"animations": {
-		"animation.eelektross.ground_idle": {
-			"loop": true,
-			"bones": {
-				"body": {
-					"rotation": [-100, 0, 0],
-					"position": [0, 4.7, 0]
-				},
-				"neck": {
-					"rotation": [15, 0, 0]
-				},
-				"neck2": {
-					"rotation": [45, 0, 0]
-				},
-				"head": {
-					"rotation": [47.5, 0, 0]
-				},
-				"segment1": {
-					"rotation": [-12.5, 0, 0]
-				},
-				"segment3": {
-					"rotation": [52.5, 0, 0]
-				},
-				"segment4": {
-					"rotation": [20, 0, 0]
-				},
-				"segment5": {
-					"rotation": [10, 0, 0]
-				},
-				"segment2": {
-					"rotation": [45, 0, 0]
-				},
-				"segment6": {
-					"rotation": [12.5, 0, 0]
-				},
-				"segment7": {
-					"rotation": [7.5, 0, 0]
-				},
-				"segment8": {
-					"rotation": [10, 0, 0]
-				},
-				"arms": {
-					"rotation": [77.5, 0, 0]
-				},
-				"arm_left": {
-					"rotation": [0, 0, 50]
-				},
-				"arm_left2": {
-					"rotation": [0, 30, -12.5]
-				},
-				"arm_left3": {
-					"rotation": [0, 17.5, 20]
-				},
-				"hand_left": {
-					"rotation": [0, 20, 25]
-				},
-				"legs": {
-					"rotation": [15, 0, 0]
-				},
-				"arm_right": {
-					"rotation": [0, 0, -50]
-				},
-				"arm_right2": {
-					"rotation": [0, -30, 12.5]
-				},
-				"arm_right3": {
-					"rotation": [0, -17.5, -20]
-				},
-				"hand_right": {
-					"rotation": [0, -20, -25]
-				},
-				"leg_left": {
-					"rotation": [0, 0, -35]
-				},
-				"leg_left2": {
-					"rotation": [0, 0, -54]
-				},
-				"leg_left3": {
-					"rotation": [0, 0, -25]
-				},
-				"leg_right": {
-					"rotation": [0, 0, 35]
-				},
-				"leg_right2": {
-					"rotation": [0, 0, 54]
-				},
-				"leg_right3": {
-					"rotation": [0, 0, 25]
-				},
-				"head_fin": {
-					"rotation": [-5, 0, 0]
-				},
-				"head_fin2": {
-					"rotation": [-35, 0, 0]
-				},
-				"head_fin3": {
-					"rotation": [20, 0, 0]
-				},
-				"head_fin5": {
-					"rotation": [-20, 0, 0]
-				},
-				"head_fin4": {
-					"rotation": [30, 0, 0]
-				},
-				"head_fin_bottom2": {
-					"rotation": [15, 0, 0]
-				},
-				"head_fin_bottom3": {
-					"rotation": [30, 0, 0]
-				},
-				"head_fin_bottom1": {
-					"rotation": [2.5, 0, 0]
-				},
-				"back_fin1": {
-					"rotation": [0, 0, 0],
-					"position": [0, 0, -0.5]
-				},
-				"head_detail_left1": {
-					"position": [0, -0.5, 0]
-				},
-				"head_detail_right1": {
-					"position": [0, -0.5, 0]
-				},
-				"head_detail_left2": {
-					"position": [0, 0, 1]
-				},
-				"head_detail_right2": {
-					"position": [0, 0, 1]
-				}
-			}
-		},
-		"animation.eelektross.water_idle": {
-			"loop": true,
-			"bones": {
-				"body": {
-					"rotation": [-15, 0, 0],
-					"position": [0, 4.7, 0]
-				},
-				"neck": {
-					"rotation": [-5, 0, 0]
-				},
-				"neck2": {
-					"rotation": [15, 0, 0]
-				},
-				"head": {
-					"rotation": [20, 0, 0]
-				},
-				"segment1": {
-					"rotation": [-12.51153, -2.4407, 0.54143]
-				},
-				"segment3": {
-					"rotation": [27.58957, 4.43385, 2.31336]
-				},
-				"segment4": {
-					"rotation": [0.22588, 3.50244, -2.34348]
-				},
-				"segment5": {
-					"rotation": [-10.23772, -12.3071, 2.20462]
-				},
-				"segment2": {
-					"rotation": [30.02363, 2.16489, 1.2506]
-				},
-				"segment6": {
-					"rotation": [-25.34721, -12.06754, 3.28396]
-				},
-				"segment7": {
-					"rotation": [-36.4568, -32.61461, 13.46783]
-				},
-				"segment8": {
-					"rotation": [-32.00206, -19.3546, 11.70092]
-				},
-				"arms": {
-					"rotation": [77.5, 0, 0]
-				},
-				"arm_left": {
-					"rotation": [10.11252, 3.77941, 51.75758]
-				},
-				"arm_left2": {
-					"rotation": [5.41207, -8.42145, -10.39875]
-				},
-				"arm_left3": {
-					"rotation": [0.14655, -15.79256, 25.63835]
-				},
-				"hand_left": {
-					"rotation": [0, 0, 20]
-				},
-				"legs": {
-					"rotation": [15, 0, 0]
-				},
-				"arm_right": {
-					"rotation": [10.11252, -3.77941, -51.75758]
-				},
-				"arm_right2": {
-					"rotation": [5.41207, 8.42145, 10.39875]
-				},
-				"arm_right3": {
-					"rotation": [0.14655, 15.79256, -25.63835]
-				},
-				"hand_right": {
-					"rotation": [0, 0, -20]
-				},
-				"leg_left": {
-					"rotation": [0, 0, -47.5]
-				},
-				"leg_left2": {
-					"rotation": [0, 0, 13.5]
-				},
-				"leg_left3": {
-					"rotation": [0, 0, 30]
-				},
-				"leg_right": {
-					"rotation": [0, 0, 47.5]
-				},
-				"leg_right2": {
-					"rotation": [0, 0, -13.5]
-				},
-				"leg_right3": {
-					"rotation": [0, 0, -30]
-				},
-				"head_fin": {
-					"rotation": [-5, 0, 0]
-				},
-				"head_fin2": {
-					"rotation": [12.59468, -4.32875, -2.50477]
-				},
-				"head_fin3": {
-					"rotation": [-25.18908, 6.79382, -3.18458]
-				},
-				"head_fin5": {
-					"rotation": [-20, 0, 0]
-				},
-				"head_fin4": {
-					"rotation": [15.0547, -4.82922, -1.29717]
-				},
-				"head_fin_bottom2": {
-					"rotation": [-30.21362, 6.49053, -3.76613]
-				},
-				"head_fin_bottom3": {
-					"rotation": [20.07031, -4.69776, -1.71394],
-					"position": [0, 0, -1]
-				},
-				"finger_side_left": {
-					"rotation": [0, 0, -25]
-				},
-				"finger_front_left": {
-					"rotation": [-27.5, 0, 0]
-				},
-				"finger_back_left": {
-					"rotation": [30, 0, 0]
-				},
-				"finger_side_right": {
-					"rotation": [0, 0, 25]
-				},
-				"finger_front_right": {
-					"rotation": [-27.5, 0, 0]
-				},
-				"finger_back_right": {
-					"rotation": [30, 0, 0]
-				},
-				"head_fin_bottom1": {
-					"rotation": [2.5, 0, 0]
-				},
-				"head2": {
-					"rotation": [-15, 0, 0]
-				},
-				"eye_base_left": {
-					"rotation": [5, 0, 0]
-				},
-				"eye_base_left2": {
-					"rotation": [10, 0, 0]
-				},
-				"back_fin1": {
-					"rotation": [0, 0, 0]
-				},
-				"back_fin6": {
-					"rotation": [0, 12.5, 0]
-				},
-				"head_detail_left1": {
-					"position": [0, 0, -0.5]
-				},
-				"head_detail_right1": {
-					"position": [0, 0, -0.5]
-				},
-				"head_detail_left2": {
-					"position": [0, 0, -1]
-				},
-				"head_detail_right2": {
-					"position": [0, 0, -1]
-				},
-				"eye_base_right": {
-					"rotation": [5, 0, 0]
-				},
-				"eye_base_right2": {
-					"rotation": [10, 0, 0]
-				}
-			}
-		},
-		"animation.eelektross.blink": {
-			"animation_length": 0.1667,
-			"bones": {
-				"eyelid_left": {
-					"position": {
-						"0.0": [0.1, 0, 0],
-						"0.125": [0.1, 0, 0],
-						"0.1667": [0, 0, 0]
-					}
-				}
-			}
-		},
-		"animation.eelektross.shock": {
-			"loop": true,
-			"bones": {
-				"pupil_left": {
-					"position": [0, -0.25, 0.25],
-					"scale": [1, 0.7, 0.7]
-				},
-				"pupil_right": {
-					"position": [0, -0.25, 0.25],
-					"scale": [1, 0.7, 0.7]
-				}
-			}
-		},
-		"animation.eelektross.angry": {
-			"loop": true,
-			"bones": {
-				"pupil_left": {
-					"position": [0, -0.25, 0]
-				},
-				"eye_expression_left": {
-					"position": [0.1, 0.5, -0.5]
-				},
-				"eye_expression_right": {
-					"position": [-0.1, 0.5, -0.5]
-				},
-				"pupil_right": {
-					"position": [0, -0.25, 0]
-				}
-			}
-		},
-		"animation.eelektross.sad": {
-			"loop": true,
-			"bones": {
-				"eye_expression_left": {
-					"position": [0.1, 0.5, 0.5]
-				},
-				"eye_expression_right": {
-					"position": [-0.1, 0.5, 0.5]
-				}
-			}
-		},
-		"animation.eelektross.happy": {
-			"loop": true,
-			"bones": {
-				"eyelid_happy_left": {
-					"position": [0.1, 0, 0]
-				},
-				"eyelid_happy_right": {
-					"position": [-0.1, 0, 0]
-				}
-			}
-		},
-		"animation.eelektross.hurt": {
-			"loop": true,
-			"bones": {
-				"eyelid_hurt_left": {
-					"position": [0.1, 0, 0]
-				},
-				"eyelid_hurt_right": {
-					"position": [-0.1, 0, 0]
-				}
-			}
-		}
-	}
-}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0616_shelmet/shelmet.animation.json

@@ -45,6 +45,81 @@
 					}
 				}
 			}
+		},
+		"animation.shelmet.shock": {
+			"loop": true,
+			"bones": {
+				"pupil_left": {
+					"position": [0, -0.5, 0],
+					"scale": [1, 0.7, 0.7]
+				},
+				"pupil_right": {
+					"position": [0, -0.5, 0],
+					"scale": [1, 0.7, 0.7]
+				},
+				"lip_upper": {
+					"rotation": [-7.5, 0, 0]
+				},
+				"lip_lower": {
+					"rotation": [15, 0, 0]
+				}
+			}
+		},
+		"animation.shelmet.angry": {
+			"loop": true,
+			"bones": {
+				"eye_angry_left": {
+					"position": [0.1, 0, -0.1]
+				},
+				"pupil_left": {
+					"position": [0, -0.5, 0]
+				},
+				"eye_angry_right": {
+					"position": [-0.1, 0, -0.1]
+				},
+				"pupil_right": {
+					"position": [0, -0.5, 0]
+				}
+			}
+		},
+		"animation.shelmet.sad": {
+			"loop": true,
+			"bones": {
+				"eye_sad_left": {
+					"position": [0.1, 0, 0]
+				},
+				"eye_sad_right": {
+					"position": [-0.1, 0, 0]
+				}
+			}
+		},
+		"animation.shelmet.happy": {
+			"loop": true,
+			"bones": {
+				"eyelid_happy_left": {
+					"position": [0.1, 0, -0.1]
+				},
+				"eyelid_happy_right": {
+					"position": [-0.1, 0, -0.1]
+				},
+				"lip_upper": {
+					"rotation": [-7.5, 0, 0]
+				},
+				"lip_lower": {
+					"rotation": [15, 0, 0]
+				}
+			}
+		},
+		"animation.shelmet.hurt": {
+			"loop": true,
+			"bones": {
+				"eyelid_recoil_left": {
+					"position": [0.1, 0, -0.1]
+				},
+				"eyelid_recoil_right": {
+					"position": [-0.1, 0, -0.1]
+				}
+			}
 		}
 	}
 }

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0628_braviary/braviary_hisuian.animation.json

@@ -1,541 +0,0 @@
-{
-	"format_version": "1.8.0",
-	"animations": {
-		"animation.braviary_hisuian.ground_idle": {
-			"loop": true,
-			"bones": {
-				"torso": {
-					"rotation": [-30, 0, 0],
-					"position": [0, -0.46175, 0.88701]
-				},
-				"tail": {
-					"rotation": [5, 0, 0]
-				},
-				"tail_feathers": {
-					"rotation": [17.5, 0, 0]
-				},
-				"torso2": {
-					"rotation": [-22.5, 0, 0]
-				},
-				"wing_closed_left3": {
-					"rotation": [12.5, 0, 0]
-				},
-				"wing_closed_left4": {
-					"rotation": [12.5, 0, 0],
-					"position": [0, 0.5, 0]
-				},
-				"neck": {
-					"rotation": [2.5, 0, 0]
-				},
-				"neck2": {
-					"rotation": [12.5, 0, 0]
-				},
-				"head": {
-					"rotation": [25, 0, 0]
-				},
-				"hair2": {
-					"rotation": [-17.5, 0, 0]
-				},
-				"hair3": {
-					"rotation": [-2.5, 0, 0]
-				},
-				"thigh_right": {
-					"position": [0, 0, -2]
-				},
-				"wing_closed_left": {
-					"rotation": [0, 2.5, 0],
-					"position": [0.04533, 0, 0.25709]
-				},
-				"wing_closed_right": {
-					"rotation": [0, -2.5, 0],
-					"position": [-0.04533, 0, 0.25709]
-				},
-				"wing_closed_right3": {
-					"rotation": [12.5, 0, 0]
-				},
-				"wing_closed_right4": {
-					"rotation": [12.5, 0, 0],
-					"position": [0, 0.5, 0]
-				},
-				"wing_open_left": {
-					"rotation": [87.5, -77.5, 0],
-					"position": [1, -5, 0]
-				},
-				"wing_open_left2": {
-					"rotation": [0, -12.5, 7.5]
-				},
-				"wing_open_left3": {
-					"rotation": [0, -22.5, 0]
-				},
-				"wing_open_left4": {
-					"rotation": [0, -5, 0]
-				},
-				"wing_open_right": {
-					"rotation": [87.5, 77.5, 0],
-					"position": [-1, -5, 0]
-				},
-				"wing_open_right2": {
-					"rotation": [0, 12.5, -7.5]
-				},
-				"wing_open_right3": {
-					"rotation": [0, 22.5, 0]
-				},
-				"wing_open_right4": {
-					"rotation": [0, 5, 0]
-				},
-				"hair": {
-					"rotation": [-10, 0, 0]
-				},
-				"thigh_left": {
-					"position": [0, 0, -2]
-				}
-			}
-		},
-		"animation.braviary_hisuian.air_idle": {
-			"loop": true,
-			"bones": {
-				"wing_open_left": {
-					"rotation": [0, 27.5, 0]
-				},
-				"wing_open_left2": {
-					"rotation": [0, -20, 0]
-				},
-				"wing_open_left3": {
-					"rotation": [0, 20, 0]
-				},
-				"wing_open_right": {
-					"rotation": [0, -27.5, 0]
-				},
-				"wing_open_right2": {
-					"rotation": [0, 20, 0]
-				},
-				"wing_open_right3": {
-					"rotation": [0, -20, 0]
-				},
-				"torso": {
-					"rotation": [-25, 0, 0]
-				},
-				"wing_closed_left": {
-					"rotation": [-90, -16, -97],
-					"position": [3, 0, 2]
-				},
-				"wing_closed_right": {
-					"rotation": [-90, 16, 97],
-					"position": [-3, 0, 2]
-				},
-				"neck2": {
-					"rotation": [12.5, 0, 0]
-				},
-				"thigh_right": {
-					"rotation": [-25, 15, 0]
-				},
-				"foot_right": {
-					"rotation": [-15, 0, 0]
-				},
-				"wing_open_left4": {
-					"rotation": [0, -25, 0]
-				},
-				"wing_open_right4": {
-					"rotation": [0, 25, 0]
-				},
-				"locator_top": {
-					"position": [0, -6, 0]
-				},
-				"thigh_left": {
-					"rotation": [-25, -15, 0]
-				},
-				"foot_left": {
-					"rotation": [-15, 0, 0]
-				},
-				"toe_back_left": {
-					"rotation": [-15, 0, 0]
-				},
-				"toe_middle_left": {
-					"rotation": [20, 0, 0]
-				},
-				"toe_middle_left2": {
-					"rotation": [15, 0, 0]
-				},
-				"toe_inner_left": {
-					"rotation": [20, 0, 0]
-				},
-				"toe_inner_left2": {
-					"rotation": [15, 0, 0]
-				},
-				"toe_outer_left": {
-					"rotation": [20, 0, 0]
-				},
-				"toe_outer_left2": {
-					"rotation": [15, 0, 0]
-				},
-				"toe_middle_right": {
-					"rotation": [20, 0, 0]
-				},
-				"toe_middle_right2": {
-					"rotation": [15, 0, 0]
-				},
-				"toe_inner_right": {
-					"rotation": [20, 0, 0]
-				},
-				"toe_inner_right2": {
-					"rotation": [15, 0, 0]
-				},
-				"toe_outer_right": {
-					"rotation": [20, 0, 0]
-				},
-				"toe_outer_right2": {
-					"rotation": [15, 0, 0]
-				},
-				"toe_back_right": {
-					"rotation": [-15, 0, 0]
-				}
-			}
-		},
-		"animation.braviary_hisuian.air_fly": {
-			"loop": true,
-			"bones": {
-				"wing_open_left": {
-					"rotation": [0, 27.5, 0]
-				},
-				"wing_open_left2": {
-					"rotation": [0, -20, 0]
-				},
-				"wing_open_left3": {
-					"rotation": [0, 20, 0]
-				},
-				"wing_open_right": {
-					"rotation": [0, -27.5, 0]
-				},
-				"wing_open_right2": {
-					"rotation": [0, 20, 0]
-				},
-				"wing_open_right3": {
-					"rotation": [0, -20, 0]
-				},
-				"torso": {
-					"rotation": [0, 0, 0]
-				},
-				"wing_closed_left": {
-					"rotation": [-90, -16, -97],
-					"position": [3, 0, 2]
-				},
-				"wing_closed_right": {
-					"rotation": [-90, 16, 97],
-					"position": [-3, 0, 2]
-				},
-				"neck2": {
-					"rotation": [-5, 0, 0]
-				},
-				"thigh_right": {
-					"rotation": [60, 0, 0]
-				},
-				"foot_right": {
-					"rotation": [30, 0, 0]
-				},
-				"tail": {
-					"rotation": [25, 0, 0]
-				},
-				"tail_feathers": {
-					"rotation": [10, 0, 0]
-				},
-				"leg_right": {
-					"rotation": [5, 0, 0]
-				},
-				"wing_open_left4": {
-					"rotation": [0, -25, 0]
-				},
-				"wing_open_right4": {
-					"rotation": [0, 25, 0]
-				},
-				"locator_top": {
-					"position": [0, -12, 0]
-				},
-				"thigh_left": {
-					"rotation": [60, 0, 0]
-				},
-				"leg_left": {
-					"rotation": [5, 0, 0]
-				},
-				"foot_left": {
-					"rotation": [30, 0, 0]
-				},
-				"toe_back_left": {
-					"rotation": [-25, 0, 0]
-				},
-				"toe_middle_left": {
-					"rotation": [35, 0, 0]
-				},
-				"toe_middle_left2": {
-					"rotation": [15, 0, 0]
-				},
-				"toe_inner_left": {
-					"rotation": [35, 0, 0]
-				},
-				"toe_inner_left2": {
-					"rotation": [15, 0, 0]
-				},
-				"toe_outer_left": {
-					"rotation": [35, 0, 0]
-				},
-				"toe_outer_left2": {
-					"rotation": [15, 0, 0]
-				},
-				"toe_middle_right": {
-					"rotation": [35, 0, 0]
-				},
-				"toe_middle_right2": {
-					"rotation": [15, 0, 0]
-				},
-				"toe_inner_right": {
-					"rotation": [35, 0, 0]
-				},
-				"toe_inner_right2": {
-					"rotation": [15, 0, 0]
-				},
-				"toe_outer_right": {
-					"rotation": [35, 0, 0]
-				},
-				"toe_outer_right2": {
-					"rotation": [15, 0, 0]
-				},
-				"toe_back_right": {
-					"rotation": [-25, 0, 0]
-				}
-			}
-		},
-		"animation.braviary_hisuian.blink": {
-			"animation_length": 0.1667,
-			"bones": {
-				"eyelid_left": {
-					"position": {
-						"0.0": [0.1, 0, -0.1],
-						"0.125": {"pre": [0.1, 0, -0.1], "post": [0.1, 0, -0.1]},
-						"0.1667": {"pre": [0.1, 0, -0.1], "post": [0, 0, 0]}
-					}
-				},
-				"eyelid_right": {
-					"position": {
-						"0.0": [-0.1, 0, -0.1],
-						"0.125": {"pre": [-0.1, 0, -0.1], "post": [-0.1, 0, -0.1]},
-						"0.1667": {"pre": [-0.1, 0, -0.1], "post": [0, 0, 0]}
-					}
-				}
-			}
-		},
-		"animation.braviary_hisuian.pose": {
-			"loop": true,
-			"bones": {
-				"torso": {
-					"rotation": [-30, 0, 0]
-				},
-				"tail_feathers": {
-					"rotation": [8.20866, 2.02004, -18.37231]
-				},
-				"torso2": {
-					"rotation": [2.5, 0, 0]
-				},
-				"wing_open_left": {
-					"rotation": [-16.13958, "7.4709+27.5", -65.35874],
-					"position": [0, -2, 0]
-				},
-				"wing_open_left2": {
-					"rotation": [0, -45, 0]
-				},
-				"wing_open_left3": {
-					"rotation": [0, 42.5, 0]
-				},
-				"feathers_left2": {
-					"rotation": [0, -25, 0]
-				},
-				"feathers_left3": {
-					"rotation": [0, -40, 0],
-					"position": [-0.7, 0, 0]
-				},
-				"wing_open_left4": {
-					"rotation": [0, -60, 0]
-				},
-				"feathers_left4": {
-					"rotation": [0, -10, 0]
-				},
-				"neck2": {
-					"rotation": [20, 0, 0]
-				},
-				"head": {
-					"rotation": [-10.02832, -4.95712, 0.65426]
-				},
-				"thigh_right": {
-					"rotation": [0, 0, 15]
-				},
-				"leg_right": {
-					"rotation": [-39.84995, 6.64902, 3.47514]
-				},
-				"foot_right": {
-					"rotation": [-13.04879, 11.82099, -24.2538]
-				},
-				"toe_middle_right2": {
-					"rotation": [52.5, 0, 0]
-				},
-				"toe_inner_right2": {
-					"rotation": [62.5, 0, 0]
-				},
-				"toe_outer_right": {
-					"rotation": [0, 5, 0]
-				},
-				"toe_outer_right2": {
-					"rotation": [50, 0, 0]
-				},
-				"toe_back_right": {
-					"rotation": [-42.5, 0, 0],
-					"position": [0, -1, 0]
-				},
-				"wings_closed": {
-					"scale": 0
-				},
-				"jaw_open": {
-					"rotation": [62.5, 0, 0]
-				},
-				"feathers_left": {
-					"rotation": [0, 12.5, 0]
-				},
-				"wing_open_right": {
-					"rotation": [33.60905, "-23.6171-27.5", 11.23692],
-					"position": [0, -2, 0]
-				},
-				"wing_open_right2": {
-					"rotation": [0, 60, 0]
-				},
-				"feathers_right": {
-					"rotation": [3.82607, -37.33289, -6.29298],
-					"position": [0, 0.3, 0]
-				},
-				"wing_open_right3": {
-					"rotation": [0, -77.5, 0]
-				},
-				"feathers_right2": {
-					"rotation": [0, 37.5, 0]
-				},
-				"feathers_right3": {
-					"rotation": [0, 40, 0],
-					"position": [0.9, 0, -1]
-				},
-				"wing_open_right4": {
-					"rotation": [0, 50, 0]
-				},
-				"feathers_right4": {
-					"rotation": [0, 10, 0]
-				},
-				"body": {
-					"rotation": [-10, 0, 0]
-				},
-				"tail": {
-					"rotation": [27.06707, -2.07928, -12.3053]
-				},
-				"neck": {
-					"rotation": [30, 0, 0],
-					"position": [0, -1, -0.3]
-				},
-				"hair": {
-					"rotation": [-2.5, 0, 0]
-				},
-				"thigh_left": {
-					"rotation": [0, 0, -15]
-				},
-				"leg_left": {
-					"rotation": [-40, 0, 0]
-				},
-				"foot_left": {
-					"rotation": [-7.50474, -2.49048, 0.21803]
-				},
-				"toe_middle_left2": {
-					"rotation": [52.5, 0, 0]
-				},
-				"toe_inner_left2": {
-					"rotation": [62.5, 0, 0]
-				},
-				"toe_outer_left": {
-					"rotation": [0, -5, 0]
-				},
-				"toe_outer_left2": {
-					"rotation": [50, 0, 0]
-				},
-				"toe_back_left": {
-					"rotation": [-42.5, 0, 0],
-					"position": [0, -1, 0]
-				}
-			}
-		},
-		"animation.braviary_hisuian.wings_pose": {
-			"loop": true,
-			"bones": {
-				"wing_open_left": {
-					"rotation": [0, 27.5, 0]
-				},
-				"wing_open_left2": {
-					"rotation": [0, -20, 0]
-				},
-				"wing_open_left3": {
-					"rotation": [0, 20, 0]
-				},
-				"wing_open_left4": {
-					"rotation": [0, -25, 0]
-				},
-				"wing_open_right": {
-					"rotation": [0, -27.5, 0]
-				},
-				"wing_open_right2": {
-					"rotation": [0, 20, 0]
-				},
-				"wing_open_right3": {
-					"rotation": [0, -20, 0]
-				},
-				"wing_open_right4": {
-					"rotation": [0, 25, 0]
-				}
-			}
-		},
-		"animation.braviary_hisuian.sad": {
-			"loop": true,
-			"bones": {
-				"eyelid_sad_left": {
-					"position": [0.1, 0, -0.1]
-				},
-				"eyelid_sad_right": {
-					"position": [-0.1, 0, -0.1]
-				}
-			}
-		},
-		"animation.braviary_hisuian.happy": {
-			"loop": true,
-			"bones": {
-				"eyelid_happy_left": {
-					"position": [0.1, 0, -0.1]
-				},
-				"eyelid_happy_right": {
-					"position": [-0.1, 0, -0.1]
-				}
-			}
-		},
-		"animation.braviary_hisuian.hurt": {
-			"loop": true,
-			"bones": {
-				"eyelid_recoil_left": {
-					"position": [0.1, 0, -0.1]
-				},
-				"eyelid_recoil_right": {
-					"position": [-0.1, 0, -0.1]
-				}
-			}
-		},
-		"animation.braviary_hisuian.unamused": {
-			"loop": true,
-			"bones": {
-				"eyelid_unamused_left": {
-					"position": [0.1, 0, -0.1]
-				},
-				"eyelid_unamused_right": {
-					"position": [-0.1, 0, -0.1]
-				}
-			}
-		}
-	}
-}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0672_skiddo/skiddo.animation.json

@@ -1,225 +0,0 @@
-{
-	"format_version": "1.8.0",
-	"animations": {
-		"animation.skiddo.ground_idle": {
-			"loop": true,
-			"bones": {
-				"hair_tuft_left1": {
-					"rotation": [-9.5, -9.5, 41.5]
-				},
-				"hair_tuft_right1": {
-					"rotation": [-9.5, 9.5, -41.5]
-				},
-				"hair_tuft_left2": {
-					"rotation": [9.5, 9.5, 41.5]
-				},
-				"hair_tuft_right2": {
-					"rotation": [9.5, -9.5, -41.5]
-				},
-				"tail": {
-					"rotation": [45, 0, 0]
-				}
-			}
-		},
-		"animation.skiddo.blink": {
-			"animation_length": 0.1667,
-			"bones": {
-				"eyelid_left": {
-					"position": {
-						"0.0": [0, 0, -0.1],
-						"0.1667": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}
-					}
-				},
-				"eyelid_right": {
-					"position": {
-						"0.0": [0, 0, -0.1],
-						"0.1667": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}
-					}
-				},
-				"eye_left": {
-					"position": {
-						"0.0": [0, 0, 0.1],
-						"0.1667": {"pre": [0, 0, 0.1], "post": [0, 0, 0]}
-					}
-				},
-				"eye_right": {
-					"position": {
-						"0.0": [0, 0, 0.1],
-						"0.1667": {"pre": [0, 0, 0.1], "post": [0, 0, 0]}
-					}
-				}
-			}
-		},
-		"animation.skiddo.happy": {
-			"loop": true,
-			"bones": {
-				"mouth_open_smile": {
-					"position": [0, -0.1, 0]
-				},
-				"mouth_closed_smile": {
-					"position": [0, 0.1, 0]
-				},
-				"eyelid_happy_left": {
-					"position": [0, 0, -0.1]
-				},
-				"eyelid_happy_right": {
-					"position": [0, 0, -0.1]
-				},
-				"eye_left": {
-					"position": [0, 0, 0.1]
-				},
-				"eye_right": {
-					"position": [0, 0, 0.1]
-				}
-			}
-		},
-		"animation.skiddo.sad": {
-			"loop": true,
-			"bones": {
-				"mouth_closed_smile": {
-					"position": [0, 0.1, 0]
-				},
-				"mouth_closed_frown": {
-					"position": [0, -0.1, 0]
-				},
-				"eyelid_emote_left": {
-					"position": [0.9, 0, -0.1]
-				},
-				"eyelid_emote_right": {
-					"position": [-0.9, 0, -0.1]
-				}
-			}
-		},
-		"animation.skiddo.angry": {
-			"loop": true,
-			"bones": {
-				"mouth_open_frown": {
-					"position": [0, -0.1, 0]
-				},
-				"mouth_closed_smile": {
-					"position": [0, 0.1, 0]
-				},
-				"eyelid_emote_left": {
-					"position": [0, 0, -0.1]
-				},
-				"eyelid_emote_right": {
-					"position": [0, 0, -0.1]
-				}
-			}
-		},
-		"animation.skiddo.surprised": {
-			"loop": true,
-			"bones": {
-				"mouth_open_neutral": {
-					"position": [0, -0.1, 0]
-				},
-				"mouth_closed_smile": {
-					"position": [0, 0.1, 0]
-				}
-			}
-		},
-		"animation.skiddo.unamused": {
-			"loop": true,
-			"bones": {
-				"mouth_closed_neutral": {
-					"position": [0, -0.1, 0]
-				},
-				"mouth_closed_smile": {
-					"position": [0, 0.1, 0]
-				},
-				"eyelid_unamused_left": {
-					"position": [0, 0, -0.1]
-				},
-				"eyelid_unamused_right": {
-					"position": [0, 0, -0.1]
-				}
-			}
-		},
-		"animation.skiddo.recoil": {
-			"loop": true,
-			"bones": {
-				"mouth_open_o": {
-					"position": [0, -0.1, 0]
-				},
-				"mouth_closed_smile": {
-					"position": [0, 0.1, 0]
-				},
-				"eyelid_recoil_left": {
-					"position": [0, 0, -0.1]
-				},
-				"eyelid_recoil_right": {
-					"position": [0, 0, -0.1]
-				},
-				"eye_left": {
-					"position": [0, 0, 0.1]
-				},
-				"eye_right": {
-					"position": [0, 0, 0.1]
-				}
-			}
-		},
-		"animation.skiddo.pose": {
-			"loop": true,
-			"bones": {
-				"body": {
-					"position": [0, 3, 0]
-				},
-				"torso": {
-					"rotation": [0, -2.5, 0],
-					"position": [0, -1, 0]
-				},
-				"torso2": {
-					"rotation": [0, 5, 0]
-				},
-				"tail": {
-					"rotation": [57.51124, -4.79394, -2.87604]
-				},
-				"head": {
-					"rotation": [-12.45392, -1.08089, -4.88206],
-					"position": [0, 1, 0.5]
-				},
-				"mouth_open_smile": {
-					"position": [0, -0.1, 0]
-				},
-				"mouth_closed_smile": {
-					"position": [0, 0.1, 0]
-				},
-				"leg_front_right": {
-					"rotation": [-25, 2.5, 5],
-					"position": [0, -0.8, -0.4]
-				},
-				"leg_front_right2": {
-					"rotation": [62.5, 0, 0]
-				},
-				"leg_front_left": {
-					"rotation": [-34.89743, 2.86544, 4.09918],
-					"position": [0, -1, -0.7]
-				},
-				"leg_front_left2": {
-					"rotation": [5, 0, 0]
-				},
-				"leg_front_left3": {
-					"rotation": [9.99067, 0.43399, -2.46207],
-					"position": [0.2, 0, 0]
-				},
-				"leg_back_left": {
-					"rotation": [64.64853, 6.74239, -7.81311],
-					"position": [0, -1.6, 1.2]
-				},
-				"leg_back_left2": {
-					"rotation": [-27.5, 0, 0]
-				},
-				"leg_back_left3": {
-					"rotation": [30, 0, 0],
-					"position": [0, 0.3, 0.5]
-				},
-				"hips": {
-					"rotation": [17.5, 0, 0]
-				},
-				"neck": {
-					"rotation": [-7.5, 0, 0]
-				}
-			}
-		}
-	}
-}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0673_gogoat/gogoat.animation.json

@@ -1,215 +0,0 @@
-{
-	"format_version": "1.8.0",
-	"animations": {
-		"animation.gogoat.ground_idle": {
-			"loop": true,
-			"bones": {
-				"torso": {
-					"rotation": [2.5, 0, 0]
-				},
-				"tail": {
-					"rotation": [42.5, 0, 0]
-				},
-				"head": {
-					"rotation": [2.5, 0, 0]
-				},
-				"torso2": {
-					"rotation": [-5, 0, 0],
-					"position": [0, 0.5, 0]
-				},
-				"ear_right": {
-					"rotation": [10.29354, 38.86967, 16.14054]
-				},
-				"ear_left": {
-					"rotation": [10.29354, -38.86967, -16.14054]
-				}
-			}
-		},
-		"animation.gogoat.blink": {
-			"animation_length": 0.1667,
-			"bones": {
-				"eye_left": {
-					"position": {
-						"0.0": [-0.1, 0, 0.1],
-						"0.125": {"pre": [-0.1, 0, 0.1], "post": [-0.1, 0, 0.1]},
-						"0.1667": {"pre": [-0.1, 0, 0.1], "post": [0, 0, 0]}
-					}
-				},
-				"eye_right": {
-					"position": {
-						"0.0": [0.1, 0, 0.1],
-						"0.125": {"pre": [0.1, 0, 0.1], "post": [0.1, 0, 0.1]},
-						"0.1667": {"pre": [0.1, 0, 0.1], "post": [0, 0, 0]}
-					}
-				},
-				"eyelid_left": {
-					"position": {
-						"0.0": [0.1, 0, -0.1],
-						"0.125": {"pre": [0.1, 0, -0.1], "post": [0.1, 0, -0.1]},
-						"0.1667": {"pre": [0.1, 0, -0.1], "post": [0, 0, 0]}
-					}
-				},
-				"eyelid_right": {
-					"position": {
-						"0.0": [-0.1, 0, -0.1],
-						"0.125": {"pre": [-0.1, 0, -0.1], "post": [-0.1, 0, -0.1]},
-						"0.1667": {"pre": [-0.1, 0, -0.1], "post": [0, 0, 0]}
-					}
-				}
-			}
-		},
-		"animation.gogoat.pose": {
-			"loop": true,
-			"bones": {
-				"body": {
-					"rotation": [0, -80, 0]
-				},
-				"torso": {
-					"rotation": [0, 0, 0]
-				},
-				"torso2": {
-					"rotation": [-5, 0, 0]
-				},
-				"head": {
-					"rotation": [5.00238, 2.49762, 0.10912]
-				},
-				"tail": {
-					"rotation": [67.78025, -3.40487, -9.40804]
-				},
-				"leg_front_left": {
-					"rotation": [-12.48848, -0.54094, -2.44081]
-				},
-				"leg_front_left2": {
-					"rotation": [80, 0, 0],
-					"position": [0, -1.1, 0]
-				},
-				"leg_front_left3": {
-					"rotation": [-15, 0, 0]
-				},
-				"leg_front_right": {
-					"rotation": [-5, 0, 0]
-				},
-				"leg_front_right3": {
-					"rotation": [5, 0, 0]
-				},
-				"leg_back_left": {
-					"rotation": [15, 0, 0],
-					"position": [0, -1.8, 0]
-				},
-				"leg_back_left3": {
-					"rotation": [-42.5, 0, 0],
-					"position": [0, -1, 0]
-				},
-				"foot_back_left": {
-					"rotation": [25, 0, 0]
-				},
-				"leg_back_right": {
-					"rotation": [2.5, 0, 5],
-					"position": [0, -0.5, 0]
-				},
-				"leg_back_right3": {
-					"rotation": [-5, 0, 0]
-				},
-				"foot_back_right": {
-					"rotation": [0, 0, -2.5]
-				}
-			}
-		},
-		"animation.gogoat.open_mouth": {
-			"loop": true,
-			"bones": {
-				"neck": {
-					"rotation": [-10, 0, 0]
-				},
-				"head": {
-					"rotation": [-15, 0, 0]
-				},
-				"mouth_open": {
-					"position": [0, -0.1, -0.2]
-				},
-				"mouth_open1": {
-					"position": [0, 0, -0.3]
-				},
-				"eyelid_left": {
-					"position": [0.1, 0, -0.1]
-				},
-				"eye_left": {
-					"position": [-0.1, 0, 0.1]
-				},
-				"eye_right": {
-					"position": [0.1, 0, 0.1]
-				},
-				"eyelid_right": {
-					"position": [-0.1, 0, -0.1]
-				}
-			}
-		},
-		"animation.gogoat.happy": {
-			"loop": true,
-			"bones": {
-				"eye_left": {
-					"position": [-0.1, 0, 0.1]
-				},
-				"eyelid_happy_left": {
-					"position": [0.1, 0, -0.1]
-				},
-				"eye_right": {
-					"position": [0.1, 0, 0.1]
-				},
-				"eyelid_happy_right": {
-					"position": [-0.1, 0, -0.1]
-				}
-			}
-		},
-		"animation.gogoat.sad": {
-			"loop": true,
-			"bones": {
-				"eyelid_sad_left": {
-					"position": [0.1, 0, 0]
-				},
-				"eyelid_sad_right": {
-					"position": [-0.1, 0, 0]
-				}
-			}
-		},
-		"animation.gogoat.angry": {
-			"loop": true,
-			"bones": {
-				"eyelid_angry_left": {
-					"position": [0, -0.4, 0]
-				},
-				"eyelid_angry_right": {
-					"position": [0, -0.4, 0]
-				}
-			}
-		},
-		"animation.gogoat.annoyed": {
-			"loop": true,
-			"bones": {
-				"eyelid_umamused_left": {
-					"position": [0.1, 0, -0.1]
-				},
-				"eyelid_umamused_right": {
-					"position": [-0.1, 0, -0.1]
-				}
-			}
-		},
-		"animation.gogoat.hurt": {
-			"loop": true,
-			"bones": {
-				"eye_left": {
-					"position": [-0.1, 0, 0.1]
-				},
-				"eyelid_recoil_left": {
-					"position": [0.1, 0, -0.1]
-				},
-				"eye_right": {
-					"position": [0.1, 0, 0.1]
-				},
-				"eyelid_recoil_right": {
-					"position": [-0.1, 0, -0.1]
-				}
-			}
-		}
-	}
-}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0677_espurr/espurr.animation.json

@@ -1,301 +0,0 @@
-{
-	"format_version": "1.8.0",
-	"animations": {
-		"animation.espurr.ground_idle": {
-			"loop": true,
-			"bones": {
-				"fur_left_bottom": {
-					"rotation": [0, -7.5, 0]
-				},
-				"fur_right_bottom": {
-					"rotation": [0, 7.5, 0]
-				},
-				"arm_left": {
-					"rotation": [0, 0, 42.5]
-				},
-				"arm_left2": {
-					"rotation": [0.66626, 0.34395, -4.9415]
-				},
-				"arm_right": {
-					"rotation": [0, 0, -42.5]
-				},
-				"arm_right2": {
-					"rotation": [0.66626, -0.34395, 4.9415]
-				},
-				"ear_left_rotation": {
-					"rotation": [-7.36298, -1.67291, 53.44759]
-				},
-				"ear_left2": {
-					"rotation": [0, 5, 85]
-				},
-				"ear_left3": {
-					"rotation": [0, 0, 7.5]
-				},
-				"ear_right_rotation": {
-					"rotation": [-7.36298, 1.67291, -53.44759]
-				},
-				"ear_right2": {
-					"rotation": [0, -5, -85]
-				},
-				"ear_right3": {
-					"rotation": [0, 0, -7.5]
-				},
-				"leg_left": {
-					"rotation": [2.49762, -0.10901, 2.49762]
-				},
-				"leg_right": {
-					"rotation": [2.49762, 0.10901, -2.49762]
-				}
-			}
-		},
-		"animation.espurr.psychic_eyes": {
-			"loop": true,
-			"bones": {
-				"fur_left_bottom": {
-					"rotation": [0, -7.5, 0]
-				},
-				"fur_right_bottom": {
-					"rotation": [0, 7.5, 0]
-				},
-				"arm_left": {
-					"rotation": [0, 0, 42.5]
-				},
-				"arm_left2": {
-					"rotation": [0.66626, 0.34395, -4.9415]
-				},
-				"arm_right": {
-					"rotation": [0, 0, -42.5]
-				},
-				"arm_right2": {
-					"rotation": [0.66626, -0.34395, 4.9415]
-				},
-				"ear_left_rotation": {
-					"rotation": [-6.35401, -4.08555, 33.56681]
-				},
-				"ear_left2": {
-					"rotation": [-3.04868, 3.9649, 47.39445]
-				},
-				"ear_left3": {
-					"rotation": [0, 0, 7.5]
-				},
-				"ear_right_rotation": {
-					"rotation": [-6.35401, 4.08555, -33.56681]
-				},
-				"ear_right2": {
-					"rotation": [-3.04868, -3.9649, -47.39445]
-				},
-				"ear_right3": {
-					"rotation": [0, 0, -7.5]
-				},
-				"leg_left": {
-					"rotation": [2.49762, -0.10901, 2.49762]
-				},
-				"leg_right": {
-					"rotation": [2.49762, 0.10901, -2.49762]
-				},
-				"eye_left_regular": {
-					"position": [0, 0, 0.1]
-				},
-				"eye_left_psychic": {
-					"position": [0, 0, -0.1]
-				},
-				"eye_right_regular": {
-					"position": [0, 0, 0.1]
-				},
-				"eye_right_psychic": {
-					"position": [0, 0, -0.1]
-				}
-			}
-		},
-		"animation.espurr.sleep": {
-			"loop": true,
-			"bones": {
-				"body": {
-					"position": [0, -1.5, 0]
-				},
-				"fur_left_bottom": {
-					"rotation": [0, -7.5, 0]
-				},
-				"fur_right_bottom": {
-					"rotation": [0, 7.5, 0]
-				},
-				"chest": {
-					"rotation": [17.44548, -1.29256, 4.83045]
-				},
-				"arm_left": {
-					"rotation": [83.63542, 60.03449, 96.36458],
-					"position": [0, -0.5, -1.5]
-				},
-				"arm_left2": {
-					"rotation": [0.72491, 0.19159, 7.55772]
-				},
-				"arm_right": {
-					"rotation": [83.63542, -60.03449, -96.36458],
-					"position": [0, -0.5, -1.5]
-				},
-				"arm_right2": {
-					"rotation": [0.72491, -0.19159, -7.55772]
-				},
-				"head": {
-					"rotation": [7.34165, -9.37545, 13.92114]
-				},
-				"ear_left_rotation": {
-					"rotation": [-7.36298, -1.67291, 53.44759]
-				},
-				"ear_left2": {
-					"rotation": [-0.43688, 4.98093, 79.981]
-				},
-				"ear_left3": {
-					"rotation": [0, 0, 7.5]
-				},
-				"ear_right_rotation": {
-					"rotation": [-7.5443, -0.28395, -68.32122]
-				},
-				"ear_right2": {
-					"rotation": [-1.08482, -4.88119, -72.45376]
-				},
-				"ear_right3": {
-					"rotation": [0, 0, -7.5]
-				},
-				"tail_top": {
-					"rotation": [-10, 0, 0]
-				},
-				"leg_left": {
-					"rotation": [-87.44074, -12.59694, 1.94387],
-					"position": [0, 0.5, -2]
-				},
-				"leg_right": {
-					"rotation": [-87.44074, 12.59694, -1.94387],
-					"position": [0, 0.5, -2]
-				},
-				"eyelid_left": {
-					"position": [0, 0, -0.1]
-				},
-				"eyelid_right": {
-					"position": [0, 0, -0.1]
-				}
-			}
-		},
-		"animation.espurr.blink": {
-			"animation_length": 0.1667,
-			"bones": {
-				"eyelid_left": {
-					"position": {
-						"0.0": [0, 0, -0.1],
-						"0.125": [0, 0, -0.1],
-						"0.1667": [0, 0, 0]
-					}
-				},
-				"eyelid_right": {
-					"position": {
-						"0.0": [0, 0, -0.1],
-						"0.125": [0, 0, -0.1],
-						"0.1667": [0, 0, 0]
-					}
-				}
-			}
-		},
-		"animation.espurr.shock": {
-			"loop": true,
-			"bones": {
-				"pupil_left": {
-					"scale": [0.7, 0.7, 1]
-				},
-				"eye_shine_left": {
-					"position": [0, 0, 0.1]
-				},
-				"mouth_closed": {
-					"position": [0, 0, 0.1]
-				},
-				"mouth_open": {
-					"position": [0, 0, -0.1]
-				},
-				"pupil_right": {
-					"scale": [0.7, 0.7, 1]
-				},
-				"eye_shine_right": {
-					"position": [0, 0, 0.1]
-				}
-			}
-		},
-		"animation.espurr.angry": {
-			"loop": true,
-			"bones": {
-				"eye_angry_left": {
-					"position": [0, 0, -0.1]
-				},
-				"eye_shine_left": {
-					"position": [0, -0.2, 0]
-				},
-				"eye_angry_right": {
-					"position": [0, 0, -0.1]
-				},
-				"eye_shine_right": {
-					"position": [0, -0.2, 0]
-				}
-			}
-		},
-		"animation.espurr.sad": {
-			"loop": true,
-			"bones": {
-				"eye_sad_left": {
-					"position": [0, 0, -0.1]
-				},
-				"eye_shine_left": {
-					"position": [0, -0.2, 0]
-				},
-				"eye_sad_right": {
-					"position": [0, 0, -0.1]
-				},
-				"eye_shine_right": {
-					"position": [0, -0.2, 0]
-				}
-			}
-		},
-		"animation.espurr.unamused": {
-			"loop": true,
-			"bones": {
-				"eye_unamused_left": {
-					"position": [0, 0, -0.1]
-				},
-				"eye_shine_left": {
-					"position": [0, -0.2, 0]
-				},
-				"eye_unamused_right": {
-					"position": [0, 0, -0.1]
-				},
-				"eye_shine_right": {
-					"position": [0, -0.2, 0]
-				}
-			}
-		},
-		"animation.espurr.happy": {
-			"loop": true,
-			"bones": {
-				"eyelid_happy_left": {
-					"position": [0, 0, -0.1]
-				},
-				"mouth_closed": {
-					"position": [0, 0, 0.1]
-				},
-				"mouth_open": {
-					"position": [0, 0, -0.1]
-				},
-				"eyelid_happy_right": {
-					"position": [0, 0, -0.1]
-				}
-			}
-		},
-		"animation.espurr.hurt": {
-			"loop": true,
-			"bones": {
-				"eyelid_recoil_left": {
-					"position": [0, 0, -0.1]
-				},
-				"eyelid_recoil_right": {
-					"position": [0, 0, -0.1]
-				}
-			}
-		}
-	}
-}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0678_meowstic/meowstic_female.animation.json

@@ -1,275 +0,0 @@
-{
-	"format_version": "1.8.0",
-	"animations": {
-		"animation.meowstic_female.ground_idle": {
-			"loop": true,
-			"bones": {
-				"body": {
-					"position": [0, 0.1, 0]
-				},
-				"arm_left": {
-					"rotation": [0, 0, 32.5]
-				},
-				"arm_left2": {
-					"rotation": [0, 0, -12.5]
-				},
-				"arm_left3": {
-					"rotation": [0, 0, -7.5]
-				},
-				"arm_right": {
-					"rotation": [0, 0, -32.5]
-				},
-				"arm_right2": {
-					"rotation": [0, 0, 12.5]
-				},
-				"arm_right3": {
-					"rotation": [0, 0, 7.5]
-				},
-				"head": {
-					"rotation": [5, 0, 0]
-				},
-				"ear_closed_left3": {
-					"rotation": [0, 0, -2.5]
-				},
-				"ear_closed_right3": {
-					"rotation": [0, 0, 2.5]
-				},
-				"tail_top": {
-					"rotation": [11.43719, 5.00737, -13.92234]
-				},
-				"tail_top2": {
-					"rotation": [0, 10, 0]
-				},
-				"tail_top3": {
-					"rotation": [6.90289, 6.09605, 3.52165]
-				},
-				"tail_top4": {
-					"rotation": [12.61435, 9.91358, 1.31845]
-				},
-				"tail_bottom": {
-					"rotation": [-15.00001, 30, -0.00002]
-				},
-				"tail_bottom2": {
-					"rotation": [7.67995, 12.39135, 1.6575]
-				},
-				"tail_bottom3": {
-					"rotation": [2.52154, 7.49282, 0.32902]
-				},
-				"tail_bottom4": {
-					"rotation": [5, 0, 0]
-				},
-				"leg_left": {
-					"rotation": [-8.57698, -2.06842, 9.44671]
-				},
-				"leg_left2": {
-					"rotation": [5, 0, 0]
-				},
-				"leg_right": {
-					"rotation": [12.48637, -0.64686, -7.58508]
-				},
-				"ear_open_left": {
-					"scale": 0
-				},
-				"ear_open_right": {
-					"scale": 0
-				}
-			}
-		},
-		"animation.meowstic_female.blink": {
-			"animation_length": 0.1667,
-			"bones": {
-				"eyelid_left": {
-					"position": {
-						"0.0": [0, 0, -0.1],
-						"0.125": [0, 0, -0.1],
-						"0.1667": [0, 0, 0]
-					}
-				},
-				"eyelid_right": {
-					"position": {
-						"0.0": [0, 0, -0.1],
-						"0.125": [0, 0, -0.1],
-						"0.1667": [0, 0, 0]
-					}
-				}
-			}
-		},
-		"animation.meowstic_female.open_ears": {
-			"loop": true,
-			"bones": {
-				"body": {
-					"position": [0, 0.1, 0]
-				},
-				"arm_left": {
-					"rotation": [0, 0, 32.5]
-				},
-				"arm_left2": {
-					"rotation": [0, 0, -12.5]
-				},
-				"arm_left3": {
-					"rotation": [0, 0, -7.5]
-				},
-				"arm_right": {
-					"rotation": [0, 0, -32.5]
-				},
-				"arm_right2": {
-					"rotation": [0, 0, 12.5]
-				},
-				"arm_right3": {
-					"rotation": [0, 0, 7.5]
-				},
-				"head": {
-					"rotation": [5, 0, 0]
-				},
-				"ear_closed_left": {
-					"scale": 0
-				},
-				"ear_closed_left3": {
-					"rotation": [0, 0, -2.5]
-				},
-				"ear_closed_right": {
-					"scale": 0
-				},
-				"ear_closed_right3": {
-					"rotation": [0, 0, 2.5]
-				},
-				"tail_top": {
-					"rotation": [11.43719, 5.00737, -13.92234]
-				},
-				"tail_top2": {
-					"rotation": [0, 10, 0]
-				},
-				"tail_top3": {
-					"rotation": [6.90289, 6.09605, 3.52165]
-				},
-				"tail_top4": {
-					"rotation": [12.5, 0, 0]
-				},
-				"tail_bottom": {
-					"rotation": [-15.00001, 30, -0.00002]
-				},
-				"tail_bottom2": {
-					"rotation": [7.67995, 12.39135, 1.6575]
-				},
-				"tail_bottom3": {
-					"rotation": [2.52154, 7.49282, 0.32902]
-				},
-				"tail_bottom4": {
-					"rotation": [5, 0, 0]
-				},
-				"leg_left": {
-					"rotation": [-8.57698, -2.06842, 9.44671]
-				},
-				"leg_left2": {
-					"rotation": [5, 0, 0]
-				},
-				"leg_right": {
-					"rotation": [12.48637, -0.64686, -7.58508]
-				}
-			}
-		},
-		"animation.meowstic_female.psychic_eyes": {
-			"loop": true,
-			"bones": {
-				"ear_eye_closed_left": {
-					"position": [0, 0, 0.1]
-				},
-				"ear_eye_open_left": {
-					"position": [0, 0, -0.1]
-				},
-				"ear_eye_closed_right": {
-					"position": [0, 0, 0.1]
-				},
-				"ear_eye_open_right": {
-					"position": [0, 0, -0.1]
-				},
-				"eye_psychic_left": {
-					"position": [0, 0, -0.1]
-				},
-				"eye_psychic_right": {
-					"position": [0, 0, -0.1]
-				}
-			}
-		},
-		"animation.meowstic_female.shock": {
-			"loop": true,
-			"bones": {
-				"pupil_left": {
-					"position": [0.25, -0.15, 0],
-					"scale": [0.8, 0.6, 1]
-				},
-				"mouth_closed": {
-					"position": [0, 0, 0.1]
-				},
-				"mouth_open": {
-					"position": [0, 0, -0.1]
-				},
-				"pupil_right": {
-					"position": [-0.25, -0.15, 0],
-					"scale": [0.8, 0.6, 1]
-				}
-			}
-		},
-		"animation.meowstic_female.angry": {
-			"loop": true,
-			"bones": {
-				"eye_angry_left": {
-					"position": [0, 0, -0.1]
-				},
-				"eye_angry_right": {
-					"position": [0, 0, -0.1]
-				}
-			}
-		},
-		"animation.meowstic_female.sad": {
-			"loop": true,
-			"bones": {
-				"eye_sad_left": {
-					"position": [0, 0, -0.1]
-				},
-				"eye_sad_right": {
-					"position": [0, 0, -0.1]
-				}
-			}
-		},
-		"animation.meowstic_female.unasumed": {
-			"loop": true,
-			"bones": {
-				"eye_unamused_left": {
-					"position": [0, 0, -0.1]
-				},
-				"eye_unamused_right": {
-					"position": [0, 0, -0.1]
-				}
-			}
-		},
-		"animation.meowstic_female.happy": {
-			"loop": true,
-			"bones": {
-				"eyelid_happy_left": {
-					"position": [0, 0, -0.1]
-				},
-				"mouth_closed": {
-					"position": [0, 0, 0.1]
-				},
-				"mouth_open": {
-					"position": [0, 0, -0.1]
-				},
-				"eyelid_happy_right": {
-					"position": [0, 0, -0.1]
-				}
-			}
-		},
-		"animation.meowstic_female.hurt": {
-			"loop": true,
-			"bones": {
-				"eyelid_recoil_left": {
-					"position": [0, 0, -0.1]
-				},
-				"eyelid_recoil_right": {
-					"position": [0, 0, -0.1]
-				}
-			}
-		}
-	}
-}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0678_meowstic/meowstic_male.animation.json

@@ -1,310 +0,0 @@
-{
-	"format_version": "1.8.0",
-	"animations": {
-		"animation.meowstic_male.ground_idle": {
-			"loop": true,
-			"bones": {
-				"torso": {
-					"rotation": [2.5, 0, 0]
-				},
-				"chest": {
-					"rotation": [-2.5, 0, 0]
-				},
-				"arm_left": {
-					"rotation": [0, 0, 20]
-				},
-				"arm_left2": {
-					"rotation": [0, 0, -12.5]
-				},
-				"arm_left3": {
-					"rotation": [0, 0, -5]
-				},
-				"arm_right": {
-					"rotation": [0, 0, -27.5]
-				},
-				"arm_right2": {
-					"rotation": [0, 0, 5]
-				},
-				"arm_right3": {
-					"rotation": [0, 0, 5]
-				},
-				"head": {
-					"rotation": [2.5, 0, 0]
-				},
-				"ear_closed_left": {
-					"rotation": [0, 0, 2.5]
-				},
-				"ear_closed_left3": {
-					"rotation": [0, 0, 2.5]
-				},
-				"tails": {
-					"rotation": [0, 20, 0]
-				},
-				"tail_top": {
-					"rotation": [32.27733, 4.02155, -6.33586]
-				},
-				"tail_top2": {
-					"rotation": [-10.01153, 2.4407, -0.54143]
-				},
-				"tail_top3": {
-					"rotation": [0, 5, 0]
-				},
-				"tail_top4": {
-					"rotation": [-22.81179, 9.23186, -3.86032]
-				},
-				"tail_top_small": {
-					"rotation": [-5.01565, 2.38422, -0.7522]
-				},
-				"tail_top_big": {
-					"rotation": [-7.78356, 0, 0]
-				},
-				"tail_bottom": {
-					"rotation": [7.38588, -9.92379, -3.87661]
-				},
-				"tail_bottom2": {
-					"rotation": [-12.5, 0, 0]
-				},
-				"tail_bottom3": {
-					"rotation": [-15.12353, 7.24305, -1.95155]
-				},
-				"tail_bottom_small": {
-					"rotation": [0, 5, 0]
-				},
-				"tail_bottom_big": {
-					"rotation": [-5.10443, 0, 0]
-				},
-				"leg_left": {
-					"rotation": [2.5, 0, -7.5]
-				},
-				"leg_right": {
-					"rotation": [2.5, 0, 7.5]
-				},
-				"ear_closed_right": {
-					"rotation": [0, 0, -2.5]
-				},
-				"ear_closed_right3": {
-					"rotation": [0, 0, -2.5]
-				},
-				"ear_open_left": {
-					"scale": 0
-				},
-				"ear_open_right": {
-					"scale": 0
-				},
-				"pupil_left": {
-					"position": [0, 0, 0]
-				}
-			}
-		},
-		"animation.meowstic_male.blink": {
-			"animation_length": 0.1667,
-			"bones": {
-				"eyelid_left": {
-					"position": {
-						"0.0": [0, 0, -0.1],
-						"0.125": [0, 0, -0.1],
-						"0.1667": [0, 0, 0]
-					}
-				},
-				"eyelid_right": {
-					"position": {
-						"0.0": [0, 0, -0.1],
-						"0.125": [0, 0, -0.1],
-						"0.1667": [0, 0, 0]
-					}
-				}
-			}
-		},
-		"animation.meowstic_male.open_ears": {
-			"loop": true,
-			"bones": {
-				"torso": {
-					"rotation": [2.5, 0, 0]
-				},
-				"chest": {
-					"rotation": [-2.5, 0, 0]
-				},
-				"arm_left": {
-					"rotation": [0, 0, 20]
-				},
-				"arm_left2": {
-					"rotation": [0, 0, -12.5]
-				},
-				"arm_left3": {
-					"rotation": [0, 0, -5]
-				},
-				"arm_right": {
-					"rotation": [0, 0, -27.5]
-				},
-				"arm_right2": {
-					"rotation": [0, 0, 5]
-				},
-				"arm_right3": {
-					"rotation": [0, 0, 5]
-				},
-				"head": {
-					"rotation": [2.5, 0, 0]
-				},
-				"ear_closed_left": {
-					"rotation": [0, 0, 2.5],
-					"scale": 0
-				},
-				"ear_closed_left3": {
-					"rotation": [0, 0, 2.5]
-				},
-				"tails": {
-					"rotation": [0, 20, 0]
-				},
-				"tail_top": {
-					"rotation": [32.27733, 4.02155, -6.33586]
-				},
-				"tail_top2": {
-					"rotation": [-10.01153, 2.4407, -0.54143]
-				},
-				"tail_top3": {
-					"rotation": [0, 5, 0]
-				},
-				"tail_top4": {
-					"rotation": [-22.81179, 9.23186, -3.86032]
-				},
-				"tail_top_small": {
-					"rotation": [-5.01565, 2.38422, -0.7522]
-				},
-				"tail_top_big": {
-					"rotation": [-7.78356, 0, 0]
-				},
-				"tail_bottom": {
-					"rotation": [7.38588, -9.92379, -3.87661]
-				},
-				"tail_bottom2": {
-					"rotation": [-12.5, 0, 0]
-				},
-				"tail_bottom3": {
-					"rotation": [-15.12353, 7.24305, -1.95155]
-				},
-				"tail_bottom_small": {
-					"rotation": [0, 5, 0]
-				},
-				"tail_bottom_big": {
-					"rotation": [-5.10443, 0, 0]
-				},
-				"leg_left": {
-					"rotation": [2.5, 0, -7.5]
-				},
-				"leg_right": {
-					"rotation": [2.5, 0, 7.5]
-				},
-				"ear_closed_right": {
-					"rotation": [0, 0, -2.5],
-					"scale": 0
-				},
-				"ear_closed_right3": {
-					"rotation": [0, 0, -2.5]
-				}
-			}
-		},
-		"animation.meowstic_male.psychic_eyes": {
-			"loop": true,
-			"bones": {
-				"ear_eye_closed_left": {
-					"position": [0, 0, 0.1]
-				},
-				"ear_eye_open_left": {
-					"position": [0, 0, -0.1]
-				},
-				"ear_eye_closed_right": {
-					"position": [0, 0, 0.1]
-				},
-				"ear_eye_open_right": {
-					"position": [0, 0, -0.1]
-				},
-				"eye_psychic_left": {
-					"position": [0, 0, -0.1]
-				},
-				"eye_psychic_right": {
-					"position": [0, 0, -0.1]
-				}
-			}
-		},
-		"animation.meowstic_male.shock": {
-			"loop": true,
-			"bones": {
-				"pupil_left": {
-					"position": [0, 0, 0],
-					"scale": [0.7, 0.5, 1]
-				},
-				"mouth_closed": {
-					"position": [0, 0, 0.1]
-				},
-				"mouth_open": {
-					"position": [0, 0, -0.1]
-				},
-				"pupil_right": {
-					"position": [0, 0, 0],
-					"scale": [0.7, 0.5, 1]
-				}
-			}
-		},
-		"animation.meowstic_male.angry": {
-			"loop": true,
-			"bones": {
-				"eye_angry_left": {
-					"position": [0, 0, -0.1]
-				},
-				"eye_angry_right": {
-					"position": [0, 0, -0.1]
-				}
-			}
-		},
-		"animation.meowstic_male.sad": {
-			"loop": true,
-			"bones": {
-				"eye_sad_left": {
-					"position": [0, 0, -0.1]
-				},
-				"eye_sad_right": {
-					"position": [0, 0, -0.1]
-				}
-			}
-		},
-		"animation.meowstic_male.unamused": {
-			"loop": true,
-			"bones": {
-				"eye_unamused_left": {
-					"position": [0, 0, -0.1]
-				},
-				"eye_unamused_right": {
-					"position": [0, 0, -0.1]
-				}
-			}
-		},
-		"animation.meowstic_male.happy": {
-			"loop": true,
-			"bones": {
-				"eyelid_happy_left": {
-					"position": [0, 0, -0.1]
-				},
-				"mouth_closed": {
-					"position": [0, 0, 0.1]
-				},
-				"mouth_open": {
-					"position": [0, 0, -0.1]
-				},
-				"eyelid_happy_right": {
-					"position": [0, 0, -0.1]
-				}
-			}
-		},
-		"animation.meowstic_male.hurt": {
-			"loop": true,
-			"bones": {
-				"eyelid_recoil_left": {
-					"position": [0, 0, -0.1]
-				},
-				"eyelid_recoil_right": {
-					"position": [0, 0, -0.1]
-				}
-			}
-		}
-	}
-}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0734_yungoos/yungoos.animation.json

@@ -1,499 +0,0 @@
-{
-	"format_version": "1.8.0",
-	"animations": {
-		"animation.yungoos.pose": {
-			"loop": true,
-			"bones": {
-				"torso": {
-					"rotation": [7.5, 0, 0]
-				},
-				"torso2": {
-					"rotation": [-10, 0, 0]
-				},
-				"tail": {
-					"rotation": [-22.5, 0, 0]
-				},
-				"tail2": {
-					"rotation": [0, 0, 0]
-				},
-				"tail3": {
-					"rotation": [32.5, 0, 0]
-				},
-				"tail4": {
-					"rotation": [51, 0, 0]
-				},
-				"tail5": {
-					"rotation": [35, 0, 0]
-				},
-				"neck": {
-					"rotation": [-37.5, -17.5, -0.8],
-					"position": [0.15, -0.6, 0.8]
-				},
-				"head": {
-					"rotation": [20, 0, 0]
-				},
-				"leg_front_left": {
-					"rotation": [-17, 0, 71],
-					"position": [1, 1, 0]
-				},
-				"leg_front_left2": {
-					"rotation": [-1.5, 71, 26],
-					"position": [0.3971, -0.08624, 0.29133]
-				},
-				"leg_back_left": {
-					"rotation": [32.5, 0, 0],
-					"position": [-1, 0.25, 0]
-				},
-				"leg_back_left2": {
-					"rotation": [-40, 0, 0]
-				},
-				"foot_back_left": {
-					"rotation": [7.5, 0, 0]
-				},
-				"head_angle": {
-					"rotation": [30, -40, -21],
-					"position": [-0.44351, 0.61642, -0.46982]
-				},
-				"ear_right": {
-					"rotation": [0, 0, 30]
-				},
-				"ear_left": {
-					"rotation": [0, 0, -30]
-				},
-				"leg_front_right": {
-					"rotation": [-20, 24, -79],
-					"position": [1, 0, 0]
-				},
-				"leg_front_right2": {
-					"rotation": [6.24605, -19.03771, -18.54835]
-				},
-				"paw_front_left": {
-					"rotation": [169, -30.5, -193],
-					"position": [0.78478, 0, -0.05574]
-				},
-				"front_claw_left": {
-					"rotation": [10, 0, 0]
-				},
-				"front_claw_left3": {
-					"rotation": [-20, 0, 0]
-				},
-				"mouth_open": {
-					"position": [0, 0, 0],
-					"scale": 1
-				},
-				"ftorso2": {
-					"position": [0, 1, 0]
-				},
-				"leg_back_right": {
-					"rotation": [32.5, 0, 0],
-					"position": [1, 0.25, 0]
-				},
-				"leg_back_right2": {
-					"rotation": [-40, 0, 0]
-				},
-				"foot_back_right": {
-					"rotation": [7.5, 0, 0]
-				},
-				"undefined": {
-					"position": [0, 0, 0],
-					"scale": 1
-				}
-			}
-		},
-		"animation.yungoos.ground_idle": {
-			"loop": true,
-			"bones": {
-				"torso": {
-					"rotation": [7.5, 0, 0]
-				},
-				"torso2": {
-					"rotation": [-5, 0, 0]
-				},
-				"tail": {
-					"rotation": [-22.5, 0, 0]
-				},
-				"tail2": {
-					"rotation": [0, 0, 0]
-				},
-				"tail3": {
-					"rotation": [5, 0, 0]
-				},
-				"tail4": {
-					"rotation": [16, 0, 0]
-				},
-				"tail5": {
-					"rotation": [15, 0, 0]
-				},
-				"neck": {
-					"rotation": [-15, 0, 0]
-				},
-				"head": {
-					"rotation": [20, 0, 0]
-				},
-				"leg_front_left": {
-					"rotation": [-14, -22.8, 77],
-					"position": [0, 0, 0]
-				},
-				"leg_front_left2": {
-					"rotation": [6, 19, 18.5]
-				},
-				"leg_back_left": {
-					"rotation": [32.5, 0, 0],
-					"position": [-1, 0.25, 0]
-				},
-				"leg_back_left2": {
-					"rotation": [-40, 0, 0]
-				},
-				"foot_back_left": {
-					"rotation": [7.5, 0, 0]
-				},
-				"head_angle": {
-					"rotation": [-5, 0, 0]
-				},
-				"ear_right": {
-					"rotation": [0, 0, 30]
-				},
-				"ear_left": {
-					"rotation": [0, 0, -30]
-				},
-				"leg_front_right": {
-					"rotation": [-14, 22.8, -77]
-				},
-				"leg_front_right2": {
-					"rotation": [6, -19, -18.5]
-				},
-				"hips": {
-					"rotation": [0, 0, 0]
-				},
-				"mouth_open": {
-					"position": [0, 0, 0],
-					"scale": 1
-				},
-				"ftorso2": {
-					"position": [0, 1, 0]
-				},
-				"leg_back_right": {
-					"rotation": [32.5, 0, 0],
-					"position": [1, 0.25, 0]
-				},
-				"leg_back_right2": {
-					"rotation": [-40, 0, 0]
-				},
-				"foot_back_right": {
-					"rotation": [7.5, 0, 0]
-				},
-				"paw_front_left": {
-					"rotation": [0, -1, 0]
-				},
-				"paw_front_right": {
-					"rotation": [0, 1, 0]
-				},
-				"undefined": {
-					"position": [0, 0, 0],
-					"scale": 1
-				}
-			}
-		},
-		"animation.yungoos.item_hold": {
-			"loop": true,
-			"bones": {
-				"hips": {
-					"rotation": [-22.5, 0, 0]
-				},
-				"torso2": {
-					"rotation": [2.5, 0, 0]
-				},
-				"neck": {
-					"rotation": [-10, 0, 0]
-				},
-				"tail2": {
-					"rotation": [22.5, 0, 0]
-				},
-				"legs_front": {
-					"rotation": [-25, 0, 0],
-					"position": [0, -0.95372, 0.30071]
-				},
-				"leg_front_left2": {
-					"rotation": [-0.15, -5, 44.5],
-					"position": [0.22028, -0.4321, -0.12152]
-				},
-				"paw_front_left": {
-					"rotation": [-54, -36.8, 67],
-					"position": [-0.15, 0.4, -0.3]
-				},
-				"front_claw_left": {
-					"rotation": [28.9854, -17.66046, -9.54013]
-				},
-				"front_claw_left3": {
-					"rotation": [-37.68944, -20.25437, 14.97401]
-				},
-				"leg_front_right2": {
-					"rotation": [-0.15, 5, -44.5],
-					"position": [-0.22028, -0.4321, -0.12152]
-				},
-				"paw_front_right": {
-					"rotation": [-54, 36.8, -67],
-					"position": [0.15, 0.4, -0.3]
-				},
-				"front_claw_right": {
-					"rotation": [28.9854, 17.66046, 9.54013]
-				},
-				"front_claw_right3": {
-					"rotation": [-37.68944, 20.25437, -14.97401]
-				},
-				"ftorso2": {
-					"rotation": [5, 0, 0],
-					"position": [0, 0.99619, -0.08716]
-				},
-				"head": {
-					"rotation": [32.5, 0, 0],
-					"position": [0, -0.42, 1.35]
-				},
-				"undefined": {
-					"rotation": [32.5, 0, 0],
-					"position": [0, -0.42, 1.35]
-				},
-				"locator_item": {
-					"rotation": [0, 45, 0],
-					"position": [-1, 1, -2]
-				}
-			}
-		},
-		"animation.yungoos.blink": {
-			"animation_length": 0.1667,
-			"bones": {
-				"pupil_left": {
-					"position": {
-						"0.0": [0, 0, 0.1],
-						"0.125": [0, 0, 0.1],
-						"0.1667": {"pre": [0, 0, 0.1], "post": [0, 0, 0]}
-					}
-				},
-				"eyelid_left": {
-					"position": {
-						"0.0": [0, 0, -0.1],
-						"0.125": [0, 0, -0.1],
-						"0.1667": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}
-					}
-				},
-				"pupil_right": {
-					"position": {
-						"0.0": [0, 0, 0.1],
-						"0.125": [0, 0, 0.1],
-						"0.1667": {"pre": [0, 0, 0.1], "post": [0, 0, 0]}
-					}
-				},
-				"eyelid_right": {
-					"position": {
-						"0.0": [0, 0, -0.1],
-						"0.125": [0, 0, -0.1],
-						"0.1667": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}
-					}
-				},
-				"undefined": {
-					"position": {
-						"0.0": [0, 0, -0.1],
-						"0.125": [0, 0, -0.1],
-						"0.1667": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}
-					}
-				}
-			}
-		},
-		"animation.yungoos.cry": {
-			"animation_length": 1.5,
-			"bones": {
-				"jaw": {
-					"rotation": {
-						"0.0": [0, 0, 0],
-						"0.25": [42.5, 0, 0],
-						"1.25": [42.5, 0, 0],
-						"1.5": [0, 0, 0]
-					}
-				},
-				"torso2": {
-					"rotation": {
-						"0.0": [0, 0, 0],
-						"0.25": [-5, 0, 0],
-						"1.25": [-5, 0, 0],
-						"1.5": [0, 0, 0]
-					}
-				},
-				"neck": {
-					"rotation": {
-						"0.0": [0, 0, 0],
-						"0.25": [-7.5, 0, 0],
-						"1.25": [-7.5, 0, 0],
-						"1.5": [0, 0, 0]
-					}
-				},
-				"head": {
-					"rotation": {
-						"0.0": [0, 0, 0],
-						"0.25": [7.5, 0, 0],
-						"1.25": [7.5, 0, 0],
-						"1.5": [0, 0, 0]
-					}
-				},
-				"mouth_closed": {
-					"position": {
-						"0.0": [0, 0, 0],
-						"0.25": [0, 0, 0],
-						"1.25": [0, 0, 0],
-						"1.5": [0, 0, 0]
-					},
-					"scale": {
-						"0.0": [1, 1, 1],
-						"0.1667": [1, 1, 1],
-						"0.25": {"pre": [1, 1, 1], "post": [0, 0, 0]},
-						"1.25": {"pre": [0, 0, 0], "post": [0, 0, 0]},
-						"1.3333": {"pre": [0, 0, 0], "post": [1, 1, 1]},
-						"1.5": {"pre": [1, 1, 1], "post": [1, 1, 1]}
-					}
-				},
-				"mouth_open": {
-					"position": {
-						"0.0": [0, 0, 0],
-						"0.25": [0, -0.01, -0.1],
-						"1.25": [0, -0.01, -0.1],
-						"1.5": [0, 0, 0]
-					},
-					"scale": {
-						"0.0": [0, 0, 0],
-						"0.1667": [1, 1, 1],
-						"0.25": {"pre": [1, 1, 1], "post": [1.03, 1.03, 1.03]},
-						"1.25": {"pre": [1.03, 1.03, 1.03], "post": [1.03, 1.03, 1.03]},
-						"1.3333": {"pre": [1.03, 1.03, 1.03], "post": [1, 1, 1]},
-						"1.5": {"pre": [1, 1, 1], "post": [1, 1, 1]}
-					}
-				},
-				"undefined": {
-					"position": {
-						"0.0": [0, 0, 0],
-						"0.25": [0, -0.01, -0.1],
-						"1.25": [0, -0.01, -0.1],
-						"1.5": [0, 0, 0]
-					},
-					"scale": {
-						"0.0": [0, 0, 0],
-						"0.1667": [1, 1, 1],
-						"0.25": {"pre": [1, 1, 1], "post": [1.03, 1.03, 1.03]},
-						"1.25": {"pre": [1.03, 1.03, 1.03], "post": [1.03, 1.03, 1.03]},
-						"1.3333": {"pre": [1.03, 1.03, 1.03], "post": [1, 1, 1]},
-						"1.5": {"pre": [1, 1, 1], "post": [1, 1, 1]}
-					}
-				}
-			}
-		},
-		"animation.yungoos.angry": {
-			"loop": true,
-			"bones": {
-				"eye_shine_left": {
-					"position": [0, 0, 0.1]
-				},
-				"eye_angry_left": {
-					"position": [0, 0.25, -0.1]
-				},
-				"eye_shine_right": {
-					"position": [0, 0, 0.1]
-				},
-				"eye_angry_right": {
-					"position": [0, 0.25, -0.1]
-				},
-				"undefined": {
-					"position": [0, 0.25, -0.1]
-				}
-			}
-		},
-		"animation.yungoos.happy": {
-			"loop": true,
-			"bones": {
-				"eye_happy_left": {
-					"position": [0, 0, -0.1]
-				},
-				"eye_happy_right": {
-					"position": [0, 0, -0.1]
-				},
-				"undefined": {
-					"position": [0, 0, -0.1]
-				}
-			}
-		},
-		"animation.yungoos.sad": {
-			"loop": true,
-			"bones": {
-				"eye_sad_left": {
-					"position": [0, 0, -0.1]
-				},
-				"eye_sad_right": {
-					"position": [0, 0, -0.1]
-				},
-				"undefined": {
-					"position": [0, 0, -0.1]
-				}
-			}
-		},
-		"animation.yungoos.hurt": {
-			"loop": true,
-			"bones": {
-				"eye_hurt_left": {
-					"position": [0, 0, -0.1]
-				},
-				"eye_hurt_right": {
-					"position": [0, 0, -0.1]
-				},
-				"undefined": {
-					"position": [0, 0, -0.1]
-				}
-			}
-		},
-		"animation.yungoos.shock": {
-			"loop": true,
-			"bones": {
-				"mouth_closed": {
-					"scale": 0
-				},
-				"mouth_open": {
-					"position": [0, -0.05, -0.125],
-					"scale": 1.01
-				},
-				"pupil_left": {
-					"scale": 0.7
-				},
-				"brow": {
-					"position": [0, 0.25, 0]
-				},
-				"pupil_right": {
-					"scale": 0.7
-				},
-				"undefined": {
-					"position": [0, 0.25, 0]
-				}
-			}
-		},
-		"animation.yungoos.tired": {
-			"loop": true,
-			"bones": {
-				"pupil_left": {
-					"position": [0, -0.00872, 0.09962]
-				},
-				"eyelid_left": {
-					"rotation": [0, 0, 15],
-					"position": [0, 0, -0.1]
-				},
-				"brow": {
-					"position": [0, 0.25, 0]
-				},
-				"pupil_right": {
-					"position": [0, 0, 0.1]
-				},
-				"eyelid_right": {
-					"rotation": [0, 0, -15],
-					"position": [0, 0, -0.1]
-				},
-				"undefined": {
-					"position": [0, 0.25, 0]
-				}
-			}
-		}
-	}
-}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0735_gumshoos/gumshoos.animation.json

@@ -1,348 +0,0 @@
-{
-	"format_version": "1.8.0",
-	"animations": {
-		"animation.gumshoos.ground_idle": {
-			"loop": true,
-			"bones": {
-				"tail": {
-					"rotation": [42.5, 0, 0]
-				},
-				"tail2": {
-					"rotation": [7.5, 0, 0]
-				},
-				"tail3": {
-					"rotation": [7.5, 0, 0]
-				},
-				"tail4": {
-					"rotation": [7.5, 0, 0]
-				},
-				"torso2": {
-					"rotation": [-11, 0, 0]
-				},
-				"head_angle": {
-					"rotation": [67.5, 0, 0]
-				},
-				"tail5": {
-					"rotation": [15, 0, 0]
-				},
-				"body": {
-					"position": [0, 0, -2]
-				},
-				"leg_left": {
-					"rotation": [21, 0, 0]
-				},
-				"leg_left2": {
-					"rotation": [-38.25, 0, 0]
-				},
-				"foot_left": {
-					"rotation": [17.5, 0, 0]
-				},
-				"arm_left": {
-					"rotation": [74.3, 51.4, -69],
-					"position": [-1, 0, 0]
-				},
-				"arm_left2": {
-					"rotation": [52.7, -1, -1.6],
-					"position": [0.03592, 1.61477, -1.53191]
-				},
-				"hand_left": {
-					"rotation": [163.1, -20.5, -34.8],
-					"position": [0.89157, -1.5871, -2.56143]
-				},
-				"claw_left2": {
-					"rotation": [0, 25, 0]
-				},
-				"claw_left3": {
-					"rotation": [0, -25, 0]
-				},
-				"arm_right": {
-					"rotation": [74.3, -51.4, 69],
-					"position": [1, 0, 0]
-				},
-				"arm_right2": {
-					"rotation": [52.7, 1, 1.6],
-					"position": [-0.03592, 1.61477, -1.53191]
-				},
-				"hand_right": {
-					"rotation": [163.1, 20.5, 34.8],
-					"position": [-0.89157, -1.5871, -2.56143]
-				},
-				"claw_right2": {
-					"rotation": [0, -25, 0]
-				},
-				"claw_right3": {
-					"rotation": [0, 25, 0]
-				},
-				"hips": {
-					"rotation": [-57.5, 0, 0]
-				},
-				"back_fur_middle": {
-					"rotation": [62.5, 0, 0],
-					"position": [0, 0.1, -1.9]
-				},
-				"back_fur_middle2": {
-					"rotation": [10, 0, 0]
-				},
-				"back_fur_left3": {
-					"rotation": [40.45, 20.3, 5.7],
-					"position": [-0.4, -0.2, 0.3]
-				},
-				"back_fur_left4": {
-					"rotation": [15.35, -12, -3.3]
-				},
-				"back_fur": {
-					"position": [0, -0.2, -0.25]
-				},
-				"back_fur_left": {
-					"rotation": [56.4, -14.5, 11],
-					"position": [-0.25532, -0.70974, -1.87343]
-				},
-				"back_fur_left2": {
-					"rotation": [10, 0, 0]
-				},
-				"back_fur_right3": {
-					"rotation": [40.45, -20.3, -5.7],
-					"position": [0.4, -0.2, 0.3]
-				},
-				"back_fur_right4": {
-					"rotation": [15.35, 12, 3.3]
-				},
-				"back_fur_right": {
-					"rotation": [56.4, 14.5, -11],
-					"position": [0.25, -0.7, -1.8]
-				},
-				"back_fur_right2": {
-					"rotation": [10, 0, 0]
-				},
-				"claw_back_left3": {
-					"rotation": [0, 25, 0]
-				},
-				"claw_back_left2": {
-					"rotation": [0, -25, 0]
-				},
-				"leg_right": {
-					"rotation": [21, 0, 0]
-				},
-				"leg_right2": {
-					"rotation": [-38.25, 0, 0]
-				},
-				"foot_right": {
-					"rotation": [17.5, 0, 0]
-				},
-				"claw_back_right2": {
-					"rotation": [0, 25, 0]
-				},
-				"claw_back_right3": {
-					"rotation": [0, -25, 0]
-				},
-				"ftorso2": {
-					"rotation": [-11, 0, 0]
-				}
-			}
-		},
-		"animation.gumshoos.ground_idle_quadruped": {
-			"loop": true,
-			"bones": {
-				"tail": {
-					"rotation": [-10, 0, 0]
-				},
-				"tail2": {
-					"rotation": [-10, 0, 0]
-				},
-				"tail3": {
-					"rotation": [7.5, 0, 0]
-				},
-				"tail4": {
-					"rotation": [10, 0, 0]
-				},
-				"torso2": {
-					"rotation": [6.5, 0, 0],
-					"position": [0, -0.1, -1]
-				},
-				"head_angle": {
-					"rotation": [2.5, 0, 0]
-				},
-				"torso": {
-					"rotation": [0, 0, 0],
-					"position": [0, 3, 0]
-				},
-				"tail5": {
-					"rotation": [0, 0, 0]
-				},
-				"body": {
-					"position": [0, 0, -2]
-				},
-				"leg_left": {
-					"rotation": [21, -15, 0]
-				},
-				"leg_left2": {
-					"rotation": [-38.25, 0, 0]
-				},
-				"foot_left": {
-					"rotation": [17.5, 0, 0]
-				},
-				"chest_fur_left": {
-					"rotation": [-1.3, 3, 29.8]
-				},
-				"arm_left": {
-					"rotation": [8.5, 0, 0]
-				},
-				"arm_left2": {
-					"rotation": [-15, 0, 0]
-				},
-				"arm_right": {
-					"rotation": [8.5, 0, 0]
-				},
-				"arm_right2": {
-					"rotation": [-15, 0, 0]
-				},
-				"back_fur_left3": {
-					"rotation": [-10, 17.6, -11.7],
-					"position": [-0.1, 0, 0]
-				},
-				"back_fur_left4": {
-					"rotation": [15.3, -12, -3.3]
-				},
-				"back_fur_left": {
-					"rotation": [0.5, 1.25, 18.1],
-					"position": [-0.16, -0.5, -0.25]
-				},
-				"back_fur_left2": {
-					"rotation": [10, 0, 0]
-				},
-				"back_fur_middle": {
-					"rotation": [7.5, 0, 0],
-					"position": [0, -0.01305, -0.09914]
-				},
-				"back_fur_middle2": {
-					"rotation": [10, 0, 0]
-				},
-				"back_fur_right3": {
-					"rotation": [-10, -17.6, 11.7],
-					"position": [0.1, 0, 0]
-				},
-				"back_fur_right4": {
-					"rotation": [15.3, 12, 3.3]
-				},
-				"back_fur_right": {
-					"rotation": [0.5, -1.25, -18.1],
-					"position": [0.16, -0.5, -0.25]
-				},
-				"back_fur_right2": {
-					"rotation": [10, 0, 0]
-				},
-				"chest_fur_right": {
-					"rotation": [-1.3, -3, -29.8]
-				},
-				"leg_right": {
-					"rotation": [21, 15, 0]
-				},
-				"leg_right2": {
-					"rotation": [-38.25, 0, 0]
-				},
-				"foot_right": {
-					"rotation": [17.5, 0, 0]
-				},
-				"arms": {
-					"rotation": [7.5, 0, 0],
-					"position": [0, 2.75, 0]
-				}
-			}
-		},
-		"animation.gumshoos.cry": {
-			"animation_length": 1.5,
-			"bones": {
-				"torso2": {
-					"rotation": {
-						"0.0": [0, 0, 0],
-						"0.25": [7.5, 0, 0],
-						"1.25": [7.5, 0, 0],
-						"1.5": [0, 0, 0]
-					}
-				},
-				"head": {
-					"rotation": {
-						"0.0": [0, 0, 0],
-						"0.25": [-7.5, 0, 0],
-						"1.25": [-7.5, 0, 0],
-						"1.5": [0, 0, 0]
-					}
-				},
-				"mouth_closed": {
-					"position": {
-						"0.0": [0, 0, 0],
-						"0.25": {"pre": [0, 0, 0], "post": [0, 0, 0]},
-						"1.25": {"pre": [0, 0, 0], "post": [0, 0, 0]},
-						"1.5": {"pre": [0, 0, 0], "post": [0, 0, 0]}
-					},
-					"scale": {
-						"0.0": [1, 1, 1],
-						"0.25": {"pre": [1, 1, 1], "post": [0.5, 0.5, 0.5]},
-						"1.25": {"pre": [0.5, 0.5, 0.5], "post": [0.5, 0.5, 0.5]},
-						"1.5": {"pre": [0.5, 0.5, 0.5], "post": [1, 1, 1]}
-					}
-				},
-				"mouth_open": {
-					"position": {
-						"0.0": [0, 0, 0],
-						"0.25": {"pre": [0, 0, 0], "post": [0, 0, 0]},
-						"1.25": {"pre": [0, 0, 0], "post": [0, -0.01, 0]},
-						"1.5": {"pre": [0, -0.01, 0], "post": [0, 0, 0]}
-					},
-					"scale": {
-						"0.0": [0, 0, 0],
-						"0.25": {"pre": [0, 0, 0], "post": [1.01, 1.03, 1.02]},
-						"1.25": {"pre": [1.01, 1.03, 1.02], "post": [1.01, 1.03, 1.02]},
-						"1.5": {"pre": [1.01, 1.03, 1.02], "post": [1, 1, 1]}
-					}
-				}
-			}
-		},
-		"animation.gumshoos.hold_item": {
-			"loop": true,
-			"bones": {
-				"arm_right": {
-					"rotation": [-10, 0, 0]
-				},
-				"arm_right2": {
-					"rotation": [-12.5, 0, 0]
-				},
-				"hand_right": {
-					"rotation": [-57.5, 0, -12.5],
-					"position": [0.5, 0.5, 0]
-				}
-			}
-		},
-		"animation.gumshoos.angry": {
-			"loop": true,
-			"bones": {
-				"mouth_closed": {
-					"scale": 0.1
-				},
-				"mouth_open": {
-					"scale": [1.01, 1.03, 1.02]
-				},
-				"pupil_left": {
-					"rotation": [0, 0, -15]
-				},
-				"pupil_right": {
-					"rotation": [0, 0, 15]
-				}
-			}
-		},
-		"animation.gumshoos.sad": {
-			"loop": true,
-			"bones": {
-				"pupil_left": {
-					"rotation": [0, 0, 15]
-				},
-				"pupil_right": {
-					"rotation": [0, 0, -15]
-				}
-			}
-		},
-		"animation.gumshoos.blink": {
-			"loop": true
-		}
-	}
-}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0777_togedemaru/togedemaru.animation.json

@@ -1,309 +0,0 @@
-{
-	"format_version": "1.8.0",
-	"animations": {
-		"animation.togedemaru.ground_idle": {
-			"loop": true,
-			"bones": {
-				"arm_right": {
-					"rotation": [40.67815, -9.5438, -8.1102]
-				},
-				"arm_left": {
-					"rotation": [40.67815, 9.54385, 8.11019]
-				},
-				"tail": {
-					"rotation": [64.31518, 10.17781, 20.17393]
-				},
-				"tail2": {
-					"rotation": [0, 10, 0]
-				},
-				"foot_right": {
-					"rotation": [7.5, 15, 0]
-				},
-				"foot_right2": {
-					"rotation": [-7.5, 0, 0]
-				},
-				"foot_left": {
-					"rotation": [7.5, -15, 0]
-				},
-				"foot_left2": {
-					"rotation": [-7.5, 0, 0]
-				}
-			}
-		},
-		"animation.togedemaru.blink": {
-			"animation_length": 0.1667,
-			"bones": {
-				"eyelid_right": {
-					"position": {
-						"0.0": [0, 0, -0.1],
-						"0.125": {
-							"pre": [0, 0, -0.1],
-							"post": [0, 0, -0.1]
-						},
-						"0.1667": {
-							"pre": [0, 0, -0.1],
-							"post": [0, 0, 0]
-						}
-					}
-				},
-				"eyelid_left": {
-					"position": {
-						"0.0": [0, 0, -0.1],
-						"0.125": {
-							"pre": [0, 0, -0.1],
-							"post": [0, 0, -0.1]
-						},
-						"0.1667": {
-							"pre": [0, 0, -0.1],
-							"post": [0, 0, 0]
-						}
-					}
-				},
-				"eye_right": {
-					"position": {
-						"0.0": [0, 0, 0.1],
-						"0.125": {
-							"pre": [0, 0, 0.1],
-							"post": [0, 0, 0.1]
-						},
-						"0.1667": {
-							"pre": [0, 0, 0.1],
-							"post": [0, 0, 0]
-						}
-					}
-				},
-				"eye_left": {
-					"position": {
-						"0.0": [0, 0, 0.1],
-						"0.125": {
-							"pre": [0, 0, 0.1],
-							"post": [0, 0, 0.1]
-						},
-						"0.1667": {
-							"pre": [0, 0, 0.1],
-							"post": [0, 0, 0]
-						}
-					}
-				}
-			}
-		},
-		"animation.togedemaru.cry": {
-			"animation_length": 0.7917,
-			"bones": {
-				"mouth_open_happy": {
-					"position": {
-						"0.0": [0, 0, 0],
-						"0.2083": {"pre": [0, 0, 0], "post": [0, 0, 0]},
-						"0.25": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
-						"0.7083": {"pre": [0, 0, -0.1], "post": [0, 0, -0.1]},
-						"0.75": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}
-					}
-				},
-				"mouth_closed": {
-					"position": {
-						"0.0": [0, 0, 0],
-						"0.2083": {"pre": [0, 0, 0], "post": [0, 0, 0]},
-						"0.25": {"pre": [0, 0, 0], "post": [0, 0, 0.1]},
-						"0.7083": {"pre": [0, 0, 0.1], "post": [0, 0, 0.1]},
-						"0.75": {"pre": [0, 0, 0.1], "post": [0, 0, 0]}
-					}
-				}
-			}
-		},
-		"animation.togedemaru.active": {
-			"loop": true,
-			"bones": {
-				"tail": {
-					"rotation": [70, 0, 0]
-				},
-				"needle_top_right": {
-					"rotation": [0, 0, -80]
-				},
-				"needle_top_left": {
-					"rotation": [0, 0, 80]
-				},
-				"needle_back_right": {
-					"rotation": [80, 0, 0]
-				},
-				"needle_back_left": {
-					"rotation": [80, 0, 0]
-				},
-				"needle_middle_right": {
-					"rotation": [0, 0, -80]
-				},
-				"needle_back_right2": {
-					"rotation": [80, 0, 0]
-				},
-				"needle_back_left2": {
-					"rotation": [80, 0, 0]
-				},
-				"needle_middle_left": {
-					"rotation": [0, 0, 80]
-				},
-				"needle_bottom_right": {
-					"rotation": [0, 0, -80]
-				},
-				"needle_back_right3": {
-					"rotation": [80, 0, 0]
-				},
-				"needle_back_left3": {
-					"rotation": [80, 0, 0]
-				},
-				"needle_bottom_left": {
-					"rotation": [0, 0, 80]
-				},
-				"needle_back_middle": {
-					"rotation": [80, 0, 0]
-				},
-				"needle_back_middle2": {
-					"rotation": [80, 0, 0]
-				},
-				"needle_left_top": {
-					"rotation": [0, 0, -90]
-				},
-				"needle_left_middle": {
-					"rotation": [0, 0, -90]
-				},
-				"needle_left_bottom": {
-					"rotation": [0, 0, -90]
-				},
-				"needle_right_top": {
-					"rotation": [0, 0, 90]
-				},
-				"needle_right_middle": {
-					"rotation": [0, 0, 90]
-				},
-				"needle_right_bottom": {
-					"rotation": [0, 0, 90]
-				},
-				"needle_back_bottom2": {
-					"rotation": [90, 0, 0]
-				},
-				"needle_back_bottom": {
-					"rotation": [90, 0, 0]
-				},
-				"needles_corner_left": {
-					"position": [-1, 0, -1]
-				},
-				"needle_corner_left_top": {
-					"position": [2.5, 1, 2.5]
-				},
-				"needle_corner_left_top2": {
-					"rotation": [0, 0, -90]
-				},
-				"needle_corner_left_middle": {
-					"position": [2.5, 0, 2.5]
-				},
-				"needle_corner_left_bottom4": {
-					"rotation": [0, 0, -90]
-				},
-				"needle_corner_left_bottom": {
-					"position": [2.5, 0, 2.5]
-				},
-				"needle_corner_left_bottom2": {
-					"rotation": [0, 0, -90]
-				},
-				"needles_corner_right": {
-					"position": [1, 0, -1]
-				},
-				"needle_corner_right_top": {
-					"position": [-2.5, 1, 2.5]
-				},
-				"needle_corner_right_top2": {
-					"rotation": [0, 0, 90]
-				},
-				"needle_corner_right_middle": {
-					"position": [-2.5, 0, 2.5]
-				},
-				"needle_corner_right_bottom4": {
-					"rotation": [0, 0, 90]
-				},
-				"needle_corner_right_bottom": {
-					"position": [-2.5, 0, 2.5]
-				},
-				"needle_corner_right_bottom2": {
-					"rotation": [0, 0, 90]
-				}
-			}
-		},
-		"animation.togedemaru.fold_active": {
-			"loop": true,
-			"bones": {
-				"arm_right": {
-					"rotation": [0, -25, 0],
-					"position": [1, 0, 0]
-				},
-				"arm_left": {
-					"rotation": [0, 25, 0],
-					"position": [-1, 0, 0]
-				},
-				"needle_left_top": {
-					"rotation": [0, 0, -117.5]
-				},
-				"needle_left_middle": {
-					"rotation": [0, 0, -90]
-				},
-				"needle_left_bottom": {
-					"rotation": [0, 0, -67.5]
-				},
-				"needle_right_top": {
-					"rotation": [0, 0, 117.5]
-				},
-				"needle_right_middle": {
-					"rotation": [0, 0, 90]
-				},
-				"needle_right_bottom": {
-					"rotation": [0, 0, 67.5]
-				},
-				"fold": {
-					"scale": 1.02
-				},
-				"arms": {
-					"rotation": [32.5, 0, 0],
-					"position": [0, 2, 0]
-				},
-				"needles_folded": {
-					"position": [0, -0.1, -0.1]
-				},
-				"needle_folded_middle": {
-					"rotation": [90, 0, 0]
-				},
-				"needle_folded_left": {
-					"rotation": [90, 0, -10]
-				},
-				"needle_folded_right": {
-					"rotation": [90, 0, 10]
-				},
-				"feet": {
-					"position": [0, 3, 0]
-				}
-			}
-		},
-		"animation.togedemaru.fold": {
-			"loop": true,
-			"bones": {
-				"arm_right": {
-					"rotation": [0, -25, 0],
-					"position": [1, 0, 0]
-				},
-				"arm_left": {
-					"rotation": [0, 25, 0],
-					"position": [-1, 0, 0]
-				},
-				"fold": {
-					"scale": 1.02
-				},
-				"arms": {
-					"rotation": [32.5, 0, 0],
-					"position": [0, 2, 0]
-				},
-				"needles_folded": {
-					"position": [0, -0.1, -0.1]
-				},
-				"feet": {
-					"position": [0, 3, 0]
-				}
-			}
-		}
-	}
-}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0819_skwovet/skwovet.animation.json

@@ -1,213 +0,0 @@
-{
-	"format_version": "1.8.0",
-	"animations": {
-		"animation.skwovet.ground_idle": {
-			"loop": true,
-			"bones": {
-				"torso": {
-					"rotation": [20, 0, 0],
-					"position": [0, 0, 0]
-				},
-				"torso2": {
-					"rotation": [-10, 0, 0]
-				},
-				"tail": {
-					"rotation": [-12.2386, -14.8687, -2.00307]
-				},
-				"leg_left": {
-					"rotation": [0, -10, 0]
-				},
-				"foot_left": {
-					"rotation": [0, -10, 0]
-				},
-				"cheek_left": {
-					"rotation": [0, 0, 0],
-					"position": [0, 0, 0]
-				},
-				"tail2": {
-					"rotation": [8.78964, 30.37393, -12.16695]
-				},
-				"tail4": {
-					"rotation": [-5, 0, 0]
-				},
-				"arm_right": {
-					"rotation": [24.49253, -45.99702, -38.45912],
-					"position": [0, 0, -0.5]
-				},
-				"hand_right": {
-					"rotation": [0, -55, 0]
-				},
-				"cheek_right": {
-					"rotation": [0, 0, 0],
-					"position": [0, 0, 0]
-				},
-				"leg_right": {
-					"rotation": [0, 10, 0]
-				},
-				"foot_right": {
-					"rotation": [0, 10, 0]
-				},
-				"oran": {
-					"scale": 1.5
-				},
-				"pecha": {
-					"scale": 1.5
-				},
-				"chesto": {
-					"scale": 1.5
-				},
-				"cheri": {
-					"scale": 1.5
-				},
-				"mago": {
-					"scale": 1.5
-				},
-				"arm_left": {
-					"rotation": [24.49253, 45.997, 38.4591],
-					"position": [0, 0, -0.5]
-				},
-				"hand_left": {
-					"rotation": [0, 55, 0]
-				},
-				"tail3": {
-					"rotation": [0, 0, -12.5]
-				},
-				"berries": {
-					"scale": 0.01
-				},
-				"tail_fluff_middle": {
-					"rotation": [25, 0, 0]
-				},
-				"tail_fluff_left": {
-					"rotation": [-25.28552, 13.45415, -7.00625],
-					"position": [0, 0.5, -0.25]
-				},
-				"head": {
-					"rotation": [-10, 0, 0]
-				}
-			}
-		},
-		"animation.skwovet.blink": {
-			"animation_length": 0.1667,
-			"bones": {
-				"eyelid_left": {
-					"position": {
-						"0.0": [0, 0, -0.1],
-						"0.125": [0, 0, -0.1],
-						"0.1667": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}
-					}
-				},
-				"eyelid_right": {
-					"position": {
-						"0.0": [0, 0, -0.1],
-						"0.125": [0, 0, -0.1],
-						"0.1667": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}
-					}
-				},
-				"eye_left": {
-					"position": {
-						"0.0": [0, 0, 0.1],
-						"0.125": [0, 0, 0.1],
-						"0.1667": {"pre": [0, 0, 0.1], "post": [0, 0, 0]}
-					}
-				},
-				"eye_right": {
-					"position": {
-						"0.0": [0, 0, 0.1],
-						"0.125": [0, 0, 0.1],
-						"0.1667": {"pre": [0, 0, 0.1], "post": [0, 0, 0]}
-					}
-				}
-			}
-		},
-		"animation.skwovet.mouth_open": {
-			"loop": true,
-			"bones": {
-				"mouth_open": {
-					"position": [0, 0, -0.1]
-				}
-			}
-		},
-		"animation.skwovet.hurt": {
-			"loop": true,
-			"bones": {
-				"eye_left": {
-					"position": [0, 0, 0.1]
-				},
-				"eye_right": {
-					"position": [0, 0, 0.1]
-				},
-				"eyelid_hurt_left": {
-					"position": [0, 0, -0.1]
-				},
-				"eyelid_hurt_right": {
-					"position": [0, 0, -0.1]
-				},
-				"mouth_open_small": {
-					"position": [0, 0, -0.1]
-				}
-			}
-		},
-		"animation.skwovet.happy": {
-			"loop": true,
-			"bones": {
-				"eye_left": {
-					"position": [0, 0, 0.1]
-				},
-				"eye_right": {
-					"position": [0, 0, 0.1]
-				},
-				"eyelid_happy_right": {
-					"position": [0, 0, -0.1]
-				},
-				"eyelid_happy_left": {
-					"position": [0, 0, -0.1]
-				},
-				"mouth_open_happy": {
-					"position": [0, 0, -0.1]
-				}
-			}
-		},
-		"animation.skwovet.sad": {
-			"loop": true,
-			"bones": {
-				"eyelid_emote_left": {
-					"position": [0, 0, -0.1]
-				},
-				"eyelid_emote_right": {
-					"position": [0, 0, -0.1]
-				},
-				"mouth_open_sad": {
-					"position": [0, 0, -0.1]
-				}
-			}
-		},
-		"animation.skwovet.angry": {
-			"loop": true,
-			"bones": {
-				"eyelid_emote_left": {
-					"position": [-1, 0, -0.1]
-				},
-				"eyelid_emote_right": {
-					"position": [1, 0, -0.1]
-				},
-				"mouth_open_sad": {
-					"position": [0, 0, -0.1]
-				}
-			}
-		},
-		"animation.skwovet.disinterested": {
-			"loop": true,
-			"bones": {
-				"eyelid_emote_left": {
-					"position": [-0.5, 0, -0.1],
-					"scale": [2, 1, 1]
-				},
-				"eyelid_emote_right": {
-					"position": [0.5, 0, -0.1],
-					"scale": [2, 1, 1]
-				}
-			}
-		}
-	}
-}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0820_greedent/greedent.animation.json

@@ -1,136 +0,0 @@
-{
-	"format_version": "1.8.0",
-	"animations": {
-		"animation.greedent.ground_idle": {
-			"loop": true,
-			"bones": {
-				"arm_right": {
-					"rotation": [59.6, -70, -61.2]
-				},
-				"hand_right": {
-					"rotation": [0, -35, 0]
-				},
-				"arm_left": {
-					"rotation": [59.6, 70, 61.2]
-				},
-				"hand_left": {
-					"rotation": [0, 35, 0]
-				},
-				"berries": {
-					"scale": 0.01
-				}
-			}
-		},
-		"animation.greedent.blink": {
-			"animation_length": 0.1667,
-			"bones": {
-				"eye_right": {
-					"position": {
-						"0.0": [0, 0, 0.1],
-						"0.125": [0, 0, 0.1],
-						"0.1667": {"pre": [0, 0, 0.1], "post": [0, 0, 0]}
-					}
-				},
-				"eye_left": {
-					"position": {
-						"0.0": [0, 0, 0.1],
-						"0.125": [0, 0, 0.1],
-						"0.1667": {"pre": [0, 0, 0.1], "post": [0, 0, 0]}
-					}
-				},
-				"eyelid_right": {
-					"position": {
-						"0.0": [0, 0, -0.1],
-						"0.125": [0, 0, -0.1],
-						"0.1667": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}
-					}
-				},
-				"eyelid_left": {
-					"position": {
-						"0.0": [0, 0, -0.1],
-						"0.125": [0, 0, -0.1],
-						"0.1667": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}
-					}
-				}
-			}
-		},
-		"animation.greedent.hurt": {
-			"loop": true,
-			"bones": {
-				"eye_right": {
-					"position": [0, 0, 0.1]
-				},
-				"eye_left": {
-					"position": [0, 0, 0.1]
-				},
-				"eyelid_hurt_right": {
-					"position": [0, 0, -0.1]
-				},
-				"eyelid_hurt_left": {
-					"position": [0, 0, -0.1]
-				}
-			}
-		},
-		"animation.greedent.happy": {
-			"loop": true,
-			"bones": {
-				"mouth_open_happy": {
-					"position": [0, 0, -0.1]
-				},
-				"eye_right": {
-					"position": [0, 0, 0.1]
-				},
-				"eye_left": {
-					"position": [0, 0, 0.1]
-				},
-				"eyelid_happy_left": {
-					"position": [0.1, 0, -0.1]
-				},
-				"eyelid_happy_right": {
-					"position": [-0.1, 0, -0.1]
-				}
-			}
-		},
-		"animation.greedent.sad": {
-			"loop": true,
-			"bones": {
-				"mouth_open": {
-					"position": [0, 0, -0.1]
-				},
-				"eyelid_emote_right": {
-					"position": [0, 0, -0.1]
-				},
-				"eyelid_emote_left": {
-					"position": [0, 0, -0.1]
-				}
-			}
-		},
-		"animation.greedent.angry": {
-			"loop": true,
-			"bones": {
-				"mouth_open": {
-					"position": [0, 0, -0.1]
-				},
-				"eyelid_emote_right": {
-					"position": [1, 0, -0.1]
-				},
-				"eyelid_emote_left": {
-					"position": [-1, 0, -0.1]
-				}
-			}
-		},
-		"animation.greedent.disinterested": {
-			"loop": true,
-			"bones": {
-				"eyelid_emote_right": {
-					"position": [0.5, 0, -0.1],
-					"scale": [2, 1, 1]
-				},
-				"eyelid_emote_left": {
-					"position": [-0.5, 0, -0.1],
-					"scale": [2, 1, 1]
-				}
-			}
-		}
-	}
-}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0833_chewtle/chewtle.animation.json

@@ -1,48 +0,0 @@
-{
-  "format_version": "1.8.0",
-  "animations": {
-    "animation.chewtle.blink": {
-      "animation_length": 0.1667,
-      "bones": {
-        "eyelid_left": {
-          "position": {
-            "0.0": [
-              0,
-              0,
-              -0.1
-            ],
-            "0.125": [
-              0,
-              0,
-              -0.1
-            ],
-            "0.1667": [
-              0,
-              0,
-              0
-            ]
-          }
-        },
-        "eyelid_right": {
-          "position": {
-            "0.0": [
-              0,
-              0,
-              -0.1
-            ],
-            "0.125": [
-              0,
-              0,
-              -0.1
-            ],
-            "0.1667": [
-              0,
-              0,
-              0
-            ]
-          }
-        }
-      }
-    }
-  }
-}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0848_toxel/toxel.animation.json

@@ -1,330 +0,0 @@
-{
-	"format_version": "1.8.0",
-	"animations": {
-		"animation.toxel.ground_idle": {
-			"loop": true,
-			"bones": {
-				"head": {
-					"rotation": [-10, 0, 0]
-				},
-				"mane2": {
-					"rotation": [-7.5, 0, 0]
-				},
-				"mane3": {
-					"rotation": [-17.5, 0, 0]
-				},
-				"arm_left": {
-					"rotation": [80.49543, 34.16814, 80.49543],
-					"position": [0, -0.5, -2.8]
-				},
-				"torso": {
-					"rotation": [47.5, 0, 0],
-					"position": [0, 0.5, 0]
-				},
-				"chest": {
-					"rotation": [-15, 0, 0]
-				},
-				"torso2": {
-					"rotation": [-10, 0, 0],
-					"position": [0, 0, -0.5]
-				},
-				"arm_left2": {
-					"rotation": [0, 20, 0]
-				},
-				"body": {
-					"position": [0, -4, 4]
-				},
-				"hand_left": {
-					"rotation": [-19.46758, -10.37641, 35.03996],
-					"position": [-0.6, 0.4, 0]
-				},
-				"finger_left1": {
-					"rotation": [5, 0, 0]
-				},
-				"leg_left": {
-					"rotation": [-99.91211, -32.28169, 28.46539],
-					"position": [0, 0.5, 0.3]
-				},
-				"finger_left2": {
-					"rotation": [-15, 0, 0]
-				},
-				"leg_right": {
-					"rotation": [-99.91211, 32.28169, -28.46539],
-					"position": [0, 0.5, 0.3]
-				},
-				"arm_right": {
-					"rotation": [80.49543, -34.16814, -80.49543],
-					"position": [0, -0.5, -2.8]
-				},
-				"arm_right2": {
-					"rotation": [0, -20, 0]
-				},
-				"hand_right": {
-					"rotation": [-19.46758, 10.37641, -35.03996],
-					"position": [0.6, 0.4, 0]
-				},
-				"finger_right1": {
-					"rotation": [5, 0, 0]
-				},
-				"finger_right2": {
-					"rotation": [-15, 0, 0]
-				},
-				"tail1": {
-					"rotation": [-57.5, 0, 0],
-					"position": [0, -1, -2]
-				},
-				"tail2": {
-					"rotation": [2.5, 0, 0]
-				},
-				"tail3": {
-					"rotation": [10, 0, 0]
-				},
-				"locator_target": {
-					"position": [0, 0, -2]
-				}
-			}
-		},
-		"animation.toxel.stupid_baby_stand": {
-			"loop": true,
-			"bones": {
-				"body": {
-					"position": [0, -0.7, 0]
-				},
-				"waist": {
-					"position": [0, 0.5, 0]
-				},
-				"torso": {
-					"rotation": [10, 0, 0]
-				},
-				"torso2": {
-					"rotation": [-12.5, 0, 0]
-				},
-				"chest": {
-					"rotation": [5, 0, 0]
-				},
-				"head": {
-					"rotation": [2.5, 0, 0]
-				},
-				"arm_left": {
-					"rotation": [7.50874, -24.51091, 38.90415]
-				},
-				"arm_left2": {
-					"rotation": [0, 72.5, 0]
-				},
-				"hand_left": {
-					"rotation": [0, 0, 117.5],
-					"position": [0, 0.5, 0]
-				},
-				"finger_left1": {
-					"rotation": [22.01082, 3.84097, -14.51082]
-				},
-				"finger_left2": {
-					"rotation": [-15.19722, 25.28057, 8.26592]
-				},
-				"arm_right": {
-					"rotation": [7.50874, 24.51091, -38.90415]
-				},
-				"arm_right2": {
-					"rotation": [0, -72.5, 0]
-				},
-				"hand_right": {
-					"rotation": [0, 0, -117.5],
-					"position": [0, 0.5, 0]
-				},
-				"finger_right1": {
-					"rotation": [22.01082, -3.84097, 14.51082]
-				},
-				"finger_right2": {
-					"rotation": [-15.19722, -25.28057, -8.26592]
-				},
-				"leg_left": {
-					"rotation": [-17.5, -42.5, 0.00001]
-				},
-				"leg_left2": {
-					"rotation": [30, 0, 0]
-				},
-				"toes_left": {
-					"rotation": [-12.5, 0, 0],
-					"position": [0, 0.3, 0]
-				},
-				"leg_right": {
-					"rotation": [-17.5, 42.5, -0.00001]
-				},
-				"leg_right2": {
-					"rotation": [30, 0, 0]
-				},
-				"toes_right": {
-					"rotation": [-12.5, 0, 0],
-					"position": [0, 0.3, 0]
-				},
-				"tail1": {
-					"rotation": [-62.5, 0, 0],
-					"position": [0, -0.6, -0.4]
-				},
-				"tail2": {
-					"rotation": [25, 0, 0]
-				},
-				"tail3": {
-					"rotation": [25, 0, 0]
-				},
-				"locator_top": {
-					"position": [0, 4, 0]
-				}
-			}
-		},
-		"animation.toxel.blink": {
-			"animation_length": 0.1667,
-			"bones": {
-				"eyelid_left": {
-					"position": {
-						"0.0": [0, 0, -0.1],
-						"0.125": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}
-					}
-				},
-				"eyelid_unamused_left": {
-					"position": {
-						"0.0": [0, 0, 0.1],
-						"0.125": {"pre": [0, 0, 0.1], "post": [0, 0, 0]}
-					}
-				},
-				"eyelid_sad_left": {
-					"position": {
-						"0.0": [0, 0, 0.1],
-						"0.125": {"pre": [0, 0, 0.1], "post": [0, 0, 0]}
-					}
-				},
-				"eyelid_angry_left": {
-					"position": {
-						"0.0": [0, 0, 0.1],
-						"0.125": {"pre": [0, 0, 0.1], "post": [0, 0, 0]}
-					}
-				},
-				"eyelid_happy_left": {
-					"position": {
-						"0.0": [0, 0, -0.1],
-						"0.125": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}
-					}
-				},
-				"eyelid_recoil_left": {
-					"position": {
-						"0.0": [0, 0, -0.1],
-						"0.125": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}
-					}
-				},
-				"eyelid_right": {
-					"position": {
-						"0.0": [0, 0, -0.1],
-						"0.125": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}
-					}
-				},
-				"eyelid_unamused_right": {
-					"position": {
-						"0.0": [0, 0, 0.1],
-						"0.125": {"pre": [0, 0, 0.1], "post": [0, 0, 0]}
-					}
-				},
-				"eyelid_sad_right": {
-					"position": {
-						"0.0": [0, 0, 0.1],
-						"0.125": {"pre": [0, 0, 0.1], "post": [0, 0, 0]}
-					}
-				},
-				"eyelid_angry_right": {
-					"position": {
-						"0.0": [0, 0, 0.1],
-						"0.125": {"pre": [0, 0, 0.1], "post": [0, 0, 0]}
-					}
-				},
-				"eyelid_happy_right": {
-					"position": {
-						"0.0": [0, 0, -0.1],
-						"0.125": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}
-					}
-				},
-				"eyelid_recoil_right": {
-					"position": {
-						"0.0": [0, 0, -0.1],
-						"0.125": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}
-					}
-				}
-			}
-		},
-		"animation.toxel.mouth": {
-			"loop": true,
-			"bones": {
-				"jaw": {
-					"rotation": [47.5, 0, 0]
-				},
-				"tongue": {
-					"rotation": [-52.5, 0, 0],
-					"position": [0, 0, 1.5]
-				}
-			}
-		},
-		"animation.toxel.unamused": {
-			"loop": true
-		},
-		"animation.toxel.sad": {
-			"loop": true,
-			"bones": {
-				"eyelid_unamused_left": {
-					"position": [0, 0, 0.1]
-				},
-				"eyelid_sad_left": {
-					"position": [0, 0, -0.1]
-				},
-				"eyelid_unamused_right": {
-					"position": [0, 0, 0.1]
-				},
-				"eyelid_sad_right": {
-					"position": [0, 0, -0.1]
-				}
-			}
-		},
-		"animation.toxel.angry": {
-			"loop": true,
-			"bones": {
-				"eyelid_unamused_left": {
-					"position": [0, 0, 0.1]
-				},
-				"eyelid_angry_left": {
-					"position": [0, 0, -0.1]
-				},
-				"eyelid_unamused_right": {
-					"position": [0, 0, 0.1]
-				},
-				"eyelid_angry_right": {
-					"position": [0, 0, -0.1]
-				}
-			}
-		},
-		"animation.toxel.happy": {
-			"loop": true,
-			"bones": {
-				"eyelid_unamused_left": {
-					"position": [0, 0, 0.1]
-				},
-				"eyelid_happy_left": {
-					"position": [0, 0, -0.1]
-				},
-				"eyelid_unamused_right": {
-					"position": [0, 0, 0.1]
-				},
-				"eyelid_happy_right": {
-					"position": [0, 0, -0.1]
-				}
-			}
-		},
-		"animation.toxel.shock": {
-			"loop": true,
-			"bones": {
-				"eyelid_unamused_left": {
-					"position": [0, 0, 0.1]
-				},
-				"eyelid_unamused_right": {
-					"position": [0, 0, 0.1]
-				}
-			}
-		}
-	}
-}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0849_toxtricity/toxtricity_amped.animation.json

@@ -1,364 +0,0 @@
-{
-	"format_version": "1.8.0",
-	"animations": {
-		"animation.toxtricity_amped.ground_idle": {
-			"loop": true,
-			"bones": {
-				"body": {
-					"position": [0, -2, 0]
-				},
-				"waist": {
-					"rotation": [0, 0, 0]
-				},
-				"belt": {
-					"rotation": [5, 0, 0]
-				},
-				"belt_front_left": {
-					"rotation": [-12.5, 0, 0]
-				},
-				"belt_front_right": {
-					"rotation": [-12.5, 0, 0]
-				},
-				"belt2": {
-					"rotation": [-5, 0, 0]
-				},
-				"torso": {
-					"rotation": [-12.5, 0, 0]
-				},
-				"spine2": {
-					"position": [0, 1, 0]
-				},
-				"chest": {
-					"rotation": [22.5, 0, 0]
-				},
-				"neck1": {
-					"rotation": [-5, 0, 0]
-				},
-				"neck2": {
-					"rotation": [12.5, 0, 0]
-				},
-				"head": {
-					"rotation": [-5, 0, 0]
-				},
-				"arm_left1": {
-					"rotation": [7.59753, -3.06817, 29.97891]
-				},
-				"arm_left2": {
-					"rotation": [0, 5, 35]
-				},
-				"arm_left3": {
-					"rotation": [0.77339, 18.73007, 5.03087]
-				},
-				"wrist_left": {
-					"rotation": [22.62442, -0.57273, 7.88279]
-				},
-				"hand_left": {
-					"rotation": [12.40986, 6.63997, 0.16269]
-				},
-				"thumb_left1": {
-					"rotation": [33.34714, -1.70579, 2.01447]
-				},
-				"thumb_left2": {
-					"rotation": [0, 0, 15]
-				},
-				"finger_left1": {
-					"rotation": [7.50706, 2.4786, 10.32652]
-				},
-				"finger_left2": {
-					"rotation": [0, 0, 22.5]
-				},
-				"finger_left3": {
-					"rotation": [-7.5, -7.5, 15]
-				},
-				"finger_left4": {
-					"rotation": [0, 0, 22.5]
-				},
-				"arm_right1": {
-					"rotation": [7.59753, 3.06817, -29.97891]
-				},
-				"arm_right2": {
-					"rotation": [0, -5, -35]
-				},
-				"arm_right3": {
-					"rotation": [0.77339, -18.73007, -5.03087]
-				},
-				"wrist_right": {
-					"rotation": [22.62442, 0.57273, -7.88279]
-				},
-				"hand_right": {
-					"rotation": [12.40986, 6.63997, 0.16269]
-				},
-				"thumb_right1": {
-					"rotation": [33.34714, 1.70579, -2.01447]
-				},
-				"thumb_right2": {
-					"rotation": [0, 0, -15]
-				},
-				"finger_right1": {
-					"rotation": [7.50706, -2.4786, -10.32652]
-				},
-				"finger_right2": {
-					"rotation": [0, 0, -22.5]
-				},
-				"finger_right3": {
-					"rotation": [-7.5, 7.5, -15]
-				},
-				"finger_right4": {
-					"rotation": [0, 0, -22.5]
-				},
-				"leg_left": {
-					"rotation": [-10.47751, -7.43331, -14.16095]
-				},
-				"leg_left2": {
-					"rotation": [35, 0, 0]
-				},
-				"foot_left": {
-					"rotation": [-22.24887, 5.12834, 11.68188]
-				},
-				"leg_right": {
-					"rotation": [-10.47751, 7.43331, 14.16095]
-				},
-				"leg_right2": {
-					"rotation": [35, 0, 0]
-				},
-				"foot_right": {
-					"rotation": [-22.24887, -5.12834, -11.68188]
-				},
-				"locator_top": {
-					"position": [0, -3, 0]
-				},
-				"locator_target": {
-					"position": [0, 0, 1.1]
-				}
-			}
-		},
-		"animation.toxtricity_amped.battle_idle": { 
-			"loop": true,
-			"bones": {
-				"body": {
-					"rotation": [0, 22.5, 0],
-					"position": [0, -2, 0]
-				},
-				"waist": {
-					"rotation": [0, 0, 0]
-				},
-				"belt": {
-					"rotation": [10, 0, 0],
-					"position": [0, 0.9, 0.3]
-				},
-				"torso": {
-					"rotation": [-22.51564, 0.75155, -2.38443]
-				},
-				"spine2": {
-					"position": [0, 2, 0]
-				},
-				"chest": {
-					"rotation": [32.49067, 0.43399, -2.46207],
-					"position": [0, 0.2, 0]
-				},
-				"neck1": {
-					"rotation": [7.28117, 2.68074, -9.63565]
-				},
-				"neck2": {
-					"rotation": [9.97659, 0.6514, -4.95269]
-				},
-				"head": {
-					"rotation": [7.32946, 7.63658, -1.52802]
-				},
-				"pupil_left": {
-					"position": [0, 0.2, 0.8]
-				},
-				"leg_left": {
-					"rotation": [-13.07039, -36.46498, -15.61249]
-				},
-				"leg_left2": {
-					"rotation": [35, 0, 0]
-				},
-				"foot_left": {
-					"rotation": [-12.19919, 0.24156, 12.74139]
-				},
-				"leg_right": {
-					"rotation": [-20.31443, 9.76061, 12.68666]
-				},
-				"leg_right2": {
-					"rotation": [35, 0, 0]
-				},
-				"foot_right": {
-					"rotation": [-12.24887, -5.12834, -11.68188]
-				},
-				"arm_left2": {
-					"rotation": [0.64601, 0.49192, 36.44279]
-				},
-				"arm_left3": {
-					"rotation": [0, 35, 0]
-				},
-				"wrist_left": {
-					"rotation": [10, 0, 0]
-				},
-				"hand_left": {
-					"rotation": [17.5, 0, 0]
-				},
-				"thumb_left1": {
-					"rotation": [7.34799, 10.10922, 12.17216],
-					"position": [0, 0, -0.1]
-				},
-				"thumb_left2": {
-					"rotation": [0, -7.5, -5]
-				},
-				"finger_left1": {
-					"rotation": [7.57198, 9.97117, 0.66119]
-				},
-				"finger_left2": {
-					"rotation": [0, 0, 25]
-				},
-				"finger_left3": {
-					"rotation": [-10, -15, 0]
-				},
-				"finger_left4": {
-					"rotation": [0, 0, 27.5]
-				},
-				"arm_left1": {
-					"rotation": [4.95708, -7.4713, 35.6574]
-				},
-				"arm_right1": {
-					"rotation": [12.34334, -2.39783, -24.85999]
-				},
-				"arm_right2": {
-					"rotation": [0, 2.5, -32.5]
-				},
-				"arm_right3": {
-					"rotation": [0, -42.5, 0]
-				},
-				"wrist_right": {
-					"rotation": [22.5, 0, 0]
-				},
-				"hand_right": {
-					"rotation": [17.10967, 3.73171, -11.93845]
-				},
-				"thumb_right1": {
-					"rotation": [7.34799, -10.10922, -12.17216],
-					"position": [0, 0, -0.1]
-				},
-				"thumb_right2": {
-					"rotation": [0, 7.5, 5]
-				},
-				"finger_right1": {
-					"rotation": [7.57198, -9.97117, -0.66119]
-				},
-				"finger_right2": {
-					"rotation": [0, 0, -25]
-				},
-				"finger_right3": {
-					"rotation": [-10, 15, 0]
-				},
-				"finger_right4": {
-					"rotation": [0, 0, -27.5]
-				},
-				"belt2": {
-					"rotation": [-20, 0, 0],
-					"position": [0, -0.53221, -0.27705]
-				},
-				"back_spike_right1": {
-					"position": [0, 1.5, 0]
-				},
-				"back_spike_left1": {
-					"position": [0, 1.5, 0]
-				},
-				"belt_front_right": {
-					"rotation": [-22.5, 0, 0],
-					"position": [0, 0.22943, -0.32766]
-				},
-				"belt_front_left": {
-					"rotation": [-22.5, 0, 0],
-					"position": [0, 0.22943, -0.32766]
-				},
-				"spike_belt_back": {
-					"rotation": [15, 0, 0]
-				},
-				"eyelid_unamused_left": {
-					"position": [0, 0.3, 0]
-				},
-				"pupil_right": {
-					"position": [0, 0, -0.6]
-				},
-				"eyelid_unamused_right": {
-					"position": [0, 0.1, 0]
-				},
-				"locator_top": {
-					"position": [0, -6, 0]
-				},
-				"locator_target": {
-					"position": [0, 0, 2.5]
-				}
-			}
-		},
-		"animation.toxtricity_amped.unamused": {
-			"loop": true
-		},
-		"animation.toxtricity_amped.angry": {
-			"loop": true,
-			"bones": {
-				"eyelid_unamused_left": {
-					"position": [-0.1, 0, 0]
-				},
-				"eyelid_angry_left": {
-					"position": [0.1, 0, 0]
-				},
-				"eyelid_unamused_right": {
-					"position": [0.1, 0, 0]
-				},
-				"eyelid_angry_right": {
-					"position": [-0.1, 0, 0]
-				}
-			}
-		},
-		"animation.toxtricity_amped.sad": {
-			"loop": true,
-			"bones": {
-				"eyelid_unamused_left": {
-					"position": [-0.1, 0, 0]
-				},
-				"eyelid_sad_left": {
-					"position": [0.1, 0, 0]
-				},
-				"eyelid_unamused_right": {
-					"position": [0.1, 0, 0]
-				},
-				"eyelid_sad_right": {
-					"position": [-0.1, 0, 0]
-				}
-			}
-		},
-		"animation.toxtricity_amped.happy": {
-			"loop": true,
-			"bones": {
-				"eyelid_unamused_left": {
-					"position": [-0.1, 0, 0]
-				},
-				"eyelid_happy_left": {
-					"position": [0.1, 0, 0]
-				},
-				"eyelid_unamused_right": {
-					"position": [0.1, 0, 0]
-				},
-				"eyelid_happy_right": {
-					"position": [-0.1, 0, 0]
-				}
-			}
-		},
-		"animation.toxtricity_amped.shocked": {
-			"loop": true,
-			"bones": {
-				"jaw": {
-					"rotation": [55, 0, 0]
-				},
-				"eyelid_unamused_left": {
-					"position": [-0.1, 0, 0]
-				},
-				"eyelid_unamused_right": {
-					"position": [0.1, 0, 0]
-				}
-			}
-		}
-	}
-}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0849_toxtricity/toxtricity_lowkey.animation.json

@@ -1,369 +0,0 @@
-{
-	"format_version": "1.8.0",
-	"animations": {
-		"animation.toxtricity_lowkey.ground_idle": {
-			"loop": true,
-			"bones": {
-				"body": {
-					"position": [0, -2, 0]
-				},
-				"waist": {
-					"rotation": [0, 0, 0]
-				},
-				"belt": {
-					"rotation": [5, 0, 0]
-				},
-				"belt_front_left": {
-					"rotation": [-12.5, 0, 0]
-				},
-				"belt_front_right": {
-					"rotation": [-12.5, 0, 0]
-				},
-				"belt2": {
-					"rotation": [-5, 0, 0]
-				},
-				"torso": {
-					"rotation": [-12.5, 0, 0]
-				},
-				"chest": {
-					"rotation": [22.5, 0, 0]
-				},
-				"neck1": {
-					"rotation": [-5, 0, 0]
-				},
-				"neck2": {
-					"rotation": [12.5, 0, 0]
-				},
-				"head": {
-					"rotation": [-5, 0, 0]
-				},
-				"arm_left1": {
-					"rotation": [7.59753, -3.06817, 29.97891]
-				},
-				"arm_left2": {
-					"rotation": [0, 5, 35]
-				},
-				"arm_left3": {
-					"rotation": [0.77339, 18.73007, 5.03087]
-				},
-				"wrist_left": {
-					"rotation": [22.62442, -0.57273, 7.88279]
-				},
-				"hand_left": {
-					"rotation": [12.40986, 6.63997, 0.16269]
-				},
-				"thumb_left1": {
-					"rotation": [33.34714, -1.70579, 2.01447]
-				},
-				"thumb_left2": {
-					"rotation": [0, 0, 15]
-				},
-				"finger_left1": {
-					"rotation": [7.50706, 2.4786, 10.32652]
-				},
-				"finger_left2": {
-					"rotation": [0, 0, 22.5]
-				},
-				"finger_left3": {
-					"rotation": [-7.5, -7.5, 15]
-				},
-				"finger_left4": {
-					"rotation": [0, 0, 22.5]
-				},
-				"arm_right1": {
-					"rotation": [7.59753, 3.06817, -29.97891]
-				},
-				"arm_right2": {
-					"rotation": [0, -5, -35]
-				},
-				"arm_right3": {
-					"rotation": [0.77339, -18.73007, -5.03087]
-				},
-				"wrist_right": {
-					"rotation": [22.62442, 0.57273, -7.88279]
-				},
-				"hand_right": {
-					"rotation": [12.40986, 6.63997, 0.16269]
-				},
-				"thumb_right1": {
-					"rotation": [33.34714, 1.70579, -2.01447]
-				},
-				"thumb_right2": {
-					"rotation": [0, 0, -15]
-				},
-				"finger_right1": {
-					"rotation": [7.50706, -2.4786, -10.32652]
-				},
-				"finger_right2": {
-					"rotation": [0, 0, -22.5]
-				},
-				"finger_right3": {
-					"rotation": [-7.5, 7.5, -15]
-				},
-				"finger_right4": {
-					"rotation": [0, 0, -22.5]
-				},
-				"leg_left": {
-					"rotation": [-10.47751, -7.43331, -14.16095]
-				},
-				"leg_left2": {
-					"rotation": [35, 0, 0]
-				},
-				"foot_left": {
-					"rotation": [-22.24887, 5.12834, 11.68188]
-				},
-				"leg_right": {
-					"rotation": [-10.47751, 7.43331, 14.16095]
-				},
-				"leg_right2": {
-					"rotation": [35, 0, 0]
-				},
-				"foot_right": {
-					"rotation": [-22.24887, -5.12834, -11.68188]
-				},
-				"locator_top": {
-					"position": [0, -3, 0]
-				},
-				"locator_target": {
-					"position": [0, 0, 1.1]
-				}
-			}
-		},
-		"animation.toxtricity_lowkey.battle_idle": {
-			"loop": true,
-			"bones": {
-				"body": {
-					"rotation": [0, -22.5, 0],
-					"position": [0, -2, 0]
-				},
-				"waist": {
-					"rotation": [0, 0, 0]
-				},
-				"belt": {
-					"rotation": [10, 0, 0],
-					"position": [0, 0.9, 0.3]
-				},
-				"torso": {
-					"rotation": [-7.47823, -0.96934, -0.10635]
-				},
-				"chest": {
-					"rotation": [14.98348, 0.54466, -4.9739],
-					"position": [0, 0.2, 0]
-				},
-				"neck1": {
-					"rotation": [-18.11892, -4.06126, -3.6608]
-				},
-				"neck2": {
-					"rotation": [-2.5297, -1.76314, -4.30454]
-				},
-				"head": {
-					"rotation": [-7.6144, -0.19091, 0.63749]
-				},
-				"pupil_left": {
-					"position": [0, -0.3, -0.6]
-				},
-				"leg_left": {
-					"rotation": [-20.31443, -9.76061, -12.68666]
-				},
-				"leg_left2": {
-					"rotation": [35, 0, 0]
-				},
-				"foot_left": {
-					"rotation": [-12.24887, 5.12834, 11.68188]
-				},
-				"leg_right": {
-					"rotation": [-13.07039, 36.46498, 15.61249]
-				},
-				"leg_right2": {
-					"rotation": [35, 0, 0]
-				},
-				"foot_right": {
-					"rotation": [-12.19919, -0.24156, -12.74139]
-				},
-				"arm_left2": {
-					"rotation": [14.36984, -7.45054, 38.2099],
-					"position": [0, 0, 0.4]
-				},
-				"arm_left3": {
-					"rotation": [0, 35, 0]
-				},
-				"wrist_left": {
-					"rotation": [9.91615, -1.29876, 7.38733]
-				},
-				"hand_left": {
-					"rotation": [17.5, 0, 0]
-				},
-				"thumb_left1": {
-					"rotation": [81.53888, -13.83061, 24.34241],
-					"position": [-0.5, -0.6, -0.1]
-				},
-				"thumb_left2": {
-					"rotation": [-2.57816, -7.04533, 15.15874]
-				},
-				"finger_left1": {
-					"rotation": [8.41207, 9.27554, 5.68331]
-				},
-				"finger_left2": {
-					"rotation": [0, 0, 25]
-				},
-				"finger_left3": {
-					"rotation": [-10, -15, 0]
-				},
-				"finger_left4": {
-					"rotation": [0, 0, 27.5]
-				},
-				"arm_left1": {
-					"rotation": [9.30627, 6.26245, 30.72637]
-				},
-				"arm_right1": {
-					"rotation": [1.73782, 17.77069, -31.71265]
-				},
-				"arm_right2": {
-					"rotation": [0.64601, -0.49192, -36.44279]
-				},
-				"arm_right3": {
-					"rotation": [0, -25, 0]
-				},
-				"wrist_right": {
-					"rotation": [22.5, 0, 0]
-				},
-				"hand_right": {
-					"rotation": [17.10967, 3.73171, -11.93845]
-				},
-				"thumb_right1": {
-					"rotation": [44.84799, -10.10922, -12.17216],
-					"position": [0, 0, -0.1]
-				},
-				"thumb_right2": {
-					"rotation": [0, 7.5, 5]
-				},
-				"finger_right1": {
-					"rotation": [7.57198, -9.97117, -0.66119]
-				},
-				"finger_right2": {
-					"rotation": [0, 0, -25]
-				},
-				"finger_right3": {
-					"rotation": [-10, 15, 0]
-				},
-				"finger_right4": {
-					"rotation": [0, 0, -27.5]
-				},
-				"belt2": {
-					"rotation": [-20, 0, 0],
-					"position": [0, -0.53221, -0.27705]
-				},
-				"back_spike_right1": {
-					"position": [0, 1.5, 0]
-				},
-				"back_spike_left1": {
-					"position": [0, 1.5, 0]
-				},
-				"belt_front_right": {
-					"rotation": [-22.5, 0, 0],
-					"position": [0, 0.22943, -0.32766]
-				},
-				"belt_front_left": {
-					"rotation": [-22.5, 0, 0],
-					"position": [0, 0.22943, -0.32766]
-				},
-				"spike_belt_back": {
-					"rotation": [15, 0, 0]
-				},
-				"eyelid_unamused_left": {
-					"position": [0, 0, 0]
-				},
-				"pupil_right": {
-					"position": [0, -0.2, 0.8]
-				},
-				"eyelid_unamused_right": {
-					"position": [0, 0, 0]
-				},
-				"locator_top": {
-					"position": [0, -1, 0]
-				},
-				"locator_target": {
-					"position": [0, 0, 0.5]
-				},
-				"head_angle": {
-					"rotation": [-2.64591, 14.95645, -0.67467]
-				},
-				"mane_right2": {
-					"rotation": [0, 0, 7.5]
-				},
-				"mane_left2": {
-					"rotation": [0, 7.5, 12.5],
-					"position": [0.5, 0, 0]
-				}
-			}
-		},
-		"animation.toxtricity_lowkey.unamused": {
-			"loop": true
-		},
-		"animation.toxtricity_lowkey.angry": {
-			"loop": true,
-			"bones": {
-				"eyelid_unamused_left": {
-					"position": [-0.1, 0, 0]
-				},
-				"eyelid_angry_left": {
-					"position": [0.1, 0, 0]
-				},
-				"eyelid_unamused_right": {
-					"position": [0.1, 0, 0]
-				},
-				"eyelid_angry_right": {
-					"position": [-0.1, 0, 0]
-				}
-			}
-		},
-		"animation.toxtricity_lowkey.sad": {
-			"loop": true,
-			"bones": {
-				"eyelid_unamused_left": {
-					"position": [-0.1, 0, 0]
-				},
-				"eyelid_sad_left": {
-					"position": [0.1, 0, 0]
-				},
-				"eyelid_unamused_right": {
-					"position": [0.1, 0, 0]
-				},
-				"eyelid_sad_right": {
-					"position": [-0.1, 0, 0]
-				}
-			}
-		},
-		"animation.toxtricity_lowkey.happy": {
-			"loop": true,
-			"bones": {
-				"eyelid_unamused_left": {
-					"position": [-0.1, 0, 0]
-				},
-				"eyelid_happy_left": {
-					"position": [0.1, 0, 0]
-				},
-				"eyelid_unamused_right": {
-					"position": [0.1, 0, 0]
-				},
-				"eyelid_happy_right": {
-					"position": [-0.1, 0, 0]
-				}
-			}
-		},
-		"animation.toxtricity_lowkey.shocked": {
-			"loop": true,
-			"bones": {
-				"jaw": {
-					"rotation": [55, 0, 0]
-				},
-				"eyelid_unamused_left": {
-					"position": [-0.1, 0, 0]
-				},
-				"eyelid_unamused_right": {
-					"position": [0.1, 0, 0]
-				}
-			}
-		}
-	}
-}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0866_mrrime/mr_rime.animation.json

@@ -1,371 +0,0 @@
-{
-	"format_version": "1.8.0",
-	"animations": {
-		"animation.mr_rime.ground_idle": {
-			"loop": true,
-			"bones": {
-				"body": {
-					"position": [0, -0.5, 0]
-				},
-				"torso": {
-					"rotation": [2.5, 0, 0]
-				},
-				"chest": {
-					"rotation": [-10, 0, 0]
-				},
-				"shoulder_right": {
-					"rotation": [104.98564, -0.00557, -14.95764]
-				},
-				"arm_right3": {
-					"rotation": [0, -80, 0]
-				},
-				"wrist_right": {
-					"rotation": [12.59435, -21.19695, 3.0003]
-				},
-				"fingers_right": {
-					"rotation": [0, 0, -35]
-				},
-				"fingers_right2": {
-					"rotation": [0, 0, -17.5]
-				},
-				"thumb_right_rotation": {
-					"rotation": [0, -12.5, -37.5]
-				},
-				"thumb_right2": {
-					"rotation": [0, 0, -27.5]
-				},
-				"shoulder_left": {
-					"rotation": [25.68485, 44.52275, 18.6358]
-				},
-				"arm_left3": {
-					"rotation": [0, 30, 0]
-				},
-				"wrist_left": {
-					"rotation": [0, 0, -12.5]
-				},
-				"fingers_left": {
-					"rotation": [0, 0, 37.5]
-				},
-				"fingers_left2": {
-					"rotation": [0, 0, 32.5]
-				},
-				"thumb_left_rotation": {
-					"rotation": [16.04323, 35.02655, 26.3081],
-					"position": [-0.5, -0.75, 0]
-				},
-				"thumb_left2": {
-					"rotation": [0, 0, 57.5]
-				},
-				"cane_top": {
-					"rotation": [92.5, 0, 0],
-					"position": [-2.5, 4.75, 11]
-				},
-				"cane_top2": {
-					"position": [0, 0, -0.25]
-				},
-				"head": {
-					"rotation": [10, 0, 0]
-				},
-				"leg_right": {
-					"rotation": [-7.5, -17.5, 0],
-					"position": [-0.75, 0, 0.5]
-				},
-				"leg_right2": {
-					"rotation": [15, 0, 0]
-				},
-				"foot_right": {
-					"rotation": [-7.5, 0, 0]
-				},
-				"leg_left": {
-					"rotation": [-7.5, 17.5, 0],
-					"position": [0.75, 0, 0.5]
-				},
-				"leg_left2": {
-					"rotation": [15, 0, 0]
-				},
-				"foot_left": {
-					"rotation": [-7.5, 0, 0]
-				},
-				"cane_bottom1": {
-					"position": [0, 1, 0]
-				}
-			}
-		},
-		"animation.mr_rime.ground_idle_angry": {
-			"loop": true,
-			"bones": {
-				"body": {
-					"position": [0, -0.5, 0]
-				},
-				"torso": {
-					"rotation": [2.5, 0, 0]
-				},
-				"chest": {
-					"rotation": [-10, 0, 0]
-				},
-				"shoulder_right": {
-					"rotation": [104.98564, -0.00557, -14.95764]
-				},
-				"arm_right3": {
-					"rotation": [0, -80, 0]
-				},
-				"wrist_right": {
-					"rotation": [12.59435, -21.19695, 3.0003]
-				},
-				"fingers_right": {
-					"rotation": [0, 0, -35]
-				},
-				"fingers_right2": {
-					"rotation": [0, 0, -17.5]
-				},
-				"thumb_right_rotation": {
-					"rotation": [0, -12.5, -37.5]
-				},
-				"thumb_right2": {
-					"rotation": [0, 0, -27.5]
-				},
-				"shoulder_left": {
-					"rotation": [25.68485, 44.52275, 18.6358]
-				},
-				"arm_left3": {
-					"rotation": [0, 30, 0]
-				},
-				"wrist_left": {
-					"rotation": [0, 0, -12.5]
-				},
-				"fingers_left": {
-					"rotation": [0, 0, 37.5]
-				},
-				"fingers_left2": {
-					"rotation": [0, 0, 32.5]
-				},
-				"thumb_left_rotation": {
-					"rotation": [16.04323, 35.02655, 26.3081],
-					"position": [-0.5, -0.75, 0]
-				},
-				"thumb_left2": {
-					"rotation": [0, 0, 57.5]
-				},
-				"cane_top": {
-					"rotation": [92.5, 0, 0],
-					"position": [-2.5, 4.75, 11]
-				},
-				"cane_top2": {
-					"position": [0, 0, -0.25]
-				},
-				"head": {
-					"rotation": [10, 0, 0]
-				},
-				"leg_right": {
-					"rotation": [-7.5, -17.5, 0],
-					"position": [-0.75, 0, 0.5]
-				},
-				"leg_right2": {
-					"rotation": [15, 0, 0]
-				},
-				"foot_right": {
-					"rotation": [-7.5, 0, 0]
-				},
-				"leg_left": {
-					"rotation": [-7.5, 17.5, 0],
-					"position": [0.75, 0, 0.5]
-				},
-				"leg_left2": {
-					"rotation": [15, 0, 0]
-				},
-				"foot_left": {
-					"rotation": [-7.5, 0, 0]
-				},
-				"cane_bottom1": {
-					"position": [0, 1, 0]
-				},
-				"belly_mouth_happy": {
-					"position": [0, 0, 0.1]
-				},
-				"belly_mouth_sad": {
-					"position": [0, 0, -0.1]
-				},
-				"belly_eye_left": {
-					"position": [0, 0, 0.1]
-				},
-				"belly_eye_left_angry": {
-					"position": [0, 0, -0.1]
-				},
-				"belly_eye_right": {
-					"position": [0, 0, 0.1]
-				},
-				"belly_eye_right_angry": {
-					"position": [0, 0, -0.1]
-				}
-			}
-		},
-		"animation.mr_rime.ground_idle_happy": {
-			"loop": true,
-			"bones": {
-				"body": {
-					"position": [0, -0.5, 0]
-				},
-				"torso": {
-					"rotation": [2.5, 0, 0]
-				},
-				"chest": {
-					"rotation": [-10, 0, 0]
-				},
-				"shoulder_right": {
-					"rotation": [104.98564, -0.00557, -14.95764]
-				},
-				"arm_right3": {
-					"rotation": [0, -80, 0]
-				},
-				"wrist_right": {
-					"rotation": [12.59435, -21.19695, 3.0003]
-				},
-				"fingers_right": {
-					"rotation": [0, 0, -35]
-				},
-				"fingers_right2": {
-					"rotation": [0, 0, -17.5]
-				},
-				"thumb_right_rotation": {
-					"rotation": [0, -12.5, -37.5]
-				},
-				"thumb_right2": {
-					"rotation": [0, 0, -27.5]
-				},
-				"shoulder_left": {
-					"rotation": [25.68485, 44.52275, 18.6358]
-				},
-				"arm_left3": {
-					"rotation": [0, 30, 0]
-				},
-				"wrist_left": {
-					"rotation": [0, 0, -12.5]
-				},
-				"fingers_left": {
-					"rotation": [0, 0, 37.5]
-				},
-				"fingers_left2": {
-					"rotation": [0, 0, 32.5]
-				},
-				"thumb_left_rotation": {
-					"rotation": [16.04323, 35.02655, 26.3081],
-					"position": [-0.5, -0.75, 0]
-				},
-				"thumb_left2": {
-					"rotation": [0, 0, 57.5]
-				},
-				"cane_top": {
-					"rotation": [92.5, 0, 0],
-					"position": [-2.5, 4.75, 11]
-				},
-				"cane_top2": {
-					"position": [0, 0, -0.25]
-				},
-				"head": {
-					"rotation": [10, 0, 0]
-				},
-				"leg_right": {
-					"rotation": [-7.5, -17.5, 0],
-					"position": [-0.75, 0, 0.5]
-				},
-				"leg_right2": {
-					"rotation": [15, 0, 0]
-				},
-				"foot_right": {
-					"rotation": [-7.5, 0, 0]
-				},
-				"leg_left": {
-					"rotation": [-7.5, 17.5, 0],
-					"position": [0.75, 0, 0.5]
-				},
-				"leg_left2": {
-					"rotation": [15, 0, 0]
-				},
-				"foot_left": {
-					"rotation": [-7.5, 0, 0]
-				},
-				"cane_bottom1": {
-					"position": [0, 1, 0]
-				},
-				"belly_eye_left": {
-					"position": [0, 0, 0.1]
-				},
-				"belly_eye_right": {
-					"position": [0, 0, 0.1]
-				},
-				"belly_eye_right_happy": {
-					"position": [0, 0, -0.1]
-				},
-				"belly_eye_left_happy": {
-					"position": [0, 0, -0.1]
-				}
-			}
-		},
-		"animation.mr_rime.blink_1": {
-			"animation_length": 0.1667,
-			"bones": {
-				"eyelid_left": {
-					"position": {
-						"0.0": [0, 0, -0.1],
-						"0.125": {"pre": [0, 0, -0.1], "post": [0, 0, -0.1]},
-						"0.1667": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}
-					}
-				},
-				"eyelid_right": {
-					"position": {
-						"0.0": [0, 0, -0.1],
-						"0.125": {"pre": [0, 0, -0.1], "post": [0, 0, -0.1]},
-						"0.1667": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}
-					}
-				},
-				"eye_open_right": {
-					"position": {
-						"0.0": [0, 0, 0.1],
-						"0.125": {"pre": [0, 0, 0.1], "post": [0, 0, 0.1]},
-						"0.1667": {"pre": [0, 0, 0.1], "post": [0, 0, 0]}
-					}
-				},
-				"eye_open_left": {
-					"position": {
-						"0.0": [0, 0, 0.1],
-						"0.125": {"pre": [0, 0, 0.1], "post": [0, 0, 0.1]},
-						"0.1667": {"pre": [0, 0, 0.1], "post": [0, 0, 0]}
-					}
-				}
-			}
-		},
-		"animation.mr_rime.blink_2": {
-			"animation_length": 0.1667,
-			"bones": {
-				"belly_eye_left": {
-					"position": {
-						"0.0": [0, 0, 0.1],
-						"0.125": {"pre": [0, 0, 0.1], "post": [0, 0, 0.1]},
-						"0.1667": {"pre": [0, 0, 0.1], "post": [0, 0, 0]}
-					}
-				},
-				"belly_eye_right": {
-					"position": {
-						"0.0": [0, 0, 0.1],
-						"0.125": {"pre": [0, 0, 0.1], "post": [0, 0, 0.1]},
-						"0.1667": {"pre": [0, 0, 0.1], "post": [0, 0, 0]}
-					}
-				},
-				"belly_eye_right_blink": {
-					"position": {
-						"0.0": [0, 0, -0.1],
-						"0.125": {"pre": [0, 0, -0.1], "post": [0, 0, -0.1]},
-						"0.1667": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}
-					}
-				},
-				"belly_eye_left_blink": {
-					"position": {
-						"0.0": [0, 0, -0.1],
-						"0.125": {"pre": [0, 0, -0.1], "post": [0, 0, -0.1]},
-						"0.1667": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}
-					}
-				}
-			}
-		}
-	}
-}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0877_morpeko/morpeko.animation.json

@@ -1,123 +0,0 @@
-{
-	"format_version": "1.8.0",
-	"animations": {
-		"animation.morpeko.ground_idle": {
-			"loop": true,
-			"bones": {
-				"tail": {
-					"rotation": [12.5, 0, 0]
-				},
-				"tail2": {
-					"rotation": [12.5, 0, 0]
-				},
-				"arm_right": {
-					"rotation": [75, -35, -90],
-					"position": [1, -0.75, -2]
-				},
-				"arm_right2": {
-					"rotation": [0, -25, 0]
-				},
-				"finger_right": {
-					"rotation": [0, 0, -20]
-				},
-				"finger_right2": {
-					"rotation": [20, 0, 0]
-				},
-				"arm_left": {
-					"rotation": [75, 35, 90],
-					"position": [-1, -0.75, -2]
-				},
-				"arm_left2": {
-					"rotation": [0, 25, 0]
-				},
-				"finger_left": {
-					"rotation": [0, 0, 20]
-				},
-				"finger_left2": {
-					"rotation": [20, 0, 0]
-				},
-				"hand_left": {
-					"rotation": [0, 17.5, 0]
-				},
-				"hand_right": {
-					"rotation": [0, -17.5, 0]
-				},
-				"leg_left": {
-					"rotation": [0, -7.5, 0]
-				},
-				"leg_right": {
-					"rotation": [0, 7.5, 0]
-				},
-				"finger_left3": {
-					"rotation": [0, 0, 20]
-				},
-				"finger_right3": {
-					"rotation": [0, 0, -20]
-				},
-				"torso": {
-					"position": [0, 0, 0]
-				},
-				"thumb_left": {
-					"rotation": [35, -43, -26]
-				},
-				"thumb_right": {
-					"rotation": [35, 43, 26]
-				},
-				"foot_left": {
-					"rotation": [0, -10, 0]
-				},
-				"foot_right": {
-					"rotation": [0, 12.5, 0]
-				}
-			}
-		},
-		"animation.morpeko.blink": {
-			"animation_length": 0.1667,
-			"bones": {
-				"eyelid_left": {
-					"position": {
-						"0.0": [0, 0, -0.1],
-						"0.125": [0, 0, -0.1],
-						"0.1667": [0, 0, 0]
-					}
-				},
-				"eyelid_right": {
-					"position": {
-						"0.0": [0, 0, -0.1],
-						"0.125": [0, 0, -0.1],
-						"0.1667": [0, 0, 0]
-					}
-				}
-			}
-		},
-		"animation.morpeko.cry": {
-			"animation_length": 1,
-			"bones": {
-				"mouth_closed": {
-					"position": {
-						"0.0833": [0, 0, 0],
-						"0.1667": {"pre": [0, 0, 0], "post": [0, 0, 0.1]},
-						"0.9167": [0, 0, 0.1],
-						"1.0": {"pre": [0, 0, 0.1], "post": [0, 0, 0]}
-					}
-				},
-				"mouth_open": {
-					"position": {
-						"0.0833": [0, 0, 0],
-						"0.1667": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
-						"0.9167": [0, 0, -0.1],
-						"1.0": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}
-					}
-				},
-				"head": {
-					"rotation": {
-						"0.0833": [0, 0, 0],
-						"0.1667": [-5, 0, 0],
-						"0.9167": [-5, 0, 0],
-						"1.0": [0, 0, 0]
-					}
-				}
-			}
-		}
-	}
-}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0938_tadbulb/tadbulb.animation.json

@@ -1,146 +0,0 @@
-{
-	"format_version": "1.8.0",
-	"animations": {
-		"animation.tadbulb.ground_idle": {
-			"loop": true,
-			"bones": {
-				"body": {
-					"position": [0, -9.5, 0]
-				},
-				"tail": {
-					"rotation": [85, 0, 0]
-				},
-				"tail2": {
-					"rotation": [5, 0, 0]
-				},
-				"tail3": {
-					"rotation": [25, 0, 0]
-				},
-				"torso": {
-					"rotation": [12.5, 0, 0]
-				},
-				"head_angle": {
-					"rotation": [-12.5, 0, 0]
-				},
-				"head_active": {
-					"scale": 1
-				}
-			}
-		},
-		"animation.tadbulb.air_idle": {
-			"loop": true,
-			"bones": {
-				"tail": {
-					"rotation": [5, 0, 0]
-				},
-				"tail2": {
-					"rotation": [5, 0, 0]
-				},
-				"tail3": {
-					"rotation": [5, 0, 0]
-				}
-			}
-		},
-		"animation.tadbulb.sleep": {
-			"loop": true,
-			"bones": {
-				"body": {
-					"position": [0, -9.5, 0]
-				},
-				"tail": {
-					"rotation": [85, 0, 0]
-				},
-				"tail2": {
-					"rotation": [5, 0, 0]
-				},
-				"tail3": {
-					"rotation": [25, 0, 0]
-				},
-				"torso": {
-					"rotation": [12.5, 0, 0]
-				},
-				"head_angle": {
-					"rotation": [7.5, 0, 0]
-				},
-				"eye_left": {
-					"position": [0, 0, 0.1]
-				},
-				"eyelid_left": {
-					"position": [0, 0, -0.1]
-				},
-				"eye_right": {
-					"position": [0, 0, 0.1]
-				},
-				"eyelid_right": {
-					"position": [0, 0, -0.1]
-				}
-			}
-		},
-		"animation.tadbulb.air_sleep": {
-			"loop": true,
-			"bones": {
-				"tail2": {
-					"rotation": [52.5, 0, 0]
-				},
-				"tail3": {
-					"rotation": [45, 0, 0]
-				},
-				"torso": {
-					"rotation": [12.5, 0, 0]
-				},
-				"head_angle": {
-					"rotation": [10, 0, 0]
-				},
-				"eye_left": {
-					"position": [0, 0, 0.1]
-				},
-				"eyelid_left": {
-					"position": [0, 0, -0.1]
-				},
-				"eye_right": {
-					"position": [0, 0, 0.1]
-				},
-				"eyelid_right": {
-					"position": [0, 0, -0.1]
-				}
-			}
-		},
-		"animation.tadbulb.blink": {
-			"animation_length": 0.1667,
-			"bones": {
-				"eye_left": {
-					"position": {
-						"0.0": [0, 0, 0.1],
-						"0.1667": {"pre": [0, 0, 0.1], "post": [0, 0, 0]}
-					}
-				},
-				"eye_right": {
-					"position": {
-						"0.0": [0, 0, 0.1],
-						"0.1667": {"pre": [0, 0, 0.1], "post": [0, 0, 0]}
-					}
-				},
-				"eyelid_left": {
-					"position": {
-						"0.0": [0, 0, -0.1],
-						"0.1667": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}
-					}
-				},
-				"eyelid_right": {
-					"position": {
-						"0.0": [0, 0, -0.1],
-						"0.1667": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}
-					}
-				}
-			}
-		},
-		"animation.tadbulb.active": {
-			"loop": true,
-			"bones": {
-				"head_active": {
-					"scale": 1.025
-				}
-			}
-		}
-	}
-}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0939_bellibolt/bellibolt.animation.json

@@ -1,108 +0,0 @@
-{
-	"format_version": "1.8.0",
-	"animations": {
-		"animation.bellibolt.blink": {
-			"animation_length": 0.1667,
-			"bones": {
-				"eye_left": {
-					"position": {
-						"0.0": [0, 0, 0.1],
-						"0.1667": {"pre": [0, 0, 0.1], "post": [0, 0, 0]}
-					}
-				},
-				"eye_right": {
-					"position": {
-						"0.0": [0, 0, 0.1],
-						"0.1667": {"pre": [0, 0, 0.1], "post": [0, 0, 0]}
-					}
-				},
-				"eyelid_left": {
-					"position": {
-						"0.0": [0, 0, -0.1],
-						"0.1667": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}
-					}
-				},
-				"eyelid_right": {
-					"position": {
-						"0.0": [0, 0, -0.1],
-						"0.1667": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}
-					}
-				}
-			}
-		},
-		"animation.bellibolt.ground_idle": {
-			"loop": true,
-			"bones": {
-				"torso": {
-					"rotation": [-2.5, 0, 0]
-				},
-				"foot_left": {
-					"rotation": [0, -22.5, 0]
-				},
-				"foot_right": {
-					"rotation": [0, 22.5, 0]
-				},
-				"arm_left": {
-					"rotation": [22.5, 25, 0]
-				},
-				"arm_right": {
-					"rotation": [22.5, -25, 0]
-				},
-				"torso2": {
-					"rotation": [5, 0, 0]
-				},
-				"belly_active": {
-					"position": [0, 0, 1]
-				}
-			}
-		},
-		"animation.bellibolt.sleep": {
-			"loop": true,
-			"bones": {
-				"torso": {
-					"rotation": [-7.5, 0, 0],
-					"position": [0, -3, 0]
-				},
-				"head_angle": {
-					"rotation": [5, 0, 0]
-				},
-				"foot_left": {
-					"rotation": [0, -22.5, 0],
-					"position": [2, 0, 0]
-				},
-				"foot_right": {
-					"rotation": [0, 22.5, 0],
-					"position": [-2, 0, 0]
-				},
-				"arm_left": {
-					"rotation": [22.5, 25, 0]
-				},
-				"arm_right": {
-					"rotation": [22.5, -25, 0]
-				},
-				"eye_left": {
-					"position": [0, 0, 0.1]
-				},
-				"eyelid_left": {
-					"position": [0, 0, -0.1]
-				},
-				"eye_right": {
-					"position": [0, 0, 0.1]
-				},
-				"eyelid_right": {
-					"position": [0, 0, -0.1]
-				},
-				"torso2": {
-					"rotation": [5, 0, 0]
-				},
-				"belly_active": {
-					"position": [0, 0, 1]
-				},
-				"feet": {
-					"rotation": [-67.5, 0, 0],
-					"position": [0, -1, -8]
-				}
-			}
-		}
-	}
-}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0948_toedscool/toedscool.animation.json

@@ -1,88 +0,0 @@
-{
-	"format_version": "1.8.0",
-	"animations": {
-		"animation.toedscool.ground_idle": {
-			"loop": true,
-			"bones": {
-				"body": {
-					"position": [0, "-0.5+0.06*(math.sin(q.anim_time*90*2-40)*2)", 0]
-				},
-				"torso": {
-					"rotation": ["5+0.5*math.sin(q.anim_time*90*2-40)*2", 0, 0]
-				},
-				"flap_left": {
-					"rotation": [0, 0, "2*math.sin(q.anim_time*90*2-60)*2"]
-				},
-				"flap_right": {
-					"rotation": [0, 0, "-2*math.sin(q.anim_time*90*2-60)*2"]
-				},
-				"flap_back": {
-					"rotation": ["-2*math.sin(q.anim_time*90*2-60)*2", 0, 0]
-				},
-				"tentacle_left": {
-					"rotation": ["-5+1.5*math.sin(q.anim_time*90*2-40)*2", -10, 0]
-				},
-				"tentacle_left2": {
-					"rotation": ["5-1*math.sin(q.anim_time*90*2-40)*2", 0, 0]
-				},
-				"tentacle_left3": {
-					"rotation": ["7.5-1*math.sin(q.anim_time*90*2-40)*2", 0, 0]
-				},
-				"tentacle_left4": {
-					"rotation": ["5-1*math.sin(q.anim_time*90*2-40)*2", 0, 0]
-				},
-				"tentacle_left5": {
-					"rotation": ["-12.5+1.5*math.sin(q.anim_time*90*2-40)*2", 0, 0]
-				},
-				"tentacle_right": {
-					"rotation": ["-5+1.5*math.sin(q.anim_time*90*2-40)*2", 10, 0]
-				},
-				"tentacle_right2": {
-					"rotation": ["5-1*math.sin(q.anim_time*90*2-40)*2", 0, 0]
-				},
-				"tentacle_right3": {
-					"rotation": ["7.5-1*math.sin(q.anim_time*90*2-40)*2", 0, 0]
-				},
-				"tentacle_right4": {
-					"rotation": ["5-1*math.sin(q.anim_time*90*2-40)*2", 0, 0]
-				},
-				"tentacle_right5": {
-					"rotation": ["-12.5+1.5*math.sin(q.anim_time*90*2-40)*2", 0, 0]
-				}
-			}
-		},
-		"animation.toedscool.blink": {
-			"animation_length": 0.1667,
-			"bones": {
-				"eyelid_right": {
-					"position": {
-						"0.0": [0, 0, -0.1],
-						"0.125": {"pre": [0, 0, -0.1], "post": [0, 0, -0.1]},
-						"0.1667": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}
-					}
-				},
-				"eye_right": {
-					"position": {
-						"0.0": [0, 0, 0.1],
-						"0.125": {"pre": [0, 0, 0.1], "post": [0, 0, 0.1]},
-						"0.1667": {"pre": [0, 0, 0.1], "post": [0, 0, 0]}
-					}
-				},
-				"eye_left": {
-					"position": {
-						"0.0": [0, 0, 0.1],
-						"0.125": {"pre": [0, 0, 0.1], "post": [0, 0, 0.1]},
-						"0.1667": {"pre": [0, 0, 0.1], "post": [0, 0, 0]}
-					}
-				},
-				"eyelid_left": {
-					"position": {
-						"0.0": [0, 0, -0.1],
-						"0.125": {"pre": [0, 0, -0.1], "post": [0, 0, -0.1]},
-						"0.1667": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}
-					}
-				}
-			}
-		}
-	}
-}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0949_toedscruel/toedscruel.animation.json

@@ -1,392 +0,0 @@
-{
-	"format_version": "1.8.0",
-	"animations": {
-		"animation.toedscruel.ground_idle": {
-			"loop": true,
-			"bones": {
-				"body": {
-					"position": [0, "-1-0.1*(math.sin(q.anim_time*90*1.5-40)*2)", 0]
-				},
-				"torso": {
-					"rotation": ["1+0.5*math.sin(q.anim_time*90*1.5-40)*2", 0, 0],
-					"position": [0, "-0.025*(math.sin(q.anim_time*90*1.5-60)*2)", 0]
-				},
-				"brim_front": {
-					"rotation": ["-1.5*math.sin(q.anim_time*90*1.5-60)*2", 0, 0]
-				},
-				"brim_right": {
-					"rotation": [0, 0, "1*math.sin(q.anim_time*90*1.5-60)*2"]
-				},
-				"brim_back": {
-					"rotation": ["1*math.sin(q.anim_time*90*1.5-60)*2", 0, 0]
-				},
-				"siphon": {
-					"rotation": ["-1.5*math.sin(q.anim_time*90*1.5-60)*2", 0, 0]
-				},
-				"tentacle_front_left": {
-					"rotation": ["-15+3*math.sin(q.anim_time*90*1.5-60)*2", "-20-1.5*math.sin(q.anim_time*90*1.5-40)*2", 0]
-				},
-				"tentacle_front_left2": {
-					"rotation": ["-35-2*math.sin(q.anim_time*90*1.5-40)*2", 0, 0]
-				},
-				"tentacle_front_left3": {
-					"rotation": ["-35-2*math.sin(q.anim_time*90*1.5-40)*2", 0, 0]
-				},
-				"tentacle_front_left4": {
-					"rotation": ["-35-2*math.sin(q.anim_time*90*1.5-40)*2", 0, 0]
-				},
-				"tentacle_front_left5": {
-					"rotation": ["40+3*math.sin(q.anim_time*90*1.5-40)*2", 0, 0]
-				},
-				"tentacle_outer_front_left": {
-					"rotation": ["-10-1.5*math.sin(q.anim_time*90*1.5-40)*2", 0, 0]
-				},
-				"tentacle_outer_front_left2": {
-					"rotation": ["5+1*math.sin(q.anim_time*90*1.5-40)*2", 0, 0]
-				},
-				"tentacle_outer_front_left3": {
-					"rotation": ["5+1*math.sin(q.anim_time*90*1.5-40)*2", 0, 0]
-				},
-				"tentacle_outer_front_left4": {
-					"rotation": ["7.5+1*math.sin(q.anim_time*90*1.5-40)*2", 0, 0]
-				},
-				"tentacle_outer_front_left5": {
-					"rotation": ["-30-1.5*math.sin(q.anim_time*90*1.5-40)*2", 0, 0]
-				},
-				"tentacle_outer_left": {
-					"rotation": ["-10-1.5*math.sin(q.anim_time*90*1.5-40)*2", 0, 0]
-				},
-				"tentacle_outer_left2": {
-					"rotation": ["5+1*math.sin(q.anim_time*90*1.5-40)*2", 0, 0]
-				},
-				"tentacle_outer_left3": {
-					"rotation": ["5+1*math.sin(q.anim_time*90*1.5-40)*2", 0, 0]
-				},
-				"tentacle_outer_left4": {
-					"rotation": ["7.5+1*math.sin(q.anim_time*90*1.5-40)*2", 0, 0]
-				},
-				"tentacle_outer_left5": {
-					"rotation": ["-30-1.5*math.sin(q.anim_time*90*1.5-40)*2", 0, 0]
-				},
-				"tentacle_outer_back_left": {
-					"rotation": ["-10-1.5*math.sin(q.anim_time*90*1.5-40)*2", 0, 0]
-				},
-				"tentacle_outer_back_left2": {
-					"rotation": ["5+1*math.sin(q.anim_time*90*1.5-40)*2", 0, 0]
-				},
-				"tentacle_outer_back_left3": {
-					"rotation": ["5+1*math.sin(q.anim_time*90*1.5-40)*2", 0, 0]
-				},
-				"tentacle_outer_back_left4": {
-					"rotation": ["7.5+1*math.sin(q.anim_time*90*1.5-40)*2", 0, 0]
-				},
-				"tentacle_outer_back_left5": {
-					"rotation": ["-30-1.5*math.sin(q.anim_time*90*1.5-40)*2", 0, 0]
-				},
-				"tentacle_back_left": {
-					"rotation": ["-10-1.5*math.sin(q.anim_time*90*1.5-40)*2", 0, 0]
-				},
-				"tentacle_back_left2": {
-					"rotation": ["5+1*math.sin(q.anim_time*90*1.5-40)*2", 0, 0]
-				},
-				"tentacle_back_left3": {
-					"rotation": ["5+1*math.sin(q.anim_time*90*1.5-40)*2", 0, 0]
-				},
-				"tentacle_back_left4": {
-					"rotation": ["7.5+1*math.sin(q.anim_time*90*1.5-40)*2", 0, 0]
-				},
-				"tentacle_back_left5": {
-					"rotation": ["-30-1.5*math.sin(q.anim_time*90*1.5-40)*2", 0, 0]
-				},
-				"tentacle_front_right": {
-					"rotation": ["-15+3*math.sin(q.anim_time*90*1.5-60)*2", "20+1.5*math.sin(q.anim_time*90*1.5-40)*2", 0]
-				},
-				"tentacle_front_right2": {
-					"rotation": ["-35-2*math.sin(q.anim_time*90*1.5-40)*2", 0, 0]
-				},
-				"tentacle_front_right3": {
-					"rotation": ["-35-2*math.sin(q.anim_time*90*1.5-40)*2", 0, 0]
-				},
-				"tentacle_front_right4": {
-					"rotation": ["-35-2*math.sin(q.anim_time*90*1.5-40)*2", 0, 0]
-				},
-				"tentacle_front_right5": {
-					"rotation": ["40+3*math.sin(q.anim_time*90*1.5-40)*2", 0, 0]
-				},
-				"tentacle_outer_front_right": {
-					"rotation": ["-10-1.5*math.sin(q.anim_time*90*1.5-40)*2", 0, 0]
-				},
-				"tentacle_outer_front_right2": {
-					"rotation": ["5+1*math.sin(q.anim_time*90*1.5-40)*2", 0, 0]
-				},
-				"tentacle_outer_front_right3": {
-					"rotation": ["5+1*math.sin(q.anim_time*90*1.5-40)*2", 0, 0]
-				},
-				"tentacle_outer_front_right4": {
-					"rotation": ["7.5+1*math.sin(q.anim_time*90*1.5-40)*2", 0, 0]
-				},
-				"tentacle_outer_front_right5": {
-					"rotation": ["-30-1.5*math.sin(q.anim_time*90*1.5-40)*2", 0, 0]
-				},
-				"tentacle_outer_right": {
-					"rotation": ["-10-1.5*math.sin(q.anim_time*90*1.5-40)*2", 0, 0]
-				},
-				"tentacle_outer_right2": {
-					"rotation": ["5+1*math.sin(q.anim_time*90*1.5-40)*2", 0, 0]
-				},
-				"tentacle_outer_right3": {
-					"rotation": ["5+1*math.sin(q.anim_time*90*1.5-40)*2", 0, 0]
-				},
-				"tentacle_outer_right4": {
-					"rotation": ["7.5+1*math.sin(q.anim_time*90*1.5-40)*2", 0, 0]
-				},
-				"tentacle_outer_right5": {
-					"rotation": ["-30-1.5*math.sin(q.anim_time*90*1.5-40)*2", 0, 0]
-				},
-				"tentacle_outer_back_right": {
-					"rotation": ["-10-1.5*math.sin(q.anim_time*90*1.5-40)*2", 0, 0]
-				},
-				"tentacle_outer_back_right2": {
-					"rotation": ["5+1*math.sin(q.anim_time*90*1.5-40)*2", 0, 0]
-				},
-				"tentacle_outer_back_right3": {
-					"rotation": ["5+1*math.sin(q.anim_time*90*1.5-40)*2", 0, 0]
-				},
-				"tentacle_outer_back_right4": {
-					"rotation": ["7.5+1*math.sin(q.anim_time*90*1.5-40)*2", 0, 0]
-				},
-				"tentacle_outer_back_right5": {
-					"rotation": ["-30-1.5*math.sin(q.anim_time*90*1.5-40)*2", 0, 0]
-				},
-				"tentacle_back_right": {
-					"rotation": ["-10-1.5*math.sin(q.anim_time*90*1.5-40)*2", 0, 0]
-				},
-				"tentacle_back_right2": {
-					"rotation": ["5+1*math.sin(q.anim_time*90*1.5-40)*2", 0, 0]
-				},
-				"tentacle_back_right3": {
-					"rotation": ["5+1*math.sin(q.anim_time*90*1.5-40)*2", 0, 0]
-				},
-				"tentacle_back_right4": {
-					"rotation": ["7.5+1*math.sin(q.anim_time*90*1.5-40)*2", 0, 0]
-				},
-				"tentacle_back_right5": {
-					"rotation": ["-30-1.5*math.sin(q.anim_time*90*1.5-40)*2", 0, 0]
-				}
-			}
-		},
-		"animation.toedscruel.ground_sleep": {
-			"loop": true,
-			"bones": {
-				"body": {
-					"position": [0, "-2-0.15*(math.sin(q.anim_time*90*1-40)*2)", 0]
-				},
-				"torso": {
-					"rotation": ["8.5+0.5*math.sin(q.anim_time*90*1-40)*2", 0, 0],
-					"position": [0, "-0.025*(math.sin(q.anim_time*90*1-60)*2)", 0]
-				},
-				"brim_front": {
-					"rotation": ["-1.5*math.sin(q.anim_time*90*1-60)*2", 0, 0]
-				},
-				"brim_right": {
-					"rotation": [0, 0, "1*math.sin(q.anim_time*90*1-60)*2"]
-				},
-				"brim_back": {
-					"rotation": ["1*math.sin(q.anim_time*90*1-60)*2", 0, 0]
-				},
-				"siphon": {
-					"rotation": ["-1.5*math.sin(q.anim_time*90*1-60)*2", 0, 0]
-				},
-				"tentacle_front_left": {
-					"rotation": ["-167.5+1.5*math.sin(q.anim_time*90*1-40)*2", 30, -180]
-				},
-				"tentacle_front_left2": {
-					"rotation": ["-10-1*math.sin(q.anim_time*90*1-40)*2", 0, 0]
-				},
-				"tentacle_front_left3": {
-					"rotation": ["-12.5-1*math.sin(q.anim_time*90*1-40)*2", 0, 0]
-				},
-				"tentacle_front_left4": {
-					"rotation": ["-17.5-1*math.sin(q.anim_time*90*1-40)*2", 0, 0]
-				},
-				"tentacle_front_left5": {
-					"rotation": ["15+30+1.5*math.sin(q.anim_time*90*1-40)*2", 0, 0]
-				},
-				"tentacle_outer_front_left": {
-					"rotation": ["-12.5-1.5*math.sin(q.anim_time*90*1-40)*2", 0, 0]
-				},
-				"tentacle_outer_front_left2": {
-					"rotation": ["10+1*math.sin(q.anim_time*90*1-40)*2", 0, 0]
-				},
-				"tentacle_outer_front_left3": {
-					"rotation": ["12.5+1*math.sin(q.anim_time*90*1-40)*2", 0, 0]
-				},
-				"tentacle_outer_front_left4": {
-					"rotation": ["17.5+1*math.sin(q.anim_time*90*1-40)*2", 0, 0]
-				},
-				"tentacle_outer_front_left5": {
-					"rotation": ["-45-1.5*math.sin(q.anim_time*90*1-40)*2", 0, 0]
-				},
-				"tentacle_outer_left": {
-					"rotation": ["-12.5-1.5*math.sin(q.anim_time*90*1-40)*2", 0, 0]
-				},
-				"tentacle_outer_left2": {
-					"rotation": ["10+1*math.sin(q.anim_time*90*1-40)*2", 0, 0]
-				},
-				"tentacle_outer_left3": {
-					"rotation": ["12.5+1*math.sin(q.anim_time*90*1-40)*2", 0, 0]
-				},
-				"tentacle_outer_left4": {
-					"rotation": ["17.5+1*math.sin(q.anim_time*90*1-40)*2", 0, 0]
-				},
-				"tentacle_outer_left5": {
-					"rotation": ["-45-1.5*math.sin(q.anim_time*90*1-40)*2", 0, 0]
-				},
-				"tentacle_outer_back_left": {
-					"rotation": ["-12.5-1.5*math.sin(q.anim_time*90*1-40)*2", 0, 0]
-				},
-				"tentacle_outer_back_left2": {
-					"rotation": ["10+1*math.sin(q.anim_time*90*1-40)*2", 0, 0]
-				},
-				"tentacle_outer_back_left3": {
-					"rotation": ["12.5+1*math.sin(q.anim_time*90*1-40)*2", 0, 0]
-				},
-				"tentacle_outer_back_left4": {
-					"rotation": ["17.5+1*math.sin(q.anim_time*90*1-40)*2", 0, 0]
-				},
-				"tentacle_outer_back_left5": {
-					"rotation": ["-45-1.5*math.sin(q.anim_time*90*1-40)*2", 0, 0]
-				},
-				"tentacle_back_left": {
-					"rotation": ["-12.5-1.5*math.sin(q.anim_time*90*1-40)*2", 0, 0]
-				},
-				"tentacle_back_left2": {
-					"rotation": ["10+1*math.sin(q.anim_time*90*1-40)*2", 0, 0]
-				},
-				"tentacle_back_left3": {
-					"rotation": ["12.5+1*math.sin(q.anim_time*90*1-40)*2", 0, 0]
-				},
-				"tentacle_back_left4": {
-					"rotation": ["17.5+1*math.sin(q.anim_time*90*1-40)*2", 0, 0]
-				},
-				"tentacle_back_left5": {
-					"rotation": ["-45-1.5*math.sin(q.anim_time*90*1-40)*2", 0, 0]
-				},
-				"tentacle_front_right": {
-					"rotation": ["-167.5+1.5*math.sin(q.anim_time*90*1-40)*2", -30, -180]
-				},
-				"tentacle_front_right2": {
-					"rotation": ["-10-1*math.sin(q.anim_time*90*1-40)*2", 0, 0]
-				},
-				"tentacle_front_right3": {
-					"rotation": ["-12.5-1*math.sin(q.anim_time*90*1-40)*2", 0, 0]
-				},
-				"tentacle_front_right4": {
-					"rotation": ["-17.5-1*math.sin(q.anim_time*90*1-40)*2", 0, 0]
-				},
-				"tentacle_front_right5": {
-					"rotation": ["15+30+1.5*math.sin(q.anim_time*90*1-40)*2", 0, 0]
-				},
-				"tentacle_outer_front_right": {
-					"rotation": ["-12.5-1.5*math.sin(q.anim_time*90*1-40)*2", 0, 0]
-				},
-				"tentacle_outer_front_right2": {
-					"rotation": ["10+1*math.sin(q.anim_time*90*1-40)*2", 0, 0]
-				},
-				"tentacle_outer_front_right3": {
-					"rotation": ["12.5+1*math.sin(q.anim_time*90*1-40)*2", 0, 0]
-				},
-				"tentacle_outer_front_right4": {
-					"rotation": ["17.5+1*math.sin(q.anim_time*90*1-40)*2", 0, 0]
-				},
-				"tentacle_outer_front_right5": {
-					"rotation": ["-45-1.5*math.sin(q.anim_time*90*1-40)*2", 0, 0]
-				},
-				"tentacle_outer_right": {
-					"rotation": ["-12.5-1.5*math.sin(q.anim_time*90*1-40)*2", 0, 0]
-				},
-				"tentacle_outer_right2": {
-					"rotation": ["10+1*math.sin(q.anim_time*90*1-40)*2", 0, 0]
-				},
-				"tentacle_outer_right3": {
-					"rotation": ["12.5+1*math.sin(q.anim_time*90*1-40)*2", 0, 0]
-				},
-				"tentacle_outer_right4": {
-					"rotation": ["17.5+1*math.sin(q.anim_time*90*1-40)*2", 0, 0]
-				},
-				"tentacle_outer_right5": {
-					"rotation": ["-45-1.5*math.sin(q.anim_time*90*1-40)*2", 0, 0]
-				},
-				"tentacle_outer_back_right": {
-					"rotation": ["-12.5-1.5*math.sin(q.anim_time*90*1-40)*2", 0, 0]
-				},
-				"tentacle_outer_back_right2": {
-					"rotation": ["10+1*math.sin(q.anim_time*90*1-40)*2", 0, 0]
-				},
-				"tentacle_outer_back_right3": {
-					"rotation": ["12.5+1*math.sin(q.anim_time*90*1-40)*2", 0, 0]
-				},
-				"tentacle_outer_back_right4": {
-					"rotation": ["17.5+1*math.sin(q.anim_time*90*1-40)*2", 0, 0]
-				},
-				"tentacle_outer_back_right5": {
-					"rotation": ["-45-1.5*math.sin(q.anim_time*90*1-40)*2", 0, 0]
-				},
-				"tentacle_back_right": {
-					"rotation": ["-12.5-1.5*math.sin(q.anim_time*90*1-40)*2", 0, 0]
-				},
-				"tentacle_back_right2": {
-					"rotation": ["10+1*math.sin(q.anim_time*90*1-40)*2", 0, 0]
-				},
-				"tentacle_back_right3": {
-					"rotation": ["12.5+1*math.sin(q.anim_time*90*1-40)*2", 0, 0]
-				},
-				"tentacle_back_right4": {
-					"rotation": ["17.5+1*math.sin(q.anim_time*90*1-40)*2", 0, 0]
-				},
-				"tentacle_back_right5": {
-					"rotation": ["-45-1.5*math.sin(q.anim_time*90*1-40)*2", 0, 0]
-				},
-				"eyelid_left": {
-					"position": [0, 0, -0.1]
-				},
-				"eyelid_right": {
-					"position": [0, 0, -0.1]
-				}
-			}
-		},
-		"animation.toedscruel.blink": {
-			"animation_length": 0.1667,
-			"bones": {
-				"eyelid_right": {
-					"position": {
-						"0.0": [0, 0, -0.1],
-						"0.125": {"pre": [0, 0, -0.1], "post": [0, 0, -0.1]},
-						"0.1667": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}
-					}
-				},
-				"eyelid_left": {
-					"position": {
-						"0.0": [0, 0, -0.1],
-						"0.125": {"pre": [0, 0, -0.1], "post": [0, 0, -0.1]},
-						"0.1667": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}
-					}
-				},
-				"eye_left": {
-					"position": {
-						"0.0": [0, 0, 0.1],
-						"0.125": {"pre": [0, 0, 0.1], "post": [0, 0, 0.1]},
-						"0.1667": {"pre": [0, 0, 0.1], "post": [0, 0, 0]}
-					}
-				},
-				"eye_right": {
-					"position": {
-						"0.0": [0, 0, 0.1],
-						"0.125": {"pre": [0, 0, 0.1], "post": [0, 0, 0.1]},
-						"0.1667": {"pre": [0, 0, 0.1], "post": [0, 0, 0]}
-					}
-				}
-			}
-		}
-	}
-}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0951_capsakid/capsakid.animation.json

@@ -1,120 +0,0 @@
-{
-	"format_version": "1.8.0",
-	"animations": {
-		"animation.capsakid.ground_idle": {
-			"loop": true,
-			"bones": {
-				"leg_left": {
-					"rotation": [0, -15, 0]
-				},
-				"leg_right": {
-					"rotation": [0, 15, 0]
-				},
-				"tail": {
-					"rotation": [15, 0, 0]
-				},
-				"arm_right": {
-					"rotation": [0, 0, -50]
-				},
-				"collar_front": {
-					"rotation": [60, 0, 0]
-				},
-				"collar_back": {
-					"rotation": [-57.5, 0, 0]
-				},
-				"arm_left": {
-					"rotation": [0, 0, 50]
-				},
-				"hair_top_left": {
-					"rotation": [10, 0, 0]
-				},
-				"hair_top_right": {
-					"rotation": [10, 0, 0]
-				},
-				"hair_back_left": {
-					"rotation": [-10, 0, 0]
-				},
-				"hair_left": {
-					"rotation": [0, 5, 0]
-				},
-				"head": {
-					"rotation": [-1, 0, 0]
-				},
-				"hair_right": {
-					"rotation": [0, -5, 0]
-				},
-				"hair_back_right": {
-					"rotation": [-10, 0, 0]
-				}
-			}
-		},
-		"animation.capsakid.blink": {
-			"animation_length": 0.1667,
-			"bones": {
-				"eye_right": {
-					"position": {
-						"0.0": [0.1, 0, 0.1],
-						"0.125": {
-							"pre": [0.1, 0, 0.1],
-							"post": [0.1, 0, 0.1]
-						},
-						"0.1667": {
-							"pre": [0.1, 0, 0.1],
-							"post": [0, 0, 0]
-						}
-					}
-				},
-				"eye_left": {
-					"position": {
-						"0.0": [-0.1, 0, 0.1],
-						"0.125": {
-							"pre": [-0.1, 0, 0.1],
-							"post": [-0.1, 0, 0.1]
-						},
-						"0.1667": {
-							"pre": [-0.1, 0, 0.1],
-							"post": [0, 0, 0]
-						}
-					}
-				},
-				"eyelid_right": {
-					"position": {
-						"0.0": [-0.1, 0, -0.1],
-						"0.125": {
-							"pre": [-0.1, 0, -0.1],
-							"post": [-0.1, 0, -0.1]
-						},
-						"0.1667": {
-							"pre": [-0.1, 0, -0.1],
-							"post": [0, 0, 0]
-						}
-					}
-				},
-				"eyelid_left": {
-					"position": {
-						"0.0": [0.1, 0, -0.1],
-						"0.125": {
-							"pre": [0.1, 0, -0.1],
-							"post": [0.1, 0, -0.1]
-						},
-						"0.1667": {
-							"pre": [0.1, 0, -0.1],
-							"post": [0, 0, 0]
-						}
-					}
-				}
-			}
-		},
-		"animation.capsakid.hold_item": {
-			"loop": true,
-			"bones": {
-				"arm_right": {
-					"rotation": [0, 0, 10]
-				},
-				"arm_right2": {
-					"rotation": [0, 0, 10]
-				}
-			}
-		}
-	}
-}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0952_scovillian/scovillain.animation.json

@@ -1,276 +0,0 @@
-{
-	"format_version": "1.8.0",
-	"animations": {
-		"animation.scovillain.ground_idle": {
-			"loop": true,
-			"bones": {
-				"jaw_right": {
-					"rotation": [5, 0, 0]
-				},
-				"tongue_right": {
-					"rotation": [5, 0, 0]
-				},
-				"tongue_right2": {
-					"rotation": [-15, 0, 0]
-				},
-				"tongue_right4": {
-					"rotation": [-45, 0, 0]
-				},
-				"head_angle_left": {
-					"rotation": [27.5, 5, -25]
-				},
-				"leaves_left_bottom": {
-					"rotation": [7.5, 0, 0]
-				},
-				"tongue_left2": {
-					"rotation": [17.5, 0, 0]
-				},
-				"tongue_left3": {
-					"rotation": [-35, 0, 0]
-				},
-				"jaw_left": {
-					"rotation": [5, 0, 0]
-				},
-				"body": {
-					"position": [0, -3.75, 0]
-				},
-				"neck_right3": {
-					"rotation": [20, 0, 0]
-				},
-				"neck_right": {
-					"rotation": [0, 45, -15]
-				},
-				"neck_left": {
-					"rotation": [0, -45, 15]
-				},
-				"neck_left3": {
-					"rotation": [20, 0, 0]
-				},
-				"head_angle_right": {
-					"rotation": [27.5, -5, 25]
-				},
-				"leg_left": {
-					"rotation": [-45, -45, 0]
-				},
-				"leg_left2": {
-					"rotation": [50, 0, 0]
-				},
-				"foot_left": {
-					"rotation": [-5, 0, 0]
-				},
-				"leg_right": {
-					"rotation": [-45, 45, 0]
-				},
-				"leg_right2": {
-					"rotation": [50, 0, 0]
-				},
-				"foot_right": {
-					"rotation": [-5, 0, 0]
-				},
-				"tail": {
-					"rotation": [-22.5, 0, 0]
-				},
-				"tail2": {
-					"rotation": [35, 0, 0]
-				},
-				"tongue_right3": {
-					"rotation": [45, 0, 0]
-				},
-				"tongue_left4": {
-					"rotation": [22.5, 0, 0]
-				},
-				"arm_left": {
-					"rotation": [0, -15, 60]
-				},
-				"arm_left2": {
-					"rotation": [0, 67.5, 0]
-				},
-				"hand_left": {
-					"rotation": [0, 0, 35]
-				},
-				"arm_right": {
-					"rotation": [0, 15, -60]
-				},
-				"arm_right2": {
-					"rotation": [0, -65, 0]
-				},
-				"hand_right": {
-					"rotation": [0, 0, -35]
-				},
-				"neck_right4": {
-					"rotation": [30, 0, 0]
-				},
-				"neck_left4": {
-					"rotation": [30, 0, 0]
-				},
-				"tail3": {
-					"rotation": [27.5, 0, 0]
-				},
-				"necks": {
-					"rotation": [10, 0, 0]
-				},
-				"collar_front_left": {
-					"rotation": [0, -15, 0]
-				},
-				"collar_front_left2": {
-					"rotation": [42.5, 0, 0]
-				},
-				"collar": {
-					"rotation": [5, 0, 0]
-				},
-				"collar_front_right": {
-					"rotation": [0, 15, 0]
-				},
-				"collar_front_right2": {
-					"rotation": [42.5, 0, 0]
-				},
-				"collar_back_left": {
-					"rotation": [5, 7.5, 0]
-				},
-				"collar_back_left2": {
-					"rotation": [-25, 0, 0]
-				},
-				"collar_back_right": {
-					"rotation": [5, -10, 0]
-				},
-				"collar_back_right2": {
-					"rotation": [-27.5, 0, 0]
-				},
-				"collar_back_right3": {
-					"rotation": [0, 0, -40]
-				},
-				"collar_back_left3": {
-					"rotation": [0, 0, 40]
-				}
-			}
-		},
-		"animation.scovillain.blink": {
-			"animation_length": 0.1667,
-			"bones": {
-				"eye_outer_right": {
-					"position": {
-						"0.0": [0.1, -0.1, 0],
-						"0.125": {
-							"pre": [0.1, -0.1, 0],
-							"post": [0.1, -0.1, 0]
-						},
-						"0.1667": {
-							"pre": [0.1, -0.1, 0],
-							"post": [0, 0, 0]
-						}
-					}
-				},
-				"eyelid_outer_right": {
-					"position": {
-						"0.0": [-0.1, 0.1, 0],
-						"0.125": {
-							"pre": [-0.1, 0.1, 0],
-							"post": [-0.1, 0.1, 0]
-						},
-						"0.1667": {
-							"pre": [-0.1, 0.1, 0],
-							"post": [0, 0, 0]
-						}
-					}
-				},
-				"eye_inner_right": {
-					"position": {
-						"0.0": [-0.1, -0.1, 0],
-						"0.125": {
-							"pre": [-0.1, -0.1, 0],
-							"post": [-0.1, -0.1, 0]
-						},
-						"0.1667": {
-							"pre": [-0.1, -0.1, 0],
-							"post": [0, 0, 0]
-						}
-					}
-				},
-				"eyelid_inner_right": {
-					"position": {
-						"0.0": [0.1, 0.1, 0],
-						"0.125": {
-							"pre": [0.1, 0.1, 0],
-							"post": [0.1, 0.1, 0]
-						},
-						"0.1667": {
-							"pre": [0.1, 0.1, 0],
-							"post": [0, 0, 0]
-						}
-					}
-				}
-			}
-		},
-		"animation.scovillain.blink2": {
-			"animation_length": 0.1667,
-			"bones": {
-				"eye_outer_left": {
-					"position": {
-						"0.0": [-0.1, -0.1, 0],
-						"0.125": {
-							"pre": [-0.1, -0.1, 0],
-							"post": [-0.1, -0.1, 0]
-						},
-						"0.1667": {
-							"pre": [-0.1, -0.1, 0],
-							"post": [0, 0, 0]
-						}
-					}
-				},
-				"eyelid_outer_left": {
-					"position": {
-						"0.0": [0.1, 0.1, 0],
-						"0.125": {
-							"pre": [0.1, 0.1, 0],
-							"post": [0.1, 0.1, 0]
-						},
-						"0.1667": {
-							"pre": [0.1, 0.1, 0],
-							"post": [0, 0, 0]
-						}
-					}
-				},
-				"eyelid_inner_left": {
-					"position": {
-						"0.0": [-0.1, 0.1, 0],
-						"0.125": {
-							"pre": [-0.1, 0.1, 0],
-							"post": [-0.1, 0.1, 0]
-						},
-						"0.1667": {
-							"pre": [-0.1, 0.1, 0],
-							"post": [0, 0, 0]
-						}
-					}
-				},
-				"eye_inner_left": {
-					"position": {
-						"0.0": [0.1, -0.1, 0],
-						"0.125": {
-							"pre": [0.1, -0.1, 0],
-							"post": [0.1, -0.1, 0]
-						},
-						"0.1667": {
-							"pre": [0.1, -0.1, 0],
-							"post": [0, 0, 0]
-						}
-					}
-				}
-			}
-		},
-		"animation.scovillain.hold_item": {
-			"loop": true,
-			"bones": {
-				"arm_right": {
-					"rotation": [0, -5, 20]
-				},
-				"arm_right2": {
-					"rotation": [0, 35, 0]
-				},
-				"hand_right": {
-					"rotation": [0, 0, 27.5]
-				}
-			}
-		}
-	}
-}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0002_ivysaur/license

@@ -1,52 +0,0 @@
-THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
-
-BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
-
-1. Definitions
-a. "Adaptation" means a work based upon the Work, or upon the Work and other pre-existing works, such as a translation, adaptation, derivative work, arrangement of music or other alterations of a literary or artistic work, or phonogram or performance and includes cinematographic adaptations or any other form in which the Work may be recast, transformed, or adapted including in any form recognizably derived from the original, except that a work that constitutes a Collection will not be considered an Adaptation for the purpose of this License. For the avoidance of doubt, where the Work is a musical work, performance or phonogram, the synchronization of the Work in timed-relation with a moving image ("synching") will be considered an Adaptation for the purpose of this License.
-b. "Collection" means a collection of literary or artistic works, such as encyclopedias and anthologies, or performances, phonograms or broadcasts, or other works or subject matter other than works listed in Section 1(f) below, which, by reason of the selection and arrangement of their contents, constitute intellectual creations, in which the Work is included in its entirety in unmodified form along with one or more other contributions, each constituting separate and independent works in themselves, which together are assembled into a collective whole. A work that constitutes a Collection will not be considered an Adaptation (as defined above) for the purposes of this License.
-c. "Distribute" means to make available to the public the original and copies of the Work or Adaptation, as appropriate, through sale or other transfer of ownership.
-d. "Licensor" means the individual, individuals, entity or entities that offer(s) the Work under the terms of this License.
-e. "Original Author" means, in the case of a literary or artistic work, the individual, individuals, entity or entities who created the Work or if no individual or entity can be identified, the publisher; and in addition (i) in the case of a performance the actors, singers, musicians, dancers, and other persons who act, sing, deliver, declaim, play in, interpret or otherwise perform literary or artistic works or expressions of folklore; (ii) in the case of a phonogram the producer being the person or legal entity who first fixes the sounds of a performance or other sounds; and, (iii) in the case of broadcasts, the organization that transmits the broadcast.
-f. "Work" means the literary and/or artistic work offered under the terms of this License including without limitation any production in the literary, scientific and artistic domain, whatever may be the mode or form of its expression including digital form, such as a book, pamphlet and other writing; a lecture, address, sermon or other work of the same nature; a dramatic or dramatico-musical work; a choreographic work or entertainment in dumb show; a musical composition with or without words; a cinematographic work to which are assimilated works expressed by a process analogous to cinematography; a work of drawing, painting, architecture, sculpture, engraving or lithography; a photographic work to which are assimilated works expressed by a process analogous to photography; a work of applied art; an illustration, map, plan, sketch or three-dimensional work relative to geography, topography, architecture or science; a performance; a broadcast; a phonogram; a compilation of data to the extent it is protected as a copyrightable work; or a work performed by a variety or circus performer to the extent it is not otherwise considered a literary or artistic work.
-g. "You" means an individual or entity exercising rights under this License who has not previously violated the terms of this License with respect to the Work, or who has received express permission from the Licensor to exercise rights under this License despite a previous violation.
-h. "Publicly Perform" means to perform public recitations of the Work and to communicate to the public those public recitations, by any means or process, including by wire or wireless means or public digital performances; to make available to the public Works in such a way that members of the public may access these Works from a place and at a place individually chosen by them; to perform the Work to the public by any means or process and the communication to the public of the performances of the Work, including by public digital performance; to broadcast and rebroadcast the Work by any means including signs, sounds or images.
-i. "Reproduce" means to make copies of the Work by any means including without limitation by sound or visual recordings and the right of fixation and reproducing fixations of the Work, including storage of a protected performance or phonogram in digital form or other electronic medium.
-2. Fair Dealing Rights. Nothing in this License is intended to reduce, limit, or restrict any uses free from copyright or rights arising from limitations or exceptions that are provided for in connection with the copyright protection under copyright law or other applicable laws.
-3. License Grant. Subject to the terms and conditions of this License, Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the rights in the Work as stated below:
-a. to Reproduce the Work, to incorporate the Work into one or more Collections, and to Reproduce the Work as incorporated in the Collections;
-b. to create and Reproduce Adaptations provided that any such Adaptation, including any translation in any medium, takes reasonable steps to clearly label, demarcate or otherwise identify that changes were made to the original Work. For example, a translation could be marked "The original work was translated from English to Spanish," or a modification could indicate "The original work has been modified.";
-c. to Distribute and Publicly Perform the Work including as incorporated in Collections; and,
-d. to Distribute and Publicly Perform Adaptations.
-The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights include the right to make such modifications as are technically necessary to exercise the rights in other media and formats. Subject to Section 8(f), all rights not expressly granted by Licensor are hereby reserved, including but not limited to the rights set forth in Section 4(d).
-
-4. Restrictions. The license granted in Section 3 above is expressly made subject to and limited by the following restrictions:
-a. You may Distribute or Publicly Perform the Work only under the terms of this License. You must include a copy of, or the Uniform Resource Identifier (URI) for, this License with every copy of the Work You Distribute or Publicly Perform. You may not offer or impose any terms on the Work that restrict the terms of this License or the ability of the recipient of the Work to exercise the rights granted to that recipient under the terms of the License. You may not sublicense the Work. You must keep intact all notices that refer to this License and to the disclaimer of warranties with every copy of the Work You Distribute or Publicly Perform. When You Distribute or Publicly Perform the Work, You may not impose any effective technological measures on the Work that restrict the ability of a recipient of the Work from You to exercise the rights granted to that recipient under the terms of the License. This Section 4(a) applies to the Work as incorporated in a Collection, but this does not require the Collection apart from the Work itself to be made subject to the terms of this License. If You create a Collection, upon notice from any Licensor You must, to the extent practicable, remove from the Collection any credit as required by Section 4(c), as requested. If You create an Adaptation, upon notice from any Licensor You must, to the extent practicable, remove from the Adaptation any credit as required by Section 4(c), as requested.
-b. You may not exercise any of the rights granted to You in Section 3 above in any manner that is primarily intended for or directed toward commercial advantage or private monetary compensation. The exchange of the Work for other copyrighted works by means of digital file-sharing or otherwise shall not be considered to be intended for or directed toward commercial advantage or private monetary compensation, provided there is no payment of any monetary compensation in connection with the exchange of copyrighted works.
-c. If You Distribute, or Publicly Perform the Work or any Adaptations or Collections, You must, unless a request has been made pursuant to Section 4(a), keep intact all copyright notices for the Work and provide, reasonable to the medium or means You are utilizing: (i) the name of the Original Author (or pseudonym, if applicable) if supplied, and/or if the Original Author and/or Licensor designate another party or parties (e.g., a sponsor institute, publishing entity, journal) for attribution ("Attribution Parties") in Licensor's copyright notice, terms of service or by other reasonable means, the name of such party or parties; (ii) the title of the Work if supplied; (iii) to the extent reasonably practicable, the URI, if any, that Licensor specifies to be associated with the Work, unless such URI does not refer to the copyright notice or licensing information for the Work; and, (iv) consistent with Section 3(b), in the case of an Adaptation, a credit identifying the use of the Work in the Adaptation (e.g., "French translation of the Work by Original Author," or "Screenplay based on original Work by Original Author"). The credit required by this Section 4(c) may be implemented in any reasonable manner; provided, however, that in the case of a Adaptation or Collection, at a minimum such credit will appear, if a credit for all contributing authors of the Adaptation or Collection appears, then as part of these credits and in a manner at least as prominent as the credits for the other contributing authors. For the avoidance of doubt, You may only use the credit required by this Section for the purpose of attribution in the manner set out above and, by exercising Your rights under this License, You may not implicitly or explicitly assert or imply any connection with, sponsorship or endorsement by the Original Author, Licensor and/or Attribution Parties, as appropriate, of You or Your use of the Work, without the separate, express prior written permission of the Original Author, Licensor and/or Attribution Parties.
-d. For the avoidance of doubt:
-i. Non-waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme cannot be waived, the Licensor reserves the exclusive right to collect such royalties for any exercise by You of the rights granted under this License;
-ii. Waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme can be waived, the Licensor reserves the exclusive right to collect such royalties for any exercise by You of the rights granted under this License if Your exercise of such rights is for a purpose or use which is otherwise than noncommercial as permitted under Section 4(b) and otherwise waives the right to collect royalties through any statutory or compulsory licensing scheme; and,
-iii. Voluntary License Schemes. The Licensor reserves the right to collect royalties, whether individually or, in the event that the Licensor is a member of a collecting society that administers voluntary licensing schemes, via that society, from any exercise by You of the rights granted under this License that is for a purpose or use which is otherwise than noncommercial as permitted under Section 4(c).
-e. Except as otherwise agreed in writing by the Licensor or as may be otherwise permitted by applicable law, if You Reproduce, Distribute or Publicly Perform the Work either by itself or as part of any Adaptations or Collections, You must not distort, mutilate, modify or take other derogatory action in relation to the Work which would be prejudicial to the Original Author's honor or reputation. Licensor agrees that in those jurisdictions (e.g. Japan), in which any exercise of the right granted in Section 3(b) of this License (the right to make Adaptations) would be deemed to be a distortion, mutilation, modification or other derogatory action prejudicial to the Original Author's honor and reputation, the Licensor will waive or not assert, as appropriate, this Section, to the fullest extent permitted by the applicable national law, to enable You to reasonably exercise Your right under Section 3(b) of this License (right to make Adaptations) but not otherwise.
-5. Representations, Warranties and Disclaimer
-UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
-
-6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-7. Termination
-a. This License and the rights granted hereunder will terminate automatically upon any breach by You of the terms of this License. Individuals or entities who have received Adaptations or Collections from You under this License, however, will not have their licenses terminated provided such individuals or entities remain in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License.
-b. Subject to the above terms and conditions, the license granted here is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding the above, Licensor reserves the right to release the Work under different license terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License), and this License will continue in full force and effect unless terminated as stated above.
-8. Miscellaneous
-a. Each time You Distribute or Publicly Perform the Work or a Collection, the Licensor offers to the recipient a license to the Work on the same terms and conditions as the license granted to You under this License.
-b. Each time You Distribute or Publicly Perform an Adaptation, Licensor offers to the recipient a license to the original Work on the same terms and conditions as the license granted to You under this License.
-c. If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this License, and without further action by the parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
-d. No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent.
-e. This License constitutes the entire agreement between the parties with respect to the Work licensed here. There are no understandings, agreements or representations with respect to the Work not specified here. Licensor shall not be bound by any additional provisions that may appear in any communication from You. This License may not be modified without the mutual written agreement of the Licensor and You.
-f. The rights granted under, and the subject matter referenced, in this License were drafted utilizing the terminology of the Berne Convention for the Protection of Literary and Artistic Works (as amended on September 28, 1979), the Rome Convention of 1961, the WIPO Copyright Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996 and the Universal Copyright Convention (as revised on July 24, 1971). These rights and subject matter take effect in the relevant jurisdiction in which the License terms are sought to be enforced according to the corresponding provisions of the implementation of those treaty provisions in the applicable national law. If the standard suite of rights granted under applicable copyright law includes additional rights not granted under this License, such additional rights are deemed to be included in the License; this License is not intended to restrict the license of any rights under applicable law.
-Creative Commons Notice
-
-Creative Commons is not a party to this License, and makes no warranty whatsoever in connection with the Work. Creative Commons will not be liable to You or any party on any legal theory for any damages whatsoever, including without limitation any general, special, incidental or consequential damages arising in connection to this license. Notwithstanding the foregoing two (2) sentences, if Creative Commons has expressly identified itself as the Licensor hereunder, it shall have all rights and obligations of Licensor.
-
-Except for the limited purpose of indicating to the public that the Work is licensed under the CCPL, Creative Commons does not authorize the use by either party of the trademark "Creative Commons" or any related trademark or logo of Creative Commons without the prior written consent of Creative Commons. Any permitted use will be in compliance with Creative Commons' then-current trademark usage guidelines, as may be published on its website or otherwise made available upon request from time to time. For the avoidance of doubt, this trademark restriction does not form part of the License.
-
-Creative Commons may be contacted at http://creativecommons.org/.

common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0088_grimer/grimer_alola.geo.json

@@ -1,453 +0,0 @@
-{
-	"format_version": "1.12.0",
-	"minecraft:geometry": [
-		{
-			"description": {
-				"identifier": "geometry.grimer",
-				"texture_width": 128,
-				"texture_height": 64,
-				"visible_bounds_width": 4,
-				"visible_bounds_height": 2.5,
-				"visible_bounds_offset": [0, 0.75, 0]
-			},
-			"bones": [
-				{
-					"name": "grimer_alola",
-					"pivot": [0, 0, 0]
-				},
-				{
-					"name": "body",
-					"parent": "grimer_alola",
-					"pivot": [0, 12, 0],
-					"cubes": [
-						{"origin": [-8.5, -0.01, -8.5], "size": [17, 4, 17], "inflate": 0.02, "uv": [0, 34]}
-					]
-				},
-				{
-					"name": "goop_bottom",
-					"parent": "body",
-					"pivot": [0, 1.49, 0.5],
-					"cubes": [
-						{"origin": [-5.5, -0.01, -6.5], "size": [11, 3, 13], "uv": [67, 27]}
-					]
-				},
-				{
-					"name": "body2",
-					"parent": "body",
-					"pivot": [0, 4, -0.5],
-					"cubes": [
-						{"origin": [-7.5, 2.5, -7], "size": [15, 6, 13], "uv": [0, 15]}
-					]
-				},
-				{
-					"name": "torso",
-					"parent": "body2",
-					"pivot": [0, 8.5, -1.5],
-					"cubes": [
-						{"origin": [-6, 7.5, -6.5], "size": [12, 7, 10], "uv": [43, 3]}
-					]
-				},
-				{
-					"name": "arms",
-					"parent": "torso",
-					"pivot": [0, 12, -3.5]
-				},
-				{
-					"name": "arm_left",
-					"parent": "arms",
-					"pivot": [6, 12, -1.5],
-					"cubes": [
-						{"origin": [5, 10, -6], "size": [6, 4, 5], "inflate": 0.01, "uv": [77, 0]}
-					]
-				},
-				{
-					"name": "arm_left2",
-					"parent": "arm_left",
-					"pivot": [11, 14, -1.5],
-					"cubes": [
-						{"origin": [11, 10, -5.5], "size": [5, 4, 4], "uv": [87, 9]}
-					]
-				},
-				{
-					"name": "slime_left",
-					"parent": "arm_left2",
-					"pivot": [16.5, 10, -3.5],
-					"cubes": [
-						{"origin": [14.5, 6.5, -3.5], "size": [2, 4, 0], "uv": [91, 17]}
-					]
-				},
-				{
-					"name": "hand_left",
-					"parent": "arm_left2",
-					"pivot": [16, 14, -1.5],
-					"cubes": [
-						{"origin": [16, 10, -5.5], "size": [2, 4, 4], "inflate": 0.02, "uv": [83, 17]}
-					]
-				},
-				{
-					"name": "fingers_left",
-					"parent": "hand_left",
-					"pivot": [18, 12, -3.5]
-				},
-				{
-					"name": "finger_front_left",
-					"parent": "fingers_left",
-					"pivot": [18, 12, -4.5],
-					"cubes": [
-						{"origin": [18, 11, -5.5], "size": [2, 2, 1], "inflate": 0.01, "uv": [43, 20]}
-					]
-				},
-				{
-					"name": "finger_front_left2",
-					"parent": "finger_front_left",
-					"pivot": [20, 12, -5.5],
-					"cubes": [
-						{"origin": [20, 11, -5.5], "size": [1, 2, 1], "uv": [43, 23]}
-					]
-				},
-				{
-					"name": "finger_middle_left",
-					"parent": "fingers_left",
-					"pivot": [18, 13, -3.5],
-					"cubes": [
-						{"origin": [18, 13, -4.5], "size": [2, 1, 2], "inflate": 0.01, "uv": [53, 21]}
-					]
-				},
-				{
-					"name": "finger_middle_left2",
-					"parent": "finger_middle_left",
-					"pivot": [20, 14, -3.5],
-					"cubes": [
-						{"origin": [20, 13, -4.5], "size": [1, 1, 2], "uv": [59, 20]}
-					]
-				},
-				{
-					"name": "finger_back_left",
-					"parent": "fingers_left",
-					"pivot": [18, 12, -2.5],
-					"cubes": [
-						{"origin": [18, 11, -2.5], "size": [2, 2, 1], "inflate": 0.01, "uv": [65, 20]}
-					]
-				},
-				{
-					"name": "finger_back_left2",
-					"parent": "finger_back_left",
-					"pivot": [20, 12, -1.5],
-					"cubes": [
-						{"origin": [20, 11, -2.5], "size": [1, 2, 1], "uv": [71, 20]}
-					]
-				},
-				{
-					"name": "arm_right",
-					"parent": "arms",
-					"pivot": [-6, 12, -1.5],
-					"cubes": [
-						{"origin": [-11, 10, -6], "size": [6, 4, 5], "inflate": 0.01, "uv": [99, 0], "mirror": true}
-					]
-				},
-				{
-					"name": "slime_right",
-					"parent": "arm_right",
-					"pivot": [-6.5, 14, -1],
-					"rotation": [10, 0, 0],
-					"cubes": [
-						{"origin": [-8.5, 10, -1], "size": [2, 4, 0], "uv": [95, 17], "mirror": true}
-					]
-				},
-				{
-					"name": "arm_right2",
-					"parent": "arm_right",
-					"pivot": [-11, 14, -1.5],
-					"cubes": [
-						{"origin": [-16, 10, -5.5], "size": [5, 4, 4], "uv": [105, 9], "mirror": true}
-					]
-				},
-				{
-					"name": "hand_right",
-					"parent": "arm_right2",
-					"pivot": [-16, 14, -1.5],
-					"cubes": [
-						{"origin": [-18, 10, -5.5], "size": [2, 4, 4], "inflate": 0.02, "uv": [95, 17], "mirror": true}
-					]
-				},
-				{
-					"name": "fingers_right",
-					"parent": "hand_right",
-					"pivot": [-18, 12, -3.5]
-				},
-				{
-					"name": "finger_front_right",
-					"parent": "fingers_right",
-					"pivot": [-18, 12, -4.5],
-					"cubes": [
-						{"origin": [-20, 11, -5.5], "size": [2, 2, 1], "inflate": 0.01, "uv": [49, 20], "mirror": true}
-					]
-				},
-				{
-					"name": "finger_front_right2",
-					"parent": "finger_front_right",
-					"pivot": [-20, 12, -5.5],
-					"cubes": [
-						{"origin": [-21, 11, -5.5], "size": [1, 2, 1], "uv": [47, 23], "mirror": true}
-					]
-				},
-				{
-					"name": "finger_middle_right",
-					"parent": "fingers_right",
-					"pivot": [-18, 13, -3.5],
-					"cubes": [
-						{"origin": [-20, 13, -4.5], "size": [2, 1, 2], "inflate": 0.01, "uv": [49, 24], "mirror": true}
-					]
-				},
-				{
-					"name": "finger_middle_right2",
-					"parent": "finger_middle_right",
-					"pivot": [-20, 14, -3.5],
-					"cubes": [
-						{"origin": [-21, 13, -4.5], "size": [1, 1, 2], "uv": [57, 24], "mirror": true}
-					]
-				},
-				{
-					"name": "finger_back_right",
-					"parent": "fingers_right",
-					"pivot": [-18, 12, -2.5],
-					"cubes": [
-						{"origin": [-20, 11, -2.5], "size": [2, 2, 1], "inflate": 0.01, "uv": [61, 23], "mirror": true}
-					]
-				},
-				{
-					"name": "finger_back_right2",
-					"parent": "finger_back_right",
-					"pivot": [-20, 12, -1.5],
-					"cubes": [
-						{"origin": [-21, 11, -2.5], "size": [1, 2, 1], "uv": [67, 23], "mirror": true}
-					]
-				},
-				{
-					"name": "head",
-					"parent": "torso",
-					"pivot": [0, 14.5, -3],
-					"cubes": [
-						{"origin": [-4, 12.5, -5], "size": [8, 9, 6], "inflate": 0.01, "uv": [0, 0]},
-						{"origin": [3, 14.5, -6], "size": [1, 3, 1], "inflate": 0.01, "uv": [22, 0]},
-						{"origin": [-4, 14.5, -6], "size": [1, 3, 1], "inflate": 0.01, "uv": [26, 0], "mirror": true},
-						{"origin": [-4, 17.5, -9], "size": [8, 4, 4], "inflate": 0.01, "uv": [28, 0]},
-						{"origin": [1.25, 16.5, -8.5], "size": [2, 2, 1], "inflate": -0.1, "pivot": [2.25, 17.5, -7.5], "rotation": [2.5, 0, 5], "uv": [48, 0]},
-						{"origin": [-3, 16.9, -8.5], "size": [1, 1, 1], "pivot": [-2, 17.9, -7.5], "rotation": [2.5, 0, 7.5], "uv": [54, 1], "mirror": true}
-					]
-				},
-				{
-					"name": "eyes",
-					"parent": "head",
-					"pivot": [0, 19.5, -8]
-				},
-				{
-					"name": "eye_left",
-					"parent": "eyes",
-					"pivot": [3.02, 19.5, -7.52],
-					"cubes": [
-						{"origin": [2.03, 18, -9.02], "size": [2, 3, 2], "uv": [0, 15]},
-						{"origin": [4.02, 18, -8.02], "size": [0, 3, 2], "uv": [2, -2]}
-					]
-				},
-				{
-					"name": "eye_angry_left",
-					"parent": "eye_left",
-					"pivot": [2.92, 21, -8.93],
-					"cubes": [
-						{"origin": [1.92, 20, -8.93], "size": [1, 1, 0], "inflate": 0.01, "uv": [7, 49]},
-						{"origin": [2.93, 20.49, -8.93], "size": [1, 1, 1], "inflate": 0.01, "uv": [0, 49]}
-					]
-				},
-				{
-					"name": "eye_sad_left",
-					"parent": "eye_left",
-					"pivot": [3.92, 21, -7.93],
-					"cubes": [
-						{"origin": [2.93, 20.49, -8.93], "size": [1, 1, 1], "inflate": 0.01, "uv": [0, 55]},
-						{"origin": [3.93, 19.99, -7.93], "size": [0, 1, 1], "inflate": 0.01, "uv": [3, 54]}
-					]
-				},
-				{
-					"name": "pupil_left",
-					"parent": "eye_left",
-					"pivot": [2.77, 20, -9.03],
-					"cubes": [
-						{"origin": [2.27, 19.5, -9.03], "size": [1, 1, 0], "uv": [0, 15]}
-					]
-				},
-				{
-					"name": "eyelid_left",
-					"parent": "eye_left",
-					"pivot": [2.92, 19.5, -7.93],
-					"cubes": [
-						{"origin": [1.93, 18, -8.93], "size": [2, 3, 2], "inflate": 0.01, "uv": [0, 20]}
-					]
-				},
-				{
-					"name": "eyelid_happy_left",
-					"parent": "eye_left",
-					"pivot": [2.92, 19.5, -7.93],
-					"cubes": [
-						{"origin": [1.93, 18, -8.93], "size": [2, 3, 2], "inflate": 0.01, "uv": [8, 34]}
-					]
-				},
-				{
-					"name": "eyelid_recoil_left",
-					"parent": "eye_left",
-					"pivot": [2.92, 19.5, -7.93],
-					"cubes": [
-						{"origin": [1.93, 18, -8.93], "size": [2, 3, 2], "inflate": 0.01, "uv": [0, 44]}
-					]
-				},
-				{
-					"name": "eye_right",
-					"parent": "eyes",
-					"pivot": [-3.02, 19.5, -7.52],
-					"cubes": [
-						{"origin": [-4.03, 18, -9.02], "size": [2, 3, 2], "uv": [0, 34], "mirror": true},
-						{"origin": [-4.02, 18, -8.02], "size": [0, 3, 2], "uv": [2, 1], "mirror": true}
-					]
-				},
-				{
-					"name": "eye_angry_right",
-					"parent": "eye_right",
-					"pivot": [-2.92, 21, -8.93],
-					"cubes": [
-						{"origin": [-2.92, 20, -8.93], "size": [1, 1, 0], "inflate": 0.01, "uv": [8, 50], "mirror": true},
-						{"origin": [-3.93, 20.49, -8.93], "size": [1, 1, 1], "inflate": 0.01, "uv": [4, 49], "mirror": true}
-					]
-				},
-				{
-					"name": "eye_sad_right",
-					"parent": "eye_right",
-					"pivot": [-3.92, 21, -7.93],
-					"cubes": [
-						{"origin": [-3.93, 20.49, -8.93], "size": [1, 1, 1], "inflate": 0.01, "uv": [0, 57], "mirror": true},
-						{"origin": [-2.93, 19.99, -7.93], "size": [0, 1, 1], "inflate": 0.01, "uv": [3, 56], "mirror": true}
-					]
-				},
-				{
-					"name": "pupil_right",
-					"parent": "eye_right",
-					"pivot": [-2.77, 20, -9.03],
-					"cubes": [
-						{"origin": [-3.27, 19.5, -9.03], "size": [1, 1, 0], "uv": [0, 34], "mirror": true}
-					]
-				},
-				{
-					"name": "eyelid_right",
-					"parent": "eye_right",
-					"pivot": [-2.92, 19.5, -7.93],
-					"cubes": [
-						{"origin": [-3.93, 18, -8.93], "size": [2, 3, 2], "inflate": 0.01, "uv": [0, 39], "mirror": true}
-					]
-				},
-				{
-					"name": "eyelid_happy_right",
-					"parent": "eye_right",
-					"pivot": [-2.92, 19.5, -7.93],
-					"cubes": [
-						{"origin": [-3.93, 18, -8.93], "size": [2, 3, 2], "inflate": 0.01, "uv": [8, 39], "mirror": true}
-					]
-				},
-				{
-					"name": "eyelid_recoil_right",
-					"parent": "eye_right",
-					"pivot": [-2.92, 19.5, -7.93],
-					"cubes": [
-						{"origin": [-3.93, 18, -8.93], "size": [2, 3, 2], "inflate": 0.01, "uv": [8, 44], "mirror": true}
-					]
-				},
-				{
-					"name": "jaw",
-					"parent": "head",
-					"pivot": [0, 15, -5.5],
-					"rotation": [50, 0, 0],
-					"cubes": [
-						{"origin": [-3.5, 14.5, -8.75], "size": [7, 1, 4], "inflate": 0.01, "uv": [28, 8]}
-					]
-				},
-				{
-					"name": "jaw2",
-					"parent": "jaw",
-					"pivot": [0, 14.5, -8.75],
-					"cubes": [
-						{"origin": [-3.5, 14.51, -9.75], "size": [7, 1, 1], "uv": [27, 13]}
-					]
-				},
-				{
-					"name": "jaw_detail1",
-					"parent": "jaw2",
-					"pivot": [0.25, 15.5, -9.75],
-					"cubes": [
-						{"origin": [0.25, 15.5, -12.75], "size": [2, 0, 3], "uv": [25, 9]}
-					]
-				},
-				{
-					"name": "jaw_detail1_2",
-					"parent": "jaw_detail1",
-					"pivot": [1.25, 15.5, -12.75],
-					"cubes": [
-						{"origin": [1.25, 15.5, -13.75], "size": [1, 0, 1], "uv": [27, 8]}
-					]
-				},
-				{
-					"name": "jaw_detail2",
-					"parent": "jaw2",
-					"pivot": [2.5, 15.5, -9.75],
-					"cubes": [
-						{"origin": [2.5, 15.5, -10.75], "size": [1, 0, 1], "uv": [29, 8]}
-					]
-				},
-				{
-					"name": "body_base",
-					"parent": "body",
-					"pivot": [0, 0, 0]
-				},
-				{
-					"name": "body_base_left",
-					"parent": "body_base",
-					"pivot": [8.5, 0.01, 0],
-					"cubes": [
-						{"origin": [3.5, 0.01, -10], "size": [8, 0, 20], "inflate": 0.015, "uv": [55, 44]}
-					]
-				},
-				{
-					"name": "body_base_right",
-					"parent": "body_base",
-					"pivot": [-8.5, 0.01, 0],
-					"cubes": [
-						{"origin": [-11.5, 0.01, -10], "size": [8, 0, 20], "inflate": 0.015, "uv": [71, 44], "mirror": true}
-					]
-				},
-				{
-					"name": "front_tail",
-					"parent": "body_base",
-					"pivot": [0, 1, -8.5],
-					"cubes": [
-						{"origin": [-3.5, 0, -11.5], "size": [7, 2, 4], "uv": [20, 55]},
-						{"origin": [-6, 0, -15.5], "size": [12, 0, 8], "inflate": 0.02, "uv": [34, 55]}
-					]
-				},
-				{
-					"name": "back_tail",
-					"parent": "body_base",
-					"pivot": [0, 1, 8.75],
-					"cubes": [
-						{"origin": [-3.5, 0, 7.75], "size": [7, 2, 6], "uv": [0, 55]},
-						{"origin": [-6, 0, 7.75], "size": [12, 0, 8], "inflate": 0.01, "uv": [43, 43]}
-					]
-				},
-				{
-					"name": "back_tail2",
-					"parent": "back_tail",
-					"pivot": [0, 0, 13.75],
-					"cubes": [
-						{"origin": [-4, 0, 13.75], "size": [8, 0, 6], "inflate": 0.015, "uv": [45, 37]}
-					]
-				}
-			]
-		}
-	]
-}