Added Debug Logging to hopefully find the issue

Interaction Fix

See merge request cable-mc/cobblemon!2339

.gitlab-ci.yml

@@ -16,6 +16,7 @@ check_assets_cache:
   stage: preprocessing
   script:
     - echo "Checking if cached hash matches current hash"
+    - yum install -y findutils
 
     # Calculate the current hash
     - find common/src/main/resources/assets common/src/main/resources/data -type f -exec sha256sum {} + | sort -k 2 | sha256sum > current_hash.txt
@@ -148,6 +149,7 @@ build:
   dependencies:
     - replace_resources
   script:
+    - yum install -y findutils
     - export GRADLE_OPTS="-Xmx4G -Xms4G"
     - chmod +x ./gradlew
     - ./gradlew build
@@ -163,6 +165,7 @@ publish:
   rules:
     - if: '$CI_PROJECT_PATH == "cable-mc/cobblemon" && $CI_COMMIT_BRANCH == "main"'
   script:
+    - yum install -y findutils
     - export GRADLE_OPTS="-Xmx4G -Xms4G"
     - chmod +x ./gradlew
     - ./gradlew publish
@@ -176,6 +179,7 @@ deploy_artifacts:
   dependencies:
     - build
   script:
+    - yum install -y findutils
     - echo "Collecting artifacts..."
     - find neoforge/build/libs/ -type f -name "*.jar" | grep -vE "dev-shadow|sources|javadoc" | xargs -I {} mv {} ./
     - find fabric/build/libs/ -type f -name "*.jar" | grep -vE "dev-shadow|sources|javadoc" | xargs -I {} mv {} ./

CHANGELOG.md

@@ -21,7 +21,7 @@
 - Added Move Dex to Pokédex
 - Added the Habitat Block, a spawner block for servers and adventure maps that controls spawning in an area.
 - Added Disk Rack for storing disks and being an audio sequencer for Noteblocks
-- Added intrinsic scaling to all mons (+-5%). Some rendering cases, such as shoulder mounting, revert to 1.0 scaling to preserve animation accuracy.
+- Added intrinsic scaling to all Pokémon (+-5%). Some rendering cases, such as shoulder mounting, revert to 1.0 scaling to preserve animation accuracy.
 - Added scaling to "baby" Pokémon (smaller (-20%) at level 1 → normally sized at level 10)
 - Added conditional seats for riding. Seats can be gated by molang such as "is_alpha".
 - Added Alpha Pokémon
@@ -59,13 +59,15 @@
 - Held item visibility can now be controlled by the held_item_visible command argument.
 
 ### New rideable Pokémon
-- Drampa
-- Archeops
-- Skarmory
 - Crobat
-- Goodra
-- Hisuian Goodra
+- Skarmory
 - Milotic
+- Archeops
+- Goodra 
+- Goodra (Hisuian Form)
+- Drampa
+- Duraludon
+- Archaludon
 
 ### Pokémon Added
 #### Generation 3
@@ -162,7 +164,10 @@
 - Cofagrigus
 - Tyranitar
 - Turtonator
+- Golett
+- Corsola
 - Arbok (New Patterns: Angry, Cartoon, Clown, Comedic, Crow, Grin, Ink, Modern, Rain, Scribble, Silence, Sloth, Suspicious, Will)
+- ... and Substitute
 
 #### Model changes to the regional bias resource pack:
 
@@ -171,6 +176,26 @@
 - Changed models for every existing regional bias
 
 ### Animation updates for the following Pokémon
+
+- Kakuna
+- Grimer
+- Nidoran♀ (+ New shoulder mount)
+- Nidorina
+- Nidoran♂ (+ New shoulder mount)
+- Sandshrew
+- Diglett
+- Dugtrio
+- Graveler
+- Happiny
+- Chansey
+- Blissey
+- Poliwhirl
+- Poliwrath
+- Zubat
+- Vulpix
+- Drowzee
+- Hypno
+- Noctowl
 - Skarmory
 - Skitty
 - Flygon
@@ -202,8 +227,19 @@
 - Yamask
 - Cofagrigus
 - Luvdisc
+- Staryu
+- Starmie
+- Togetic
+- Rellor
+- Rabsca
+- Yungoos
+- Gumshoos
+- Cottonee
+- Whimsicott
+- Corsola
 
 #### Added sounds to the following moves
+
 - Absorb
 - Aurora Beam
 - Double Team
@@ -229,13 +265,8 @@
 ### Changes
 - Stat increase and decrease particles have been changed, with the addition of alpha boost particles. 
 - Dragonite's mailbag cosmetic can now also be obtained with a chest in the cosmetic slot
-
-### Fixes
 - Adjusted Croagunk's walkspeed
-- Fixed Blitzle's base scale being `1` rather than the intended `0.8`
-- Fixed Magnezone's emissive layer for the shiny having the wrong name, thus displaying wrongly
-- Fixed Litleo not blinking
-- Fixed Garchomp T-posing when sleeping while out of battle.
+- Adjusted Aerodactyl's walkspeed
 - Sharp Beak can now be crafted
 - Metal Alloy can now be crafted
 - Ability Capsules can now be brewed
@@ -288,31 +319,19 @@
     - Hearty Grains can be milled like Farmer's Delight Rice Panicles if both Farmer's Delight and Create are installed
     - Big Roots and Revival Herbs can be milled to their respective powders
     - Pep-Up Flowers, Medicinal Leeks, and all 70 berries can be milled in Create's Millstone for additional dye drops
-    - Auspicious Armor and Upgrades can be Haunted using Create's crafting systems
+    - Auspicious Armour and Upgrades can be Haunted using Create's crafting systems
     - Applin Apples can be used to make Honeyed Apples in Create
 - Golden Apples can now be crafted using the Applin Apples
 - Prismarine Crystals and Amethyst Shards can now be used to craft Pokedexes
-- Updated Pokedex Screens item tag to support tagged variants of Redstone and Glowstone Dust
-- Sounds for interacting with various Cobblemon blocks now play from the center of the block, rather than the corner
+- Updated Pokédex Screens item tag to support tagged variants of Redstone and Glowstone Dust
+- Sounds for interacting with various Cobblemon blocks now play from the centre of the block, rather than the corner
 - The `/pc` command no longer plays PC activation sounds
-- Lowered the volume of Blitzle and Zebstrika's cry
-- Fixed Raichu (male) and Alolan Raichu (both genders) not displaying the correct Partner Cap when Pewter Crunchies are in the cosmetic slot.
-- Regional Foods will now prioritize being eaten instead of used for healing Pokémon, shift clicking will use it as healing
-- Resolved Z-Fighting on Pokédex Models
-- Restored Ninjask's ability to do barrel rolls
-- Fixed a crash caused by adding enchanted items to the Resurrection Machine
-- Fixed a crash that could occur when starting a PvN battle with only fainted Pokémon.
-- Fixed the Remember Riding Camera config not being respected when dismounting and resolved the incompatibility with the Auto Third Person mod
-- Fixed Full Heal block not dropping Full Heals
-- Fixed status cure items not returning an empty bottle when used
-- Fixed Panpour consuming its held item when evolving with a Water Stone
-- Fixed Smoked Tail Curry returning a Wooden Bowl when consumed despite it not being included in the recipe
 
 ### Fixes
-- Fixed Croagunk's walkspeed
 - Fixed Blitzle's base scale being `1` rather than the intended `0.8`
 - Fixed Magnezone's emissive layer for the shiny having the wrong name, thus displaying wrongly
 - Fixed Litleo not blinking
+- Fixed Omanyte and Omastar incorrectly using water animations on land.
 - Fixed Pokédex layout for genderless variations
 - Fixed odd stacking behaviour with the poke_bait item.
 - Fixed a compatibility issue with World Game Rules which caused some log spam in specific cases.
@@ -354,11 +373,30 @@
 - Fixed Exploit where you could take out the bait or drop your Pokérod with bait to avoid consuming bait, now the bobber will just disappear if you do so
 - Fixed Apricorn and Saccharine boats incorrectly using chest boat models
 - Fixed wild and trainer battle AI refusing to select moves with the `adjacentAlly` target type, even when it's their only option
-- Fixed Guilded chests being more accessible than intended
+- Fixed gilded chests being more accessible than intended
 - Fixed fished up Pokémon not being added as "seen" to the Pokedex
 - Fixed surprised Gimmighoul encounters not being added as "seen" to the Pokedex
 - Fixed a crash involving berry trees that have been world edited.
-- Fixed visual desync in multiplayer for players mounting Pokémon outside other players' loaded chunks 
+- Fixed visual desync in multiplayer for players mounting Pokémon outside other players' loaded chunks
+- Fixed Pokémon entities leveled by rare candy not getting stronger as Minecraft entities unless recalled.
+- Fixed a freeze during game load that occurred when multiple mods tried to load Cobblemon API classes at the same time.
+- Fixed random tick crashes from berry trees
+- Lowered the volume of Blitzle and Zebstrika's cry
+- Regional Foods will now prioritise being eaten instead of used for healing Pokémon, shift clicking will use it as healing
+- Resolved Z-Fighting on Pokédex Models
+- Restored Ninjask's ability to do barrel rolls
+- Fixed Raichu (male) and Alolan Raichu (both genders) not displaying the correct Partner Cap when Pewter Crunchies are in the cosmetic slot.
+- Fixed a crash caused by adding enchanted items to the Resurrection Machine
+- Fixed a crash that could occur when starting a PvN battle with only fainted Pokémon.
+- Fixed the Remember Riding Camera config not being respected when dismounting and resolved the incompatibility with the Auto Third Person mod
+- Fixed Full Heal block not dropping Full Heals
+- Fixed status cure items not returning an empty bottle when used
+- Fixed Panpour consuming its held item when evolving with a Water Stone
+- Fixed Smoked Tail Curry returning a Wooden Bowl when consumed despite it not being included in the recipe
+- Fixed `/giveallpokemon` not respecting the min and max parameters
+- Fixed the choose starter toast not disappearing when capturing a Pokémon instead of opening the starter selection screen
+- Fixed an issue where certain Sinister Tea seasonings were only applying as instant effects and would not apply over time
+- Long config option labels now scroll instead of overflowing
 
 ### Developer
 - Added `PokeSnackSpawnerFactory` which allows influence registration on PokeSnack encounters
@@ -371,6 +409,7 @@
 - Removed "SpawnBucket" class in favour of just storing maps of bucket names to weights.
 - Fixed nicknames not being applied to Pokémon spawned from `spawn_pool_world` files.
 - Added support for `profilePokedexScale`, `profilePokedexTranslation`, `profileSummaryScale`, and `profileSummaryTranslation` in poser files for finer control over profile displays.
+- Fixed riding camera offsets defined on Pokémon forms not being applied
 
 ### Molang & Datapacks
 - Added `moveset_builders` datapack folder for different styles of movesets.
@@ -381,6 +420,7 @@
 - Added `q.item.is_enchanted()`
 - Added `q.item.has_enchantment(minecraft:sharpness, 3)`
 - Added `has_chosen_starter` & `get_starter_uuid` as available Molang functions
+- Added `has_tm_move_unlocked`, `unlock_tm_move`, & `lock_tm_move` as available Molang functions for Players
 - Added `marks`, `has_mark`, & `remove_marks` as available Molang functions for Pokémon
 - Added Data Component support for species drops, eg `"components": {"minecraft:custom_model_data": 123}`
 - Added the new `sortOrder` field to mark entries, (defaults to 0 if not specified) which controls the order in which marks are rendered on the HUD, with higher numbers being rendered on top of lower numbers
@@ -471,6 +511,7 @@
   - German
   - Spanish
   - Ecuadorian Spanish
+  - Portuguese
   - Brazilian Portuguese
   - Simplified Chinese
   - Traditional Chinese

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

@@ -20,6 +20,8 @@ import net.minecraft.world.level.levelgen.structure.pools.alias.PoolAliasLookup;
 import net.minecraft.world.level.levelgen.structure.templatesystem.LiquidSettings;
 import net.minecraft.world.level.levelgen.structure.templatesystem.StructureProcessor;
 import net.minecraft.world.level.levelgen.structure.templatesystem.StructureProcessorList;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
@@ -31,6 +33,9 @@ import java.util.Optional;
 @Mixin(JigsawPlacement.class)
 public class JigsawPlacementMixin {
 
+	@Unique
+	private static final Logger cobblemon$LOGGER = LoggerFactory.getLogger("Cobblemon/HeightRangeVeto");
+
 	@Inject(
 			method = "addPieces(Lnet/minecraft/world/level/levelgen/structure/Structure$GenerationContext;Lnet/minecraft/core/Holder;Ljava/util/Optional;ILnet/minecraft/core/BlockPos;ZLjava/util/Optional;ILnet/minecraft/world/level/levelgen/structure/pools/alias/PoolAliasLookup;Lnet/minecraft/world/level/levelgen/structure/pools/DimensionPadding;Lnet/minecraft/world/level/levelgen/structure/templatesystem/LiquidSettings;)Ljava/util/Optional;",
 			at = @At("RETURN"),
@@ -54,18 +59,30 @@ public class JigsawPlacementMixin {
 		if (result.isEmpty()) {
 			return;
 		}
+
 		BlockPos spawnPos = result.get().position();
-		boolean canPlace = cobblemon$canAnyStartElementPlace(context, startPool, spawnPos);
+		String poolId = startPool.unwrapKey().map(key -> key.location().toString()).orElse("unknown");
+		boolean canPlace = cobblemon$canStructurePlace(context, startPool, spawnPos);
+
+		cobblemon$LOGGER.info(
+				"[HeightRangeVeto] addPieces evaluated requestedPos={} spawnPos={} startPool={} -> canPlace={}",
+				pos, spawnPos, poolId, canPlace
+		);
 
 		if (canPlace) {
 			return;
 		}
 
+		cobblemon$LOGGER.info(
+				"[HeightRangeVeto] Vetoing structure start at {} (startPool={})",
+				spawnPos, poolId
+		);
+
 		cir.setReturnValue(Optional.empty());
 	}
 
 	@Unique
-	private static boolean cobblemon$canAnyStartElementPlace(
+	private static boolean cobblemon$canStructurePlace(
 			Structure.GenerationContext generationContext,
 			Holder<StructureTemplatePool> startPool,
 			BlockPos startPos
@@ -74,7 +91,7 @@ public class JigsawPlacementMixin {
 			Optional<HeightRangeStructureProcessor> heightRangeProcessor = cobblemon$getHeightRangeProcessor(element);
 
 			if (heightRangeProcessor.isEmpty()) {
-				return true;
+				continue;
 			}
 
 			HeightRangeStructureProcessor processor = heightRangeProcessor.get();
@@ -85,12 +102,17 @@ public class JigsawPlacementMixin {
 					startPos
 			);
 
-			if (valid) {
-				return true;
+			cobblemon$LOGGER.info(
+					"[HeightRangeVeto] template={} pos={} valid={}",
+					element, startPos, valid
+			);
+
+			if (!valid) {
+				return false;
 			}
 		}
 
-		return false;
+		return true;
 	}
 
 	@Unique

common/src/main/kotlin/com/cobblemon/mod/common/api/cooking/effects/CleanseAllEffect.kt

@@ -8,6 +8,7 @@
 
 package com.cobblemon.mod.common.api.cooking.effects
 
+import net.minecraft.server.level.ServerPlayer
 import net.minecraft.world.effect.MobEffect
 import net.minecraft.world.effect.MobEffectCategory
 import net.minecraft.world.entity.Entity
@@ -18,5 +19,13 @@ class CleanseAllEffect : MobEffect(MobEffectCategory.BENEFICIAL, 0xFFFFFF) {
     override fun applyInstantenousEffect(source: Entity?, indirect: Entity?, target: LivingEntity, amplifier: Int, proximity: Double) {
         target.removeAllEffects()
     }
-    override fun shouldApplyEffectTickThisTick(duration: Int, amplifier: Int) = false
+
+    override fun applyEffectTick(livingEntity: LivingEntity, amplifier: Int): Boolean {
+        if (livingEntity is ServerPlayer){
+            livingEntity.removeAllEffects()
+        }
+        return true
+    }
+
+    override fun shouldApplyEffectTickThisTick(duration: Int, amplifier: Int) = true
 }

common/src/main/kotlin/com/cobblemon/mod/common/api/cooking/effects/CleanseNegativeEffect.kt

@@ -8,6 +8,7 @@
 
 package com.cobblemon.mod.common.api.cooking.effects
 
+import net.minecraft.server.level.ServerPlayer
 import net.minecraft.world.effect.MobEffect
 import net.minecraft.world.effect.MobEffectCategory
 import net.minecraft.world.entity.Entity
@@ -23,5 +24,18 @@ class CleanseNegativeEffect : MobEffect(MobEffectCategory.BENEFICIAL, 0xFFFFFF)
             }
         }
     }
-    override fun shouldApplyEffectTickThisTick(duration: Int, amplifier: Int) = false
+
+    override fun applyEffectTick(livingEntity: LivingEntity, amplifier: Int): Boolean {
+        if (livingEntity is ServerPlayer){
+            val snapshot = livingEntity.activeEffects.toList()
+            for (ei in snapshot) {
+                if (ei.effect.value().category == MobEffectCategory.HARMFUL) {
+                    livingEntity.removeEffect(ei.effect)
+                }
+            }
+        }
+        return true
+    }
+
+    override fun shouldApplyEffectTickThisTick(duration: Int, amplifier: Int) = true
 }

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

@@ -17,6 +17,8 @@ import com.bedrockk.molang.runtime.value.MoValue
 import com.bedrockk.molang.runtime.value.StringValue
 import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.CobblemonBlockEntities
+import com.cobblemon.mod.common.api.moves.Moves
+import com.cobblemon.mod.common.api.tms.TechnicalMachines
 import com.cobblemon.mod.common.api.dialogue.PlayerDialogueFaceProvider
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMoLangValue
 import com.cobblemon.mod.common.api.molang.ObjectValue
@@ -44,6 +46,7 @@ import com.cobblemon.mod.common.util.party
 import com.cobblemon.mod.common.util.pc
 import com.cobblemon.mod.common.util.pokedex
 import com.cobblemon.mod.common.util.server
+import com.cobblemon.mod.common.util.tmList
 import net.minecraft.core.registries.BuiltInRegistries
 import net.minecraft.core.registries.Registries
 import net.minecraft.resources.ResourceLocation
@@ -312,6 +315,23 @@ object PlayerMoLangFunctions : AbstractMoLangFunctionHolder<Player>() {
                 }
                 return@put DoubleValue.ZERO
             }
+            map["has_tm_move_unlocked"] = put@{ params ->
+                val move = Moves.getByName(params.getString(0)) ?: return@put DoubleValue.ZERO
+                val tm = TechnicalMachines.moveToTM[move] ?: return@put DoubleValue.ZERO
+                DoubleValue(if (player.tmList().learnedTMs.contains(tm.id)) 1.0 else 0.0)
+            }
+            map["unlock_tm_move"] = put@{ params ->
+                val move = Moves.getByName(params.getString(0)) ?: return@put DoubleValue.ZERO
+                val tm = TechnicalMachines.moveToTM[move] ?: return@put DoubleValue.ZERO
+                player.tmList().syncTMFromMove(move)
+                DoubleValue(if (player.tmList().learnedTMs.contains(tm.id)) 1.0 else 0.0)
+            }
+            map["lock_tm_move"] = put@{ params ->
+                val move = Moves.getByName(params.getString(0)) ?: return@put DoubleValue.ZERO
+                val tm = TechnicalMachines.moveToTM[move] ?: return@put DoubleValue.ZERO
+                player.tmList().syncTMLockFromMove(move)
+                DoubleValue(if (player.tmList().learnedTMs.contains(tm.id)) 0.0 else 1.0)
+            }
             map["start_battle"] = put@{ params ->
                 val opponentValue = params.get<MoValue>(0)
                 val opponent = if (opponentValue is ObjectValue<*>) {

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

@@ -9,6 +9,7 @@
 package com.cobblemon.mod.common.api.tms
 
 import com.cobblemon.mod.common.tms.obtain.DefaultObtainMethod
+import com.cobblemon.mod.common.tms.obtain.ImpossibleObtainMethod
 import com.cobblemon.mod.common.tms.obtain.PlayerHasAdvancementObtainMethod
 import com.cobblemon.mod.common.tms.obtain.PlayerYObtainMethod
 import com.cobblemon.mod.common.tms.obtain.UnlockableObtainMethod
@@ -36,6 +37,7 @@ interface ObtainMethod {
             val variant = buffer.readUtf()
             return when (variant) {
                 "cobblemon:unlockable" -> UnlockableObtainMethod()
+                "cobblemon:impossible" -> ImpossibleObtainMethod()
                 "cobblemon:default" -> DefaultObtainMethod()
                 "cobblemon:advancement" -> {
                     val advancement = buffer.readResourceLocation()

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

@@ -14,6 +14,8 @@ import com.cobblemon.mod.common.advancement.CobblemonCriteria
 import com.cobblemon.mod.common.advancement.criterion.CountableContext
 import com.cobblemon.mod.common.advancement.criterion.LearnAllTMContext
 import com.cobblemon.mod.common.advancement.criterion.LearnTMContext
+import com.cobblemon.mod.common.api.abilities.Ability
+import com.cobblemon.mod.common.api.abilities.AbilityPool
 import com.cobblemon.mod.common.api.moves.MoveTemplate
 import com.cobblemon.mod.common.api.scheduling.ScheduledTask
 import com.cobblemon.mod.common.api.scheduling.ServerTaskTracker
@@ -50,6 +52,11 @@ class TMMoveManager(
         learn(listOf(tmId))
     }
 
+    fun syncTMLockFromMove(moveTemplate: MoveTemplate) {
+        val tmId = TechnicalMachines.moveToTM[moveTemplate]?.id ?: return
+        unlearn(listOf(tmId))
+    }
+
     fun getLearnableTMsFromPokemon(pokemon: Pokemon): Collection<ResourceLocation> {
         val learnableMoves = pokemon.allAccessibleMoves.toMutableSet()
         learnableMoves.addAll(pokemon.moveSet.map { it.template })

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

@@ -42,10 +42,12 @@ class ElementalType(
 
     companion object {
         @JvmStatic
-        val BY_STRING_CODEC: Codec<ElementalType> = CodecUtils.createByStringCodec(
-            ElementalTypes::get,
-            {it.showdownId}
-        ) { id -> "No ElementalType for ID $id" }
+        val BY_STRING_CODEC: Codec<ElementalType> by lazy {
+            CodecUtils.createByStringCodec(
+                ElementalTypes::get,
+                { it.showdownId }
+            ) { id -> "No ElementalType for ID $id" }
+        }
     }
 
-}
+}

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

@@ -73,7 +73,7 @@ class BerryBlock(private val berryIdentifier: ResourceLocation, settings: Proper
     override fun playerWillDestroy(world: Level, pos: BlockPos, state: BlockState, player: Player): BlockState {
         if (!player.isCreative && state.getValue(AGE) == FRUIT_AGE) {
             val treeEntity = world.getBlockEntity(pos) as BerryBlockEntity
-            treeEntity.harvest(world, state, pos, player).forEach { drop -> Block.popResource(world, pos, drop) }
+            treeEntity.harvest(world, state, pos, player).forEach { drop -> popResource(world, pos, drop) }
         }
         return super.playerWillDestroy(world, pos, state, player)
     }
@@ -95,7 +95,7 @@ class BerryBlock(private val berryIdentifier: ResourceLocation, settings: Proper
     // Random Tick handler: uses time compensation to ensure correct growth speed
     @Deprecated("Deprecated in Java")
     override fun randomTick(state: BlockState, world: ServerLevel, pos: BlockPos, random: RandomSource) {
-        val blockEntity = world.getBlockEntity(pos) as? BerryBlockEntity ?: return
+        val blockEntity = world.getBlockEntity(pos) as? BerryBlockEntity? ?: return
         
         // processTick calculates elapsed time and updates timer, returns whether growth is needed
         if (blockEntity.processTick(world, pos, state) && !world.getBlockTicks().hasScheduledTick(pos, this)) {
@@ -131,7 +131,7 @@ class BerryBlock(private val berryIdentifier: ResourceLocation, settings: Proper
         val newAge = curAge + 1
         if (newAge > FRUIT_AGE) return
         val newState = state.setValue(AGE, newAge)
-        val treeEntity = world.getBlockEntity(pos) as? BerryBlockEntity ?: run {
+        val treeEntity = world.getBlockEntity(pos) as? BerryBlockEntity? ?: run {
             world.setBlock(pos, Blocks.AIR.defaultBlockState(), UPDATE_CLIENTS)
             return
         }
@@ -152,7 +152,7 @@ class BerryBlock(private val berryIdentifier: ResourceLocation, settings: Proper
         for (direction in this.lookupDirections) {
             val redirectedPos = pos.offset(direction.normal)
             val redirectedState = world.getBlockState(redirectedPos)
-            val berryBlock = redirectedState.block as? BerryBlock ?: continue
+            val berryBlock = redirectedState.block as? BerryBlock? ?: continue
             val berry = berryBlock.berry() ?: continue
             val mutation = this.berry()?.mutationWith(berry) ?: continue
             mutations += mutation
@@ -166,7 +166,7 @@ class BerryBlock(private val berryIdentifier: ResourceLocation, settings: Proper
                         treeEntity.decrementMulchDuration(world, pos, state)
                     }
                     val mutation = if (random.nextInt(1000) < mutateChance) mutations.random() else null
-                    (world.getBlockEntity(pos) as? BerryBlockEntity)?.let { blockEntity ->
+                    (world.getBlockEntity(pos) as? BerryBlockEntity?)?.let { blockEntity ->
                         CobblemonEvents.BERRY_MUTATION_RESULT.post(BerryMutationResultEvent(berry, world, state, pos, berryMutationOffer.mutations, mutation)) { berryMutationResult ->
                             berryMutationResult.pickedMutation?.let { mutation -> blockEntity.mutate(mutation) }
                         }
@@ -184,7 +184,7 @@ class BerryBlock(private val berryIdentifier: ResourceLocation, settings: Proper
     ): Boolean {
         val underBlockState = world.getBlockState(pos.below())
         val validSoil = state.getValue(IS_ROOTED) || underBlockState.`is`(CobblemonBlockTags.BERRY_SOIL)
-        val treeEntity = world.getBlockEntity(pos) as? BerryBlockEntity ?: return false
+        val treeEntity = world.getBlockEntity(pos) as? BerryBlockEntity? ?: return false
         return getMulch(treeEntity) == MulchVariant.NONE && state.getValue(AGE) < FLOWER_AGE && validSoil
     }
 
@@ -359,7 +359,7 @@ class BerryBlock(private val berryIdentifier: ResourceLocation, settings: Proper
         fun getMulch(entity: BerryBlockEntity) = entity.mulchVariant
 
         fun convertMulchToEntity(world: ServerLevel, state: BlockState, pos: BlockPos) {
-            val entity = world.getBlockEntity(pos) as? BerryBlockEntity ?: return
+            val entity = world.getBlockEntity(pos) as? BerryBlockEntity? ?: return
             if (state.getValue(MULCH) != MulchVariant.NONE && state.getValue(MULCH) != entity.mulchVariant) {
                 entity.mulchVariant = state.getValue(MULCH)
                 world.setBlockAndUpdate(pos, state.setValue(MULCH, MulchVariant.NONE))
@@ -376,9 +376,9 @@ class BerryBlock(private val berryIdentifier: ResourceLocation, settings: Proper
     }
 
     private fun harvestBerry(world: Level, state: BlockState, pos: BlockPos, player: Player? = null): Boolean {
-        val blockEntity = world.getBlockEntity(pos) as? BerryBlockEntity ?: return false
+        val blockEntity = world.getBlockEntity(pos) as? BerryBlockEntity? ?: return false
         blockEntity.harvest(world, state, pos, player).forEach { drop ->
-            Block.popResource(world, pos, drop)
+            popResource(world, pos, drop)
         }
 
         val sound = if (player != null) CobblemonSounds.BERRY_HARVEST else SoundEvents.SHEEP_SHEAR

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

@@ -14,7 +14,6 @@ import com.cobblemon.mod.common.api.multiblock.MultiblockEntity
 import com.cobblemon.mod.common.api.multiblock.MultiblockStructure
 import com.cobblemon.mod.common.api.multiblock.builder.MultiblockStructureBuilder
 import com.cobblemon.mod.common.api.pokemon.PokemonProperties
-import com.cobblemon.mod.common.api.tms.TechnicalMachines
 import com.cobblemon.mod.common.api.types.ElementalTypes
 import com.cobblemon.mod.common.block.MonitorBlock
 import com.cobblemon.mod.common.block.multiblock.FossilMultiblockStructure
@@ -307,8 +306,7 @@ open class FossilMultiblockEntity(
     private fun unlockTmForPlayer(player: ServerPlayer, stack: ItemStack) {
         if (stack.item !is TechnicalMachineItem) return
         val move = TMMoveComponent.getTMMove(stack) ?: return
-        val tmId = TechnicalMachines.moveToTM[move]?.id ?: return
-        player.tmList()?.learn(listOf(tmId))
+        player.tmList().syncTMFromMove(move)
     }
 
     private fun updateMonitorScreen() {

common/src/main/kotlin/com/cobblemon/mod/common/block/habitat/HabitatBlock.kt

@@ -25,6 +25,7 @@ import net.minecraft.world.level.block.SoundType
 import net.minecraft.world.level.block.entity.BlockEntity
 import net.minecraft.world.level.block.entity.BlockEntityTicker
 import net.minecraft.world.level.block.entity.BlockEntityType
+import net.minecraft.world.level.block.entity.CommandBlockEntity
 import net.minecraft.world.level.block.state.BlockState
 import net.minecraft.world.level.block.state.StateDefinition
 import net.minecraft.world.level.block.state.properties.BooleanProperty
@@ -80,11 +81,13 @@ class HabitatBlock(properties: Properties) : Block(properties), EntityBlock {
     }
 
     override fun useWithoutItem(state: BlockState, level: Level, pos: BlockPos, player: Player, hitResult: BlockHitResult): InteractionResult {
-        if (!level.isClientSide) {
-            val be = level.getBlockEntity(pos) as? HabitatBlockEntity ?: return InteractionResult.PASS
-            return be.onUse(player, hitResult)
+        val blockEntity = level.getBlockEntity(pos)
+        val be = level.getBlockEntity(pos) as? HabitatBlockEntity ?: return InteractionResult.PASS
+        return if (blockEntity is HabitatBlockEntity && player.canUseGameMasterBlocks()) {
+            be.onUse(player, hitResult)
+        } else {
+            InteractionResult.PASS
         }
-        return InteractionResult.SUCCESS
     }
 
     override fun getDrops(state: BlockState, params: LootParams.Builder): MutableList<ItemStack> {

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

@@ -130,20 +130,25 @@ class PartyOverlay : Gui(Minecraft.getInstance()) {
         val party = CobblemonClient.storage.party
         val matrices = context.pose()
         if (party.slots.none { it != null }) {
-            if (CobblemonClient.clientPlayerData.promptStarter &&
+            if (!this.attachedToast &&
+                CobblemonClient.clientPlayerData.promptStarter &&
                 !CobblemonClient.clientPlayerData.starterLocked &&
                 !CobblemonClient.clientPlayerData.starterSelected &&
                 !CobblemonClient.checkedStarterScreen
             ) {
-                if (!this.attachedToast) {
-                    // Adding starter toast on start and connect of client to server.
-                    minecraft.toasts.addToast(this.starterToast)
-                    this.attachedToast = true
-                }
+                // Adding starter toast on start and connect of client to server.
+                minecraft.toasts.addToast(this.starterToast)
+                this.attachedToast = true
             }
             return // Don't render the stuff below if no Pokémon in party
         }
 
+        // Without this simply capturing a Pokémon instead of opening the starter screen won't dismiss the toast
+        if (!CobblemonClient.checkedStarterScreen) {
+            CobblemonClient.checkedStarterScreen = true
+            starterToast.nextVisibility = Toast.Visibility.HIDE
+        }
+
         val totalHeight = party.slots.size * SLOT_HEIGHT
         val midY = minecraft.window.guiScaledHeight / 2
         val startY = (midY - totalHeight / 2) - ((SLOT_SPACING * 5) / 2)

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

@@ -41,6 +41,7 @@ class CobblemonConfigScreen(
         const val WIDGET_HEIGHT = SLOT_HEIGHT - PADDING
         const val LABEL_Y_OFFSET = 4
         const val WIDGET_Y_OFFSET = 0
+        const val LABEL_MAX_WIDTH = SLOT_WIDTH - RESET_SLOT_WIDTH - WIDGET_WIDTH - PADDING * 2
     }
 
     val clonedConfig = Cobblemon.config.clone()

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/config/variable/CobblemonConfigVariable.kt

@@ -8,17 +8,18 @@
 
 package com.cobblemon.mod.common.client.gui.config.variable
 
-import com.cobblemon.mod.common.client.gui.config.CobblemonConfigScreen.Companion.LABEL_Y_OFFSET
+import com.cobblemon.mod.common.client.gui.config.CobblemonConfigScreen.Companion.LABEL_MAX_WIDTH
 import com.cobblemon.mod.common.client.gui.config.CobblemonConfigScreen.Companion.RESET_SLOT_WIDTH
 import com.cobblemon.mod.common.client.gui.config.CobblemonConfigScreen.Companion.SLOT_WIDTH
 import com.cobblemon.mod.common.client.gui.config.CobblemonConfigScreen.Companion.WIDGET_HEIGHT
 import com.cobblemon.mod.common.client.gui.config.CobblemonConfigScreen.Companion.WIDGET_Y_OFFSET
 import com.cobblemon.mod.common.client.gui.config.CobblemonConfigVariableList
 import com.cobblemon.mod.common.client.gui.config.CobblemonConfigVariableList.CobblemonConfigVariableListEntry
-import com.cobblemon.mod.common.client.render.drawScaledText
+import com.cobblemon.mod.common.client.render.drawScrollingText
 import com.cobblemon.mod.common.config.CobblemonConfig
 import com.cobblemon.mod.common.config.CobblemonConfigField
 import com.cobblemon.mod.common.util.lang
+import net.minecraft.client.Minecraft
 import net.minecraft.client.gui.GuiGraphics
 import net.minecraft.client.gui.components.Button
 import net.minecraft.client.gui.components.Tooltip
@@ -91,12 +92,15 @@ abstract class CobblemonConfigVariable(
         val x = getX(left)
         val y = getY(top)
 
-        drawScaledText(
-            context = context,
-            text = labelLang,
-            x = getX(left),
-            y = getY(top) + LABEL_Y_OFFSET,
-            shadow = true
+        drawScrollingText(
+            context,
+            Minecraft.getInstance().font,
+            labelLang,
+            x,
+            y + WIDGET_Y_OFFSET,
+            x + LABEL_MAX_WIDTH,
+            y + WIDGET_Y_OFFSET + WIDGET_HEIGHT,
+            -1
         )
 
         resetButton.x = x + SLOT_WIDTH - RESET_SLOT_WIDTH

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

@@ -493,8 +493,8 @@ class TMMachineScreen(containerMenu: TMMachineMenu, val inventory: Inventory, ti
     fun updateSelectedTM(tm: TechnicalMachine?) {
         if (!initScreen) {
             initScreen = true
-            setScreenFromMode(TM_BURN_MODE)
             tm?.let {
+                setScreenFromMode(TM_BURN_MODE)
                 sortType = ElementalTypes.get(tm.type)
                 setMoveList()
             }

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

@@ -18,17 +18,23 @@ import com.mojang.blaze3d.systems.RenderSystem
 import com.mojang.blaze3d.vertex.PoseStack
 import com.mojang.blaze3d.vertex.VertexConsumer
 import com.mojang.math.Axis
+import net.minecraft.Util
 import net.minecraft.client.Minecraft
+import net.minecraft.client.gui.Font
 import net.minecraft.client.gui.GuiGraphics
 import net.minecraft.client.renderer.MultiBufferSource
 import net.minecraft.client.renderer.RenderType
 import net.minecraft.client.renderer.texture.OverlayTexture
 import net.minecraft.client.renderer.texture.TextureAtlas
+import net.minecraft.network.chat.Component
 import net.minecraft.network.chat.MutableComponent
 import net.minecraft.resources.ResourceLocation
 import net.minecraft.util.FormattedCharSequence
+import net.minecraft.util.Mth
 import net.minecraft.world.item.ItemDisplayContext
 import net.minecraft.world.item.ItemStack
+import kotlin.math.cos
+import kotlin.math.sin
 
 fun renderScaledGuiItemIcon(itemStack: ItemStack, x: Double, y: Double, scale: Double = 1.0, zTranslation: Float = 100.0F, matrixStack: PoseStack? = null) {
     val itemRenderer = Minecraft.getInstance().itemRenderer
@@ -97,6 +103,55 @@ fun getDepletableRedGreen(
     return r.toFloat() to g.toFloat()
 }
 
+fun drawScrollingText(
+    context: GuiGraphics,
+    font: Font,
+    text: Component,
+    minX: Int,
+    minY: Int,
+    maxX: Int,
+    maxY: Int,
+    colour: Int,
+    minScrollVelocity: Double? = 10.0
+) {
+    val textWidth = font.width(text)
+    val fittedMaxX = if (textWidth <= maxX - minX) minX + textWidth else maxX
+    renderScrollingString(context, font, text, minX, minY, fittedMaxX, maxY, colour, minScrollVelocity)
+}
+
+/** Copied from [net.minecraft.client.gui.components.AbstractWidget.renderScrollingString] **/
+fun renderScrollingString(
+    context: GuiGraphics,
+    font: Font,
+    text: Component,
+    minX: Int,
+    minY: Int,
+    maxX: Int,
+    maxY: Int,
+    colour: Int,
+    minScrollVelocity: Double? = 10.0
+) {
+    val textWidth = font.width(text)
+    val centerY = (minY + maxY - 9) / 2 + 1
+    val boxWidth = maxX - minX
+    if (textWidth <= boxWidth) {
+        val centerX = Mth.clamp((minX + maxX) / 2, minX + textWidth / 2, maxX - textWidth / 2)
+        context.drawCenteredString(font, text, centerX, centerY, colour)
+        return
+    }
+
+    val overflow = textWidth - boxWidth
+    var period = (overflow * 0.5).coerceAtLeast(3.0)
+    if (minScrollVelocity != null) {
+        period = period.coerceAtMost(2 * overflow / minScrollVelocity)
+    }
+    val time = Util.getMillis() / 1000.0
+    val easedProgress = sin((Math.PI / 2) * cos(2 * Math.PI * time / period)) / 2.0 + 0.5
+    val offset = Mth.lerp(easedProgress, 0.0, overflow.toDouble())
+    context.enableScissor(minX, minY, maxX, maxY)
+    context.drawString(font, text, minX - offset.toInt(), centerY, colour)
+    context.disableScissor()
+}
 
 fun drawScaledText(
     context: GuiGraphics,

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

@@ -72,7 +72,8 @@ object MountedCameraRenderer {
         val rollable = vehicle as OrientationControllable
         val vehicleController = rollable.getOrientationController()
 
-        val model = getPoser(vehicle.pokemon.species.resourceIdentifier, FloatingState())
+        val state = FloatingState().also { it.currentAspects = vehicle.pokemon.aspects }
+        val model = getPoser(vehicle.pokemon.species.resourceIdentifier, state)
 
         val locatorName = delegate.getSeatLocator(driver)
         val locator = delegate.locatorStates[locatorName] ?: return null

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

@@ -34,7 +34,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.util.exists
 import com.cobblemon.mod.common.entity.PosableEntity
 import com.cobblemon.mod.common.entity.PoseType
 import com.cobblemon.mod.common.entity.generic.GenericBedrockEntity
@@ -256,7 +255,7 @@ open class PosableModel(@Transient override val rootPart: Bone) : ModelFrame {
     }
 
     fun setLayerContext(buffer: MultiBufferSource, state: PosableState, layers: Iterable<ModelLayer>) {
-        currentLayers = layers
+        currentLayers = layers.sortedBy { it.translucent }
         bufferProvider = buffer
         currentState = state
     }

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

@@ -1,85 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen1
-
-import com.cobblemon.mod.common.client.render.models.blockbench.PosableState
-import com.cobblemon.mod.common.client.render.models.blockbench.frame.BipedFrame
-import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
-import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
-import com.cobblemon.mod.common.client.render.models.blockbench.pose.CobblemonPose
-import com.cobblemon.mod.common.entity.PoseType
-import 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 ChanseyModel(root: ModelPart) : PokemonPosableModel(root), BipedFrame {
-    override val rootPart = root.registerChildWithAllChildren("chansey")
-    override val leftLeg = getPart("left_foot")
-    override val rightLeg = getPart("right_foot")
-
-    override var portraitScale = 1.5F
-    override var portraitTranslation = Vec3(-0.35, 0.3, 0.0)
-
-    override var profileScale = 0.8F
-    override var profileTranslation = Vec3(0.0, 0.55, 0.0)
-
-    lateinit var standing: CobblemonPose
-    lateinit var walk: CobblemonPose
-    lateinit var sleep: CobblemonPose
-    lateinit var battleIdle: CobblemonPose
-
-    override val cryAnimation = CryProvider { bedrockStateful("chansey", "cry") }
-
-    override fun registerPoses() {
-        val blink = quirk { bedrockStateful("chansey", "blink") }
-
-        sleep = registerPose(
-            poseName = "sleep",
-            poseType = PoseType.SLEEP,
-            animations = arrayOf(
-                bedrock("chansey", "sleep")
-            )
-        )
-
-        standing = registerPose(
-            poseName = "standing",
-            poseTypes = STATIONARY_POSES + UI_POSES,
-            condition = { !it.isBattling },
-            transformTicks = 10,
-            animations = arrayOf(
-                bedrock("chansey", "ground_idle")
-            )
-        )
-
-        walk = registerPose(
-            poseName = "walk",
-            poseTypes = MOVING_POSES,
-            transformTicks = 10,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                bedrock("chansey", "ground_walk")
-            )
-        )
-
-        battleIdle = registerPose(
-            poseName = "battle_idle",
-            poseTypes = PoseType.STATIONARY_POSES,
-            condition = { it.isBattling },
-            transformTicks = 10,
-            animations = arrayOf(
-                bedrock("chansey", "battle_idle")
-            )
-        )
-    }
-
-    override fun getFaintAnimation(state: PosableState) = bedrockStateful("chansey", "faint")
-}

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

@@ -1,74 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen1
-
-import com.cobblemon.mod.common.client.render.models.blockbench.PosableState
-import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
-import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
-import com.cobblemon.mod.common.client.render.models.blockbench.pose.CobblemonPose
-import com.cobblemon.mod.common.entity.PoseType
-import 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 DiglettAlolanModel(root: ModelPart) : PokemonPosableModel(root) {
-    override val rootPart = root.registerChildWithAllChildren("diglett_alolan")
-
-    override var portraitScale = 1.8F
-    override var portraitTranslation = Vec3(-0.06, -0.86, 0.0)
-
-    override var profileScale = 0.9F
-    override var profileTranslation = Vec3(0.0, 0.32, 0.0)
-
-    lateinit var stand: CobblemonPose
-    lateinit var walk: CobblemonPose
-    lateinit var battleidle: CobblemonPose
-    lateinit var sleep: CobblemonPose
-
-    override val cryAnimation = CryProvider { bedrockStateful("diglett_alolan", "cry") }
-
-    override fun registerPoses() {
-        val blink = quirk { bedrockStateful("diglett_alolan", "blink")}
-        val quirk = quirk { bedrockStateful("diglett_alolan", "quirk_idle")}
-
-        sleep = registerPose(
-            poseName = "sleep",
-            poseType = PoseType.SLEEP,
-            animations = arrayOf(bedrock("diglett_alolan", "sleep"))
-        )
-
-        stand = registerPose(
-            poseName = "stand",
-            poseTypes = STATIONARY_POSES + UI_POSES,
-            condition = { !it.isBattling },
-            quirks = arrayOf(blink,quirk),
-            animations = arrayOf(bedrock("diglett_alolan", "ground_idle"))
-        )
-
-        walk = registerPose(
-            poseName = "walk",
-            poseTypes = MOVING_POSES,
-            quirks = arrayOf(blink),
-            animations = arrayOf(bedrock("diglett_alolan", "ground_idle"))
-        )
-
-        battleidle = registerPose(
-            poseName = "battleidle",
-            poseTypes = STATIONARY_POSES,
-            condition = { it.isBattling },
-            quirks = arrayOf(blink),
-            animations = arrayOf(bedrock("diglett_alolan", "battle_idle"))
-        )
-    }
-
-    override fun getFaintAnimation(state: PosableState) = bedrockStateful("diglett_alolan", "faint")
-}

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

@@ -1,71 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen1
-
-import com.cobblemon.mod.common.client.render.models.blockbench.PosableState
-import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
-import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
-import com.cobblemon.mod.common.client.render.models.blockbench.pose.CobblemonPose
-import com.cobblemon.mod.common.entity.PoseType
-import 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 net.minecraft.client.model.geom.ModelPart
-import net.minecraft.world.phys.Vec3
-
-class DiglettModel(root: ModelPart) : PokemonPosableModel(root) {
-    override val rootPart = root.registerChildWithAllChildren("diglett")
-
-    override var portraitScale = 1.8F
-    override var portraitTranslation = Vec3(-0.06, -0.86, 0.0)
-
-    override var profileScale = 0.9F
-    override var profileTranslation = Vec3(0.0, 0.32, 0.0)
-
-    lateinit var stand: CobblemonPose
-    lateinit var walk: CobblemonPose
-    lateinit var battleidle: CobblemonPose
-    lateinit var sleep: CobblemonPose
-
-    override val cryAnimation = CryProvider { bedrockStateful("diglett", "cry") }
-
-    override fun registerPoses() {
-        val blink = quirk { bedrockStateful("diglett", "blink")}
-        val quirk = quirk { bedrockStateful("diglett", "quirk_idle")}
-
-        sleep = registerPose(
-            poseName = "sleep",
-            poseType = PoseType.SLEEP,
-            animations = arrayOf(bedrock("diglett", "sleep"))
-        )
-
-        stand = registerPose(
-            poseName = "stand",
-            poseTypes = STATIONARY_POSES + UI_POSES,
-            quirks = arrayOf(blink, quirk),
-            animations = arrayOf(bedrock("diglett", "ground_idle"))
-        )
-
-        walk = registerPose(
-            poseName = "walk",
-            poseTypes = MOVING_POSES,
-            quirks = arrayOf(blink),
-            animations = arrayOf(bedrock("diglett", "ground_walk"))
-        )
-
-        battleidle = registerPose(
-            poseName = "battleidle",
-            poseTypes = STATIONARY_POSES,
-            quirks = arrayOf(blink, quirk),
-            animations = arrayOf(bedrock("diglett", "battle_idle"))
-        )
-    }
-
-    override fun getFaintAnimation(state: PosableState) = bedrockStateful("diglett", "faint")
-}

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

@@ -1,79 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen1
-
-import com.cobblemon.mod.common.client.render.models.blockbench.PosableState
-import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
-import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
-import com.cobblemon.mod.common.client.render.models.blockbench.pose.CobblemonPose
-import com.cobblemon.mod.common.entity.PoseType
-import 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 DugtrioAlolanModel(root: ModelPart) : PokemonPosableModel(root) {
-    override val rootPart = root.registerChildWithAllChildren("dugtrio_alolan")
-
-    override var portraitScale = 1.3F
-    override var portraitTranslation = Vec3(-0.11, -0.1, 0.0)
-
-    override var profileScale = 0.9F
-    override var profileTranslation = Vec3(0.0, 0.29, 0.0)
-
-    lateinit var standing: CobblemonPose
-    lateinit var walking: CobblemonPose
-    lateinit var battleidle: CobblemonPose
-    lateinit var sleep: CobblemonPose
-
-    override val cryAnimation = CryProvider { bedrockStateful("dugtrio_alolan", "cry") }
-
-    override fun registerPoses() {
-        val blink = quirk { bedrockStateful("dugtrio_alolan", "blink")}
-        val blink2 = quirk { bedrockStateful("dugtrio_alolan", "blink2")}
-        val blink3 = quirk { bedrockStateful("dugtrio_alolan", "blink3")}
-
-        val quirk = quirk { bedrockStateful("dugtrio_alolan", "quirk_idle")}
-        val quirk2 = quirk { bedrockStateful("dugtrio_alolan", "quirk_idle2")}
-        val quirk3 = quirk { bedrockStateful("dugtrio_alolan", "quirk_idle3")}
-
-        sleep = registerPose(
-            poseName = "sleep",
-            poseType = PoseType.SLEEP,
-            animations = arrayOf(bedrock("dugtrio_alolan", "sleep"))
-        )
-
-        standing = registerPose(
-            poseName = "stand",
-            poseTypes = STATIONARY_POSES + UI_POSES,
-            condition = { !it.isBattling },
-            quirks = arrayOf(blink, blink2, blink3, quirk, quirk2, quirk3),
-            animations = arrayOf(bedrock("dugtrio_alolan", "ground_idle"))
-        )
-
-        walking = registerPose(
-            poseName = "walk",
-            poseTypes = MOVING_POSES,
-            quirks = arrayOf(blink, blink2, blink3),
-            animations = arrayOf(bedrock("dugtrio_alolan", "ground_idle"))
-        )
-
-        battleidle = registerPose(
-            poseName = "battleidle",
-            poseTypes = STATIONARY_POSES,
-            condition = { it.isBattling },
-            quirks = arrayOf(blink, blink2, blink3, quirk, quirk2, quirk3),
-            animations = arrayOf(bedrock("dugtrio_alolan", "battle_idle"))
-        )
-    }
-
-    override fun getFaintAnimation(state: PosableState) = bedrockStateful("dugtrio_alolan", "faint")
-}

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

@@ -1,99 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen1
-
-import com.cobblemon.mod.common.client.render.models.blockbench.PosableState
-import com.cobblemon.mod.common.client.render.models.blockbench.animation.SingleBoneLookAnimation
-import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
-import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
-import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
-import com.cobblemon.mod.common.client.render.models.blockbench.pose.CobblemonPose
-import com.cobblemon.mod.common.entity.PoseType
-import 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 DugtrioModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame {
-    override val rootPart = root.registerChildWithAllChildren("dugtrio")
-    override val head = getPart("body3")
-
-    val lefthead = object : HeadedFrame {
-        override val rootPart = this@DugtrioModel.rootPart
-        override val head: ModelPart = getPart("body2")
-    }
-    val righthead = object : HeadedFrame {
-        override val rootPart = this@DugtrioModel.rootPart
-        override val head: ModelPart = getPart("body1")
-    }
-
-    override var portraitScale = 1.3F
-    override var portraitTranslation = Vec3(-0.11, -0.1, 0.0)
-
-    override var profileScale = 0.9F
-    override var profileTranslation = Vec3(0.0, 0.29, 0.0)
-
-    lateinit var standing: CobblemonPose
-    lateinit var walking: CobblemonPose
-    lateinit var battleidle: CobblemonPose
-    lateinit var sleep: CobblemonPose
-
-    override val cryAnimation = CryProvider { bedrockStateful("dugtrio", "cry") }
-
-    override fun registerPoses() {
-        val blink = quirk { bedrockStateful("dugtrio", "blink")}
-        val blink2 = quirk { bedrockStateful("dugtrio", "blink2")}
-        val blink3 = quirk { bedrockStateful("dugtrio", "blink3")}
-
-        val quirk = quirk { bedrockStateful("dugtrio", "quirk_idle")}
-        val quirk2 = quirk { bedrockStateful("dugtrio", "quirk_idle2")}
-        val quirk3 = quirk { bedrockStateful("dugtrio", "quirk_idle3")}
-
-        sleep = registerPose(
-            poseName = "sleep",
-            poseType = PoseType.SLEEP,
-            animations = arrayOf(bedrock("dugtrio", "sleep"))
-        )
-
-        standing = registerPose(
-            poseName = "stand",
-            poseTypes = STATIONARY_POSES + UI_POSES,
-            condition = { !it.isBattling },
-            quirks = arrayOf(blink, blink2, blink3, quirk, quirk2, quirk3),
-            animations = arrayOf(
-                    singleBoneLook(pitchMultiplier = 0.6F, yawMultiplier = 0.4F, maxPitch = 10F, minPitch = -30F),
-                    SingleBoneLookAnimation(lefthead, false, false, false, false, 1F, 1.4F, 0F, -30F, 20F, -45F),
-                    SingleBoneLookAnimation(righthead, false, false, false, false, 1F, 1.4F, 0F, -30F, 45F, -25F),
-                    bedrock("dugtrio", "ground_idle"))
-        )
-
-        walking = registerPose(
-            poseName = "walk",
-            poseTypes = MOVING_POSES,
-            quirks = arrayOf(blink, blink2, blink3),
-            animations = arrayOf(
-                    singleBoneLook(pitchMultiplier = 0.6F, yawMultiplier = 0.4F, maxPitch = 10F, minPitch = -30F),
-                    SingleBoneLookAnimation(lefthead, false, false, false, false, 1F, 1.4F, 0F, -30F, 20F, -45F),
-                    SingleBoneLookAnimation(righthead, false, false, false, false, 1F, 1.4F, 0F, -30F, 45F, -25F),
-                    bedrock("dugtrio", "ground_walk"))
-        )
-
-        battleidle = registerPose(
-            poseName = "battleidle",
-            poseTypes = STATIONARY_POSES,
-            condition = { it.isBattling },
-            quirks = arrayOf(blink, blink2, blink3, quirk, quirk2, quirk3),
-            animations = arrayOf(bedrock("dugtrio", "battle_idle"))
-        )
-    }
-
-    override fun getFaintAnimation(state: PosableState) = bedrockStateful("dugtrio", "faint")
-}

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

@@ -1,66 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen1
-
-import com.cobblemon.mod.common.client.render.models.blockbench.animation.BipedWalkAnimation
-import com.cobblemon.mod.common.client.render.models.blockbench.frame.BipedFrame
-import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
-import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
-import com.cobblemon.mod.common.client.render.models.blockbench.pose.CobblemonPose
-import com.cobblemon.mod.common.entity.PoseType.Companion.MOVING_POSES
-import com.cobblemon.mod.common.entity.PoseType.Companion.STATIONARY_POSES
-import com.cobblemon.mod.common.entity.PoseType.Companion.UI_POSES
-import net.minecraft.client.model.geom.ModelPart
-import net.minecraft.world.phys.Vec3
-
-class GravelerModel(root: ModelPart) : PokemonPosableModel(root), BipedFrame {
-    override val rootPart = root.registerChildWithAllChildren("graveler")
-
-    override val leftLeg = getPart("leg_left")
-    override val rightLeg = getPart("leg_right")
-
-    override var portraitScale = 1.4F
-    override var portraitTranslation = Vec3(-0.1, -0.28, 0.0)
-
-    override var profileScale = 0.9F
-    override var profileTranslation = Vec3(0.0, 0.37, 0.0)
-
-    lateinit var standing: CobblemonPose
-    lateinit var walk: CobblemonPose
-
-    override val cryAnimation = CryProvider { bedrockStateful("graveler", "cry") }
-
-    override fun registerPoses() {
-        val blink = quirk { bedrockStateful("graveler", "blink")}
-        standing = registerPose(
-            poseName = "standing",
-            poseTypes = STATIONARY_POSES + UI_POSES,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                bedrock("graveler", "ground_idle")
-            )
-        )
-
-        walk = registerPose(
-            poseName = "walk",
-            poseTypes = MOVING_POSES,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                BipedWalkAnimation(this, periodMultiplier = 1.1F),
-                bedrock("graveler", "ground_idle")
-                //bedrock("graveler", "ground_walk")
-            )
-        )
-    }
-
-//    override fun getFaintAnimation(
-//        pokemonEntity: PokemonEntity,
-//        state: PosableState<PokemonEntity>
-//    ) = if (state.isPosedIn(standing, walk)) bedrockStateful("graveler", "faint") else null
-}

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

@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen1
-
-import com.cobblemon.mod.common.client.render.models.blockbench.PosableState
-import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
-import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
-import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
-import com.cobblemon.mod.common.client.render.models.blockbench.pose.Pose
-import com.cobblemon.mod.common.entity.PoseType
-import com.cobblemon.mod.common.entity.PoseType.Companion.ALL_POSES
-import net.minecraft.client.model.geom.ModelPart
-import net.minecraft.world.phys.Vec3
-
-class KakunaModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame {
-    override val rootPart = root.registerChildWithAllChildren("kakuna")
-    override val head = getPart("head")
-
-    override var portraitScale = 1.7F
-    override var portraitTranslation = Vec3(0.1, -0.4, 0.0)
-    override var profileScale = 0.96F
-    override var profileTranslation = Vec3(0.0, 0.35, 0.0)
-
-    lateinit var sleep: Pose
-    lateinit var standing: Pose
-
-    override val cryAnimation = CryProvider { bedrockStateful("kakuna", "cry") }
-
-    override fun registerPoses() {
-        sleep = registerPose(
-            poseType = PoseType.SLEEP,
-            animations = arrayOf(bedrock("kakuna", "sleep"))
-        )
-
-        standing = registerPose(
-            poseName = "standing",
-            poseTypes = ALL_POSES - PoseType.SLEEP,
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("kakuna", "ground_idle")
-            )
-        )
-    }
-
-    override fun getFaintAnimation(state: PosableState) = bedrockStateful("kakuna", "faint")
-}

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

@@ -1,73 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen1
-
-import com.cobblemon.mod.common.client.render.models.blockbench.animation.QuadrupedWalkAnimation
-import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
-import com.cobblemon.mod.common.client.render.models.blockbench.frame.QuadrupedFrame
-import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
-import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
-import com.cobblemon.mod.common.client.render.models.blockbench.pose.CobblemonPose
-import com.cobblemon.mod.common.entity.PoseType.Companion.MOVING_POSES
-import com.cobblemon.mod.common.entity.PoseType.Companion.STATIONARY_POSES
-import com.cobblemon.mod.common.entity.PoseType.Companion.UI_POSES
-import net.minecraft.client.model.geom.ModelPart
-import net.minecraft.world.phys.Vec3
-
-class NidoranfModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame, QuadrupedFrame {
-    override val rootPart = root.registerChildWithAllChildren("nidoran_f")
-    override val head = getPart("head")
-    override val foreLeftLeg = getPart("leg_front_left")
-    override val foreRightLeg = getPart("leg_front_right")
-    override val hindLeftLeg = getPart("leg_back_left")
-    override val hindRightLeg = getPart("leg_back_right")
-
-    override var portraitScale = 2.0F
-    override var portraitTranslation = Vec3(-0.16, -0.85, 0.0)
-
-    override var profileScale = 1.03F
-    override var profileTranslation = Vec3(0.02, 0.21, 0.0)
-
-    lateinit var sleep: CobblemonPose
-    lateinit var standing: CobblemonPose
-    lateinit var walk: CobblemonPose
-
-    override val cryAnimation = CryProvider { bedrockStateful("nidoranf", "cry") }
-
-    override fun registerPoses() {
-        val blink = quirk { bedrockStateful("nidoranf", "blink") }
-        standing = registerPose(
-            poseName = "standing",
-            poseTypes = STATIONARY_POSES + UI_POSES,
-            transformTicks = 10,
-                quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("nidoranf", "idle")
-            )
-        )
-
-        walk = registerPose(
-            poseName = "walk",
-            poseTypes = MOVING_POSES,
-            transformTicks = 10,
-                quirks = arrayOf(blink),
-            animations = arrayOf(
-                    singleBoneLook(),
-                    bedrock("nidoranf", "idle"),
-                    QuadrupedWalkAnimation(this)
-            )
-        )
-    }
-
-//    override fun getFaintAnimation(
-//        pokemonEntity: PokemonEntity,
-//        state: PosableState<PokemonEntity>
-//    ) = if (state.isPosedIn(standing, walk)) bedrockStateful("nidoranf", "faint") else null
-}

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

@@ -1,73 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen1
-
-import com.cobblemon.mod.common.client.render.models.blockbench.animation.QuadrupedWalkAnimation
-import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
-import com.cobblemon.mod.common.client.render.models.blockbench.frame.QuadrupedFrame
-import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
-import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
-import com.cobblemon.mod.common.client.render.models.blockbench.pose.Pose
-import com.cobblemon.mod.common.entity.PoseType.Companion.MOVING_POSES
-import com.cobblemon.mod.common.entity.PoseType.Companion.STATIONARY_POSES
-import com.cobblemon.mod.common.entity.PoseType.Companion.UI_POSES
-import net.minecraft.client.model.geom.ModelPart
-import net.minecraft.world.phys.Vec3
-
-class NidoranmModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame, QuadrupedFrame {
-    override val rootPart = root.registerChildWithAllChildren("nidoran_m")
-    override val head = getPart("head")
-    override val foreLeftLeg = getPart("leg_front_left")
-    override val foreRightLeg = getPart("leg_front_right")
-    override val hindLeftLeg = getPart("leg_back_left")
-    override val hindRightLeg = getPart("leg_back_right")
-
-    override var portraitScale = 1.97F
-    override var portraitTranslation = Vec3(-0.18, -1.28, 0.0)
-
-    override var profileScale = 1.05F
-    override var profileTranslation = Vec3(0.03, 0.11, 0.0)
-
-    lateinit var sleep: Pose
-    lateinit var standing: Pose
-    lateinit var walk: Pose
-
-    override val cryAnimation = CryProvider { bedrockStateful("nidoranm", "cry") }
-
-    override fun registerPoses() {
-        val blink = quirk { bedrockStateful("nidoranm", "blink") }
-        standing = registerPose(
-                poseName = "standing",
-                poseTypes = STATIONARY_POSES + UI_POSES,
-                transformTicks = 10,
-                quirks = arrayOf(blink),
-                animations = arrayOf(
-                        singleBoneLook(),
-                        bedrock("nidoranm", "idle")
-                )
-        )
-
-        walk = registerPose(
-                poseName = "walk",
-                poseTypes = MOVING_POSES,
-                transformTicks = 10,
-                quirks = arrayOf(blink),
-                animations = arrayOf(
-                        singleBoneLook(),
-                        bedrock("nidoranm", "idle"),
-                        QuadrupedWalkAnimation(this)
-                )
-        )
-    }
-
-//    override fun getFaintAnimation(
-//        pokemonEntity: PokemonEntity,
-//        state: PosableState<PokemonEntity>
-//    ) = if (state.isPosedIn(standing, walk)) bedrockStateful("nidoranm", "faint") else null
-}

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

@@ -1,92 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen1
-
-import com.cobblemon.mod.common.client.render.models.blockbench.animation.QuadrupedWalkAnimation
-import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
-import com.cobblemon.mod.common.client.render.models.blockbench.frame.QuadrupedFrame
-import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
-import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
-import com.cobblemon.mod.common.client.render.models.blockbench.pose.Pose
-import com.cobblemon.mod.common.entity.PoseType
-import 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 NidorinaModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame, QuadrupedFrame {
-    override val rootPart = root.registerChildWithAllChildren("nidorina")
-    override val head = getPart("head")
-    override val foreLeftLeg= getPart("left_upper_arm")
-    override val foreRightLeg = getPart("right_upper_arm")
-    override val hindLeftLeg = getPart("left_leg")
-    override val hindRightLeg = getPart("right_leg")
-
-    override var portraitScale = 2.13F
-    override var portraitTranslation = Vec3(-0.05, -0.71, 0.0)
-
-    override var profileScale = 1.0F
-    override var profileTranslation = Vec3(0.0, 0.21, 0.0)
-
-    lateinit var sleep: Pose
-    lateinit var standing: Pose
-    lateinit var walk: Pose
-    lateinit var battleidle: Pose
-
-    override val cryAnimation = CryProvider { bedrockStateful("nidorina", "cry") }
-
-    override fun registerPoses() {
-        val blink = quirk { bedrockStateful("nidorina", "blink")}
-        standing = registerPose(
-            poseName = "standing",
-            poseTypes = STATIONARY_POSES + UI_POSES,
-            condition = { !it.isBattling },
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("nidorina", "idle3")
-            )
-        )
-
-        sleep = registerPose(
-                poseType = PoseType.SLEEP,
-                animations = arrayOf(bedrock("nidorina", "idle2"))
-        )
-
-        walk = registerPose(
-            poseName = "walk",
-            poseTypes = MOVING_POSES,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("nidorina", "idle2"),
-                QuadrupedWalkAnimation(this)
-            )
-        )
-
-        battleidle = registerPose(
-            poseName = "battle_idle",
-            poseTypes = PoseType.STATIONARY_POSES,
-            transformTicks = 10,
-            quirks = arrayOf(blink),
-            condition = { it.isBattling },
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("nidorina", "idle")
-            )
-        )
-    }
-
-//    override fun getFaintAnimation(
-//        pokemonEntity: PokemonEntity,
-//        state: PosableState<PokemonEntity>
-//    ) = if (state.isPosedIn(standing, walk)) bedrockStateful("nidorina", "faint") else null
-}

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

@@ -1,206 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen1
-
-import com.cobblemon.mod.common.client.render.models.blockbench.createTransformation
-import com.cobblemon.mod.common.client.render.models.blockbench.frame.BiWingedFrame
-import com.cobblemon.mod.common.client.render.models.blockbench.frame.BipedFrame
-import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
-import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
-import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
-import com.cobblemon.mod.common.client.render.models.blockbench.pose.ModelPartTransformation
-import com.cobblemon.mod.common.client.render.models.blockbench.pose.Pose
-import com.cobblemon.mod.common.client.render.models.blockbench.wavefunction.parabolaFunction
-import com.cobblemon.mod.common.client.render.models.blockbench.wavefunction.sineFunction
-import com.cobblemon.mod.common.entity.PoseType
-import com.cobblemon.mod.common.entity.PoseType.Companion.STATIONARY_POSES
-import com.cobblemon.mod.common.entity.PoseType.Companion.UI_POSES
-import com.cobblemon.mod.common.util.math.geometry.toRadians
-import net.minecraft.client.model.geom.ModelPart
-import net.minecraft.world.phys.Vec3
-
-class PidgeottoModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame, BipedFrame, BiWingedFrame {
-    override val rootPart = root.registerChildWithAllChildren("pidgeotto")
-    override val head = getPart("neck")
-
-    override val leftWing = getPart("wing_closed_left")
-    override val rightWing = getPart("wing_closed_right")
-    override val leftLeg = getPart("leg_left")
-    override val rightLeg = getPart("leg_right")
-    private val tail = getPart("tail")
-
-    private val wingOpenRight = getPart("wing_open_right")
-    private val wingOpenLeft = getPart("wing_open_left")
-    private val wingClosedRight = getPart("wing_closed_right")
-    private val wingClosedLeft = getPart("wing_closed_left")
-
-    override var portraitScale = 2.8F
-    override var portraitTranslation = Vec3(-0.4, -0.9, 0.0)
-    override var profileScale = 1.1F
-    override var profileTranslation = Vec3(0.0, 0.1, 0.0)
-
-    lateinit var sleep: Pose
-    lateinit var stand: Pose
-    lateinit var walk: Pose
-    lateinit var hover: Pose
-    lateinit var fly: Pose
-
-    override val cryAnimation = CryProvider { bedrockStateful("pidgeotto", "cry") }
-
-    override fun registerPoses() {
-        val blink = quirk { bedrockStateful("pidgeotto", "blink")}
-        val flyQuirk1 = quirk { bedrockStateful("pidgeotto", "air_fly_quirk") }
-        val flyQuirk2 = quirk { bedrockStateful("pidgeotto", "air_fly_quirk2") }
-
-        sleep = registerPose(
-            poseName = "sleep",
-            poseType = PoseType.SLEEP,
-            transformedParts = arrayOf(
-                wingClosedLeft.createTransformation().withVisibility(visibility = true),
-                wingClosedRight.createTransformation().withVisibility(visibility = true),
-                wingOpenLeft.createTransformation().withVisibility(visibility = false),
-                wingOpenRight.createTransformation().withVisibility(visibility = false)
-            ),
-            animations = arrayOf(bedrock("pidgeotto", "sleep_PLACEHOLDER"))
-        )
-
-        stand = registerPose(
-            poseName = "stand",
-            poseTypes = STATIONARY_POSES - PoseType.HOVER + UI_POSES,
-            transformedParts = arrayOf(
-                wingClosedLeft.createTransformation().withVisibility(visibility = true),
-                wingClosedRight.createTransformation().withVisibility(visibility = true),
-                wingOpenLeft.createTransformation().withVisibility(visibility = false),
-                wingOpenRight.createTransformation().withVisibility(visibility = false)
-            ),
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("pidgeotto", "ground_idle_PLACEHOLDER")
-            )
-        )
-        walk = registerPose(
-            poseName = "hover",
-            poseTypes = PoseType.MOVING_POSES - PoseType.FLY,
-            transformedParts = arrayOf(
-                wingClosedLeft.createTransformation().withVisibility(visibility = true),
-                wingClosedRight.createTransformation().withVisibility(visibility = true),
-                wingOpenLeft.createTransformation().withVisibility(visibility = false),
-                wingOpenRight.createTransformation().withVisibility(visibility = false)
-            ),
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("pidgeotto", "ground_idle_PLACEHOLDER"),
-                rootPart.translation(
-                    function = parabolaFunction(
-                        peak = -4F,
-                        period = 0.4F
-                    ),
-                    timeVariable = { state, _, _ -> state.animationSeconds },
-                    axis = ModelPartTransformation.Y_AXIS
-                ),
-                head.translation(
-                    function = sineFunction(
-                        amplitude = (-20F).toRadians(),
-                        period = 1F,
-                        verticalShift = (-10F).toRadians()
-                    ),
-                    axis = ModelPartTransformation.X_AXIS,
-                    timeVariable = { state, _, _ -> state.animationSeconds }
-                ),
-                leftLeg.rotation(
-                    function = parabolaFunction(
-                        tightness = -20F,
-                        phaseShift = 0F,
-                        verticalShift = (30F).toRadians()
-                    ),
-                    axis = ModelPartTransformation.X_AXIS,
-                    timeVariable = { _, _, ageInTicks -> ageInTicks / 20 },
-                ),
-                rightLeg.rotation(
-                    function = parabolaFunction(
-                        tightness = -20F,
-                        phaseShift = 0F,
-                        verticalShift = (30F).toRadians()
-                    ),
-                    axis = ModelPartTransformation.X_AXIS,
-                    timeVariable = { _, _, ageInTicks -> ageInTicks / 20 },
-                ),
-                tail.rotation(
-                    function = sineFunction(
-                        amplitude = (-5F).toRadians(),
-                        period = 1F
-                    ),
-                    axis = ModelPartTransformation.X_AXIS,
-                    timeVariable = { _, _, ageInTicks -> ageInTicks / 20 },
-                ),
-                wingFlap(
-                    flapFunction = sineFunction(
-                        amplitude = (-5F).toRadians(),
-                        period = 0.4F,
-                        phaseShift = 0.00F,
-                        verticalShift = (-20F).toRadians()
-                    ),
-                    timeVariable = { state, _, _ -> state.animationSeconds },
-                    axis = ModelPartTransformation.Z_AXIS
-                ),
-                rightWing.translation(
-                    function = parabolaFunction(
-                        tightness = -10F,
-                        phaseShift = 30F,
-                        verticalShift = (25F).toRadians()
-                    ),
-                    axis = ModelPartTransformation.Y_AXIS,
-                    timeVariable = { _, _, ageInTicks -> ageInTicks / 20 },
-                ),
-                leftWing.translation(
-                    function = parabolaFunction(
-                        tightness = -10F,
-                        phaseShift = 30F,
-                        verticalShift = (25F).toRadians()
-                    ),
-                    axis = ModelPartTransformation.Y_AXIS,
-                    timeVariable = { _, _, ageInTicks -> ageInTicks / 20 },
-                ),
-            )
-        )
-        hover = registerPose(
-            poseName = "fly",
-            poseType = PoseType.HOVER,
-            transformedParts = arrayOf(
-                wingClosedLeft.createTransformation().withVisibility(visibility = false),
-                wingClosedRight.createTransformation().withVisibility(visibility = false),
-                wingOpenLeft.createTransformation().withVisibility(visibility = true),
-                wingOpenRight.createTransformation().withVisibility(visibility = true)
-            ),
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("pidgeotto", "air_idle")
-            )
-        )
-        fly = registerPose(
-            poseName = "walk",
-            poseType = PoseType.FLY,
-            transformedParts = arrayOf(
-                wingClosedLeft.createTransformation().withVisibility(visibility = false),
-                wingClosedRight.createTransformation().withVisibility(visibility = false),
-                wingOpenLeft.createTransformation().withVisibility(visibility = true),
-                wingOpenRight.createTransformation().withVisibility(visibility = true)
-            ),
-            transformTicks = 10,
-            quirks = arrayOf(blink, flyQuirk1, flyQuirk2),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("pidgeotto", "air_fly")
-            )
-        )
-    }
-}

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

@@ -1,131 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen1
-
-import com.cobblemon.mod.common.client.render.models.blockbench.animation.PitchTiltAnimation
-import com.cobblemon.mod.common.client.render.models.blockbench.createTransformation
-import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
-import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
-import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
-import com.cobblemon.mod.common.client.render.models.blockbench.pose.CobblemonPose
-import com.cobblemon.mod.common.entity.PoseType
-import com.cobblemon.mod.common.entity.PoseType.Companion.SHOULDER_POSES
-import com.cobblemon.mod.common.entity.PoseType.Companion.UI_POSES
-import net.minecraft.client.model.geom.ModelPart
-import net.minecraft.world.phys.Vec3
-
-class PidgeyModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame {
-    override val rootPart = root.registerChildWithAllChildren("pidgey")
-    override val head = getPart("head")
-
-    private val wingOpenRight = getPart("wing_open_right")
-    private val wingOpenLeft = getPart("wing_open_left")
-    private val wingClosedRight = getPart("wing_closed_right")
-    private val wingClosedLeft = getPart("wing_closed_left")
-
-    override var portraitScale = 3.5F
-    override var portraitTranslation = Vec3(-0.1, -2.1, 0.0)
-
-    override var profileScale = 1.2F
-    override var profileTranslation = Vec3(0.0, -0.01, 0.0)
-
-    lateinit var sleep: CobblemonPose
-    lateinit var stand: CobblemonPose
-    lateinit var walk: CobblemonPose
-    lateinit var hover: CobblemonPose
-    lateinit var fly: CobblemonPose
-
-    override val cryAnimation = CryProvider { bedrockStateful("pidgey", "cry") }
-
-    override fun registerPoses() {
-        val blink = quirk { bedrockStateful("pidgey", "blink") }
-
-        sleep = registerPose(
-            poseName = "sleeping",
-            transformedParts = arrayOf(
-                wingClosedLeft.createTransformation().withVisibility(visibility = true),
-                wingClosedRight.createTransformation().withVisibility(visibility = true),
-                wingOpenLeft.createTransformation().withVisibility(visibility = false),
-                wingOpenRight.createTransformation().withVisibility(visibility = false)
-            ),
-            poseType = PoseType.SLEEP,
-            animations = arrayOf(bedrock("pidgey", "sleep_PLACEHOLDER"))
-        )
-
-        stand = registerPose(
-            poseName = "standing",
-            poseTypes = SHOULDER_POSES + UI_POSES + PoseType.STATIONARY_POSES - PoseType.HOVER,
-            transformTicks = 10,
-            transformedParts = arrayOf(
-                wingClosedLeft.createTransformation().withVisibility(visibility = true),
-                wingClosedRight.createTransformation().withVisibility(visibility = true),
-                wingOpenLeft.createTransformation().withVisibility(visibility = false),
-                wingOpenRight.createTransformation().withVisibility(visibility = false)
-            ),
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("pidgey", "ground_idle")
-            )
-        )
-
-        hover = registerPose(
-            poseName = "hover",
-            poseType = PoseType.HOVER,
-            transformedParts = arrayOf(
-                wingClosedLeft.createTransformation().withVisibility(visibility = false),
-                wingClosedRight.createTransformation().withVisibility(visibility = false),
-                wingOpenLeft.createTransformation().withVisibility(visibility = true),
-                wingOpenRight.createTransformation().withVisibility(visibility = true)
-            ),
-            transformTicks = 10,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                PitchTiltAnimation(bone = getPart("body"), maxChangePerTick = 1F),
-                singleBoneLook(),
-                bedrock("pidgey", "air_idle")
-            )
-        )
-
-        fly = registerPose(
-            poseName = "fly",
-            poseType = PoseType.FLY,
-            transformedParts = arrayOf(
-                wingClosedLeft.createTransformation().withVisibility(visibility = false),
-                wingClosedRight.createTransformation().withVisibility(visibility = false),
-                wingOpenLeft.createTransformation().withVisibility(visibility = true),
-                wingOpenRight.createTransformation().withVisibility(visibility = true)
-            ),
-            transformTicks = 10,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                PitchTiltAnimation(bone = getPart("body"), maxChangePerTick = 1F),
-                singleBoneLook(),
-                bedrock("pidgey", "air_fly")
-            )
-        )
-
-        walk = registerPose(
-            poseName = "walking",
-            poseTypes = PoseType.MOVING_POSES - PoseType.FLY,
-            transformedParts = arrayOf(
-                wingClosedLeft.createTransformation().withVisibility(visibility = true),
-                wingClosedRight.createTransformation().withVisibility(visibility = true),
-                wingOpenLeft.createTransformation().withVisibility(visibility = false),
-                wingOpenRight.createTransformation().withVisibility(visibility = false)
-            ),
-            transformTicks = 10,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("pidgey", "ground_walk")
-            )
-        )
-    }
-}

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

@@ -1,93 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen1
-
-import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
-import com.cobblemon.mod.common.client.render.models.blockbench.pose.CobblemonPose
-import com.cobblemon.mod.common.entity.PoseType
-import com.cobblemon.mod.common.entity.PoseType.Companion.UI_POSES
-import com.cobblemon.mod.common.util.isInWater
-import net.minecraft.client.model.geom.ModelPart
-import net.minecraft.world.phys.Vec3
-
-class TentacoolModel(root: ModelPart) : PokemonPosableModel(root) {
-    override val rootPart = root.registerChildWithAllChildren("tentacool")
-
-    override var portraitScale = 1.2F
-    override var portraitTranslation = Vec3(0.1, 1.1, 0.0)
-
-    override var profileScale = 0.6F
-    override var profileTranslation = Vec3(0.0, 0.8, 0.0)
-
-    lateinit var standing: CobblemonPose
-    lateinit var walk: CobblemonPose
-    lateinit var swim: CobblemonPose
-    lateinit var float: CobblemonPose
-    lateinit var sleep: CobblemonPose
-    lateinit var watersleep: CobblemonPose
-
-    override fun registerPoses() {
-        val blink = quirk { bedrockStateful("tentacool", "blink")}
-        standing = registerPose(
-            poseName = "standing",
-            poseType = PoseType.STAND,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                bedrock("tentacool", "ground_idle")
-            )
-        )
-
-        walk = registerPose(
-            poseName = "walk",
-            poseType = PoseType.WALK,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                bedrock("tentacool", "ground_idle")
-                //bedrock("tentacool", "ground_walk")
-            )
-        )
-
-        float = registerPose(
-            poseName = "float",
-            poseTypes = UI_POSES + PoseType.FLOAT,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                bedrock("tentacool", "water_idle")
-            )
-        )
-
-        swim = registerPose(
-            poseName = "swim",
-            poseType = PoseType.SWIM,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                bedrock("tentacool", "water_swim")
-            )
-        )
-
-        sleep = registerPose(
-                poseName = "sleep",
-                poseType = PoseType.SLEEP,
-                condition = { !it.isInWater },
-                animations = arrayOf(bedrock("tentacool", "sleep"))
-        )
-
-        watersleep = registerPose(
-                poseName = "watersleep",
-                poseType = PoseType.SLEEP,
-                condition = { it.isInWater },
-                animations = arrayOf(bedrock("tentacool", "water_sleep"))
-        )
-    }
-
-//    override fun getFaintAnimation(
-//        pokemonEntity: PokemonEntity,
-//        state: PosableState<PokemonEntity>
-//    ) = if (state.isPosedIn(standing, walk)) bedrockStateful("tentacool", "faint") else null
-}

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

@@ -30,7 +30,7 @@ class WartortleModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame {
     override var portraitTranslation = Vec3(-0.17, 0.54, 0.0)
 
     override var profileScale = 0.69F
-    override var profileTranslation = Vec3(-0.04, 0.69, 0.0)
+    override var profileTranslation = Vec3(0.0, 0.69, 0.0)
 
     lateinit var sleep: CobblemonPose
     lateinit var standing: CobblemonPose

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

@@ -1,86 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen2
-
-import com.cobblemon.mod.common.client.render.models.blockbench.PosableState
-import com.cobblemon.mod.common.client.render.models.blockbench.frame.BimanualFrame
-import com.cobblemon.mod.common.client.render.models.blockbench.frame.BipedFrame
-import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
-import com.cobblemon.mod.common.client.render.models.blockbench.pose.CobblemonPose
-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 BlisseyModel(root: ModelPart) : PokemonPosableModel(root), BipedFrame, BimanualFrame {
-    override val rootPart = root.registerChildWithAllChildren("blissey")
-
-    override val leftLeg = getPart("left_foot")
-    override val rightLeg = getPart("right_foot")
-    override val leftArm = getPart("left_arm")
-    override val rightArm = getPart("right_arm")
-
-    override var portraitScale = 1.5F
-    override var portraitTranslation = Vec3(-0.6, 0.9, 0.0)
-
-    override var profileScale = 0.7F
-    override var profileTranslation = Vec3(0.0, 0.7, 0.0)
-
-    lateinit var standing: CobblemonPose
-    lateinit var walk: CobblemonPose
-    lateinit var sleep: CobblemonPose
-    lateinit var battle_idle: CobblemonPose
-
-    override fun registerPoses() {
-        val blink = quirk { bedrockStateful("blissey", "blink") }
-        val eggQuirk = quirk { bedrockStateful("blissey", "eggadjust_quirk") }
-
-        sleep = registerPose(
-            poseName = "sleep",
-            poseType = PoseType.SLEEP,
-            animations = arrayOf(
-                bedrock("blissey", "sleep")
-            )
-        )
-
-        standing = registerPose(
-            poseName = "standing",
-            poseTypes = STATIONARY_POSES + UI_POSES,
-            condition = { !it.isBattling },
-            quirks = arrayOf(blink, eggQuirk),
-            animations = arrayOf(
-                bedrock("blissey", "ground_idle")
-            )
-        )
-
-        walk = registerPose(
-            poseName = "walk",
-            poseTypes = MOVING_POSES,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                bedrock("blissey", "ground_walk")
-            )
-        )
-
-        battle_idle = registerPose(
-            poseName = "battle_idle",
-            poseTypes = STATIONARY_POSES,
-            condition = { it.isBattling },
-            quirks = arrayOf(blink, eggQuirk),
-            animations = arrayOf(
-                bedrock("blissey", "battle_idle")
-            )
-        )
-    }
-
-    override fun getFaintAnimation(state: PosableState) = bedrockStateful("blissey", "faint")
-}

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

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

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

@@ -224,16 +224,11 @@ object VaryingModelRepository {
         inbuilt("metapod", ::MetapodModel)
         inbuilt("butterfree", ::ButterfreeModel)
         inbuilt("weedle", ::WeedleModel)
-        inbuilt("kakuna", ::KakunaModel)
         inbuilt("beedrill", ::BeedrillModel)
         inbuilt("rattata", ::RattataModel)
         inbuilt("raticate", ::RaticateModel)
         inbuilt("rattata_alolan", ::RattataAlolanModel)
         inbuilt("raticate_alolan", ::RaticateAlolanModel)
-        inbuilt("pidgey", ::PidgeyModel)
-        inbuilt("pidgeotto", ::PidgeottoModel)
-        inbuilt("diglett", ::DiglettModel)
-        inbuilt("dugtrio", ::DugtrioModel)
         inbuilt("krabby", ::KrabbyModel)
         inbuilt("paras", ::ParasModel)
         inbuilt("mankey", ::MankeyModel)
@@ -248,7 +243,6 @@ object VaryingModelRepository {
         inbuilt("machop", ::MachopModel)
         inbuilt("machoke", ::MachokeModel)
         inbuilt("machamp", ::MachampModel)
-        inbuilt("chansey", ::ChanseyModel)
         inbuilt("cubone", ::CuboneModel)
         inbuilt("dodrio", ::DodrioModel)
         inbuilt("doduo", ::DoduoModel)
@@ -261,7 +255,6 @@ object VaryingModelRepository {
         inbuilt("geodude", ::GeodudeModel)
         inbuilt("golduck", ::GolduckModel)
         inbuilt("golem", ::GolemModel)
-        inbuilt("graveler", ::GravelerModel)
         inbuilt("hitmonchan", ::HitmonchanModel)
         inbuilt("hitmonlee", ::HitmonleeModel)
         inbuilt("kabuto", ::KabutoModel)
@@ -272,9 +265,6 @@ object VaryingModelRepository {
         inbuilt("marowak", ::MarowakModel)
         inbuilt("meowth", ::MeowthModel)
         inbuilt("nidoqueen", ::NidoqueenModel)
-        inbuilt("nidoranf", ::NidoranfModel)
-        inbuilt("nidoranm", ::NidoranmModel)
-        inbuilt("nidorina", ::NidorinaModel)
         inbuilt("nidorino", ::NidorinoModel)
         inbuilt("persian", ::PersianModel)
         inbuilt("pinsir", ::PinsirModel)
@@ -285,14 +275,12 @@ object VaryingModelRepository {
         inbuilt("rapidash", ::RapidashModel)
         inbuilt("sandslash", ::SandslashModel)
         inbuilt("tangela", ::TangelaModel)
-        inbuilt("tentacool", ::TentacoolModel)
         inbuilt("venomoth", ::VenomothModel)
         inbuilt("venonat", ::VenonatModel)
         inbuilt("elekid", ::ElekidModel)
         inbuilt("hitmontop", ::HitmontopModel)
         inbuilt("electivire", ::ElectivireModel)
         inbuilt("tangrowth", ::TangrowthModel)
-        inbuilt("blissey", ::BlisseyModel)
         inbuilt("piloswine", ::PiloswineModel)
         inbuilt("quagsire", ::QuagsireModel)
         inbuilt("swinub", ::SwinubModel)
@@ -341,7 +329,6 @@ object VaryingModelRepository {
         inbuilt("lotad", :: LotadModel)
         inbuilt("lombre", :: LombreModel)
         inbuilt("ludicolo", :: LudicoloModel)
-        inbuilt("golett", :: GolettModel)
         inbuilt("stantler", :: StantlerModel)
         inbuilt("bergmite", :: BergmiteModel)
         inbuilt("avalugg", :: AvaluggModel)
@@ -549,8 +536,6 @@ object VaryingModelRepository {
         inbuilt("beartic", ::BearticModel)
         inbuilt("dreepy", ::DreepyModel)
         inbuilt("drakloak", ::DrakloakModel)
-        inbuilt("diglett_alolan", ::DiglettAlolanModel)
-        inbuilt("dugtrio_alolan", ::DugtrioAlolanModel)
         inbuilt("makuhita", ::MakuhitaModel)
         inbuilt("hariyama", ::HariyamaModel)
         inbuilt("alomomola", ::AlomomolaModel)

common/src/main/kotlin/com/cobblemon/mod/common/command/GiveAllPokemon.kt

@@ -45,6 +45,9 @@ object GiveAllPokemon {
         val orderedSpeces = PokemonSpecies.implemented.sortedBy { it.nationalPokedexNumber }
 
         for (species in orderedSpeces) {
+            if (species.nationalPokedexNumber !in range) {
+                continue
+            }
             val pokemon = species.create()
             pokemon.setOriginalTrainer(player.uuid)
             pc.add(pokemon)//.sendOut(player.level() as ServerWorld, player.pos)

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

@@ -14,7 +14,6 @@ import com.bedrockk.molang.runtime.value.MoValue
 import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.CobblemonMemories
 import com.cobblemon.mod.common.CobblemonSounds
-import com.cobblemon.mod.common.OrientationControllable
 import com.cobblemon.mod.common.api.entity.PokemonSender
 import com.cobblemon.mod.common.api.entity.PokemonSideDelegate
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.addPokemonEntityFunctions
@@ -31,7 +30,6 @@ import com.cobblemon.mod.common.pokemon.Pokemon
 import com.cobblemon.mod.common.pokemon.activestate.ActivePokemonState
 import com.cobblemon.mod.common.pokemon.activestate.SentOutState
 import com.cobblemon.mod.common.util.*
-import com.cobblemon.mod.common.util.math.geometry.toRadians
 import com.cobblemon.mod.common.world.gamerules.CobblemonGameRules
 import net.minecraft.network.chat.Component
 import net.minecraft.network.syncher.EntityDataAccessor
@@ -43,8 +41,6 @@ import net.minecraft.world.entity.ai.attributes.Attributes
 import net.minecraft.world.item.ItemStack
 import net.minecraft.world.level.pathfinder.PathType
 import net.minecraft.world.phys.Vec3
-import org.joml.Matrix3f
-import org.joml.Vector3f
 import java.util.*
 import kotlin.math.*
 
@@ -52,6 +48,7 @@ import kotlin.math.*
 class PokemonServerDelegate : PokemonSideDelegate {
     lateinit var entity: PokemonEntity
     var acknowledgedHPValue = -1
+    var acknowledgedLevel = -1
     val passengerOffsets = mutableMapOf<Int, Vec3>()
 
     /** Mocked properties exposed to the client [PokemonEntity]. */
@@ -301,6 +298,11 @@ class PokemonServerDelegate : PokemonSideDelegate {
             if (entity.ownerUUID == null) entity.ownerUUID = entity.pokemon.getOwnerUUID()
         }
 
+        if (acknowledgedLevel != entity.pokemon.level) {
+            acknowledgedLevel = entity.pokemon.level
+            updateAttributes(entity.pokemon)
+        }
+
         val tethering = entity.tethering
         if (tethering != null && entity.pokemon.tetheringId != tethering.tetheringId) {
             return entity.discard()

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

@@ -9,6 +9,7 @@
 package com.cobblemon.mod.common.item
 
 import com.cobblemon.mod.common.CobblemonSounds
+import com.cobblemon.mod.common.block.TypeGemClusterBlock
 import net.minecraft.sounds.SoundEvents
 import net.minecraft.sounds.SoundSource
 import net.minecraft.world.InteractionResult
@@ -29,7 +30,7 @@ class GemItem(settings: Properties, val block: Block): Item(settings) {
         if (state.isFaceSturdy(world, pos, direction)) {
             if (!world.getBlockState(pos.relative(direction)).isAir) return InteractionResult.FAIL
             context.itemInHand.consume(1, context.player)
-            world.setBlockAndUpdate(pos.relative(direction), block.defaultBlockState().setValue(DirectionalBlock.FACING, direction))
+            world.setBlockAndUpdate(pos.relative(direction), block.defaultBlockState().setValue(DirectionalBlock.FACING, direction).setValue(TypeGemClusterBlock.STAGE, 1))
             world.playSound(null, pos, CobblemonSounds.TYPE_GEM_CLUSTER_SOUNDS.placeSound, SoundSource.BLOCKS)
             return InteractionResult.SUCCESS
         }

common/src/main/kotlin/com/cobblemon/mod/common/item/group/CobblemonItemGroups.kt

@@ -316,7 +316,6 @@ object CobblemonItemGroups {
         entries.accept(CobblemonItems.PASTURE)
         entries.accept(CobblemonItems.TM_MACHINE)
         entries.accept(CobblemonItems.DISC_SHELF)
-        entries.accept(CobblemonItems.HABITAT_BLOCK)
 
         entries.accept(CobblemonItems.GILDED_CHEST)
         entries.accept(CobblemonItems.YELLOW_GILDED_CHEST)

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

@@ -40,7 +40,7 @@ class SinisterTeaItem : Item(
                     val holder = inst.effect
                     val effect = holder.value()
 
-                    if (effect.isInstantenous) {
+                    if (effect.isInstantenous && (inst.duration <= 1)) {
                         effect.applyInstantenousEffect(user as? Player, null, user, inst.amplifier, 1.0)
                     } else {
                         user.addEffect(inst)

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

@@ -327,7 +327,6 @@ open class Pokemon : ShowdownIdentifiable {
             if (experienceGroup.getLevel(experience) != boundedValue || value == Cobblemon.config.maxPokemonLevel) {
                 experience = experienceGroup.getExperience(boundedValue)
             }
-//            _level.emit(value)
 
             currentHealth = ceil(hpRatio * maxHealth).coerceIn(0..maxHealth)
         }

common/src/main/kotlin/com/cobblemon/mod/common/tms/obtain/ImpossibleObtainMethod.kt

@@ -0,0 +1,36 @@
+/*
+ * 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.tms.obtain
+
+import com.cobblemon.mod.common.api.tms.ObtainMethod
+import com.cobblemon.mod.common.util.cobblemonResource
+import net.minecraft.network.RegistryFriendlyByteBuf
+import net.minecraft.server.level.ServerPlayer
+
+/**
+ * An [ObtainMethod] for TMs that cannot be unlocked through gameplay triggers.
+ * These TMs are intended to be granted manually by command or MoLang only.
+ */
+class ImpossibleObtainMethod : ObtainMethod {
+    override val passive = false
+
+    companion object {
+        val ID = cobblemonResource("impossible")
+
+        fun readFromBuffer(buffer: RegistryFriendlyByteBuf): ImpossibleObtainMethod {
+            return ImpossibleObtainMethod()
+        }
+    }
+
+    override fun matches(player: ServerPlayer) = false
+
+    override fun writeToBuffer(buffer: RegistryFriendlyByteBuf) {
+        buffer.writeUtf("cobblemon:impossible")
+    }
+}

common/src/main/kotlin/com/cobblemon/mod/common/trade/TradeManager.kt

@@ -115,8 +115,26 @@ object TradeManager : RequestManager<TradeManager.TradeRequest>() {
         }
 
         CobblemonEvents.TRADE_EVENT_PRE.postThen(TradeEvent.Pre(player1, pokemon2, player2, pokemon1)) {
-            party1.remove(pokemon1)
-            party2.remove(pokemon2)
+            val party1 = player1.party
+            val party2 = player2.party
+
+            val player1Removed = party1.remove(pokemon1)
+            val player2Removed = party2.remove(pokemon2)
+
+            if (!player1Removed || !player2Removed) {
+                if (!player1Removed) {
+                    Cobblemon.LOGGER.warn("Failed to remove traded Pokémon ${pokemon1.species.resourceIdentifier} from ${player1.name.string}(${player1.uuid}). Aborting trade with ${player2.name.string}(${player2.uuid}), potential exploit abused.")
+                }
+
+                if (!player2Removed) {
+                    Cobblemon.LOGGER.warn("Failed to remove traded Pokémon ${pokemon2.species.resourceIdentifier} from ${player2.name.string}(${player2.uuid}). Aborting trade with ${player1.name.string}(${player1.uuid}), potential exploit abused.")
+                }
+
+                // Revert any changes if one of the removals failed
+                if (player1Removed) party1.add(pokemon1)
+                if (player2Removed) party2.add(pokemon2)
+                return@postThen
+            }
 
             // If player1 is the OT, keep track of the friendship
             pokemon1.cacheFriendship(player1.uuid)

common/src/main/kotlin/com/cobblemon/mod/common/util/adapters/TMObtainMethodAdapter.kt

@@ -11,6 +11,7 @@ package com.cobblemon.mod.common.util.adapters
 import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.api.tms.ObtainMethod
 import com.cobblemon.mod.common.tms.obtain.DefaultObtainMethod
+import com.cobblemon.mod.common.tms.obtain.ImpossibleObtainMethod
 import com.cobblemon.mod.common.tms.obtain.PlayerHasAdvancementObtainMethod
 import com.cobblemon.mod.common.tms.obtain.PlayerYObtainMethod
 import com.cobblemon.mod.common.tms.obtain.UnlockableObtainMethod
@@ -29,6 +30,7 @@ object TMObtainMethodAdapter : JsonSerializer<ObtainMethod>, JsonDeserializer<Ob
 
     init {
         this.register(UnlockableObtainMethod::class, UnlockableObtainMethod.ID)
+        this.register(ImpossibleObtainMethod::class, ImpossibleObtainMethod.ID)
         this.register(PlayerHasAdvancementObtainMethod::class, PlayerHasAdvancementObtainMethod.ID)
         this.register(DefaultObtainMethod::class, DefaultObtainMethod.ID)
         this.register(PlayerYObtainMethod::class, PlayerYObtainMethod.ID)

common/src/main/kotlin/com/cobblemon/mod/common/world/structureprocessors/HeightRangeStructureProcessor.kt

@@ -20,6 +20,7 @@ import net.minecraft.world.level.levelgen.RandomState
 import net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings
 import net.minecraft.world.level.levelgen.structure.templatesystem.StructureProcessor
 import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate
+import org.slf4j.LoggerFactory
 
 class HeightRangeStructureProcessor(
 	val minOffset: Int,
@@ -43,7 +44,14 @@ class HeightRangeStructureProcessor(
 		val referenceY = reference.getY(chunkGenerator, heightAccessor, randomState, pos)
 		val minY = referenceY + minOffset
 		val maxY = referenceY + maxOffset
-		return pos.y in minY..maxY
+		val valid = pos.y in minY..maxY
+
+		LOGGER.info(
+			"[HeightRangeVeto] isValidPlacement pos={} reference={} referenceY={} minY={} maxY={} pos.y={} -> valid={}",
+			pos, reference, referenceY, minY, maxY, pos.y, valid
+		)
+
+		return valid
 	}
 
 	override fun processBlock(
@@ -105,6 +113,8 @@ class HeightRangeStructureProcessor(
 	}
 
 	companion object {
+		private val LOGGER = LoggerFactory.getLogger("Cobblemon/HeightRangeStructureProcessor")
+
 		val CODEC: MapCodec<HeightRangeStructureProcessor> = RecordCodecBuilder.mapCodec { instance ->
 			instance.group(
 				Codec.INT.fieldOf("min_offset").forGetter { it.minOffset },

common/src/main/resources/assets/cobblemon/bedrock/generic/models/substitute.geo.json

@@ -15,114 +15,411 @@
 					"name": "substitute",
 					"pivot": [0, 0, 0]
 				},
+				{
+					"name": "locator_root",
+					"parent": "substitute",
+					"pivot": [0, 0, 0],
+					"locators": {
+						"root": [0, 0, 0]
+					}
+				},
+				{
+					"name": "locator_top",
+					"parent": "substitute",
+					"pivot": [0, 16.5, 0],
+					"locators": {
+						"top": [0, 16.5, 0]
+					}
+				},
 				{
 					"name": "body",
 					"parent": "substitute",
-					"pivot": [0, 0, 0]
+					"pivot": [0, 8, 0]
+				},
+				{
+					"name": "locator_middle",
+					"parent": "body",
+					"pivot": [0, 8, 0],
+					"locators": {
+						"middle": [0, 8, 0]
+					}
+				},
+				{
+					"name": "locator_target",
+					"parent": "body",
+					"pivot": [0, 8.5, -8],
+					"locators": {
+						"target": [0, 8.5, -8]
+					}
+				},
+				{
+					"name": "locator_physical",
+					"parent": "body",
+					"pivot": [0, 9, -7.25],
+					"locators": {
+						"physical": [0, 9, -7.25]
+					}
+				},
+				{
+					"name": "locator_special",
+					"parent": "body",
+					"pivot": [0, 9, -7.25],
+					"locators": {
+						"special": [0, 9, -7.25]
+					}
 				},
 				{
 					"name": "torso",
 					"parent": "body",
-					"pivot": [0, 2, -1.75],
+					"pivot": [0, 2.5, -0.75],
 					"cubes": [
-						{"origin": [-4.5, 0, -4], "size": [9, 8, 7], "inflate": 0.01, "uv": [0, 15]},
-						{"origin": [0, 5.5, 2.5], "size": [0, 3, 3], "uv": [0, 0]}
+						{"origin": [-4.5, 0, -5], "size": [9, 8, 9], "inflate": 0.01, "uv": [0, 0]},
+						{"origin": [0, 4.5, 4], "size": [0, 3, 2], "uv": [6, 58]}
 					]
 				},
+				{
+					"name": "locator_seat_1",
+					"parent": "torso",
+					"pivot": [0, 10.75, 6.5],
+					"locators": {
+						"seat_1": [0, 10.75, 6.5]
+					}
+				},
+				{
+					"name": "locator_neck_fluff",
+					"parent": "torso",
+					"pivot": [0, 8.25, -0.5],
+					"locators": {
+						"neck_fluff": [0, 8.25, -0.5]
+					}
+				},
+				{
+					"name": "stuffing_shoulder_left",
+					"parent": "torso",
+					"pivot": [4.35, 6, -3.5],
+					"cubes": [
+						{"origin": [4.3, 5, -4.5], "size": [0, 2, 2], "uv": [60, 33]},
+						{"origin": [4.4, 5.5, -4], "size": [0, 1, 1], "uv": [62, 40]}
+					]
+				},
+				{
+					"name": "stuffing_shoulder_right",
+					"parent": "torso",
+					"pivot": [-4.35, 6, -3.5],
+					"cubes": [
+						{"origin": [-4.3, 5, -4.5], "size": [0, 2, 2], "uv": [55, 33]},
+						{"origin": [-4.4, 5.5, -4], "size": [0, 1, 1], "uv": [59, 40]}
+					]
+				},
+				{
+					"name": "stuffing_neck",
+					"parent": "torso",
+					"pivot": [0, 7.7, -0.5],
+					"cubes": [
+						{"origin": [-3.5, 7.71, -4], "size": [7, 0, 7], "inflate": 0.01, "uv": [43, 27]},
+						{"origin": [-2.5, 7.96, -3], "size": [5, 0, 5], "uv": [49, 21]}
+					]
+				},
+				{
+					"name": "locator_item",
+					"parent": "torso",
+					"pivot": [0.05, 3.5, -5],
+					"rotation": [90, 0, 0],
+					"locators": {
+						"item": [0, 3.5, -5]
+					}
+				},
 				{
 					"name": "head",
 					"parent": "torso",
-					"pivot": [0, 8, -4],
+					"pivot": [0, 8, 0]
+				},
+				{
+					"name": "head_ai",
+					"parent": "head",
+					"pivot": [0, 8, 0]
+				},
+				{
+					"name": "head_angle",
+					"parent": "head_ai",
+					"pivot": [0, 8, 0],
 					"cubes": [
-						{"origin": [-4.5, 8, -5], "size": [9, 7, 8], "uv": [0, 0]},
-						{"origin": [0, 9.5, 2.5], "size": [0, 3, 3], "uv": [0, 12]}
+						{"origin": [-4, 7.5, -7], "size": [8, 7, 10], "uv": [0, 17]},
+						{"origin": [-0.5, 7.5, -7], "size": [1, 7, 10], "inflate": 0.01, "uv": [0, 34]},
+						{"origin": [0, 8, 3], "size": [0, 3, 2], "uv": [1, 58]}
 					]
 				},
 				{
-					"name": "eye_right",
-					"parent": "head",
-					"pivot": [-4.5, 12.5, -3.25],
+					"name": "locator_face",
+					"parent": "head_angle",
+					"pivot": [0, 10.5, -7],
+					"locators": {
+						"face": [0, 10.5, -7]
+					}
+				},
+				{
+					"name": "locator_head",
+					"parent": "head_angle",
+					"pivot": [0, 14.5, -5.5],
+					"locators": {
+						"head": [0, 14.5, -5.5]
+					}
+				},
+				{
+					"name": "locator_item_face",
+					"parent": "head_angle",
+					"pivot": [0, 13.7, -6.9],
+					"locators": {
+						"item_face": [0, 13.7, -6.9]
+					}
+				},
+				{
+					"name": "locator_item_hat",
+					"parent": "head_angle",
+					"pivot": [0, 15.75, -2],
+					"locators": {
+						"item_hat": [0, 15.75, -2]
+					}
+				},
+				{
+					"name": "face_ditto",
+					"parent": "head_angle",
+					"pivot": [0, 10.25, -6.9]
+				},
+				{
+					"name": "eyes_ditto",
+					"parent": "face_ditto",
+					"pivot": [0, 11, -6.92],
 					"cubes": [
-						{"origin": [-4.5, 11.5, -4.75], "size": [0, 2, 3], "inflate": 0.01, "pivot": [-4.5, 12.5, -3.25], "rotation": [5, 0, 0], "uv": [0, 37], "mirror": true}
+						{"origin": [-3.5, 10.5, -6.92], "size": [7, 1, 0], "uv": [26, 52]}
 					]
 				},
+				{
+					"name": "eyes_blink_ditto",
+					"parent": "face_ditto",
+					"pivot": [0, 11, -6.82],
+					"cubes": [
+						{"origin": [-4, 10.5, -6.82], "size": [8, 1, 0], "uv": [25, 54]},
+						{"origin": [-3.5, 11, -6.83], "size": [7, 1, 0], "uv": [26, 56]}
+					]
+				},
+				{
+					"name": "mouth_ditto",
+					"parent": "face_ditto",
+					"pivot": [0, 9.25, -6.9],
+					"cubes": [
+						{"origin": [-3, 8.5, -6.92], "size": [6, 1, 0], "uv": [27, 60]},
+						{"origin": [-4, 9, -6.92], "size": [8, 1, 0], "uv": [25, 58]}
+					]
+				},
+				{
+					"name": "mouth_open_ditto",
+					"parent": "face_ditto",
+					"pivot": [0, 9, -6.81],
+					"cubes": [
+						{"origin": [-4, 8, -6.82], "size": [8, 2, 0], "uv": [25, 62]}
+					]
+				},
+				{
+					"name": "face",
+					"parent": "head_angle",
+					"pivot": [0, 10.5, -4.51]
+				},
+				{
+					"name": "mouth",
+					"parent": "face",
+					"pivot": [0, 9.5, -7.01],
+					"cubes": [
+						{"origin": [-4, 8.5, -7.01], "size": [8, 2, 2], "inflate": 0.01, "uv": [23, 47]}
+					]
+				},
+				{
+					"name": "eyes",
+					"parent": "face",
+					"pivot": [0, 12, -3.75]
+				},
 				{
 					"name": "eye_left",
-					"parent": "head",
-					"pivot": [4.5, 12.5, -3.25],
+					"parent": "eyes",
+					"pivot": [4, 12, -3.75],
 					"cubes": [
-						{"origin": [4.5, 11.5, -4.75], "size": [0, 2, 3], "inflate": 0.01, "pivot": [4.5, 12.5, -3.25], "rotation": [5, 0, 0], "uv": [0, 37]}
+						{"origin": [3, 10.5, -6], "size": [1, 2, 4], "inflate": 0.01, "uv": [12, 52]}
+					]
+				},
+				{
+					"name": "locator_eye_left",
+					"parent": "eye_left",
+					"pivot": [4, 11.5, -4],
+					"rotation": [0, -90, 0],
+					"locators": {
+						"eye2": [4, 11.5, -4]
+					}
+				},
+				{
+					"name": "eye_right",
+					"parent": "eyes",
+					"pivot": [-4, 12, -3.75],
+					"cubes": [
+						{"origin": [-4, 10.5, -6], "size": [1, 2, 4], "inflate": 0.01, "uv": [1, 52]}
+					]
+				},
+				{
+					"name": "locator_eye_right",
+					"parent": "eye_right",
+					"pivot": [-4, 11.5, -4],
+					"rotation": [0, 90, 0],
+					"locators": {
+						"eye1": [-4, 11.5, -4]
+					}
+				},
+				{
+					"name": "ears",
+					"parent": "head_angle",
+					"pivot": [0, 14, -0.1]
+				},
+				{
+					"name": "ear_left",
+					"parent": "ears",
+					"pivot": [1.5, 14.5, -0.5],
+					"rotation": [0, -25, 0],
+					"cubes": [
+						{"origin": [1, 14.5, -0.5], "size": [3, 2, 0], "uv": [11, 61]}
 					]
 				},
 				{
 					"name": "ear_right",
-					"parent": "head",
-					"pivot": [-3.25, 14.5, 0],
-					"rotation": [-10, 15, -20],
+					"parent": "ears",
+					"pivot": [-1.5, 14.5, -0.5],
+					"rotation": [0, 25, 0],
 					"cubes": [
-						{"origin": [-4.75, 14.5, 0], "size": [3, 3, 0], "uv": [0, 18]}
+						{"origin": [-4, 14.5, -0.5], "size": [3, 2, 0], "uv": [18, 61]}
 					]
 				},
 				{
-					"name": "ear_left",
-					"parent": "head",
-					"pivot": [3.25, 14.5, 0],
-					"rotation": [-10, -15, 20],
-					"cubes": [
-						{"origin": [1.75, 14.5, 0], "size": [3, 3, 0], "uv": [0, 0]}
-					]
-				},
-				{
-					"name": "arm_right",
+					"name": "arms",
 					"parent": "torso",
-					"pivot": [-3.25, 6.25, -3],
-					"rotation": [-5, 15, 0],
-					"cubes": [
-						{"origin": [-4.75, 4.75, -6.5], "size": [3, 3, 4], "uv": [26, 0]}
-					]
+					"pivot": [0, 6, -2.5]
 				},
 				{
 					"name": "arm_left",
-					"parent": "torso",
-					"pivot": [3.25, 6.25, -3],
-					"rotation": [-5, -15, 0],
+					"parent": "arms",
+					"pivot": [3.5, 6, -2.5],
 					"cubes": [
-						{"origin": [1.75, 4.75, -6.5], "size": [3, 3, 4], "uv": [16, 30]}
+						{"origin": [3.5, 4.5, -6], "size": [2, 3, 4], "uv": [36, 27]}
 					]
 				},
+				{
+					"name": "stuffing_arm_left",
+					"parent": "arm_left",
+					"pivot": [3.6925, 6, -3.5],
+					"cubes": [
+						{"origin": [3.735, 5, -4.5], "size": [0, 2, 2], "uv": [60, 36]},
+						{"origin": [3.65, 5.5, -4], "size": [0, 1, 1], "uv": [62, 42]}
+					]
+				},
+				{
+					"name": "locator_hand_secondary",
+					"parent": "arm_left",
+					"pivot": [0.5, 6, -6],
+					"locators": {
+						"hand_secondary": [0.5, 6, -6]
+					}
+				},
+				{
+					"name": "arm_right",
+					"parent": "arms",
+					"pivot": [-4.5, 6, -2.5],
+					"cubes": [
+						{"origin": [-5.5, 4.5, -6], "size": [2, 3, 4], "uv": [42, 34]}
+					]
+				},
+				{
+					"name": "stuffing_arm_right",
+					"parent": "arm_right",
+					"pivot": [-4.6925, 6, -3.5],
+					"cubes": [
+						{"origin": [-3.735, 5, -4.5], "size": [0, 2, 2], "uv": [55, 36]},
+						{"origin": [-3.65, 5.5, -4], "size": [0, 1, 1], "uv": [59, 42]}
+					]
+				},
+				{
+					"name": "locator_hand_primary",
+					"parent": "arm_right",
+					"pivot": [-3.5, 6, -6],
+					"locators": {
+						"hand_primary": [-3.5, 6, -6]
+					}
+				},
 				{
 					"name": "tail",
 					"parent": "torso",
-					"pivot": [0, 2.25, 3],
+					"pivot": [0, 2.25, 3.5],
 					"cubes": [
-						{"origin": [-2, 0.25, 2], "size": [4, 4, 5], "uv": [27, 25]}
+						{"origin": [-2.5, 0.25, 3], "size": [5, 4, 5], "uv": [36, 11]}
 					]
 				},
+				{
+					"name": "locator_tail",
+					"parent": "tail",
+					"pivot": [0, 2.25, 6.5],
+					"rotation": [180, 0, 0],
+					"locators": {
+						"tail": [0, 2.25, 6.5]
+					}
+				},
 				{
 					"name": "tail2",
 					"parent": "tail",
-					"pivot": [0, 0.25, 7],
+					"pivot": [0, 2, 8],
 					"cubes": [
-						{"origin": [-1.5, 0.25, 7], "size": [3, 3, 3], "uv": [32, 19]}
+						{"origin": [-1.5, 0.5, 7.5], "size": [3, 3, 4], "uv": [36, 20]}
 					]
 				},
 				{
-					"name": "leg_right",
+					"name": "locator_tail_tip",
+					"parent": "tail2",
+					"pivot": [0, 2, 11.5],
+					"rotation": [180, 0, 0],
+					"locators": {
+						"tail_tip": [0, 2, 11.5]
+					}
+				},
+				{
+					"name": "legs",
 					"parent": "body",
-					"pivot": [-3.5, 2, -1.75],
-					"rotation": [0, 15, 0],
-					"cubes": [
-						{"origin": [-5, 0, -6.25], "size": [3, 4, 5], "uv": [29, 10]}
-					]
+					"pivot": [0, 2.5, -0.75]
 				},
 				{
 					"name": "leg_left",
-					"parent": "body",
-					"pivot": [3.5, 2, -1.75],
-					"rotation": [0, -15, 0],
+					"parent": "legs",
+					"pivot": [5, 2.5, -0.75],
 					"cubes": [
-						{"origin": [2, 0, -6.25], "size": [3, 4, 5], "uv": [0, 30]}
+						{"origin": [3.5, 0.5, -7.25], "size": [3, 4, 7], "uv": [22, 34]}
 					]
+				},
+				{
+					"name": "locator_foot_secondary",
+					"parent": "leg_left",
+					"pivot": [5, 2.5, -6.75],
+					"locators": {
+						"foot_secondary": [5, 2.5, -6.75]
+					}
+				},
+				{
+					"name": "leg_right",
+					"parent": "legs",
+					"pivot": [-5, 2.5, -0.75],
+					"cubes": [
+						{"origin": [-6.5, 0.5, -7.25], "size": [3, 4, 7], "uv": [36, 0]}
+					]
+				},
+				{
+					"name": "locator_foot_primary",
+					"parent": "leg_right",
+					"pivot": [-5, 2.5, -6.75],
+					"locators": {
+						"foot_primary": [-5, 2.5, -6.75]
+					}
 				}
 			]
 		}

common/src/main/resources/assets/cobblemon/bedrock/generic/posers/substitute.json

@@ -1,10 +1,33 @@
 {
+  "portraitScale": 1.8,
+  "portraitTranslation": [-0.11, -0.36, 0],
+  "profileScale": 1.0,
+  "profileTranslation": [0.0, 0.18, 0.0],
+  "rootBone": "substitute",
+  "animations": {
+    "faint": "q.bedrock_primary('substitute', math.random(0, 1) < (1/3) ? 'destroy_flop' : (math.random(0, 1) < 0.5 ? 'destroy_fling_left' : 'destroy_fling_right'), q.curve('one'))",
+    "recoil": "q.bedrock_stateful('substitute', 'recoil')"
+  },
   "poses": {
+    "battle-standing": {
+      "poseTypes": ["STAND"],
+      "isBattle": true,
+      "animations": [
+        "q.bedrock('substitute', 'ground_idle')"
+      ]
+    },
     "standing": {
-      "poseName": "standing",
-      "transformTicks": 10,
-      "allPoseTypes": true,
-      "animations": []
+      "poseTypes": ["STAND", "NONE", "PORTRAIT", "PROFILE"],
+      "isBattle": false,
+      "animations": [
+        "q.bedrock('substitute', 'ground_idle')"
+      ]
+    },
+    "walking": {
+      "poseTypes": ["WALK"],
+      "animations": [
+        "q.bedrock('substitute', 'ground_idle')"
+	  ]
     }
   }
 }

common/src/main/resources/assets/cobblemon/bedrock/generic/variations/0_substitute_base.json

@@ -12,6 +12,16 @@
     {
       "aspects": ["shiny"],
       "texture": "cobblemon:textures/pokemon/substitute_shiny.png"
+    },
+    {
+      "aspects": ["alpha_eyes"],
+      "layers": [
+        {
+          "name": "alpha_eyes",
+          "texture": "cobblemon:textures/pokemon/substitute_alpha.png",
+          "emissive": true
+        }
+      ]
     }
   ]
 }

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0014_kakuna/kakuna.animation.json

@@ -5,19 +5,8 @@
 			"loop": true,
 			"bones": {
 				"body": {
-					"rotation": [
-						"math.clamp(math.sin(q.anim_time*90*2)*1,-1,0)+math.clamp(math.sin(q.anim_time*90*2)*1,0,1)+math.sin(q.anim_time*90*2)*0.5",
-						0,
-						"math.clamp(math.sin(q.anim_time*90*4)*0.5,-1,0)+math.clamp(math.sin(q.anim_time*90*4)*0.5,0,1)+math.sin(q.anim_time*90*4)*0.1"
-					],
-					"position": [
-						0,
-						"(-math.clamp(math.sin(q.anim_time*90*2)*0.2,-0.1,0)-math.clamp(math.sin(q.anim_time*90*2)*0.2,0,0.1)-math.sin(q.anim_time*90*2)*0.2)*0.1",
-						0
-					]
-				},
-				"tail": {
-					"rotation": ["-math.clamp(math.sin(q.anim_time*90*2)*0.5,-0.8,0)-math.clamp(math.sin(q.anim_time*90*2)*0.5,0,0.8)-math.sin(q.anim_time*90*2)*0.5", 0, 0]
+					"rotation": ["-math.sin(q.anim_time*90*2)*1", 0, "math.sin(q.anim_time*90*2-90)*0.5"],
+					"position": ["-math.sin(q.anim_time*90*2-90)*-0.1", 0.5, "math.sin(q.anim_time*90*2)*0.2"]
 				}
 			}
 		},
@@ -25,71 +14,226 @@
 			"loop": true,
 			"bones": {
 				"body": {
-					"rotation": [
-						"math.clamp(math.sin(q.anim_time*90*1)*1,-1,0)+math.clamp(math.sin(q.anim_time*90*1)*1,0,1)+math.sin(q.anim_time*90*1)*0.5",
-						0,
-						"math.clamp(math.sin(q.anim_time*90*2)*0.5,-1,0)+math.clamp(math.sin(q.anim_time*90*2)*0.5,0,1)+math.sin(q.anim_time*90*2)*0.1"
-					],
-					"position": [
-						0,
-						"(-math.clamp(math.sin(q.anim_time*90*1)*0.2,-0.1,0)-math.clamp(math.sin(q.anim_time*90*1)*0.2,0,0.1)-math.sin(q.anim_time*90*2)*0.2)*0.1",
-						0
-					]
-				},
-				"tail": {
-					"rotation": ["-math.clamp(math.sin(q.anim_time*90*2)*0.5,-0.8,0)-math.clamp(math.sin(q.anim_time*90*2)*0.5,0,0.8)-math.sin(q.anim_time*90*2)*0.5", 0, 0]
+					"rotation": ["-math.sin(q.anim_time*90*1-90)*1", 0, "math.sin(q.anim_time*90*1)*0.5"],
+					"position": ["-math.sin(q.anim_time*90*1)*-0.1", 0.5, "math.sin(q.anim_time*90*1-90)*0.2"]
+				}
+			}
+		},
+		"animation.kakuna.physical": {
+			"animation_length": 3,
+			"bones": {
+				"body": {
+					"rotation": {
+						"0.0": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.5": {
+							"post": ["-math.sin(q.anim_time*90*3)*-20", 0, "math.cos(q.anim_time*90*3)*-20"],
+							"lerp_mode": "catmullrom"
+						},
+						"0.7917": {
+							"post": ["-math.sin(q.anim_time*90*3)*-20", 0, "math.cos(q.anim_time*90*3)*-20"],
+							"lerp_mode": "catmullrom"
+						},
+						"1.0417": {
+							"post": [-16.62939, 7, -11.1114],
+							"lerp_mode": "catmullrom"
+						},
+						"1.1667": {
+							"post": [0, 30, -32.5],
+							"lerp_mode": "catmullrom"
+						},
+						"1.2083": {
+							"post": [43.5061, 41.7947, 7.1679],
+							"lerp_mode": "catmullrom"
+						},
+						"1.25": {
+							"post": [43.47759, 0, 7.65367],
+							"lerp_mode": "catmullrom"
+						},
+						"1.5417": {
+							"post": [36.1795, -24.8022, 10.1779],
+							"lerp_mode": "catmullrom"
+						},
+						"1.8333": {
+							"post": [8.1692, -24.4369, 32.0742],
+							"lerp_mode": "catmullrom"
+						},
+						"2.5833": {
+							"post": ["-math.cos(q.anim_time*90*2)*20", 0, "math.sin(q.anim_time*90*2)*-20"],
+							"lerp_mode": "catmullrom"
+						},
+						"3.0": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						}
+					},
+					"position": {
+						"0.0": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.5": {
+							"post": ["-math.cos(q.anim_time*90*3)*2.6", "math.sin(q.anim_time*90*3)*0.2", "math.sin(q.anim_time*90*3)*-2.6"],
+							"lerp_mode": "catmullrom"
+						},
+						"0.7917": {
+							"post": ["-math.cos(q.anim_time*90*3)*2.6", "math.sin(q.anim_time*90*3)*0.2", "math.sin(q.anim_time*90*3)*-2.6"],
+							"lerp_mode": "catmullrom"
+						},
+						"1.0417": {
+							"post": [-1.44448, -0.16629, 2.16182],
+							"lerp_mode": "catmullrom"
+						},
+						"1.1667": {
+							"post": [-3.6, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"1.2083": {
+							"post": [-2.31, 0.1, -3.81],
+							"lerp_mode": "catmullrom"
+						},
+						"1.25": {
+							"post": [0.99498, 0.18478, -5.40209],
+							"lerp_mode": "catmullrom"
+						},
+						"1.5417": {
+							"post": [2.22, 0.2, -4.24],
+							"lerp_mode": "catmullrom"
+						},
+						"1.8333": {
+							"post": [3.11, -0.5, -0.9],
+							"lerp_mode": "catmullrom"
+						},
+						"2.5833": {
+							"post": ["-math.sin(q.anim_time*90*2)*2.6", "math.cos(q.anim_time*90*2)*-0.2", "math.cos(q.anim_time*90*2)*2.6"],
+							"lerp_mode": "catmullrom"
+						},
+						"3.0": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						}
+					},
+					"scale": {
+						"1.125": [1, 1, 1],
+						"1.2083": [1.2, 1.1, 0.8],
+						"1.25": [1, 1, 1]
+					}
 				}
 			}
 		},
 		"animation.kakuna.faint": {
 			"animation_length": 3,
 			"bones": {
-				"kakuna": {
+				"body": {
 					"rotation": {
-						"0.0": [0, 0, 0],
-						"0.125": [5, 0, 0],
-						"0.2917": [7.5, 0, 0],
-						"0.75": [0, 0, 0],
-						"1.0417": [-10.17, 0, 0],
-						"1.1667": [-26.43, 0, 0],
-						"1.25": [-52.86, 0, 0],
-						"1.3333": [-72.68, 0, 0],
-						"1.4167": [-92.5, 0, 0],
-						"1.5417": [-97.5, 0, 0],
-						"1.6667": [-100, 0, 0],
-						"1.75": [-100, 0, 0],
-						"2.0833": [-88.46, 0, 0],
-						"2.2917": [-70, 0, 0],
-						"2.3333": [-72.64, 0, 0],
-						"2.375": [-70, 0, 0]
+						"0.0": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.5": {
+							"post": ["-math.sin(q.anim_time*90*2)*-20", 0, "math.cos(q.anim_time*90*2)*-20"],
+							"lerp_mode": "catmullrom"
+						},
+						"1.1667": {
+							"post": ["-math.sin(q.anim_time*90*2)*-20", 0, "math.cos(q.anim_time*90*2)*-20"],
+							"lerp_mode": "catmullrom"
+						},
+						"1.375": {
+							"post": ["-19.94-math.sin(q.anim_time*90*32)*1", -0.9, 2.28],
+							"lerp_mode": "catmullrom"
+						},
+						"1.5417": {
+							"post": ["-24.1146-math.sin(q.anim_time*90*32)*1", -5.1806, -9.6237],
+							"lerp_mode": "catmullrom"
+						},
+						"1.75": {
+							"post": [-48.12, -9.9, -10.88],
+							"lerp_mode": "catmullrom"
+						},
+						"1.8333": {
+							"post": [-82.4083, -26.1002, -17.2368],
+							"lerp_mode": "catmullrom"
+						},
+						"2.0417": {
+							"post": [-102.1119, -24.854, -31.5905],
+							"lerp_mode": "catmullrom"
+						},
+						"2.3333": {
+							"post": [-99.1014, -23.4505, -14.6775],
+							"lerp_mode": "catmullrom"
+						},
+						"2.6667": {
+							"post": [-66.3538, -24.159, 6.6861],
+							"lerp_mode": "catmullrom"
+						},
+						"3.0": {
+							"post": [-85.0639, -23.1834, -2.9264],
+							"lerp_mode": "catmullrom"
+						}
 					},
 					"position": {
-						"0.0": [0, -0.2, 0],
-						"0.75": [0, -0.2, 0],
-						"1.0417": [0, -0.2, 0],
-						"1.1667": [0, -0.2, 0],
-						"1.25": [0, -0.1, 0],
-						"1.3333": [0, 0.05, 0],
-						"1.4167": [0, 2.8, 0],
-						"1.5417": [0, 3.3, 0.3],
-						"1.6667": [0, 3.7, 0.6],
-						"1.75": [0, 3.7, 0.6],
-						"2.0833": [0, 2.16, 0.48],
-						"2.2917": [0, -0.3, 0.3],
-						"2.3333": [0, 0.05, 0.33],
-						"2.375": [0, -0.3, 0.3]
-					}
-				},
-				"body": {
-					"position": {
-						"0.0": [0, 0, 0],
-						"0.75": [0, 0, 0],
-						"1.2917": [0, 0, 0],
-						"1.3333": [0, -0.05954, 0.19093],
-						"1.375": [0, 0, 0],
-						"1.4167": [0, 0.00436, 0.0999],
-						"1.4583": [0, 0, 0],
-						"1.75": [0, 0.98481, -0.17365]
+						"0.0": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.5": {
+							"post": ["-math.cos(q.anim_time*90*2)*2.6", "math.sin(q.anim_time*90*2)*0.2", "math.sin(q.anim_time*90*2)*-2.6"],
+							"lerp_mode": "catmullrom"
+						},
+						"1.1667": {
+							"post": ["-math.cos(q.anim_time*90*2)*2.6", "math.sin(q.anim_time*90*2)*0.2", "math.sin(q.anim_time*90*2)*-2.6"],
+							"lerp_mode": "catmullrom"
+						},
+						"1.375": {
+							"post": [0.3, -0.73, 2.28],
+							"lerp_mode": "catmullrom"
+						},
+						"1.5417": {
+							"post": [-1.64, -1.13, 2.77],
+							"lerp_mode": "catmullrom"
+						},
+						"1.625": {
+							"post": [-1.96, -1.39, 4.06],
+							"lerp_mode": "catmullrom"
+						},
+						"1.7083": {
+							"post": [-2.19, -2.77, 4.5],
+							"lerp_mode": "catmullrom"
+						},
+						"1.8333": {
+							"post": [-3.71, -4.79, 5.06],
+							"lerp_mode": "catmullrom"
+						},
+						"1.9167": {
+							"post": [-4.94977, -3.02238, 5.61398],
+							"lerp_mode": "catmullrom"
+						},
+						"2.2083": {
+							"post": [-5.87185, -2.2078, 6.20958],
+							"lerp_mode": "catmullrom"
+						},
+						"2.5": {
+							"post": [-4.3217, -4.5458, 4.90724],
+							"lerp_mode": "catmullrom"
+						},
+						"2.6667": {
+							"post": [-3.91, -4.91, 5.01],
+							"lerp_mode": "catmullrom"
+						},
+						"2.75": {
+							"post": [-3.92405, -4.96563, 5.12418],
+							"lerp_mode": "catmullrom"
+						},
+						"2.9167": {
+							"post": [-4.24661, -5.20065, 5.11229],
+							"lerp_mode": "catmullrom"
+						},
+						"3.0": {
+							"post": [-4.29542, -5.18509, 5.3042],
+							"lerp_mode": "catmullrom"
+						}
 					}
 				}
 			}
@@ -100,32 +244,53 @@
 				"body": {
 					"rotation": {
 						"0.0": [0, 0, 0],
-						"0.125": [7.5, 2.5, 0],
-						"0.3333": [0, 0, 0],
-						"0.4167": [0, 7.5, 0],
-						"0.5": [0, -7.5, 0],
-						"0.5833": [0, 0, 0],
-						"0.625": [0, 0, 0]
+						"0.125": {
+							"pre": [4.5, 0, 0],
+							"post": [4.5, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.3333": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.4167": {
+							"post": [-0.1296, 2.4461, -3.0023],
+							"lerp_mode": "catmullrom"
+						},
+						"0.5": {
+							"post": [-0.0867, -2.4636, 2.0016],
+							"lerp_mode": "catmullrom"
+						},
+						"0.5833": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.6667": [0, 0, 0]
 					},
 					"position": {
 						"0.0": [0, 0, 0],
-						"0.125": [0, -0.2, 0.55],
-						"0.3333": [0, 0, 0.5],
-						"0.625": [0, 0, 0]
-					}
-				},
-				"head": {
-					"rotation": {
-						"0.0": [0, 0, 0],
-						"0.125": [10, 0, 0],
-						"0.25": [0, 0, 0]
-					}
-				},
-				"tail": {
-					"rotation": {
-						"0.0": [0, 0, 0],
-						"0.125": [-20, 0, 0],
-						"0.4583": [0, 0, 0]
+						"0.125": {
+							"pre": [0, -0.05, -0.5],
+							"post": [0, -0.05, -0.5],
+							"lerp_mode": "catmullrom"
+						},
+						"0.3333": {
+							"post": [0, -0.1, 0.1],
+							"lerp_mode": "catmullrom"
+						},
+						"0.4167": {
+							"post": [-0.25, -0.08, 0.12],
+							"lerp_mode": "catmullrom"
+						},
+						"0.5": {
+							"post": [0.08, -0.05, 0.08],
+							"lerp_mode": "catmullrom"
+						},
+						"0.5833": {
+							"post": [0.015, -0.01, 0.02],
+							"lerp_mode": "catmullrom"
+						},
+						"0.6667": [0, 0, 0]
 					}
 				}
 			},

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0050_diglett/diglett.animation.json

@@ -22,6 +22,387 @@
 				}
 			}
 		},
+		"animation.diglett.physical": {
+			"animation_length": 3,
+			"bones": {
+				"ground": {
+					"rotation": {
+						"0.0": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.2083": {
+							"post": ["-2.5-math.sin(q.anim_time*90*24)*02", 12.5, "math.sin(q.anim_time*90*17)*02"],
+							"lerp_mode": "catmullrom"
+						},
+						"0.6667": {
+							"post": ["-2-math.sin(q.anim_time*90*24)*02", -5, "math.sin(q.anim_time*90*17)*02"],
+							"lerp_mode": "catmullrom"
+						},
+						"1.0833": {
+							"post": ["5-math.sin(q.anim_time*90*24)*02", 5, "math.sin(q.anim_time*90*17)*02"],
+							"lerp_mode": "catmullrom"
+						},
+						"1.125": {
+							"post": ["-2.5-math.sin(q.anim_time*90*48)*04", 0, "math.sin(q.anim_time*90*32)*05"],
+							"lerp_mode": "catmullrom"
+						},
+						"1.1667": {
+							"post": [10, 3.1406, 2.1769],
+							"lerp_mode": "catmullrom"
+						},
+						"1.25": {
+							"post": ["2.5-math.sin(q.anim_time*90*48)*04", 0, "math.sin(q.anim_time*90*32)*05"],
+							"lerp_mode": "catmullrom"
+						},
+						"1.3333": {
+							"post": ["-2.5-math.sin(q.anim_time*90*48)*2", -0.25, "math.sin(q.anim_time*90*32)*2"],
+							"lerp_mode": "catmullrom"
+						},
+						"1.4167": {
+							"post": [0.04, -0.24, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"2.0417": {
+							"post": [0, -0.04, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"2.2083": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"2.375": {
+							"post": ["-math.sin(q.anim_time*90*24)*02", 5, "math.sin(q.anim_time*90*17)*02"],
+							"lerp_mode": "catmullrom"
+						},
+						"2.5833": {
+							"post": ["-2.5-math.sin(q.anim_time*90*30)*03", 0, "math.sin(q.anim_time*90*23)*03"],
+							"lerp_mode": "catmullrom"
+						},
+						"2.875": {
+							"post": ["-math.sin(q.anim_time*90*24)*02", 5, "math.sin(q.anim_time*90*17)*02"],
+							"lerp_mode": "catmullrom"
+						},
+						"3.0": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						}
+					},
+					"position": {
+						"0.0": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.1667": {
+							"post": [3.81, 0, -0.16],
+							"lerp_mode": "catmullrom"
+						},
+						"0.3333": {
+							"post": [7.36, 0, 2.18],
+							"lerp_mode": "catmullrom"
+						},
+						"0.375": {
+							"post": [7.39, -1, 2.69],
+							"lerp_mode": "catmullrom"
+						},
+						"0.4583": {
+							"post": [6.99, 0, 3.6],
+							"lerp_mode": "catmullrom"
+						},
+						"0.625": {
+							"post": [5.32, 0, 6.24],
+							"lerp_mode": "catmullrom"
+						},
+						"0.875": {
+							"post": [0, 0, 8],
+							"lerp_mode": "catmullrom"
+						},
+						"1.0": {
+							"post": [-6.18, 0, 3.1],
+							"lerp_mode": "catmullrom"
+						},
+						"1.125": {
+							"post": [-8.51, 0, -3.46],
+							"lerp_mode": "catmullrom"
+						},
+						"1.25": {
+							"post": [1, 0, -15],
+							"lerp_mode": "catmullrom"
+						},
+						"1.2917": {
+							"post": [1.84, 0.4, -16.22],
+							"lerp_mode": "catmullrom"
+						},
+						"1.3333": {
+							"post": [1.5, 0, -16],
+							"lerp_mode": "catmullrom"
+						},
+						"2.2083": {
+							"post": [1.5, 0, -16],
+							"lerp_mode": "catmullrom"
+						},
+						"2.25": {
+							"post": [1.48, -1, -15.81],
+							"lerp_mode": "catmullrom"
+						},
+						"2.3333": {
+							"post": [1.44, 0, -15.39],
+							"lerp_mode": "catmullrom"
+						},
+						"2.4583": {
+							"post": [1.26, 0, -13.4],
+							"lerp_mode": "catmullrom"
+						},
+						"2.75": {
+							"post": [0.27, 0, -2.89],
+							"lerp_mode": "catmullrom"
+						},
+						"3.0": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						}
+					}
+				},
+				"body": {
+					"rotation": {
+						"0.0": {
+							"post": [0, 1, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.125": {
+							"post": [-0.0639, 0.4994, -10.1039],
+							"lerp_mode": "catmullrom"
+						},
+						"0.25": {
+							"post": [0, 0, -0.2392],
+							"lerp_mode": "catmullrom"
+						},
+						"0.375": {
+							"post": [-0.38018, -0.04695, -0.49598],
+							"lerp_mode": "catmullrom"
+						},
+						"1.1667": {
+							"post": [-0.38018, -0.04695, -0.49598],
+							"lerp_mode": "catmullrom"
+						},
+						"1.2083": {
+							"post": [3.28242, -7.51775, -0.56308],
+							"lerp_mode": "catmullrom"
+						},
+						"1.25": {
+							"post": [45, -15, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"1.4583": {
+							"post": [-8.1232, 5.2505, 0.0419],
+							"lerp_mode": "catmullrom"
+						},
+						"1.875": {
+							"post": [0, 1, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"2.125": {
+							"post": [0, 0, -0.2392],
+							"lerp_mode": "catmullrom"
+						},
+						"2.25": {
+							"post": [-0.38018, -0.04695, -0.49598],
+							"lerp_mode": "catmullrom"
+						},
+						"3.0": {
+							"post": [0, 1, 0],
+							"lerp_mode": "catmullrom"
+						}
+					},
+					"position": {
+						"0.0": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.25": {
+							"post": [0, 0.6, 0.2],
+							"lerp_mode": "catmullrom"
+						},
+						"0.3333": [0, -0.28, 0.21],
+						"0.375": [0, -2.1, 0.2],
+						"1.2083": [0, -2.1, 0.2],
+						"1.25": {
+							"pre": [0, -0.4, -0.8],
+							"post": [0, -0.4, -0.8],
+							"lerp_mode": "catmullrom"
+						},
+						"1.875": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"2.125": {
+							"post": [0, 0.6, 0.2],
+							"lerp_mode": "catmullrom"
+						},
+						"2.2083": [0, -0.28, 0.21],
+						"2.25": [0, -2.1, 0.2],
+						"2.6667": [0, -2.1, 0.2],
+						"2.8333": {
+							"pre": [0, 0, 0],
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"3.0": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						}
+					},
+					"scale": {
+						"0.0": [1, 1, 1],
+						"0.2083": [1, 1, 1],
+						"0.3333": [0.9, 1.2, 0.9],
+						"0.375": [1, 0.1, 1],
+						"1.2083": [1, 0.1, 1],
+						"1.25": [1, 1.3, 1],
+						"1.3333": [1, 1, 1],
+						"2.0833": [1, 1, 1],
+						"2.2083": [0.9, 1.2, 0.9],
+						"2.25": [1, 0.1, 1],
+						"2.6667": [1, 0.1, 1],
+						"2.7917": [1, 1, 1],
+						"3.0": [1, 1, 1]
+					}
+				},
+				"body2": {
+					"rotation": {
+						"0.0": {
+							"post": [-2.59808, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.125": {
+							"post": [10.0582, 0, -3.4641],
+							"lerp_mode": "catmullrom"
+						},
+						"0.2917": {
+							"post": [-15.0433, 1.3008, 4.8282],
+							"lerp_mode": "catmullrom"
+						},
+						"0.3333": {
+							"post": [2.4019, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"1.2083": {
+							"post": [2.4019, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"1.25": {
+							"post": [20, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"1.375": {
+							"post": [24.9889, 0, -0.5265],
+							"lerp_mode": "catmullrom"
+						},
+						"1.5833": {
+							"post": [8.6796, 1.8689, -15.6325],
+							"lerp_mode": "catmullrom"
+						},
+						"1.9583": {
+							"post": [4.3843, -5.6, 3.6003],
+							"lerp_mode": "catmullrom"
+						},
+						"2.125": {
+							"post": [-15.0433, 1.3008, 4.8282],
+							"lerp_mode": "catmullrom"
+						},
+						"2.2083": {
+							"post": [2.4019, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"2.6667": {
+							"post": [2.4019, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"2.875": {
+							"post": [-2.59808, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"3.0": {
+							"post": [-2.59808, 0, 0],
+							"lerp_mode": "catmullrom"
+						}
+					},
+					"position": {
+						"0.0": [0, 0, 0],
+						"0.25": [0, 0, 0],
+						"0.3333": [0, -4, 0],
+						"1.2083": [0, -4, 0],
+						"1.25": {
+							"pre": [0, 1, 0],
+							"post": [0, 1, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"1.375": {
+							"post": [0, -1, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"1.6667": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"1.875": [0, 0, 0],
+						"2.125": [0, 0, 0],
+						"2.2083": [0, -4, 0],
+						"2.6667": [0, -4, 0],
+						"2.875": [0, 0, 0],
+						"3.0": [0, 0, 0]
+					}
+				},
+				"eye_angry_left": {
+					"position": {
+						"0.0": [0, 0, 0],
+						"0.25": {"pre": [0, 0, 0], "post": [0, 0, 0]},
+						"1.4583": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
+						"2.125": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}
+					}
+				},
+				"eyelid_left": {
+					"position": {
+						"0.0": [0, 0, 0],
+						"2.6667": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
+						"2.9167": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}
+					}
+				},
+				"eyelid_recoil_left": {
+					"position": {
+						"0.0": [0, 0, 0],
+						"0.25": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
+						"1.4583": {"pre": [0, 0, -0.1], "post": [0, 0, 0]},
+						"2.125": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
+						"2.6667": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}
+					}
+				},
+				"eye_angry_right": {
+					"position": {
+						"0.0": [0, 0, 0],
+						"0.25": {"pre": [0, 0, 0], "post": [0, 0, 0]},
+						"1.4583": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
+						"2.125": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}
+					}
+				},
+				"eyelid_right": {
+					"position": {
+						"0.0": [0, 0, 0],
+						"2.6667": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
+						"2.9167": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}
+					}
+				},
+				"eyelid_recoil_right": {
+					"position": {
+						"0.0": [0, 0, 0],
+						"0.25": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
+						"1.4583": {"pre": [0, 0, -0.1], "post": [0, 0, 0]},
+						"2.125": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
+						"2.6667": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}
+					}
+				}
+			}
+		},
 		"animation.diglett.ground_walk": {
 			"loop": true,
 			"animation_length": 4,
@@ -161,27 +542,27 @@
 						"0.3333": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
 						"0.4583": {"pre": [0, 0, -0.1], "post": [0, 0, -0.13]},
 						"0.5": {"pre": [0, 0, -0.13], "post": [0, 0, 0]},
-						"0.8333": {"pre": [0, 0, 0], "post": [0, 0, 0]},
+						"0.8333": [0, 0, 0],
 						"0.875": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
 						"1.4583": {"pre": [0, 0, -0.1], "post": [0, 0, -0.13]},
 						"1.5": {"pre": [0, 0, -0.13], "post": [0, 0, 0]},
-						"1.7083": {"pre": [0, 0, 0], "post": [0, 0, 0]},
+						"1.7083": [0, 0, 0],
 						"1.75": {"pre": [0, 0, 0], "post": [0, 0, -0.13]}
 					}
 				},
 				"eyelid_left": {
 					"position": {
 						"0.0": [0, 0, -0.1],
-						"0.1667": {"pre": [0, 0, -0.1], "post": [0, 0, -0.1]},
+						"0.1667": [0, 0, -0.1],
 						"0.2917": {"pre": [0, 0, -0.1], "post": [0, 0, 0]},
 						"0.3333": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
-						"0.4583": {"pre": [0, 0, -0.1], "post": [0, 0, -0.1]},
+						"0.4583": [0, 0, -0.1],
 						"0.5": {"pre": [0, 0, -0.1], "post": [0, 0, 0]},
-						"0.8333": {"pre": [0, 0, 0], "post": [0, 0, 0]},
+						"0.8333": [0, 0, 0],
 						"0.875": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
-						"1.4583": {"pre": [0, 0, -0.1], "post": [0, 0, -0.1]},
+						"1.4583": [0, 0, -0.1],
 						"1.5": {"pre": [0, 0, -0.1], "post": [0, 0, 0]},
-						"1.7083": {"pre": [0, 0, 0], "post": [0, 0, 0]},
+						"1.7083": [0, 0, 0],
 						"1.75": {"pre": [0, 0, 0], "post": [0, 0, -0.1]}
 					}
 				},
@@ -239,19 +620,19 @@
 			}
 		},
 		"animation.diglett.blink": {
-			"animation_length": 0.16667,
+			"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.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": {"pre": [0, 0, -0.1], "post": [0, 0, -0.1]},
+						"0.125": [0, 0, -0.1],
 						"0.1667": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}
 					}
 				}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0050_diglett/diglett_alolan.animation.json

@@ -22,6 +22,387 @@
 				}
 			}
 		},
+		"animation.diglett_alolan.physical": {
+			"animation_length": 3,
+			"bones": {
+				"ground": {
+					"rotation": {
+						"0.0": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.2083": {
+							"post": ["-2.5-math.sin(q.anim_time*90*24)*02", 12.5, "math.sin(q.anim_time*90*17)*02"],
+							"lerp_mode": "catmullrom"
+						},
+						"0.6667": {
+							"post": ["-2-math.sin(q.anim_time*90*24)*02", -5, "math.sin(q.anim_time*90*17)*02"],
+							"lerp_mode": "catmullrom"
+						},
+						"1.0833": {
+							"post": ["5-math.sin(q.anim_time*90*24)*02", 5, "math.sin(q.anim_time*90*17)*02"],
+							"lerp_mode": "catmullrom"
+						},
+						"1.125": {
+							"post": ["-2.5-math.sin(q.anim_time*90*48)*04", 0, "math.sin(q.anim_time*90*32)*05"],
+							"lerp_mode": "catmullrom"
+						},
+						"1.1667": {
+							"post": [10, 3.1406, 2.1769],
+							"lerp_mode": "catmullrom"
+						},
+						"1.25": {
+							"post": ["2.5-math.sin(q.anim_time*90*48)*04", 0, "math.sin(q.anim_time*90*32)*05"],
+							"lerp_mode": "catmullrom"
+						},
+						"1.3333": {
+							"post": ["-2.5-math.sin(q.anim_time*90*48)*2", -0.25, "math.sin(q.anim_time*90*32)*2"],
+							"lerp_mode": "catmullrom"
+						},
+						"1.4167": {
+							"post": [0.04, -0.24, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"2.0417": {
+							"post": [0, -0.04, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"2.2083": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"2.375": {
+							"post": ["-math.sin(q.anim_time*90*24)*02", 5, "math.sin(q.anim_time*90*17)*02"],
+							"lerp_mode": "catmullrom"
+						},
+						"2.5833": {
+							"post": ["-2.5-math.sin(q.anim_time*90*30)*03", 0, "math.sin(q.anim_time*90*23)*03"],
+							"lerp_mode": "catmullrom"
+						},
+						"2.875": {
+							"post": ["-math.sin(q.anim_time*90*24)*02", 5, "math.sin(q.anim_time*90*17)*02"],
+							"lerp_mode": "catmullrom"
+						},
+						"3.0": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						}
+					},
+					"position": {
+						"0.0": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.1667": {
+							"post": [3.81, 0, -0.16],
+							"lerp_mode": "catmullrom"
+						},
+						"0.3333": {
+							"post": [7.36, 0, 2.18],
+							"lerp_mode": "catmullrom"
+						},
+						"0.375": {
+							"post": [7.39, -1, 2.69],
+							"lerp_mode": "catmullrom"
+						},
+						"0.4583": {
+							"post": [6.99, 0, 3.6],
+							"lerp_mode": "catmullrom"
+						},
+						"0.625": {
+							"post": [5.32, 0, 6.24],
+							"lerp_mode": "catmullrom"
+						},
+						"0.875": {
+							"post": [0, 0, 8],
+							"lerp_mode": "catmullrom"
+						},
+						"1.0": {
+							"post": [-6.18, 0, 3.1],
+							"lerp_mode": "catmullrom"
+						},
+						"1.125": {
+							"post": [-8.51, 0, -3.46],
+							"lerp_mode": "catmullrom"
+						},
+						"1.25": {
+							"post": [1, 0, -15],
+							"lerp_mode": "catmullrom"
+						},
+						"1.2917": {
+							"post": [1.84, 0.4, -16.22],
+							"lerp_mode": "catmullrom"
+						},
+						"1.3333": {
+							"post": [1.5, 0, -16],
+							"lerp_mode": "catmullrom"
+						},
+						"2.2083": {
+							"post": [1.5, 0, -16],
+							"lerp_mode": "catmullrom"
+						},
+						"2.25": {
+							"post": [1.48, -1, -15.81],
+							"lerp_mode": "catmullrom"
+						},
+						"2.3333": {
+							"post": [1.44, 0, -15.39],
+							"lerp_mode": "catmullrom"
+						},
+						"2.4583": {
+							"post": [1.26, 0, -13.4],
+							"lerp_mode": "catmullrom"
+						},
+						"2.75": {
+							"post": [0.27, 0, -2.89],
+							"lerp_mode": "catmullrom"
+						},
+						"3.0": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						}
+					}
+				},
+				"body": {
+					"rotation": {
+						"0.0": {
+							"post": [0, 1, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.125": {
+							"post": [-0.0639, 0.4994, -10.1039],
+							"lerp_mode": "catmullrom"
+						},
+						"0.25": {
+							"post": [0, 0, -0.2392],
+							"lerp_mode": "catmullrom"
+						},
+						"0.375": {
+							"post": [-0.38018, -0.04695, -0.49598],
+							"lerp_mode": "catmullrom"
+						},
+						"1.1667": {
+							"post": [-0.38018, -0.04695, -0.49598],
+							"lerp_mode": "catmullrom"
+						},
+						"1.2083": {
+							"post": [3.28242, -7.51775, -0.56308],
+							"lerp_mode": "catmullrom"
+						},
+						"1.25": {
+							"post": [45, -15, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"1.4583": {
+							"post": [-8.1232, 5.2505, 0.0419],
+							"lerp_mode": "catmullrom"
+						},
+						"1.875": {
+							"post": [0, 1, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"2.125": {
+							"post": [0, 0, -0.2392],
+							"lerp_mode": "catmullrom"
+						},
+						"2.25": {
+							"post": [-0.38018, -0.04695, -0.49598],
+							"lerp_mode": "catmullrom"
+						},
+						"3.0": {
+							"post": [0, 1, 0],
+							"lerp_mode": "catmullrom"
+						}
+					},
+					"position": {
+						"0.0": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.25": {
+							"post": [0, 0.6, 0.2],
+							"lerp_mode": "catmullrom"
+						},
+						"0.3333": [0, -0.28, 0.21],
+						"0.375": [0, -2.1, 0.2],
+						"1.2083": [0, -2.1, 0.2],
+						"1.25": {
+							"pre": [0, -0.4, -0.8],
+							"post": [0, -0.4, -0.8],
+							"lerp_mode": "catmullrom"
+						},
+						"1.875": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"2.125": {
+							"post": [0, 0.6, 0.2],
+							"lerp_mode": "catmullrom"
+						},
+						"2.2083": [0, -0.28, 0.21],
+						"2.25": [0, -2.1, 0.2],
+						"2.6667": [0, -2.1, 0.2],
+						"2.8333": {
+							"pre": [0, 0, 0],
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"3.0": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						}
+					},
+					"scale": {
+						"0.0": [1, 1, 1],
+						"0.2083": [1, 1, 1],
+						"0.3333": [0.9, 1.2, 0.9],
+						"0.375": [1, 0.1, 1],
+						"1.2083": [1, 0.1, 1],
+						"1.25": [1, 1.3, 1],
+						"1.3333": [1, 1, 1],
+						"2.0833": [1, 1, 1],
+						"2.2083": [0.9, 1.2, 0.9],
+						"2.25": [1, 0.1, 1],
+						"2.6667": [1, 0.1, 1],
+						"2.7917": [1, 1, 1],
+						"3.0": [1, 1, 1]
+					}
+				},
+				"body2": {
+					"rotation": {
+						"0.0": {
+							"post": [-2.59808, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.125": {
+							"post": [10.0582, 0, -3.4641],
+							"lerp_mode": "catmullrom"
+						},
+						"0.2917": {
+							"post": [-15.0433, 1.3008, 4.8282],
+							"lerp_mode": "catmullrom"
+						},
+						"0.3333": {
+							"post": [2.4019, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"1.2083": {
+							"post": [2.4019, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"1.25": {
+							"post": [20, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"1.375": {
+							"post": [24.9889, 0, -0.5265],
+							"lerp_mode": "catmullrom"
+						},
+						"1.5833": {
+							"post": [8.6796, 1.8689, -15.6325],
+							"lerp_mode": "catmullrom"
+						},
+						"1.9583": {
+							"post": [4.3843, -5.6, 3.6003],
+							"lerp_mode": "catmullrom"
+						},
+						"2.125": {
+							"post": [-15.0433, 1.3008, 4.8282],
+							"lerp_mode": "catmullrom"
+						},
+						"2.2083": {
+							"post": [2.4019, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"2.6667": {
+							"post": [2.4019, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"2.875": {
+							"post": [-2.59808, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"3.0": {
+							"post": [-2.59808, 0, 0],
+							"lerp_mode": "catmullrom"
+						}
+					},
+					"position": {
+						"0.0": [0, 0, 0],
+						"0.25": [0, 0, 0],
+						"0.3333": [0, -4, 0],
+						"1.2083": [0, -4, 0],
+						"1.25": {
+							"pre": [0, 1, 0],
+							"post": [0, 1, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"1.375": {
+							"post": [0, -1, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"1.6667": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"1.875": [0, 0, 0],
+						"2.125": [0, 0, 0],
+						"2.2083": [0, -4, 0],
+						"2.6667": [0, -4, 0],
+						"2.875": [0, 0, 0],
+						"3.0": [0, 0, 0]
+					}
+				},
+				"eye_angry_left": {
+					"position": {
+						"0.0": [0, 0, 0],
+						"0.25": [0, 0, 0],
+						"1.4583": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
+						"2.125": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}
+					}
+				},
+				"eyelid_left": {
+					"position": {
+						"0.0": [0, 0, 0],
+						"2.6667": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
+						"2.9167": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}
+					}
+				},
+				"eyelid_recoil_left": {
+					"position": {
+						"0.0": [0, 0, 0],
+						"0.25": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
+						"1.4583": {"pre": [0, 0, -0.1], "post": [0, 0, 0]},
+						"2.125": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
+						"2.6667": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}
+					}
+				},
+				"eye_angry_right": {
+					"position": {
+						"0.0": [0, 0, 0],
+						"0.25": [0, 0, 0],
+						"1.4583": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
+						"2.125": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}
+					}
+				},
+				"eyelid_right": {
+					"position": {
+						"0.0": [0, 0, 0],
+						"2.6667": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
+						"2.9167": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}
+					}
+				},
+				"eyelid_recoil_right": {
+					"position": {
+						"0.0": [0, 0, 0],
+						"0.25": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
+						"1.4583": {"pre": [0, 0, -0.1], "post": [0, 0, 0]},
+						"2.125": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
+						"2.6667": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}
+					}
+				}
+			}
+		},
 		"animation.diglett_alolan.ground_walk": {
 			"loop": true,
 			"animation_length": 4,
@@ -156,78 +537,33 @@
 				"eyelid_right": {
 					"position": {
 						"0.0": [0, 0, -0.1],
-						"0.1667": {
-							"pre": [0, 0, -0.1],
-							"post": [0, 0, -0.13]
-						},
-						"0.2917": {
-							"pre": [0, 0, -0.13],
-							"post": [0, 0, 0]
-						},
-						"0.3333": {
-							"pre": [0, 0, 0],
-							"post": [0, 0, -0.1]
-						},
-						"0.4583": {
-							"pre": [0, 0, -0.1],
-							"post": [0, 0, -0.13]
-						},
-						"0.5": {
-							"pre": [0, 0, -0.13],
-							"post": [0, 0, 0]
-						},
+						"0.1667": {"pre": [0, 0, -0.1], "post": [0, 0, -0.13]},
+						"0.2917": {"pre": [0, 0, -0.13], "post": [0, 0, 0]},
+						"0.3333": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
+						"0.4583": {"pre": [0, 0, -0.1], "post": [0, 0, -0.13]},
+						"0.5": {"pre": [0, 0, -0.13], "post": [0, 0, 0]},
 						"0.8333": [0, 0, 0],
-						"0.875": {
-							"pre": [0, 0, 0],
-							"post": [0, 0, -0.1]
-						},
-						"1.4583": {
-							"pre": [0, 0, -0.1],
-							"post": [0, 0, -0.13]
-						},
-						"1.5": {
-							"pre": [0, 0, -0.13],
-							"post": [0, 0, 0]
-						},
+						"0.875": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
+						"1.4583": {"pre": [0, 0, -0.1], "post": [0, 0, -0.13]},
+						"1.5": {"pre": [0, 0, -0.13], "post": [0, 0, 0]},
 						"1.7083": [0, 0, 0],
-						"1.75": {
-							"pre": [0, 0, 0],
-							"post": [0, 0, -0.13]
-						}
+						"1.75": {"pre": [0, 0, 0], "post": [0, 0, -0.13]}
 					}
 				},
 				"eyelid_left": {
 					"position": {
 						"0.0": [0, 0, -0.1],
 						"0.1667": [0, 0, -0.1],
-						"0.2917": {
-							"pre": [0, 0, -0.1],
-							"post": [0, 0, 0]
-						},
-						"0.3333": {
-							"pre": [0, 0, 0],
-							"post": [0, 0, -0.1]
-						},
+						"0.2917": {"pre": [0, 0, -0.1], "post": [0, 0, 0]},
+						"0.3333": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
 						"0.4583": [0, 0, -0.1],
-						"0.5": {
-							"pre": [0, 0, -0.1],
-							"post": [0, 0, 0]
-						},
+						"0.5": {"pre": [0, 0, -0.1], "post": [0, 0, 0]},
 						"0.8333": [0, 0, 0],
-						"0.875": {
-							"pre": [0, 0, 0],
-							"post": [0, 0, -0.1]
-						},
+						"0.875": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
 						"1.4583": [0, 0, -0.1],
-						"1.5": {
-							"pre": [0, 0, -0.1],
-							"post": [0, 0, 0]
-						},
+						"1.5": {"pre": [0, 0, -0.1], "post": [0, 0, 0]},
 						"1.7083": [0, 0, 0],
-						"1.75": {
-							"pre": [0, 0, 0],
-							"post": [0, 0, -0.1]
-						}
+						"1.75": {"pre": [0, 0, 0], "post": [0, 0, -0.1]}
 					}
 				},
 				"body2": {
@@ -284,26 +620,20 @@
 			}
 		},
 		"animation.diglett_alolan.blink": {
-			"animation_length": 0.16667,
+			"animation_length": 0.1667,
 			"bones": {
 				"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]
-						}
+						"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]
-						}
+						"0.1667": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}
 					}
 				}
 			}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0051_dugtrio/dugtrio.animation.json

@@ -75,6 +75,712 @@
 				}
 			}
 		},
+		"animation.dugtrio.physical": {
+			"animation_length": 3,
+			"bones": {
+				"body": {
+					"rotation": {
+						"0.0": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.25": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.9167": {
+							"post": ["-math.sin(q.anim_time*90*24)*02", 0, "math.sin(q.anim_time*90*17)*02"],
+							"lerp_mode": "catmullrom"
+						},
+						"1.25": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"2.2083": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"2.6667": {
+							"post": ["-math.sin(q.anim_time*90*24)*02", 0, "math.sin(q.anim_time*90*17)*02"],
+							"lerp_mode": "catmullrom"
+						},
+						"3.0": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						}
+					},
+					"position": {
+						"0.0": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.5833": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.8333": {
+							"post": [0, 0, -1.25],
+							"lerp_mode": "catmullrom"
+						},
+						"1.125": {
+							"post": ["-math.sin(q.anim_time*90*6)*2", 0, -7.1],
+							"lerp_mode": "catmullrom"
+						},
+						"1.25": {
+							"post": [0, 0, -16],
+							"lerp_mode": "catmullrom"
+						},
+						"1.75": {
+							"post": [0, 0, -16.7],
+							"lerp_mode": "catmullrom"
+						},
+						"2.2083": {
+							"post": [0, 0, -16],
+							"lerp_mode": "catmullrom"
+						},
+						"2.4583": {
+							"post": ["-math.sin(q.anim_time*90*6)*2", 0, -13.4],
+							"lerp_mode": "catmullrom"
+						},
+						"2.75": {
+							"post": ["-math.sin(q.anim_time*90*6)*2", 0, -2.89],
+							"lerp_mode": "catmullrom"
+						},
+						"3.0": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						}
+					}
+				},
+				"body1": {
+					"rotation": {
+						"0.0": {
+							"post": [7.5, -4, -5],
+							"lerp_mode": "catmullrom"
+						},
+						"0.125": {
+							"post": [11.9213, -50.9243, -13.7818],
+							"lerp_mode": "catmullrom"
+						},
+						"0.3333": {
+							"post": [11.6966, -74.0498, -19.4432],
+							"lerp_mode": "catmullrom"
+						},
+						"0.5": {
+							"post": [12.1827, -67.8747, -22.7017],
+							"lerp_mode": "catmullrom"
+						},
+						"0.625": {
+							"post": [-1.1013, -13.7699, 2.8238],
+							"lerp_mode": "catmullrom"
+						},
+						"1.1667": {
+							"post": [3.28242, 7.51775, 0.56308],
+							"lerp_mode": "catmullrom"
+						},
+						"1.25": {
+							"post": [50.709, 2.0361, -22.8812],
+							"lerp_mode": "catmullrom"
+						},
+						"1.5417": {
+							"post": [50.709, 2.0361, -22.8812],
+							"lerp_mode": "catmullrom"
+						},
+						"1.9167": {
+							"post": [16.737, 14.4812, -21.7787],
+							"lerp_mode": "catmullrom"
+						},
+						"2.0833": {
+							"post": [15, 0, -0.2392],
+							"lerp_mode": "catmullrom"
+						},
+						"2.2083": {
+							"post": [-0.38018, -0.04695, -0.49598],
+							"lerp_mode": "catmullrom"
+						},
+						"3.0": {
+							"post": [7.5, -4, -5],
+							"lerp_mode": "catmullrom"
+						}
+					},
+					"position": {
+						"0.0": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.625": [0, 0, 0],
+						"0.7083": [0, -1, 0],
+						"1.1667": [0, -2.1, 0.2],
+						"1.25": {
+							"pre": [-1.18301, -0.69289, -1.48301],
+							"post": [-1.18301, -0.69289, -1.48301],
+							"lerp_mode": "catmullrom"
+						},
+						"1.2917": [-0.9559, -1.11355, -0.74652],
+						"1.3333": [-1.33194, -0.27231, -1.99076],
+						"1.375": [-1.21126, -0.41201, -1.64918],
+						"1.5833": {
+							"pre": [-0.92, -0.13, -1.18],
+							"post": [-0.92, -0.13, -1.18],
+							"lerp_mode": "catmullrom"
+						},
+						"2.0833": {
+							"post": [0, 0.6, 0.2],
+							"lerp_mode": "catmullrom"
+						},
+						"2.1667": [0, -0.28, 0.21],
+						"2.2083": [0, -2.1, 0.2],
+						"2.5833": [0, -2.1, 0.2],
+						"2.7917": {
+							"pre": [0, 0, 0],
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"3.0": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						}
+					},
+					"scale": {
+						"0.5833": [1, 1, 1],
+						"0.625": [0.8, 0.75, 0.8],
+						"0.6667": [1, 0.1, 1],
+						"1.1667": [1, 0.1, 1],
+						"1.25": [0.9, 1.2, 0.9],
+						"1.3333": [1, 1, 1],
+						"2.0417": [1, 1, 1],
+						"2.1667": [0.9, 1.2, 0.9],
+						"2.2083": [1, 0.1, 1],
+						"2.5833": [1, 0.1, 1],
+						"2.7083": [1, 1, 1],
+						"3.0": [1, 1, 1]
+					}
+				},
+				"body1_2": {
+					"rotation": {
+						"0.0": {
+							"post": [-1.73205, 0, -2.59808],
+							"lerp_mode": "catmullrom"
+						},
+						"0.0833": {
+							"post": [8.2679, 0, -2.5981],
+							"lerp_mode": "catmullrom"
+						},
+						"0.25": {
+							"post": [-6.7321, 0, -2.5981],
+							"lerp_mode": "catmullrom"
+						},
+						"0.625": {
+							"post": [10.7679, 0, -2.5981],
+							"lerp_mode": "catmullrom"
+						},
+						"0.6667": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"2.6667": {
+							"post": [2.4019, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"2.875": {
+							"post": [-2.59808, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"3.0": {
+							"post": [-1.73205, 0, -2.59808],
+							"lerp_mode": "catmullrom"
+						}
+					},
+					"position": {
+						"0.0": [0, 0, 0],
+						"0.625": [0, 0, 0],
+						"0.6667": [0, -5, 0],
+						"1.1667": [0, -5, 0],
+						"1.25": [0, -2, 0],
+						"2.6667": [0, -4, 0],
+						"2.875": [0, 0, 0],
+						"3.0": [0, 0, 0]
+					}
+				},
+				"body2": {
+					"rotation": {
+						"0.0": {
+							"post": [3.9762, 6.495, 10.7976],
+							"lerp_mode": "catmullrom"
+						},
+						"0.125": {
+							"post": [10.3891, 24.9296, 12.6481],
+							"lerp_mode": "catmullrom"
+						},
+						"0.2083": {
+							"post": [1.3318, 51.3394, 15.2992],
+							"lerp_mode": "catmullrom"
+						},
+						"0.4167": {
+							"post": [-3.8835, 53.834, 15.0282],
+							"lerp_mode": "catmullrom"
+						},
+						"0.5": {
+							"post": [7.6917, 14.8915, -0.6214],
+							"lerp_mode": "catmullrom"
+						},
+						"0.5417": {
+							"post": [0, 17.5, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"1.1667": {
+							"post": [3.28242, -7.51775, -0.56308],
+							"lerp_mode": "catmullrom"
+						},
+						"1.25": {
+							"post": [42.509, -8.8475, 30.2404],
+							"lerp_mode": "catmullrom"
+						},
+						"1.6667": {
+							"post": [42.509, -8.8475, 30.2404],
+							"lerp_mode": "catmullrom"
+						},
+						"1.875": {
+							"post": [10.6615, -8.0683, 18.5147],
+							"lerp_mode": "catmullrom"
+						},
+						"2.125": {
+							"post": [0, 0, -0.2392],
+							"lerp_mode": "catmullrom"
+						},
+						"2.25": {
+							"post": [-0.38018, -0.04695, -0.49598],
+							"lerp_mode": "catmullrom"
+						},
+						"3.0": {
+							"post": [3.9762, 6.495, 10.7976],
+							"lerp_mode": "catmullrom"
+						}
+					},
+					"position": {
+						"0.0": {
+							"post": [0.7766, 0.14679, -0.3],
+							"lerp_mode": "catmullrom"
+						},
+						"0.125": {
+							"post": [0.78, -0.45, -0.3],
+							"lerp_mode": "catmullrom"
+						},
+						"0.3333": {
+							"post": [0.7766, 0.14679, -0.3],
+							"lerp_mode": "catmullrom"
+						},
+						"0.5": {
+							"post": [0.7766, 0.14679, -0.3],
+							"lerp_mode": "catmullrom"
+						},
+						"0.5417": {
+							"post": [0.78, -1.55, -0.3],
+							"lerp_mode": "catmullrom"
+						},
+						"1.1667": [0, -2.1, 0.2],
+						"1.25": {
+							"pre": [1.18301, -0.69289, -1.48301],
+							"post": [1.18301, -0.69289, -1.48301],
+							"lerp_mode": "catmullrom"
+						},
+						"1.2917": [0.9559, -1.11355, -0.74652],
+						"1.3333": [1.33194, -0.27231, -1.99076],
+						"1.375": [1.21126, -0.41201, -1.64918],
+						"1.6667": {
+							"pre": [0.88, -0.12, -1.05],
+							"post": [0.88, -0.12, -1.05],
+							"lerp_mode": "catmullrom"
+						},
+						"1.7917": {
+							"post": [1.27, 0.19, -0.61],
+							"lerp_mode": "catmullrom"
+						},
+						"2.125": {
+							"post": [0, 0.6, 0.2],
+							"lerp_mode": "catmullrom"
+						},
+						"2.2083": [0, -0.28, 0.21],
+						"2.25": [0, -2.1, 0.2],
+						"2.6667": [0, -2.1, 0.2],
+						"2.8333": {
+							"pre": [0, 0, 0],
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"3.0": {
+							"post": [0.7766, 0.14679, -0.3],
+							"lerp_mode": "catmullrom"
+						}
+					},
+					"scale": {
+						"0.5": [1, 1, 1],
+						"0.5417": [0.9, 1, 0.9],
+						"0.5833": [1, 0.1, 1],
+						"1.1667": [1, 0.1, 1],
+						"1.25": [0.9, 1.2, 0.9],
+						"1.3333": [1, 1, 1],
+						"2.0833": [1, 1, 1],
+						"2.2083": [0.9, 1.2, 0.9],
+						"2.25": [1, 0.1, 1],
+						"2.6667": [1, 0.1, 1],
+						"2.7917": [1, 1, 1],
+						"3.0": [1, 1, 1]
+					}
+				},
+				"body3": {
+					"rotation": {
+						"0.0": {
+							"post": [2.0871, -1.0039, 7.5008],
+							"lerp_mode": "catmullrom"
+						},
+						"0.2917": {
+							"post": [-0.4129, -1.0039, 7.5008],
+							"lerp_mode": "catmullrom"
+						},
+						"0.4583": {
+							"post": [4.454, -1.0178, 6.3469],
+							"lerp_mode": "catmullrom"
+						},
+						"0.6667": {
+							"post": [-7.8238, -1.0361, "2.5001+math.sin(q.anim_time*90*6-60)*3"],
+							"lerp_mode": "catmullrom"
+						},
+						"0.9167": {
+							"post": [-26.56, -1.04, "2.26+math.sin(q.anim_time*90*6-60)*5"],
+							"lerp_mode": "catmullrom"
+						},
+						"1.1667": {
+							"post": [-35.3238, -1.0361, 2.5001],
+							"lerp_mode": "catmullrom"
+						},
+						"1.2083": {
+							"post": [32.1762, -1.0361, 2.5001],
+							"lerp_mode": "catmullrom"
+						},
+						"1.25": {
+							"post": [65.145, -1.0361, 2.5001],
+							"lerp_mode": "catmullrom"
+						},
+						"1.2917": {
+							"post": [59.6762, -1.0361, 2.5001],
+							"lerp_mode": "catmullrom"
+						},
+						"1.6667": {
+							"post": [59.6762, -1.0361, 2.5001],
+							"lerp_mode": "catmullrom"
+						},
+						"2.125": {
+							"post": [15.1947, -1.0361, 2.5001],
+							"lerp_mode": "catmullrom"
+						},
+						"2.2083": {
+							"post": [2.6947, -1.0361, 2.5001],
+							"lerp_mode": "catmullrom"
+						},
+						"3.0": {
+							"post": [2.0871, -1.0039, 7.5008],
+							"lerp_mode": "catmullrom"
+						}
+					},
+					"position": {
+						"0.0": {
+							"post": [0, -0.3, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"1.1667": [0, -0.23, 1],
+						"1.2083": [0, -0.23, -3.04],
+						"1.25": [0, 0.47, -2.96],
+						"1.2917": [0, -0.6, -2.87],
+						"1.3333": [0, 0.05, -2.79],
+						"1.375": [0, -0.3, -2.7],
+						"1.4167": [0, 0, -2.62],
+						"1.5833": [0, -0.25, -2.28],
+						"2.2083": [0, -0.3, 0],
+						"2.25": [0, -1.3, 0],
+						"2.75": [0, -2.1, 0.2],
+						"2.875": {
+							"pre": [0, 0, 0],
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"3.0": {
+							"post": [0, -0.3, 0],
+							"lerp_mode": "catmullrom"
+						}
+					},
+					"scale": {
+						"0.0": [1, 1, 1],
+						"1.125": [1, 1, 1],
+						"1.2083": [0.8, 1, 1.35],
+						"1.25": {"pre": [0.8, 1, 1.35], "post": [1.2, 1, 0.9]},
+						"1.3333": [1, 1, 1],
+						"2.2083": [1, 1, 1],
+						"2.2917": [1, 0.1, 1],
+						"2.75": [1, 0.1, 1],
+						"2.8333": [1, 1, 1],
+						"3.0": [1, 1, 1]
+					}
+				},
+				"body3_2": {
+					"rotation": {
+						"0.0": {
+							"post": [1.28558, 0, 1.92836],
+							"lerp_mode": "catmullrom"
+						},
+						"0.2083": {
+							"post": ["23.7856-math.sin(q.anim_time*90*16)*7.5", 0, 1.9284],
+							"lerp_mode": "catmullrom"
+						},
+						"0.4583": {
+							"post": [31.2856, 0, 1.9284],
+							"lerp_mode": "catmullrom"
+						},
+						"0.6667": {
+							"post": [23.35, 0, 1.93],
+							"lerp_mode": "catmullrom"
+						},
+						"0.875": {
+							"post": [8.7856, 0, "1.9284+math.sin(q.anim_time*90*6-120)*15"],
+							"lerp_mode": "catmullrom"
+						},
+						"1.125": {
+							"post": [-43.1823, 0, 1.9284],
+							"lerp_mode": "catmullrom"
+						},
+						"1.2083": {
+							"post": [-57.1266, 0, 1.9284],
+							"lerp_mode": "catmullrom"
+						},
+						"1.25": {
+							"post": [21.2856, 0, 1.9284],
+							"lerp_mode": "catmullrom"
+						},
+						"1.375": {
+							"post": [27.6157, 0, 1.9284],
+							"lerp_mode": "catmullrom"
+						},
+						"1.5833": {
+							"post": [26.5571, 0, 1.994],
+							"lerp_mode": "catmullrom"
+						},
+						"1.8333": {
+							"post": [44.7157, 0, 2.0597],
+							"lerp_mode": "catmullrom"
+						},
+						"2.125": {
+							"post": [13.7856, 0, 1.9284],
+							"lerp_mode": "catmullrom"
+						},
+						"2.25": {
+							"post": [-15.4247, 0, 0.3886],
+							"lerp_mode": "catmullrom"
+						},
+						"2.2917": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"2.75": {
+							"post": [2.4019, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"2.9167": {
+							"post": [-2.59808, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"3.0": {
+							"post": [1.28558, 0, 1.92836],
+							"lerp_mode": "catmullrom"
+						}
+					},
+					"position": {
+						"0.0": [0, 0, 0],
+						"0.7083": [0, 0, 0],
+						"0.9583": [0, 0, 0],
+						"1.125": [-0.05508, -1.63581, -0.30179],
+						"1.2083": [-0.05508, -1.63581, -0.30179],
+						"1.25": [0, 0, 0],
+						"2.25": [0, 0, 0],
+						"2.3333": [0, -8, 0],
+						"2.75": [0, -4, 0],
+						"2.9167": [0, 0, 0],
+						"3.0": [0, 0, 0]
+					}
+				},
+				"eye_left2": {
+					"position": {
+						"0.0": [0, 0, 0],
+						"0.2083": {"pre": [0, 0, 0], "post": [-0.5, 0, 0]},
+						"0.4583": {"pre": [-0.5, 0, 0], "post": [0, 0, 0]}
+					}
+				},
+				"eyelid_left2": {
+					"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.4583": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
+						"1.25": {"pre": [0, 0, -0.1], "post": [0, 0, 0]},
+						"1.625": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
+						"1.9583": {"pre": [0, 0, -0.1], "post": [0, 0, 0]},
+						"3.0": {"pre": [0, 0, 0], "post": [0, 0, 0]}
+					}
+				},
+				"eyelid_recoil_left2": {
+					"position": {
+						"0.0": [0, 0, 0],
+						"1.25": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
+						"1.625": {"pre": [0, 0, -0.1], "post": [0, 0, 0]},
+						"3.0": {"pre": [0, 0, 0], "post": [0, 0, 0]}
+					}
+				},
+				"eye_right2": {
+					"position": {
+						"0.0": [0, 0, 0],
+						"0.2083": {"pre": [0, 0, 0], "post": [-0.5, 0, 0]},
+						"0.4583": {"pre": [-0.5, 0, 0], "post": [0, 0, 0]}
+					}
+				},
+				"pupil_right2": {
+					"position": [0, 0, 0]
+				},
+				"eyelid_right2": {
+					"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.4583": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
+						"1.25": {"pre": [0, 0, -0.1], "post": [0, 0, 0]},
+						"1.625": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
+						"1.9583": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}
+					}
+				},
+				"eyelid_happy_right2": {
+					"position": [1, 0, 0]
+				},
+				"eyelid_recoil_right2": {
+					"position": {
+						"0.0": [0, 0, 0],
+						"1.25": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
+						"1.625": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}
+					}
+				},
+				"eye_left1": {
+					"position": {
+						"0.0": [0, 0, 0],
+						"0.1667": {"pre": [0, 0, 0], "post": [0.5, 0, 0]},
+						"0.5833": {"pre": [0.5, 0, 0], "post": [0, 0, 0]}
+					}
+				},
+				"eye_angry_left1": {
+					"position": {
+						"0.0": [0, 0, 0],
+						"1.875": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
+						"2.1667": {"pre": [0, 0, -0.1], "post": [0, 0, 0]},
+						"3.0": {"pre": [0, 0, 0], "post": [0, 0, 0]}
+					}
+				},
+				"eyelid_left1": {
+					"position": {
+						"0.0": [0, 0, -0.1],
+						"0.1667": {"pre": [0, 0, -0.1], "post": [0, 0, 0]},
+						"0.5833": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
+						"1.25": {"pre": [0, 0, -0.1], "post": [0, 0, 0]},
+						"1.5": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
+						"1.875": {"pre": [0, 0, -0.1], "post": [0, 0, 0]},
+						"2.1667": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
+						"2.7917": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}
+					}
+				},
+				"eyelid_happy_left1": {
+					"position": [-1, 0, 0]
+				},
+				"eyelid_recoil_left1": {
+					"position": {
+						"0.0": [0, 0, 0],
+						"1.25": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
+						"1.5": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}
+					}
+				},
+				"eye_right1": {
+					"position": {
+						"0.0": [0, 0, 0],
+						"0.1667": {"pre": [0, 0, 0], "post": [0.5, 0, 0]},
+						"0.5833": {"pre": [0.5, 0, 0], "post": [0, 0, 0]}
+					}
+				},
+				"eye_angry_right1": {
+					"position": {
+						"0.0": [0, 0, 0],
+						"0.1667": {"pre": [0, 0, 0], "post": [0, -0.5, -0.1]},
+						"1.875": {"pre": [0, -0.5, -0.1], "post": [0, 0, -0.1]},
+						"2.1667": {"pre": [0, 0, -0.1], "post": [0, 0, 0]},
+						"3.0": {"pre": [0, 0, 0], "post": [0, 0, 0]}
+					}
+				},
+				"eyelid_right1": {
+					"position": {
+						"0.0": [0, 0, -0.1],
+						"0.1667": {"pre": [0, 0, -0.1], "post": [0, 0, 0]},
+						"0.5833": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
+						"1.25": {"pre": [0, 0, -0.1], "post": [0, 0, 0]},
+						"1.5": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
+						"1.875": {"pre": [0, 0, -0.1], "post": [0, 0, 0]},
+						"2.1667": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
+						"2.7917": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}
+					}
+				},
+				"eyelid_recoil_right1": {
+					"position": {
+						"0.0": [0, 0, 0],
+						"1.25": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
+						"1.5": {"pre": [0, 0, -0.1], "post": [0, 0, 0]},
+						"3.0": {"pre": [0, 0, 0], "post": [0, 0, 0]}
+					}
+				},
+				"eyelid_left3": {
+					"position": {
+						"0.0": [0, 0, 0],
+						"0.2083": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
+						"0.5833": {"pre": [0, 0, -0.1], "post": [0, 0, 0]},
+						"0.7083": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
+						"1.0": {"pre": [0, 0, -0.1], "post": [0, 0, 0]},
+						"1.3333": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
+						"2.0833": {"pre": [0, 0, -0.1], "post": [0, 0, 0.1]},
+						"2.25": {"pre": [0, 0, 0.1], "post": [0, 0, -0.1]},
+						"2.875": {"pre": [0, 0, -0.1], "post": [0, 0, 0.1]}
+					}
+				},
+				"eyelid_recoil_left3": {
+					"position": {
+						"0.0": [0, 0, 0],
+						"1.0": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
+						"1.3333": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}
+					}
+				},
+				"eyelid_right3": {
+					"position": {
+						"0.0": [0, 0, 0],
+						"0.2083": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
+						"0.5833": {"pre": [0, 0, -0.1], "post": [0, 0, 0]},
+						"0.7083": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
+						"1.0": {"pre": [0, 0, -0.1], "post": [0, 0, 0]},
+						"1.3333": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
+						"2.0833": {"pre": [0, 0, -0.1], "post": [0, 0, 0.1]},
+						"2.25": {"pre": [0, 0, 0.1], "post": [0, 0, -0.1]},
+						"2.875": {"pre": [0, 0, -0.1], "post": [0, 0, 0.1]}
+					}
+				},
+				"eyelid_recoil_right3": {
+					"position": {
+						"0.0": [0, 0, 0],
+						"1.0": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
+						"1.3333": {"pre": [0, 0, -0.1], "post": [0, 0, 0]},
+						"3.0": {"pre": [0, 0, 0], "post": [0, 0, 0]}
+					}
+				}
+			}
+		},
 		"animation.dugtrio.faint": {
 			"loop": "hold_on_last_frame",
 			"animation_length": 3,
@@ -328,13 +1034,13 @@
 					"position": {
 						"0.2917": [0, 0, 0],
 						"0.3333": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
-						"0.4583": {"pre": [0, 0, -0.1], "post": [0, 0, -0.1]},
+						"0.4583": [0, 0, -0.1],
 						"0.5": {"pre": [0, 0, -0.1], "post": [0, 0, 0]},
-						"1.25": {"pre": [0, 0, 0], "post": [0, 0, 0]},
+						"1.25": [0, 0, 0],
 						"1.2917": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
-						"1.4167": {"pre": [0, 0, -0.1], "post": [0, 0, -0.1]},
+						"1.4167": [0, 0, -0.1],
 						"1.4583": {"pre": [0, 0, -0.1], "post": [0, 0, 0]},
-						"1.75": {"pre": [0, 0, 0], "post": [0, 0, 0]},
+						"1.75": [0, 0, 0],
 						"1.7917": {"pre": [0, 0, 0], "post": [0, 0, -0.1]}
 					}
 				},
@@ -342,13 +1048,13 @@
 					"position": {
 						"0.2917": [0, 0, 0],
 						"0.3333": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
-						"0.4583": {"pre": [0, 0, -0.1], "post": [0, 0, -0.1]},
+						"0.4583": [0, 0, -0.1],
 						"0.5": {"pre": [0, 0, -0.1], "post": [0, 0, 0]},
-						"1.25": {"pre": [0, 0, 0], "post": [0, 0, 0]},
+						"1.25": [0, 0, 0],
 						"1.2917": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
-						"1.4167": {"pre": [0, 0, -0.1], "post": [0, 0, -0.1]},
+						"1.4167": [0, 0, -0.1],
 						"1.4583": {"pre": [0, 0, -0.1], "post": [0, 0, 0]},
-						"1.75": {"pre": [0, 0, 0], "post": [0, 0, 0]},
+						"1.75": [0, 0, 0],
 						"1.7917": {"pre": [0, 0, 0], "post": [0, 0, -0.1]}
 					}
 				},
@@ -372,13 +1078,13 @@
 					"position": {
 						"0.125": [0, 0, 0],
 						"0.1667": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
-						"0.2917": {"pre": [0, 0, -0.1], "post": [0, 0, -0.1]},
+						"0.2917": [0, 0, -0.1],
 						"0.3333": {"pre": [0, 0, -0.1], "post": [0, 0, 0]},
-						"0.7083": {"pre": [0, 0, 0], "post": [0, 0, 0]},
+						"0.7083": [0, 0, 0],
 						"0.75": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
-						"0.875": {"pre": [0, 0, -0.1], "post": [0, 0, -0.1]},
+						"0.875": [0, 0, -0.1],
 						"0.9167": {"pre": [0, 0, -0.1], "post": [0, 0, 0]},
-						"1.0417": {"pre": [0, 0, 0], "post": [0, 0, 0]},
+						"1.0417": [0, 0, 0],
 						"1.0833": {"pre": [0, 0, 0], "post": [0, 0, -0.1]}
 					}
 				},
@@ -386,13 +1092,13 @@
 					"position": {
 						"0.125": [0, 0, 0],
 						"0.1667": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
-						"0.2917": {"pre": [0, 0, -0.1], "post": [0, 0, -0.1]},
+						"0.2917": [0, 0, -0.1],
 						"0.3333": {"pre": [0, 0, -0.1], "post": [0, 0, 0]},
-						"0.7083": {"pre": [0, 0, 0], "post": [0, 0, 0]},
+						"0.7083": [0, 0, 0],
 						"0.75": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
-						"0.875": {"pre": [0, 0, -0.1], "post": [0, 0, -0.1]},
+						"0.875": [0, 0, -0.1],
 						"0.9167": {"pre": [0, 0, -0.1], "post": [0, 0, 0]},
-						"1.0417": {"pre": [0, 0, 0], "post": [0, 0, 0]},
+						"1.0417": [0, 0, 0],
 						"1.0833": {"pre": [0, 0, 0], "post": [0, 0, -0.1]}
 					}
 				},
@@ -416,13 +1122,13 @@
 					"position": {
 						"0.0": [0, 0, 0],
 						"0.0417": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
-						"0.1667": {"pre": [0, 0, -0.1], "post": [0, 0, -0.1]},
+						"0.1667": [0, 0, -0.1],
 						"0.2083": {"pre": [0, 0, -0.1], "post": [0, 0, 0]},
-						"1.25": {"pre": [0, 0, 0], "post": [0, 0, 0]},
+						"1.25": [0, 0, 0],
 						"1.2917": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
-						"1.4167": {"pre": [0, 0, -0.1], "post": [0, 0, -0.1]},
+						"1.4167": [0, 0, -0.1],
 						"1.4583": {"pre": [0, 0, -0.1], "post": [0, 0, 0]},
-						"2.375": {"pre": [0, 0, 0], "post": [0, 0, 0]},
+						"2.375": [0, 0, 0],
 						"2.4167": {"pre": [0, 0, 0], "post": [0, 0, -0.1]}
 					}
 				},
@@ -430,13 +1136,13 @@
 					"position": {
 						"0.0": [0, 0, 0],
 						"0.0417": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
-						"0.1667": {"pre": [0, 0, -0.1], "post": [0, 0, -0.1]},
+						"0.1667": [0, 0, -0.1],
 						"0.2083": {"pre": [0, 0, -0.1], "post": [0, 0, 0]},
-						"1.25": {"pre": [0, 0, 0], "post": [0, 0, 0]},
+						"1.25": [0, 0, 0],
 						"1.2917": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
-						"1.4167": {"pre": [0, 0, -0.1], "post": [0, 0, -0.1]},
+						"1.4167": [0, 0, -0.1],
 						"1.4583": {"pre": [0, 0, -0.1], "post": [0, 0, 0]},
-						"2.375": {"pre": [0, 0, 0], "post": [0, 0, 0]},
+						"2.375": [0, 0, 0],
 						"2.4167": {"pre": [0, 0, 0], "post": [0, 0, -0.1]}
 					}
 				}
@@ -462,14 +1168,14 @@
 				"eyelid_right1": {
 					"position": {
 						"0.0": [0, 0, -0.1],
-						"0.125": {"pre": [0, 0, -0.1], "post": [0, 0, -0.1]},
+						"0.125": [0, 0, -0.1],
 						"0.1667": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}
 					}
 				},
 				"eyelid_left1": {
 					"position": {
 						"0.0": [0, 0, -0.1],
-						"0.125": {"pre": [0, 0, -0.1], "post": [0, 0, -0.1]},
+						"0.125": [0, 0, -0.1],
 						"0.1667": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}
 					}
 				}
@@ -495,14 +1201,14 @@
 				"eyelid_right2": {
 					"position": {
 						"0.0": [0, 0, -0.1],
-						"0.125": {"pre": [0, 0, -0.1], "post": [0, 0, -0.1]},
+						"0.125": [0, 0, -0.1],
 						"0.1667": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}
 					}
 				},
 				"eyelid_left2": {
 					"position": {
 						"0.0": [0, 0, -0.1],
-						"0.125": {"pre": [0, 0, -0.1], "post": [0, 0, -0.1]},
+						"0.125": [0, 0, -0.1],
 						"0.1667": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}
 					}
 				}
@@ -528,14 +1234,14 @@
 				"eyelid_right3": {
 					"position": {
 						"0.0": [0, 0, -0.1],
-						"0.125": {"pre": [0, 0, -0.1], "post": [0, 0, -0.1]},
+						"0.125": [0, 0, -0.1],
 						"0.1667": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}
 					}
 				},
 				"eyelid_left3": {
 					"position": {
 						"0.0": [0, 0, -0.1],
-						"0.125": {"pre": [0, 0, -0.1], "post": [0, 0, -0.1]},
+						"0.125": [0, 0, -0.1],
 						"0.1667": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}
 					}
 				}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0051_dugtrio/dugtrio_alolan.animation.json

@@ -75,6 +75,712 @@
 				}
 			}
 		},
+		"animation.dugtrio_alolan.physical": {
+			"animation_length": 3,
+			"bones": {
+				"body": {
+					"rotation": {
+						"0.0": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.25": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.9167": {
+							"post": ["-math.sin(q.anim_time*90*24)*02", 0, "math.sin(q.anim_time*90*17)*02"],
+							"lerp_mode": "catmullrom"
+						},
+						"1.25": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"2.2083": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"2.6667": {
+							"post": ["-math.sin(q.anim_time*90*24)*02", 0, "math.sin(q.anim_time*90*17)*02"],
+							"lerp_mode": "catmullrom"
+						},
+						"3.0": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						}
+					},
+					"position": {
+						"0.0": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.5833": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.8333": {
+							"post": [0, 0, -1.25],
+							"lerp_mode": "catmullrom"
+						},
+						"1.125": {
+							"post": ["-math.sin(q.anim_time*90*6)*2", 0, -7.1],
+							"lerp_mode": "catmullrom"
+						},
+						"1.25": {
+							"post": [0, 0, -16],
+							"lerp_mode": "catmullrom"
+						},
+						"1.75": {
+							"post": [0, 0, -16.7],
+							"lerp_mode": "catmullrom"
+						},
+						"2.2083": {
+							"post": [0, 0, -16],
+							"lerp_mode": "catmullrom"
+						},
+						"2.4583": {
+							"post": ["-math.sin(q.anim_time*90*6)*2", 0, -13.4],
+							"lerp_mode": "catmullrom"
+						},
+						"2.75": {
+							"post": ["-math.sin(q.anim_time*90*6)*2", 0, -2.89],
+							"lerp_mode": "catmullrom"
+						},
+						"3.0": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						}
+					}
+				},
+				"body1": {
+					"rotation": {
+						"0.0": {
+							"post": [7.5, -4, -5],
+							"lerp_mode": "catmullrom"
+						},
+						"0.125": {
+							"post": [11.9213, -50.9243, -13.7818],
+							"lerp_mode": "catmullrom"
+						},
+						"0.3333": {
+							"post": [11.6966, -74.0498, -19.4432],
+							"lerp_mode": "catmullrom"
+						},
+						"0.5": {
+							"post": [12.1827, -67.8747, -22.7017],
+							"lerp_mode": "catmullrom"
+						},
+						"0.625": {
+							"post": [-1.1013, -13.7699, 2.8238],
+							"lerp_mode": "catmullrom"
+						},
+						"1.1667": {
+							"post": [3.28242, 7.51775, 0.56308],
+							"lerp_mode": "catmullrom"
+						},
+						"1.25": {
+							"post": [50.709, 2.0361, -22.8812],
+							"lerp_mode": "catmullrom"
+						},
+						"1.5417": {
+							"post": [50.709, 2.0361, -22.8812],
+							"lerp_mode": "catmullrom"
+						},
+						"1.9167": {
+							"post": [16.737, 14.4812, -21.7787],
+							"lerp_mode": "catmullrom"
+						},
+						"2.0833": {
+							"post": [15, 0, -0.2392],
+							"lerp_mode": "catmullrom"
+						},
+						"2.2083": {
+							"post": [-0.38018, -0.04695, -0.49598],
+							"lerp_mode": "catmullrom"
+						},
+						"3.0": {
+							"post": [7.5, -4, -5],
+							"lerp_mode": "catmullrom"
+						}
+					},
+					"position": {
+						"0.0": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.625": [0, 0, 0],
+						"0.7083": [0, -1, 0],
+						"1.1667": [0, -2.1, 0.2],
+						"1.25": {
+							"pre": [-1.18301, -0.69289, -1.48301],
+							"post": [-1.18301, -0.69289, -1.48301],
+							"lerp_mode": "catmullrom"
+						},
+						"1.2917": [-0.9559, -1.11355, -0.74652],
+						"1.3333": [-1.33194, -0.27231, -1.99076],
+						"1.375": [-1.21126, -0.41201, -1.64918],
+						"1.5833": {
+							"pre": [-0.92, -0.13, -1.18],
+							"post": [-0.92, -0.13, -1.18],
+							"lerp_mode": "catmullrom"
+						},
+						"2.0833": {
+							"post": [0, 0.6, 0.2],
+							"lerp_mode": "catmullrom"
+						},
+						"2.1667": [0, -0.28, 0.21],
+						"2.2083": [0, -2.1, 0.2],
+						"2.5833": [0, -2.1, 0.2],
+						"2.7917": {
+							"pre": [0, 0, 0],
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"3.0": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						}
+					},
+					"scale": {
+						"0.5833": [1, 1, 1],
+						"0.625": [0.8, 0.75, 0.8],
+						"0.6667": [1, 0.1, 1],
+						"1.1667": [1, 0.1, 1],
+						"1.25": [0.9, 1.2, 0.9],
+						"1.3333": [1, 1, 1],
+						"2.0417": [1, 1, 1],
+						"2.1667": [0.9, 1.2, 0.9],
+						"2.2083": [1, 0.1, 1],
+						"2.5833": [1, 0.1, 1],
+						"2.7083": [1, 1, 1],
+						"3.0": [1, 1, 1]
+					}
+				},
+				"body1_2": {
+					"rotation": {
+						"0.0": {
+							"post": [-1.73205, 0, -2.59808],
+							"lerp_mode": "catmullrom"
+						},
+						"0.0833": {
+							"post": [8.2679, 0, -2.5981],
+							"lerp_mode": "catmullrom"
+						},
+						"0.25": {
+							"post": [-6.7321, 0, -2.5981],
+							"lerp_mode": "catmullrom"
+						},
+						"0.625": {
+							"post": [10.7679, 0, -2.5981],
+							"lerp_mode": "catmullrom"
+						},
+						"0.6667": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"2.6667": {
+							"post": [2.4019, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"2.875": {
+							"post": [-2.59808, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"3.0": {
+							"post": [-1.73205, 0, -2.59808],
+							"lerp_mode": "catmullrom"
+						}
+					},
+					"position": {
+						"0.0": [0, 0, 0],
+						"0.625": [0, 0, 0],
+						"0.6667": [0, -5, 0],
+						"1.1667": [0, -5, 0],
+						"1.25": [0, -2, 0],
+						"2.6667": [0, -4, 0],
+						"2.875": [0, 0, 0],
+						"3.0": [0, 0, 0]
+					}
+				},
+				"body2": {
+					"rotation": {
+						"0.0": {
+							"post": [3.9762, 6.495, 10.7976],
+							"lerp_mode": "catmullrom"
+						},
+						"0.125": {
+							"post": [10.3891, 24.9296, 12.6481],
+							"lerp_mode": "catmullrom"
+						},
+						"0.2083": {
+							"post": [1.3318, 51.3394, 15.2992],
+							"lerp_mode": "catmullrom"
+						},
+						"0.4167": {
+							"post": [-3.8835, 53.834, 15.0282],
+							"lerp_mode": "catmullrom"
+						},
+						"0.5": {
+							"post": [7.6917, 14.8915, -0.6214],
+							"lerp_mode": "catmullrom"
+						},
+						"0.5417": {
+							"post": [0, 17.5, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"1.1667": {
+							"post": [3.28242, -7.51775, -0.56308],
+							"lerp_mode": "catmullrom"
+						},
+						"1.25": {
+							"post": [42.509, -8.8475, 30.2404],
+							"lerp_mode": "catmullrom"
+						},
+						"1.6667": {
+							"post": [42.509, -8.8475, 30.2404],
+							"lerp_mode": "catmullrom"
+						},
+						"1.875": {
+							"post": [10.6615, -8.0683, 18.5147],
+							"lerp_mode": "catmullrom"
+						},
+						"2.125": {
+							"post": [0, 0, -0.2392],
+							"lerp_mode": "catmullrom"
+						},
+						"2.25": {
+							"post": [-0.38018, -0.04695, -0.49598],
+							"lerp_mode": "catmullrom"
+						},
+						"3.0": {
+							"post": [3.9762, 6.495, 10.7976],
+							"lerp_mode": "catmullrom"
+						}
+					},
+					"position": {
+						"0.0": {
+							"post": [0.7766, 0.14679, -0.3],
+							"lerp_mode": "catmullrom"
+						},
+						"0.125": {
+							"post": [0.78, -0.45, -0.3],
+							"lerp_mode": "catmullrom"
+						},
+						"0.3333": {
+							"post": [0.7766, 0.14679, -0.3],
+							"lerp_mode": "catmullrom"
+						},
+						"0.5": {
+							"post": [0.7766, 0.14679, -0.3],
+							"lerp_mode": "catmullrom"
+						},
+						"0.5417": {
+							"post": [0.78, -1.55, -0.3],
+							"lerp_mode": "catmullrom"
+						},
+						"1.1667": [0, -2.1, 0.2],
+						"1.25": {
+							"pre": [1.18301, -0.69289, -1.48301],
+							"post": [1.18301, -0.69289, -1.48301],
+							"lerp_mode": "catmullrom"
+						},
+						"1.2917": [0.9559, -1.11355, -0.74652],
+						"1.3333": [1.33194, -0.27231, -1.99076],
+						"1.375": [1.21126, -0.41201, -1.64918],
+						"1.6667": {
+							"pre": [0.88, -0.12, -1.05],
+							"post": [0.88, -0.12, -1.05],
+							"lerp_mode": "catmullrom"
+						},
+						"1.7917": {
+							"post": [1.27, 0.19, -0.61],
+							"lerp_mode": "catmullrom"
+						},
+						"2.125": {
+							"post": [0, 0.6, 0.2],
+							"lerp_mode": "catmullrom"
+						},
+						"2.2083": [0, -0.28, 0.21],
+						"2.25": [0, -2.1, 0.2],
+						"2.6667": [0, -2.1, 0.2],
+						"2.8333": {
+							"pre": [0, 0, 0],
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"3.0": {
+							"post": [0.7766, 0.14679, -0.3],
+							"lerp_mode": "catmullrom"
+						}
+					},
+					"scale": {
+						"0.5": [1, 1, 1],
+						"0.5417": [0.9, 1, 0.9],
+						"0.5833": [1, 0.1, 1],
+						"1.1667": [1, 0.1, 1],
+						"1.25": [0.9, 1.2, 0.9],
+						"1.3333": [1, 1, 1],
+						"2.0833": [1, 1, 1],
+						"2.2083": [0.9, 1.2, 0.9],
+						"2.25": [1, 0.1, 1],
+						"2.6667": [1, 0.1, 1],
+						"2.7917": [1, 1, 1],
+						"3.0": [1, 1, 1]
+					}
+				},
+				"body3": {
+					"rotation": {
+						"0.0": {
+							"post": [2.0871, -1.0039, 7.5008],
+							"lerp_mode": "catmullrom"
+						},
+						"0.2917": {
+							"post": [-0.4129, -1.0039, 7.5008],
+							"lerp_mode": "catmullrom"
+						},
+						"0.4583": {
+							"post": [4.454, -1.0178, 6.3469],
+							"lerp_mode": "catmullrom"
+						},
+						"0.6667": {
+							"post": [-7.8238, -1.0361, "2.5001+math.sin(q.anim_time*90*6-60)*3"],
+							"lerp_mode": "catmullrom"
+						},
+						"0.9167": {
+							"post": [-26.56, -1.04, "2.26+math.sin(q.anim_time*90*6-60)*5"],
+							"lerp_mode": "catmullrom"
+						},
+						"1.1667": {
+							"post": [-35.3238, -1.0361, 2.5001],
+							"lerp_mode": "catmullrom"
+						},
+						"1.2083": {
+							"post": [32.1762, -1.0361, 2.5001],
+							"lerp_mode": "catmullrom"
+						},
+						"1.25": {
+							"post": [65.145, -1.0361, 2.5001],
+							"lerp_mode": "catmullrom"
+						},
+						"1.2917": {
+							"post": [59.6762, -1.0361, 2.5001],
+							"lerp_mode": "catmullrom"
+						},
+						"1.6667": {
+							"post": [59.6762, -1.0361, 2.5001],
+							"lerp_mode": "catmullrom"
+						},
+						"2.125": {
+							"post": [15.1947, -1.0361, 2.5001],
+							"lerp_mode": "catmullrom"
+						},
+						"2.2083": {
+							"post": [2.6947, -1.0361, 2.5001],
+							"lerp_mode": "catmullrom"
+						},
+						"3.0": {
+							"post": [2.0871, -1.0039, 7.5008],
+							"lerp_mode": "catmullrom"
+						}
+					},
+					"position": {
+						"0.0": {
+							"post": [0, -0.3, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"1.1667": [0, -0.23, 1],
+						"1.2083": [0, -0.23, -3.04],
+						"1.25": [0, 0.47, -2.96],
+						"1.2917": [0, -0.6, -2.87],
+						"1.3333": [0, 0.05, -2.79],
+						"1.375": [0, -0.3, -2.7],
+						"1.4167": [0, 0, -2.62],
+						"1.5833": [0, -0.25, -2.28],
+						"2.2083": [0, -0.3, 0],
+						"2.25": [0, -1.3, 0],
+						"2.75": [0, -2.1, 0.2],
+						"2.875": {
+							"pre": [0, 0, 0],
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"3.0": {
+							"post": [0, -0.3, 0],
+							"lerp_mode": "catmullrom"
+						}
+					},
+					"scale": {
+						"0.0": [1, 1, 1],
+						"1.125": [1, 1, 1],
+						"1.2083": [0.8, 1, 1.35],
+						"1.25": {"pre": [0.8, 1, 1.35], "post": [1.2, 1, 0.9]},
+						"1.3333": [1, 1, 1],
+						"2.2083": [1, 1, 1],
+						"2.2917": [1, 0.1, 1],
+						"2.75": [1, 0.1, 1],
+						"2.8333": [1, 1, 1],
+						"3.0": [1, 1, 1]
+					}
+				},
+				"body3_2": {
+					"rotation": {
+						"0.0": {
+							"post": [1.28558, 0, 1.92836],
+							"lerp_mode": "catmullrom"
+						},
+						"0.2083": {
+							"post": ["23.7856-math.sin(q.anim_time*90*16)*7.5", 0, 1.9284],
+							"lerp_mode": "catmullrom"
+						},
+						"0.4583": {
+							"post": [31.2856, 0, 1.9284],
+							"lerp_mode": "catmullrom"
+						},
+						"0.6667": {
+							"post": [23.35, 0, 1.93],
+							"lerp_mode": "catmullrom"
+						},
+						"0.875": {
+							"post": [8.7856, 0, "1.9284+math.sin(q.anim_time*90*6-120)*15"],
+							"lerp_mode": "catmullrom"
+						},
+						"1.125": {
+							"post": [-43.1823, 0, 1.9284],
+							"lerp_mode": "catmullrom"
+						},
+						"1.2083": {
+							"post": [-57.1266, 0, 1.9284],
+							"lerp_mode": "catmullrom"
+						},
+						"1.25": {
+							"post": [21.2856, 0, 1.9284],
+							"lerp_mode": "catmullrom"
+						},
+						"1.375": {
+							"post": [27.6157, 0, 1.9284],
+							"lerp_mode": "catmullrom"
+						},
+						"1.5833": {
+							"post": [26.5571, 0, 1.994],
+							"lerp_mode": "catmullrom"
+						},
+						"1.8333": {
+							"post": [44.7157, 0, 2.0597],
+							"lerp_mode": "catmullrom"
+						},
+						"2.125": {
+							"post": [13.7856, 0, 1.9284],
+							"lerp_mode": "catmullrom"
+						},
+						"2.25": {
+							"post": [-15.4247, 0, 0.3886],
+							"lerp_mode": "catmullrom"
+						},
+						"2.2917": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"2.75": {
+							"post": [2.4019, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"2.9167": {
+							"post": [-2.59808, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"3.0": {
+							"post": [1.28558, 0, 1.92836],
+							"lerp_mode": "catmullrom"
+						}
+					},
+					"position": {
+						"0.0": [0, 0, 0],
+						"0.7083": [0, 0, 0],
+						"0.9583": [0, 0, 0],
+						"1.125": [-0.05508, -1.63581, -0.30179],
+						"1.2083": [-0.05508, -1.63581, -0.30179],
+						"1.25": [0, 0, 0],
+						"2.25": [0, 0, 0],
+						"2.3333": [0, -8, 0],
+						"2.75": [0, -4, 0],
+						"2.9167": [0, 0, 0],
+						"3.0": [0, 0, 0]
+					}
+				},
+				"eye_left2": {
+					"position": {
+						"0.0": [0, 0, 0],
+						"0.2083": {"pre": [0, 0, 0], "post": [-0.5, 0, 0]},
+						"0.4583": {"pre": [-0.5, 0, 0], "post": [0, 0, 0]}
+					}
+				},
+				"eyelid_left2": {
+					"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.4583": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
+						"1.25": {"pre": [0, 0, -0.1], "post": [0, 0, 0]},
+						"1.625": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
+						"1.9583": {"pre": [0, 0, -0.1], "post": [0, 0, 0]},
+						"3.0": [0, 0, 0]
+					}
+				},
+				"eyelid_recoil_left2": {
+					"position": {
+						"0.0": [0, 0, 0],
+						"1.25": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
+						"1.625": {"pre": [0, 0, -0.1], "post": [0, 0, 0]},
+						"3.0": [0, 0, 0]
+					}
+				},
+				"eye_right2": {
+					"position": {
+						"0.0": [0, 0, 0],
+						"0.2083": {"pre": [0, 0, 0], "post": [-0.5, 0, 0]},
+						"0.4583": {"pre": [-0.5, 0, 0], "post": [0, 0, 0]}
+					}
+				},
+				"pupil_right2": {
+					"position": [0, 0, 0]
+				},
+				"eyelid_right2": {
+					"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.4583": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
+						"1.25": {"pre": [0, 0, -0.1], "post": [0, 0, 0]},
+						"1.625": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
+						"1.9583": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}
+					}
+				},
+				"eyelid_happy_right2": {
+					"position": [1, 0, 0]
+				},
+				"eyelid_recoil_right2": {
+					"position": {
+						"0.0": [0, 0, 0],
+						"1.25": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
+						"1.625": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}
+					}
+				},
+				"eye_left1": {
+					"position": {
+						"0.0": [0, 0, 0],
+						"0.1667": {"pre": [0, 0, 0], "post": [0.5, 0, 0]},
+						"0.5833": {"pre": [0.5, 0, 0], "post": [0, 0, 0]}
+					}
+				},
+				"eye_angry_left1": {
+					"position": {
+						"0.0": [0, 0, 0],
+						"1.875": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
+						"2.1667": {"pre": [0, 0, -0.1], "post": [0, 0, 0]},
+						"3.0": [0, 0, 0]
+					}
+				},
+				"eyelid_left1": {
+					"position": {
+						"0.0": [0, 0, -0.1],
+						"0.1667": {"pre": [0, 0, -0.1], "post": [0, 0, 0]},
+						"0.5833": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
+						"1.25": {"pre": [0, 0, -0.1], "post": [0, 0, 0]},
+						"1.5": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
+						"1.875": {"pre": [0, 0, -0.1], "post": [0, 0, 0]},
+						"2.1667": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
+						"2.7917": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}
+					}
+				},
+				"eyelid_happy_left1": {
+					"position": [-1, 0, 0]
+				},
+				"eyelid_recoil_left1": {
+					"position": {
+						"0.0": [0, 0, 0],
+						"1.25": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
+						"1.5": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}
+					}
+				},
+				"eye_right1": {
+					"position": {
+						"0.0": [0, 0, 0],
+						"0.1667": {"pre": [0, 0, 0], "post": [0.5, 0, 0]},
+						"0.5833": {"pre": [0.5, 0, 0], "post": [0, 0, 0]}
+					}
+				},
+				"eye_angry_right1": {
+					"position": {
+						"0.0": [0, 0, 0],
+						"0.1667": {"pre": [0, 0, 0], "post": [0, -0.5, -0.1]},
+						"1.875": {"pre": [0, -0.5, -0.1], "post": [0, 0, -0.1]},
+						"2.1667": {"pre": [0, 0, -0.1], "post": [0, 0, 0]},
+						"3.0": [0, 0, 0]
+					}
+				},
+				"eyelid_right1": {
+					"position": {
+						"0.0": [0, 0, -0.1],
+						"0.1667": {"pre": [0, 0, -0.1], "post": [0, 0, 0]},
+						"0.5833": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
+						"1.25": {"pre": [0, 0, -0.1], "post": [0, 0, 0]},
+						"1.5": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
+						"1.875": {"pre": [0, 0, -0.1], "post": [0, 0, 0]},
+						"2.1667": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
+						"2.7917": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}
+					}
+				},
+				"eyelid_recoil_right1": {
+					"position": {
+						"0.0": [0, 0, 0],
+						"1.25": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
+						"1.5": {"pre": [0, 0, -0.1], "post": [0, 0, 0]},
+						"3.0": [0, 0, 0]
+					}
+				},
+				"eyelid_left3": {
+					"position": {
+						"0.0": [0, 0, 0],
+						"0.2083": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
+						"0.5833": {"pre": [0, 0, -0.1], "post": [0, 0, 0]},
+						"0.7083": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
+						"1.0": {"pre": [0, 0, -0.1], "post": [0, 0, 0]},
+						"1.3333": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
+						"2.0833": {"pre": [0, 0, -0.1], "post": [0, 0, 0.1]},
+						"2.25": {"pre": [0, 0, 0.1], "post": [0, 0, -0.1]},
+						"2.875": {"pre": [0, 0, -0.1], "post": [0, 0, 0.1]}
+					}
+				},
+				"eyelid_recoil_left3": {
+					"position": {
+						"0.0": [0, 0, 0],
+						"1.0": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
+						"1.3333": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}
+					}
+				},
+				"eyelid_right3": {
+					"position": {
+						"0.0": [0, 0, 0],
+						"0.2083": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
+						"0.5833": {"pre": [0, 0, -0.1], "post": [0, 0, 0]},
+						"0.7083": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
+						"1.0": {"pre": [0, 0, -0.1], "post": [0, 0, 0]},
+						"1.3333": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
+						"2.0833": {"pre": [0, 0, -0.1], "post": [0, 0, 0.1]},
+						"2.25": {"pre": [0, 0, 0.1], "post": [0, 0, -0.1]},
+						"2.875": {"pre": [0, 0, -0.1], "post": [0, 0, 0.1]}
+					}
+				},
+				"eyelid_recoil_right3": {
+					"position": {
+						"0.0": [0, 0, 0],
+						"1.0": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
+						"1.3333": {"pre": [0, 0, -0.1], "post": [0, 0, 0]},
+						"3.0": [0, 0, 0]
+					}
+				}
+			}
+		},
 		"animation.dugtrio_alolan.faint": {
 			"loop": "hold_on_last_frame",
 			"animation_length": 3,
@@ -327,29 +1033,59 @@
 				"eyelid_left1": {
 					"position": {
 						"0.2917": [0, 0, 0],
-						"0.3333": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
+						"0.3333": {
+							"pre": [0, 0, 0],
+							"post": [0, 0, -0.1]
+						},
 						"0.4583": [0, 0, -0.1],
-						"0.5": {"pre": [0, 0, -0.1], "post": [0, 0, 0]},
+						"0.5": {
+							"pre": [0, 0, -0.1],
+							"post": [0, 0, 0]
+						},
 						"1.25": [0, 0, 0],
-						"1.2917": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
+						"1.2917": {
+							"pre": [0, 0, 0],
+							"post": [0, 0, -0.1]
+						},
 						"1.4167": [0, 0, -0.1],
-						"1.4583": {"pre": [0, 0, -0.1], "post": [0, 0, 0]},
+						"1.4583": {
+							"pre": [0, 0, -0.1],
+							"post": [0, 0, 0]
+						},
 						"1.75": [0, 0, 0],
-						"1.7917": {"pre": [0, 0, 0], "post": [0, 0, -0.1]}
+						"1.7917": {
+							"pre": [0, 0, 0],
+							"post": [0, 0, -0.1]
+						}
 					}
 				},
 				"eyelid_right1": {
 					"position": {
 						"0.2917": [0, 0, 0],
-						"0.3333": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
+						"0.3333": {
+							"pre": [0, 0, 0],
+							"post": [0, 0, -0.1]
+						},
 						"0.4583": [0, 0, -0.1],
-						"0.5": {"pre": [0, 0, -0.1], "post": [0, 0, 0]},
+						"0.5": {
+							"pre": [0, 0, -0.1],
+							"post": [0, 0, 0]
+						},
 						"1.25": [0, 0, 0],
-						"1.2917": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
+						"1.2917": {
+							"pre": [0, 0, 0],
+							"post": [0, 0, -0.1]
+						},
 						"1.4167": [0, 0, -0.1],
-						"1.4583": {"pre": [0, 0, -0.1], "post": [0, 0, 0]},
+						"1.4583": {
+							"pre": [0, 0, -0.1],
+							"post": [0, 0, 0]
+						},
 						"1.75": [0, 0, 0],
-						"1.7917": {"pre": [0, 0, 0], "post": [0, 0, -0.1]}
+						"1.7917": {
+							"pre": [0, 0, 0],
+							"post": [0, 0, -0.1]
+						}
 					}
 				},
 				"ground2": {
@@ -371,29 +1107,59 @@
 				"eyelid_left2": {
 					"position": {
 						"0.125": [0, 0, 0],
-						"0.1667": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
+						"0.1667": {
+							"pre": [0, 0, 0],
+							"post": [0, 0, -0.1]
+						},
 						"0.2917": [0, 0, -0.1],
-						"0.3333": {"pre": [0, 0, -0.1], "post": [0, 0, 0]},
+						"0.3333": {
+							"pre": [0, 0, -0.1],
+							"post": [0, 0, 0]
+						},
 						"0.7083": [0, 0, 0],
-						"0.75": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
+						"0.75": {
+							"pre": [0, 0, 0],
+							"post": [0, 0, -0.1]
+						},
 						"0.875": [0, 0, -0.1],
-						"0.9167": {"pre": [0, 0, -0.1], "post": [0, 0, 0]},
+						"0.9167": {
+							"pre": [0, 0, -0.1],
+							"post": [0, 0, 0]
+						},
 						"1.0417": [0, 0, 0],
-						"1.0833": {"pre": [0, 0, 0], "post": [0, 0, -0.1]}
+						"1.0833": {
+							"pre": [0, 0, 0],
+							"post": [0, 0, -0.1]
+						}
 					}
 				},
 				"eyelid_right2": {
 					"position": {
 						"0.125": [0, 0, 0],
-						"0.1667": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
+						"0.1667": {
+							"pre": [0, 0, 0],
+							"post": [0, 0, -0.1]
+						},
 						"0.2917": [0, 0, -0.1],
-						"0.3333": {"pre": [0, 0, -0.1], "post": [0, 0, 0]},
+						"0.3333": {
+							"pre": [0, 0, -0.1],
+							"post": [0, 0, 0]
+						},
 						"0.7083": [0, 0, 0],
-						"0.75": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
+						"0.75": {
+							"pre": [0, 0, 0],
+							"post": [0, 0, -0.1]
+						},
 						"0.875": [0, 0, -0.1],
-						"0.9167": {"pre": [0, 0, -0.1], "post": [0, 0, 0]},
+						"0.9167": {
+							"pre": [0, 0, -0.1],
+							"post": [0, 0, 0]
+						},
 						"1.0417": [0, 0, 0],
-						"1.0833": {"pre": [0, 0, 0], "post": [0, 0, -0.1]}
+						"1.0833": {
+							"pre": [0, 0, 0],
+							"post": [0, 0, -0.1]
+						}
 					}
 				},
 				"ground3": {
@@ -415,29 +1181,59 @@
 				"eyelid_left3": {
 					"position": {
 						"0.0": [0, 0, 0],
-						"0.0417": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
+						"0.0417": {
+							"pre": [0, 0, 0],
+							"post": [0, 0, -0.1]
+						},
 						"0.1667": [0, 0, -0.1],
-						"0.2083": {"pre": [0, 0, -0.1], "post": [0, 0, 0]},
+						"0.2083": {
+							"pre": [0, 0, -0.1],
+							"post": [0, 0, 0]
+						},
 						"1.25": [0, 0, 0],
-						"1.2917": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
+						"1.2917": {
+							"pre": [0, 0, 0],
+							"post": [0, 0, -0.1]
+						},
 						"1.4167": [0, 0, -0.1],
-						"1.4583": {"pre": [0, 0, -0.1], "post": [0, 0, 0]},
+						"1.4583": {
+							"pre": [0, 0, -0.1],
+							"post": [0, 0, 0]
+						},
 						"2.375": [0, 0, 0],
-						"2.4167": {"pre": [0, 0, 0], "post": [0, 0, -0.1]}
+						"2.4167": {
+							"pre": [0, 0, 0],
+							"post": [0, 0, -0.1]
+						}
 					}
 				},
 				"eyelid_right3": {
 					"position": {
 						"0.0": [0, 0, 0],
-						"0.0417": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
+						"0.0417": {
+							"pre": [0, 0, 0],
+							"post": [0, 0, -0.1]
+						},
 						"0.1667": [0, 0, -0.1],
-						"0.2083": {"pre": [0, 0, -0.1], "post": [0, 0, 0]},
+						"0.2083": {
+							"pre": [0, 0, -0.1],
+							"post": [0, 0, 0]
+						},
 						"1.25": [0, 0, 0],
-						"1.2917": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
+						"1.2917": {
+							"pre": [0, 0, 0],
+							"post": [0, 0, -0.1]
+						},
 						"1.4167": [0, 0, -0.1],
-						"1.4583": {"pre": [0, 0, -0.1], "post": [0, 0, 0]},
+						"1.4583": {
+							"pre": [0, 0, -0.1],
+							"post": [0, 0, 0]
+						},
 						"2.375": [0, 0, 0],
-						"2.4167": {"pre": [0, 0, 0], "post": [0, 0, -0.1]}
+						"2.4167": {
+							"pre": [0, 0, 0],
+							"post": [0, 0, -0.1]
+						}
 					}
 				}
 			}
@@ -463,14 +1259,20 @@
 					"position": {
 						"0.0": [0, 0, -0.1],
 						"0.125": [0, 0, -0.1],
-						"0.1667": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}
+						"0.1667": {
+							"pre": [0, 0, -0.1],
+							"post": [0, 0, 0]
+						}
 					}
 				},
 				"eyelid_left1": {
 					"position": {
 						"0.0": [0, 0, -0.1],
 						"0.125": [0, 0, -0.1],
-						"0.1667": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}
+						"0.1667": {
+							"pre": [0, 0, -0.1],
+							"post": [0, 0, 0]
+						}
 					}
 				}
 			}
@@ -496,14 +1298,20 @@
 					"position": {
 						"0.0": [0, 0, -0.1],
 						"0.125": [0, 0, -0.1],
-						"0.1667": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}
+						"0.1667": {
+							"pre": [0, 0, -0.1],
+							"post": [0, 0, 0]
+						}
 					}
 				},
 				"eyelid_left2": {
 					"position": {
 						"0.0": [0, 0, -0.1],
 						"0.125": [0, 0, -0.1],
-						"0.1667": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}
+						"0.1667": {
+							"pre": [0, 0, -0.1],
+							"post": [0, 0, 0]
+						}
 					}
 				}
 			}
@@ -529,14 +1337,20 @@
 					"position": {
 						"0.0": [0, 0, -0.1],
 						"0.125": [0, 0, -0.1],
-						"0.1667": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}
+						"0.1667": {
+							"pre": [0, 0, -0.1],
+							"post": [0, 0, 0]
+						}
 					}
 				},
 				"eyelid_left3": {
 					"position": {
 						"0.0": [0, 0, -0.1],
 						"0.125": [0, 0, -0.1],
-						"0.1667": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}
+						"0.1667": {
+							"pre": [0, 0, -0.1],
+							"post": [0, 0, 0]
+						}
 					}
 				}
 			}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0062_poliwrath/poliwrath.animation.json

@@ -96,6 +96,458 @@
 				}
 			}
 		},
+		"animation.poliwrath.ground_walk": {
+			"loop": true,
+			"animation_length": 1.3333,
+			"bones": {
+				"waist": {
+					"rotation": ["9 - math.sin( q.anim_time * 90 * 6 - 45)*-4", "-math.sin( q.anim_time * 90 * 3)*8", "math.sin( q.anim_time * 90 * 3)*4"],
+					"position": [0, "-0.3+math.sin( q.anim_time * 90 * 6)*1.5", 0]
+				},
+				"torso": {
+					"rotation": ["8 - math.sin( q.anim_time * 90 * 6 - 45)*8", "-math.sin( q.anim_time * 90 * 3 - 25)*-8", "math.sin( q.anim_time * 90 * 3 - 25)*-8"],
+					"position": [0, "math.sin( q.anim_time * 90 * 6 + 45)*0.3", 0]
+				},
+				"head": {
+					"rotation": ["-math.sin( q.anim_time * 90 * 6 - 45)*-4", "-math.sin( q.anim_time * 90 * 3 - 25)*-1", 0]
+				},
+				"arm_left1": {
+					"rotation": {
+						"0.0": {
+							"post": [-13.63, -16.48493, 36.18],
+							"lerp_mode": "catmullrom"
+						},
+						"0.25": {
+							"post": [-41, 8.77773, 38.5],
+							"lerp_mode": "catmullrom"
+						},
+						"0.625": {
+							"post": [-8.15, -36.46773, 42.45],
+							"lerp_mode": "catmullrom"
+						},
+						"1.0833": {
+							"post": [24.5, -46.5535, 23.9],
+							"lerp_mode": "catmullrom"
+						},
+						"1.3333": {
+							"post": [-13.63, -16.48493, 36.18],
+							"lerp_mode": "catmullrom"
+						}
+					}
+				},
+				"arm_left2": {
+					"rotation": {
+						"0.0": {
+							"post": [0, 61.31326, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.2917": {
+							"post": [0, 70.51, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.5833": {
+							"post": [0, 45.6917, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.875": {
+							"post": [0, 32.9252, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"1.125": {
+							"post": [0, 33.79, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"1.3333": {
+							"post": [0, 61.31326, 0],
+							"lerp_mode": "catmullrom"
+						}
+					}
+				},
+				"hand_left": {
+					"rotation": {
+						"0.0": {
+							"post": [-6.39933, 10.3524, 6.73624],
+							"lerp_mode": "catmullrom"
+						},
+						"0.375": {
+							"post": [-6.4, 10.35, 6.74],
+							"lerp_mode": "catmullrom"
+						},
+						"1.3333": {
+							"post": [-6.39933, 10.3524, 6.73624],
+							"lerp_mode": "catmullrom"
+						}
+					}
+				},
+				"finger_front_left1": {
+					"rotation": {
+						"0.0": {
+							"post": [0, 0, 67.5],
+							"lerp_mode": "catmullrom"
+						}
+					}
+				},
+				"finger_front_left2": {
+					"rotation": {
+						"0.0": {
+							"post": [0, 0, 67.5],
+							"lerp_mode": "catmullrom"
+						}
+					}
+				},
+				"finger_back_left1": {
+					"rotation": [0, 0, 70]
+				},
+				"finger_back_left2": {
+					"rotation": [0, 0, 72.5]
+				},
+				"thumb_left1": {
+					"rotation": [35.65498, -41.23664, 27.4926]
+				},
+				"arm_right1": {
+					"rotation": {
+						"0.0": {
+							"post": [-8.15, 36.46773, -42.45],
+							"lerp_mode": "catmullrom"
+						},
+						"0.4167": {
+							"post": [24.5, 46.5535, -23.9],
+							"lerp_mode": "catmullrom"
+						},
+						"0.6667": {
+							"post": [-13.63, 16.48493, -36.18],
+							"lerp_mode": "catmullrom"
+						},
+						"0.9167": {
+							"post": [-41, -8.77773, -38.5],
+							"lerp_mode": "catmullrom"
+						},
+						"1.3333": {
+							"post": [-8.15, 36.46773, -42.45],
+							"lerp_mode": "catmullrom"
+						}
+					}
+				},
+				"arm_right2": {
+					"rotation": {
+						"0.0": {
+							"post": [0, -45.6917, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.2083": {
+							"post": [0, -32.9252, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.4583": {
+							"post": [0, -33.79, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.6667": {
+							"post": [0, -61.31326, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.9583": {
+							"post": [0, -70.51, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"1.3333": {
+							"post": [0, -45.6917, 0],
+							"lerp_mode": "catmullrom"
+						}
+					}
+				},
+				"hand_right": {
+					"rotation": {
+						"0.0": {
+							"post": [-6.4, -10.35, -6.74],
+							"lerp_mode": "catmullrom"
+						},
+						"0.6667": {
+							"post": [-6.39933, -10.3524, -6.73624],
+							"lerp_mode": "catmullrom"
+						},
+						"1.0417": {
+							"post": [-6.4, -10.35, -6.74],
+							"lerp_mode": "catmullrom"
+						},
+						"1.3333": {
+							"post": [-6.4, -10.35, -6.74],
+							"lerp_mode": "catmullrom"
+						}
+					}
+				},
+				"finger_front_right1": {
+					"rotation": {
+						"0.0": {
+							"post": [0, 0, -67.5],
+							"lerp_mode": "catmullrom"
+						},
+						"0.6667": {
+							"post": [0, 0, -67.5],
+							"lerp_mode": "catmullrom"
+						},
+						"1.3333": {
+							"post": [0, 0, -67.5],
+							"lerp_mode": "catmullrom"
+						}
+					}
+				},
+				"finger_front_right2": {
+					"rotation": {
+						"0.0": {
+							"post": [0, 0, -67.5],
+							"lerp_mode": "catmullrom"
+						},
+						"0.6667": {
+							"post": [0, 0, -67.5],
+							"lerp_mode": "catmullrom"
+						},
+						"1.3333": {
+							"post": [0, 0, -67.5],
+							"lerp_mode": "catmullrom"
+						}
+					}
+				},
+				"finger_back_right1": {
+					"rotation": {
+						"0.0": [0, 0, -70],
+						"0.6667": [0, 0, -70],
+						"1.3333": [0, 0, -70]
+					}
+				},
+				"finger_back_right2": {
+					"rotation": {
+						"0.0": [0, 0, -72.5],
+						"0.6667": [0, 0, -72.5],
+						"1.3333": [0, 0, -72.5]
+					}
+				},
+				"leg_left": {
+					"rotation": {
+						"0.0": [-3.5, 0, 0],
+						"0.25": [28, 0, 0],
+						"0.3333": [27, 0, 0],
+						"0.4583": [36, 0, 0],
+						"0.6667": {
+							"pre": [-1, 0, 0],
+							"post": [-1, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.8333": {
+							"post": [-57.5, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"1.0833": [-35, 0, 0],
+						"1.3333": [-3.5, 0, 0]
+					},
+					"position": {
+						"0.0": [0, -0.3, 0],
+						"0.25": [0, -1.1, 2.3],
+						"0.3333": [0, 0.25, 2.3],
+						"0.4583": [0, 0.2, 1.8],
+						"0.6667": {
+							"pre": [0, 0.9, -0.4],
+							"post": [0, 0.9, -0.4],
+							"lerp_mode": "catmullrom"
+						},
+						"0.8333": {
+							"post": [0, 0.8, -2.3],
+							"lerp_mode": "catmullrom"
+						},
+						"1.0": [0, -0.7, -2.3],
+						"1.0833": [0, -1.3, -2.3],
+						"1.3333": [0, -0.3, 0]
+					}
+				},
+				"leg_left2": {
+					"rotation": {
+						"0.0": [9, 0, 0],
+						"0.25": [5, 0, 0],
+						"0.3333": [14, 0, 0],
+						"0.4583": [33, 0, 0],
+						"0.5417": {
+							"pre": [57.7, 0, 0],
+							"post": [57.7, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.6667": {
+							"post": [53, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.8333": {
+							"post": [34.5, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"1.0": [17, 0, 0],
+						"1.0833": [13, 0, 0],
+						"1.3333": [9, 0, 0]
+					}
+				},
+				"foot_left": {
+					"rotation": {
+						"0.0": [-5, 0, 0],
+						"0.25": [-32, 0, 0],
+						"0.3333": [1.5, 0, 0],
+						"0.5": {
+							"pre": [29, 0, 0],
+							"post": [29, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.6667": {
+							"post": [-1, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"1.0": [-13, 0, 0],
+						"1.0833": [22, 0, 0],
+						"1.3333": [-5, 0, 0]
+					}
+				},
+				"toes_left": {
+					"rotation": {
+						"0.0": [0, 0, 0],
+						"0.25": [0, 0, 0],
+						"0.3333": [-41, 0, 0],
+						"0.5": {
+							"pre": [-19, 0, 0],
+							"post": [-19, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.6667": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.875": {
+							"post": [-23.89, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"1.0417": {
+							"post": [-20.18, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"1.0833": [0, 0, 0],
+						"1.3333": [0, 0, 0]
+					}
+				},
+				"leg_right": {
+					"rotation": {
+						"0.0": {
+							"post": [-1, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.1667": {
+							"post": [-57.5, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.4167": [-35, 0, 0],
+						"0.6667": [-3.5, 0, 0],
+						"0.9167": [28, 0, 0],
+						"1.0": [27, 0, 0],
+						"1.125": [36, 0, 0],
+						"1.3333": {
+							"pre": [-1, 0, 0],
+							"post": [-1, 0, 0],
+							"lerp_mode": "catmullrom"
+						}
+					},
+					"position": {
+						"0.0": {
+							"post": [0, 0.9, -0.4],
+							"lerp_mode": "catmullrom"
+						},
+						"0.1667": {
+							"post": [0, 0.8, -2.3],
+							"lerp_mode": "catmullrom"
+						},
+						"0.3333": [0, -0.7, -2.3],
+						"0.4167": [0, -1.3, -2.3],
+						"0.6667": [0, -0.3, 0],
+						"0.9167": [0, -1.1, 2.3],
+						"1.0": [0, 0.25, 2.3],
+						"1.125": [0, 0.2, 1.8],
+						"1.3333": {
+							"pre": [0, 0.9, -0.4],
+							"post": [0, 0.9, -0.4],
+							"lerp_mode": "catmullrom"
+						}
+					}
+				},
+				"leg_right2": {
+					"rotation": {
+						"0.0": {
+							"post": [53, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.1667": {
+							"post": [34.5, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.3333": [17, 0, 0],
+						"0.4167": [13, 0, 0],
+						"0.9167": [5, 0, 0],
+						"1.0": [-1, 0, 0],
+						"1.125": [33, 0, 0],
+						"1.2083": {
+							"pre": [57.7, 0, 0],
+							"post": [57.7, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"1.3333": {
+							"post": [53, 0, 0],
+							"lerp_mode": "catmullrom"
+						}
+					}
+				},
+				"foot_right": {
+					"rotation": {
+						"0.0": {
+							"post": [-1, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.3333": [-13, 0, 0],
+						"0.4167": [22, 0, 0],
+						"0.9167": [-32, 0, 0],
+						"1.0": [-6, 0, 0],
+						"1.1667": {
+							"pre": [29, 0, 0],
+							"post": [29, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"1.3333": {
+							"post": [-1, 0, 0],
+							"lerp_mode": "catmullrom"
+						}
+					}
+				},
+				"toes_right": {
+					"rotation": {
+						"0.0": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.2083": {
+							"post": [-23.89, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.375": {
+							"post": [-20.18, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.4167": [0, 0, 0],
+						"0.9167": [0, 0, 0],
+						"1.0": [-41, 0, 0],
+						"1.1667": {
+							"pre": [-19, 0, 0],
+							"post": [-19, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"1.3333": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						}
+					}
+				}
+			}
+		},
 		"animation.poliwrath.battle_idle": {
 			"loop": true,
 			"bones": {

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0120_staryu/staryu.animation.json

@@ -38,6 +38,496 @@
 				}
 			}
 		},
+		"animation.staryu.physical": {
+			"loop": true,
+			"animation_length": 3,
+			"bones": {
+				"body": {
+					"rotation": {
+						"0.0": {
+							"post": [0.2, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.25": {
+							"post": [12.8384, 24.0851, -4.3796],
+							"lerp_mode": "catmullrom"
+						},
+						"0.4167": {
+							"post": [17.8384, 24.0851, -4.3796],
+							"lerp_mode": "catmullrom"
+						},
+						"0.5417": [-90, 0, 0],
+						"0.7917": [-90, 0, 0],
+						"0.8333": [-90, 0, 0],
+						"0.875": {"pre": [-90, 0, 0], "post": [-90, 360, 0]},
+						"1.1667": [-90, 360, 0],
+						"1.25": {
+							"pre": [0, 277.5, 0],
+							"post": [0, 277.5, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"1.4167": {
+							"post": [6.39, 117.88, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"2.0": {
+							"post": [5.48, -33.58, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"2.2083": {
+							"post": [21.1183, -47.3658, -26.7217],
+							"lerp_mode": "catmullrom"
+						},
+						"2.5417": {
+							"post": [0, 15, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"3.0": {
+							"post": [0.2, 0, 0],
+							"lerp_mode": "catmullrom"
+						}
+					},
+					"position": {
+						"0.0": {
+							"post": [0, 0.18, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.2083": {
+							"post": [0, -0.82, -1],
+							"lerp_mode": "catmullrom"
+						},
+						"0.4167": {
+							"post": [0, -0.82, -1.4],
+							"lerp_mode": "catmullrom"
+						},
+						"0.5": {
+							"post": [6.02, 0.94, 0.77],
+							"lerp_mode": "catmullrom"
+						},
+						"0.5833": {
+							"post": [13.15, -0.88, 3.58],
+							"lerp_mode": "catmullrom"
+						},
+						"0.625": {
+							"post": [15, -3, 5.6],
+							"lerp_mode": "catmullrom"
+						},
+						"0.6667": {
+							"post": [14.57, -5.35, 6.54],
+							"lerp_mode": "catmullrom"
+						},
+						"0.75": {
+							"post": [13.35, -3.68, 8.94],
+							"lerp_mode": "catmullrom"
+						},
+						"0.8333": {
+							"post": [11.93, -5.63, 11.86],
+							"lerp_mode": "catmullrom"
+						},
+						"0.875": {
+							"post": [11.18, -5.08, 13.37],
+							"lerp_mode": "catmullrom"
+						},
+						"0.9583": {
+							"post": [7, -6, 14.6],
+							"lerp_mode": "catmullrom"
+						},
+						"1.0417": {
+							"post": [-6.26, -6.52, 13.55],
+							"lerp_mode": "catmullrom"
+						},
+						"1.125": {
+							"post": [-15, -6, 1.6],
+							"lerp_mode": "catmullrom"
+						},
+						"1.25": [1, 1.4, -20.4],
+						"1.2917": [0.43, 1.45, -20.36],
+						"1.3333": [-1.24, 1.49, -21.13],
+						"1.375": [-1.88, 1.68, -22.94],
+						"1.4167": [-1.54, 1.81, -24.12],
+						"1.5417": [-0.88, 1.67, -23.04],
+						"1.625": [-1.19, 1.92, -22.77],
+						"1.75": [-2.72, 1.42, -23.27],
+						"1.9167": [-3.9, 0.72, -26.2],
+						"2.0": [-3.13, -0.04, -27.22],
+						"2.125": {
+							"pre": [-2.63, -1.14, -29.12],
+							"post": [-2.63, -1.14, -29.12],
+							"lerp_mode": "catmullrom"
+						},
+						"2.2083": {
+							"post": [-2.2, 5.12, -21.92],
+							"lerp_mode": "catmullrom"
+						},
+						"2.3333": {
+							"post": [-1.31, 8.05, -13.11],
+							"lerp_mode": "catmullrom"
+						},
+						"2.4583": {
+							"post": [-0.45, 6.18, -4.51],
+							"lerp_mode": "catmullrom"
+						},
+						"2.5417": {
+							"post": [0, 0.18, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"2.7083": {
+							"post": [0.03, -1.22, 0.37],
+							"lerp_mode": "catmullrom"
+						},
+						"3.0": {
+							"post": [0, 0.18, 0],
+							"lerp_mode": "catmullrom"
+						}
+					}
+				},
+				"body_limb_left3": {
+					"rotation": {
+						"0.0": [0, 2.5, 0],
+						"3.0": [0, 2.5, 0]
+					}
+				},
+				"body_limb_bottom_left3": {
+					"rotation": {
+						"0.0": [-5, 0, 0],
+						"3.0": [-5, 0, 0]
+					}
+				},
+				"body_limb_top3": {
+					"rotation": {
+						"0.0": [2.5, 0, 0],
+						"3.0": [2.5, 0, 0]
+					}
+				},
+				"body_limb_left": {
+					"rotation": {
+						"0.0": {
+							"post": [0, 0, 7.5],
+							"lerp_mode": "catmullrom"
+						},
+						"1.2083": {
+							"post": [0, 0, 7.5],
+							"lerp_mode": "catmullrom"
+						},
+						"1.375": {
+							"post": [-10, -20, 20],
+							"lerp_mode": "catmullrom"
+						},
+						"1.875": {
+							"post": [0, 0, 7.5],
+							"lerp_mode": "catmullrom"
+						},
+						"2.0": {
+							"post": [5.1686, 19.3385, 5.9149],
+							"lerp_mode": "catmullrom"
+						},
+						"2.125": {
+							"post": [4.7679, 3.7657, 12.0388],
+							"lerp_mode": "catmullrom"
+						},
+						"2.1667": {
+							"post": [0, 5, 15],
+							"lerp_mode": "catmullrom"
+						},
+						"3.0": {
+							"post": [0, 0, 7.5],
+							"lerp_mode": "catmullrom"
+						}
+					},
+					"scale": {
+						"2.125": [1, 1, 1],
+						"2.1667": [1.2, 0.9, 1],
+						"2.2083": [1, 1, 1]
+					}
+				},
+				"body_limb_bottom_left": {
+					"rotation": {
+						"0.0": [0.3, 0, 2.15],
+						"2.5833": [8.66217, -7.5105, 6.41838],
+						"2.7083": [-2.3895, -8.7088, 4.394],
+						"3.0": [0.3, 0, 2.15]
+					}
+				},
+				"body_limb_right": {
+					"rotation": {
+						"0.0": {
+							"post": [0, 0, -7.5],
+							"lerp_mode": "catmullrom"
+						},
+						"1.2083": {
+							"post": [0, 0, -7.5],
+							"lerp_mode": "catmullrom"
+						},
+						"1.3333": {
+							"post": [0, -15, -7.5],
+							"lerp_mode": "catmullrom"
+						},
+						"1.8333": {
+							"post": [0, 0, -7.5],
+							"lerp_mode": "catmullrom"
+						},
+						"3.0": {
+							"post": [0, 0, -7.5],
+							"lerp_mode": "catmullrom"
+						}
+					}
+				},
+				"body_limb_bottom_right": {
+					"rotation": {
+						"0.0": {
+							"post": [0.3, 0, -2.15],
+							"lerp_mode": "catmullrom"
+						},
+						"0.25": {
+							"post": [-12.5699, -2.2333, 16.2155],
+							"lerp_mode": "catmullrom"
+						},
+						"0.3333": {
+							"post": [-17.0419, 2.0337, 17.6707],
+							"lerp_mode": "catmullrom"
+						},
+						"0.4167": {
+							"post": [-11.9836, 2.1592, 17.6561],
+							"lerp_mode": "catmullrom"
+						},
+						"0.4583": {
+							"post": [0.2897, -0.0776, 12.85],
+							"lerp_mode": "catmullrom"
+						},
+						"0.5833": {
+							"post": [0.3, 0, -2.15],
+							"lerp_mode": "catmullrom"
+						},
+						"2.5833": [-9.7324, -5.0125, 8.4786],
+						"2.7083": [-21.5994, 2.9166, 17.3467],
+						"3.0": {
+							"pre": [0.3, 0, -2.15],
+							"post": [0.3, 0, -2.15],
+							"lerp_mode": "catmullrom"
+						}
+					},
+					"scale": {
+						"0.4167": [1, 1, 1],
+						"0.4583": [1, 1.1, 1],
+						"0.5": [1, 1, 1]
+					}
+				},
+				"body_limb_bottom_right3": {
+					"rotation": {
+						"0.0": [-5, 0, 0],
+						"3.0": [-5, 0, 0]
+					}
+				},
+				"body_limb_top": {
+					"rotation": {
+						"0.0": [0, 0, 0],
+						"3.0": [0, 0, 0]
+					}
+				},
+				"face": {
+					"rotation": {
+						"0.0": [0, 0, 0],
+						"2.5833": [0, 0, 0],
+						"2.7083": [0, -7.5, 0],
+						"2.875": [0, 0, 0]
+					}
+				},
+				"body_limb_top2": {
+					"rotation": {
+						"0.0": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.2083": {
+							"post": [-7.5, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.4167": {
+							"post": [12.5, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.5417": {
+							"post": [-12.5, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.6667": {
+							"post": [0, 0, 5],
+							"lerp_mode": "catmullrom"
+						},
+						"1.1667": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						}
+					}
+				},
+				"body_limb_left2": {
+					"rotation": {
+						"0.0": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.1667": {
+							"post": [0, -12.5, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.2917": {
+							"post": [-0.0298, 17.7172, 0.0411],
+							"lerp_mode": "catmullrom"
+						},
+						"0.5": {
+							"post": [-0.1175, -19.5709, 0.2845],
+							"lerp_mode": "catmullrom"
+						},
+						"0.7083": {
+							"post": [0, 0, 12.5],
+							"lerp_mode": "catmullrom"
+						},
+						"1.0833": {
+							"post": [0, 0, 12.5],
+							"lerp_mode": "catmullrom"
+						},
+						"1.2083": {
+							"post": [-0.0112, -22.4314, 11.7901],
+							"lerp_mode": "catmullrom"
+						},
+						"1.375": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"2.0": [0, 0, 0],
+						"2.0833": [13.4251, -35.9563, -26.0018],
+						"2.125": [17.7735, -35.6335, -34.2819],
+						"2.1667": [0, 0, 0]
+					}
+				},
+				"body_limb_right2": {
+					"rotation": {
+						"0.0": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.1667": {
+							"post": [0, 12.5, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.2917": {
+							"post": [-0.0298, -17.7172, -0.0411],
+							"lerp_mode": "catmullrom"
+						},
+						"0.5": {
+							"post": [-0.1175, 19.5709, -0.2845],
+							"lerp_mode": "catmullrom"
+						},
+						"0.7083": {
+							"post": [0, 0, 12.5],
+							"lerp_mode": "catmullrom"
+						},
+						"1.0833": {
+							"post": [0, 0, 12.5],
+							"lerp_mode": "catmullrom"
+						},
+						"1.2083": {
+							"post": [-0.0112, 22.4314, 11.7901],
+							"lerp_mode": "catmullrom"
+						},
+						"1.375": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						}
+					}
+				},
+				"body_limb_bottom_left2": {
+					"rotation": {
+						"0.0": [0, 0, 0],
+						"2.5833": [0, 0, 0],
+						"2.7083": [42.9952, 6.5597, 2.4923],
+						"3.0": [0, 0, 0]
+					}
+				},
+				"body_limb_bottom_right2": {
+					"rotation": {
+						"0.0": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.25": {
+							"post": [-18.586, -7.5206, -21.2677],
+							"lerp_mode": "catmullrom"
+						},
+						"0.4167": {
+							"post": [-22.8925, -9.0864, -26.0667],
+							"lerp_mode": "catmullrom"
+						},
+						"0.4583": {
+							"post": [20.9813, -9.8466, 17.4953],
+							"lerp_mode": "catmullrom"
+						},
+						"0.5833": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.75": {
+							"post": [0, 0, -10],
+							"lerp_mode": "catmullrom"
+						},
+						"1.0833": {
+							"post": [0, 0, -10],
+							"lerp_mode": "catmullrom"
+						},
+						"1.2083": {
+							"post": [29.7624, 0.4222, -0.417],
+							"lerp_mode": "catmullrom"
+						},
+						"1.8333": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"2.25": {
+							"post": [-13.6038, -3.6461, -10.334],
+							"lerp_mode": "catmullrom"
+						},
+						"2.4583": [-8.1623, 0.0203, 12.7371],
+						"2.5833": [0, 0, 0],
+						"2.7083": [35.3924, 9.0867, -26.0666],
+						"3.0": {
+							"pre": [0, 0, 0],
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						}
+					}
+				},
+				"torso": {
+					"rotation": {
+						"0.0": [0, 0, 0],
+						"0.25": [0, 0, 0],
+						"0.2917": [0, 0, 0],
+						"0.3333": {"pre": [0, 0, 0], "post": [0, 0, 1080]},
+						"0.4167": [0, 0, 1080],
+						"0.875": {
+							"pre": [0, 0, 780],
+							"post": [0, 0, 780],
+							"lerp_mode": "catmullrom"
+						},
+						"1.25": [0, 0, 201],
+						"1.8333": [0, 0, 153.14],
+						"2.0833": {
+							"pre": [0, 0, 148.3],
+							"post": [0, 0, 148.3],
+							"lerp_mode": "catmullrom"
+						},
+						"2.2917": {
+							"post": [0, 0, 153.14],
+							"lerp_mode": "catmullrom"
+						},
+						"2.5": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"3.0": [0, 0, 0]
+					}
+				}
+			}
+		},
 		"animation.staryu.ground_walk": {
 			"loop": true,
 			"animation_length": 1.6,

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

@@ -21,6 +21,16 @@
 				}
 			}
 		},
+		"animation.corsola.ground_run": {
+			"loop": true,
+			"animation_length": 1,
+			"bones": {
+				"body": {
+					"rotation": [0, "math.sin(q.anim_time*90*8+90)*3", "math.sin(q.anim_time*90*8)*7.5"],
+					"position": ["math.sin(q.anim_time*90*8)*0.8", "math.abs(math.sin(q.anim_time*90*8)*0.28)", 0]
+				}
+			}
+		},
 		"animation.corsola.battle_idle": {
 			"loop": true,
 			"animation_length": 3,
@@ -62,6 +72,211 @@
 						"2.2917": ["-math.sin(q.anim_time*90*24)*0.14", "math.abs(math.sin(q.anim_time*90*24)*0.12)", 0],
 						"2.7083": [0, 0, 0]
 					}
+				},
+				"eyelid_expression_right": {
+					"position": [0.5, 0.5, -0.1]
+				},
+				"eyelid_expression_left": {
+					"position": [-0.5, 0.5, -0.1]
+				}
+			}
+		},
+		"animation.corsola.physical": {
+			"animation_length": 3,
+			"bones": {
+				"body": {
+					"position": {
+						"0.0": [0, 0, 0],
+						"0.125": [0, 0, -0.18],
+						"0.8333": [0, -0.3, -2.2],
+						"1.0": [0, 0, -3],
+						"1.25": [0, 0, -1.69],
+						"1.3333": [0, 0, 0.87],
+						"1.6667": [0, 0, 0]
+					}
+				},
+				"torso": {
+					"rotation": {
+						"0.0": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.25": {
+							"post": [0, "math.sin(q.anim_time*90*8+90)*3", "math.sin(q.anim_time*90*8)*7.5"],
+							"lerp_mode": "catmullrom"
+						},
+						"0.5833": {
+							"post": [0, "math.sin(q.anim_time*90*8+90)*3", "math.sin(q.anim_time*90*8)*7.5"],
+							"lerp_mode": "catmullrom"
+						},
+						"0.8333": {
+							"post": [7.4631, -25.1415, -7.7255],
+							"lerp_mode": "catmullrom"
+						},
+						"1.0": {
+							"post": [20.6525, -25.2579, -19.3876],
+							"lerp_mode": "catmullrom"
+						},
+						"1.1667": {
+							"post": [19.6525, -14.0579, -19.3876],
+							"lerp_mode": "catmullrom"
+						},
+						"1.2083": {
+							"post": [7.8327, 12.1328, -23.5115],
+							"lerp_mode": "catmullrom"
+						},
+						"1.25": [0, 145, 0],
+						"1.2917": [-0.61, 160, 1.82],
+						"1.4167": {
+							"pre": [-0.24, 310.01, 0.72],
+							"post": [-0.24, 310.01, 0.72],
+							"lerp_mode": "catmullrom"
+						},
+						"1.9583": [0, 360, 0],
+						"2.4167": [0, 360, 0],
+						"2.4583": [0, 360, 0],
+						"2.5": {"pre": [0, 360, 0], "post": [0, 0, 0]},
+						"2.5417": [0, 0, 0],
+						"3.0": [0, 0, 0]
+					},
+					"position": {
+						"0.0": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.25": {
+							"post": ["math.sin(q.anim_time*90*8)*0.8", "math.abs(math.sin(q.anim_time*90*8)*0.28)", 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.5833": {
+							"post": ["math.sin(q.anim_time*90*8)*0.8", "math.abs(math.sin(q.anim_time*90*8)*0.28)", 0],
+							"lerp_mode": "catmullrom"
+						},
+						"1.0": {
+							"post": [-2, 0.8, -0.7],
+							"lerp_mode": "catmullrom"
+						},
+						"1.1667": {
+							"post": [-1.94, 0.77, -1.17],
+							"lerp_mode": "catmullrom"
+						},
+						"1.2083": {
+							"post": [-1.89, 0.76, -1.55],
+							"lerp_mode": "catmullrom"
+						},
+						"1.25": {
+							"post": [-3.06, 0.79, -5.62],
+							"lerp_mode": "catmullrom"
+						},
+						"1.2917": {
+							"post": [-3.53, 0.83, -6.84],
+							"lerp_mode": "catmullrom"
+						},
+						"1.4167": {
+							"post": [1.5, 0.89, -1.81],
+							"lerp_mode": "catmullrom"
+						},
+						"1.625": {
+							"post": [2.67, 1.09, -1.58],
+							"lerp_mode": "catmullrom"
+						},
+						"1.9583": [2.11, 0.9, -1.56],
+						"2.0833": [-0.76, 0.52, -0.89],
+						"2.1667": [0.65, 0.28, -0.45],
+						"2.25": ["0.1+math.sin(q.anim_time*90*1)*0.14", "math.abs(math.sin(q.anim_time*90*1)*0.12)", 0],
+						"2.5417": ["0.1+math.sin(q.anim_time*90*1)*0.14", "-0.1+math.abs(math.sin(q.anim_time*90*1)*0.12)", 0],
+						"3.0": {
+							"pre": [0, 0, 0],
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						}
+					}
+				},
+				"head": {
+					"rotation": {
+						"0.0": [0, 0, 0],
+						"1.125": [0, 0, 0],
+						"1.2083": {
+							"pre": [0, 0, 0],
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"1.25": {
+							"post": [7.23, 0.08, 8.72],
+							"lerp_mode": "catmullrom"
+						},
+						"1.2917": {
+							"post": [11.06, 0.18, 23.62],
+							"lerp_mode": "catmullrom"
+						},
+						"1.3333": {
+							"post": [25, 0, 30],
+							"lerp_mode": "catmullrom"
+						},
+						"1.5417": {
+							"post": [29.9164, -2.1109, 34.5336],
+							"lerp_mode": "catmullrom"
+						},
+						"1.6667": {
+							"post": [28.79, -2.21, 33.12],
+							"lerp_mode": "catmullrom"
+						},
+						"1.9167": {
+							"post": [23.04, -1.75, 26.51],
+							"lerp_mode": "catmullrom"
+						},
+						"2.0417": {
+							"post": [9.17, -0.85, 6.79],
+							"lerp_mode": "catmullrom"
+						},
+						"2.0833": ["-math.sin(q.anim_time*90*12)*5", 0, "math.sin(q.anim_time*90*17)*12"],
+						"2.4583": [0, 0, 0],
+						"3.0": [0, 0, 0]
+					},
+					"position": {
+						"1.2083": [0, 0, 0],
+						"1.25": [-4.91491, -1, 3.44146],
+						"1.3333": [-1.21175, 0.04809, -1.59039],
+						"1.4167": [0.18912, 0.03323, -0.1785],
+						"1.5417": [0, 0, 0]
+					},
+					"scale": {
+						"1.2083": [1, 1, 1],
+						"1.25": [1.5, 0.8, 1.3],
+						"1.3333": [1, 1, 1]
+					}
+				},
+				"mouth_smile": {
+					"position": {
+						"0.0": [0, 0, 0],
+						"0.25": {"pre": [0, 0, 0], "post": [0, 0, 0.2]},
+						"0.7917": {"pre": [0, 0, 0.2], "post": [0, 0, 0]},
+						"1.2083": {"pre": [0, 0, 0], "post": [0, 0, 0.2]},
+						"1.6667": {"pre": [0, 0, 0.2], "post": [0, 0, 0]}
+					}
+				},
+				"mouth_open_smile": {
+					"position": {
+						"0.0": [0, 0, 0],
+						"0.25": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
+						"0.7917": {"pre": [0, 0, -0.1], "post": [0, 0, 0]},
+						"1.2083": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
+						"1.6667": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}
+					}
+				},
+				"eyelid_expression_right": {
+					"position": {
+						"0.0": [0.5, 0.5, -0.1],
+						"1.2083": {"pre": [0.5, 0.5, -0.1], "post": [0.5, 0.5, 0]},
+						"2.1667": {"pre": [0.5, 0.5, 0], "post": [0.5, 0.5, -0.1]}
+					}
+				},
+				"eyelid_expression_left": {
+					"position": {
+						"0.0": [-0.5, 0.5, -0.1],
+						"1.2083": {"pre": [-0.5, 0.5, -0.1], "post": [-0.5, 0.5, 0]},
+						"2.1667": {"pre": [-0.5, 0.5, 0], "post": [-0.5, 0.5, -0.1]}
+					}
 				}
 			}
 		},
@@ -132,10 +347,7 @@
 		"animation.corsola.sleep": {
 			"loop": true,
 			"bones": {
-				"eye_right_closed": {
-					"position": [0, 0, -0.1]
-				},
-				"eye_left_closed": {
+				"eyelid_left": {
 					"position": [0, 0, -0.1]
 				},
 				"arm_front_right": {
@@ -147,32 +359,71 @@
 				"body": {
 					"rotation": [0, 0, "0+math.sin(q.anim_time*90*1)*2"],
 					"position": ["0+math.sin(q.anim_time*90*1)*0.3", 0, 0]
+				},
+				"eyelid_right": {
+					"position": [0, 0, -0.1]
 				}
 			}
 		},
 		"animation.corsola.cry": {
 			"animation_length": 0.7917,
 			"bones": {
-				"mouth": {
+				"mouth_smile": {
 					"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]}
+						"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": {
+				"mouth_open_smile": {
 					"position": {
 						"0.0": [0, 0, 0],
-						"0.0417": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
-						"0.1667": {"pre": [0, 0, -0.1], "post": [0, 0, -0.1]},
-						"0.2083": {"pre": [0, 0, -0.1], "post": [0, 0, 0]},
-						"0.25": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
-						"0.625": {"pre": [0, 0, -0.1], "post": [0, 0, -0.1]},
-						"0.6667": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}
+						"0.0417": {
+							"pre": [0, 0, 0],
+							"post": [0, 0, -0.1]
+						},
+						"0.1667": {
+							"pre": [0, 0, -0.1],
+							"post": [0, 0, -0.1]
+						},
+						"0.2083": {
+							"pre": [0, 0, -0.1],
+							"post": [0, 0, 0]
+						},
+						"0.25": {
+							"pre": [0, 0, 0],
+							"post": [0, 0, -0.1]
+						},
+						"0.625": {
+							"pre": [0, 0, -0.1],
+							"post": [0, 0, -0.1]
+						},
+						"0.6667": {
+							"pre": [0, 0, -0.1],
+							"post": [0, 0, 0]
+						}
 					}
 				},
 				"body": {
@@ -205,20 +456,33 @@
 			}
 		},
 		"animation.corsola.blink": {
-			"animation_length": 0.2083,
+			"animation_length": 0.1667,
 			"bones": {
-				"eye_right_closed": {
+				"eyelid_left": {
 					"position": {
 						"0.0": [0, 0, -0.1],
-						"0.125": [0, 0, -0.1],
-						"0.2083": [0, 0, 0]
+						"0.125": {
+							"pre": [0, 0, -0.1],
+							"post": [0, 0, -0.1]
+						}
 					}
 				},
-				"eye_left_closed": {
+				"eyelid_right": {
 					"position": {
 						"0.0": [0, 0, -0.1],
-						"0.125": [0, 0, -0.1],
-						"0.2083": [0, 0, 0]
+						"0.125": {
+							"pre": [0, 0, -0.1],
+							"post": [0, 0, -0.1]
+						}
+					}
+				},
+				"eyelid_expression_right": {
+					"position": {
+						"0.0": [0, 0, -0.1],
+						"0.125": {
+							"pre": [0, 0, -0.1],
+							"post": [0, 0, -0.1]
+						}
 					}
 				}
 			}
@@ -232,11 +496,130 @@
 				"head": {
 					"rotation": [-9.11405, 22.13991, -10.80524]
 				},
-				"mouth": {
+				"mouth_smile": {
 					"position": [0, 0, 0.1]
 				},
-				"mouth_open": {
+				"mouth_open_smile": {
 					"position": [0, 0, -0.1]
+				},
+				"mouth_open_frown": {
+					"position": [0, 0, -0.1]
+				}
+			}
+		},
+		"animation.corsola.recoil": {
+			"animation_length": 1,
+			"bones": {
+				"body": {
+					"rotation": {
+						"0.75": [0, 0, 0],
+						"0.8333": [0, 0, "math.sin(q.anim_time*90*24)*2"],
+						"1.0": [0, 0, 0]
+					},
+					"position": {
+						"0.75": [0, 0, 0],
+						"0.8333": ["math.sin(q.anim_time*90*24)*0.14", "math.abs(math.sin(q.anim_time*90*24)*0.12)", 0],
+						"1.0": [0, 0, 0]
+					}
+				},
+				"torso": {
+					"position": {
+						"0.75": [0, 0, 0],
+						"0.8333": [0, 0.4, 0],
+						"0.9167": [0, 0, 0],
+						"0.9583": [0, 0.1, 0],
+						"1.0": [0, 0, 0]
+					}
+				},
+				"head": {
+					"rotation": {
+						"0.0": [0, 0, 0],
+						"0.0417": {
+							"pre": [-22.5, 0, 0],
+							"post": [-22.5, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.375": {
+							"post": [-27.5, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.5833": {
+							"post": [-22.5, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.6667": [-15.46, 0, 0],
+						"0.75": [0, 0, 0]
+					},
+					"position": {
+						"0.0": [0, 0, 0],
+						"0.0417": {
+							"pre": [0, 0.8, 2.2],
+							"post": [0, 0.8, 2.2],
+							"lerp_mode": "catmullrom"
+						},
+						"0.375": {
+							"post": [0, 0.8, 2.9],
+							"lerp_mode": "catmullrom"
+						},
+						"0.625": {
+							"post": [0, 0.8, 2.2],
+							"lerp_mode": "catmullrom"
+						},
+						"0.7083": {
+							"post": [0, 0.56, 0.9],
+							"lerp_mode": "catmullrom"
+						},
+						"0.75": [0, 0, 0]
+					}
+				},
+				"eyelid_left": {
+					"position": {
+						"0.0": [0, 0, -0.1],
+						"0.75": {
+							"pre": [0, 0, -0.1],
+							"post": [0, 0, 0]
+						}
+					}
+				},
+				"mouth_smile": {
+					"position": {
+						"0.0": [0, 0, 0.1],
+						"0.8333": {
+							"pre": [0, 0, 0.1],
+							"post": [0, 0, 0]
+						}
+					}
+				},
+				"eyelid_right": {
+					"position": {
+						"0.0": [0, 0, -0.1],
+						"0.75": {
+							"pre": [0, 0, -0.1],
+							"post": [0, 0, 0]
+						}
+					}
+				},
+				"mouth_open_frown": {
+					"position": {
+						"0.0": [0, 0, -0.1],
+						"0.5": {
+							"pre": [0, 0, -0.1],
+							"post": [0, 0, 0]
+						}
+					}
+				},
+				"mouth_frown": {
+					"position": {
+						"0.0": [0, 0, 0],
+						"0.5": {
+							"pre": [0, 0, 0],
+							"post": [0, 0, -0.1]
+						},
+						"0.8333": {
+							"pre": [0, 0, -0.1],
+							"post": [0, 0, 0]
+						}
+					}
 				}
 			}
 		}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0546_cottonee/cottonee.animation.json

@@ -1,93 +1,652 @@
 {
 	"format_version": "1.8.0",
 	"animations": {
-		"animation.cottonee.ground_idle": {
-			"loop": true,
-			"bones": {
-				"wing_left2": {
-					"rotation": [0, 0, -15]
-				},
-				"wing_right2": {
-					"rotation": [0, 0, 15]
-				},
-				"nimbus_top": {
-					"position": [0, -0.15, 0]
-				},
-				"wing_left": {
-					"rotation": [0, 0, 5]
-				},
-				"wing_right": {
-					"rotation": [0, 0, -5]
-				}
-			}
-		},
 		"animation.cottonee.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]
-						}
-					}
-				},
-				"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]
-						}
+						"0.125": [0, 0, -0.1],
+						"0.1667": [0, 0, 0]
 					}
 				},
-				"eyes_ditto": {
-					"position": {
-						"0.0": [0, 0, 0.1],
-						"0.1667": {
-							"pre": [0, 0, 0.1],
-							"post": [0, 0, 0]
-						}
-					}
-				},
-				"eyes_blink_ditto": {
+				"eyelid_left": {
 					"position": {
 						"0.0": [0, 0, -0.1],
-						"0.1667": {
-							"pre": [0, 0, -0.1],
-							"post": [0, 0, 0]
-						}
+						"0.125": [0, 0, -0.1],
+						"0.1667": [0, 0, 0]
 					}
 				}
 			}
 		},
 		"animation.cottonee.cry": {
-			"animation_length": 0.7083,
+			"animation_length": 1,
+			"bones": {
+				"body": {
+					"rotation": {
+						"0.0": [0, 0, 0],
+						"0.0417": [0, 0, 0],
+						"0.125": {
+							"pre": [3.33, 0, 0],
+							"post": [3.33, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.2083": {
+							"post": [-10, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.375": {
+							"post": [-10, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.4583": {
+							"post": [-5, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.5417": {
+							"post": [-10, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.75": {
+							"post": [-5, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.875": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						}
+					},
+					"position": {
+						"0.0": [0, 0, 0],
+						"0.0417": [0, 0, 0],
+						"0.125": {
+							"pre": [0, 0, -0.15],
+							"post": [0, 0, -0.15],
+							"lerp_mode": "catmullrom"
+						},
+						"0.2083": {
+							"post": [0, 0.08, 0.5],
+							"lerp_mode": "catmullrom"
+						},
+						"0.375": {
+							"post": [0, 1, 0.5],
+							"lerp_mode": "catmullrom"
+						},
+						"0.4583": {
+							"post": [0, 0.5, 0.25],
+							"lerp_mode": "catmullrom"
+						},
+						"0.5417": {
+							"post": [0, 0.63, 0.5],
+							"lerp_mode": "catmullrom"
+						},
+						"0.625": {
+							"post": [0, 0.75, 0.375],
+							"lerp_mode": "catmullrom"
+						},
+						"0.75": {
+							"post": [0, 0, 0.225],
+							"lerp_mode": "catmullrom"
+						},
+						"0.875": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						}
+					}
+				},
+				"eyelid_right": {
+					"position": {
+						"0.0": [0, 0, 0],
+						"0.5": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
+						"0.625": {"pre": [0, 0, -0.1], "post": [0, 0, 0]},
+						"0.7917": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
+						"0.875": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}
+					}
+				},
+				"eyelid_left": {
+					"position": {
+						"0.0": [0, 0, 0],
+						"0.5": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
+						"0.625": {"pre": [0, 0, -0.1], "post": [0, 0, 0]},
+						"0.7917": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
+						"0.875": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}
+					}
+				},
+				"nimbus_bottom": {
+					"rotation": {
+						"0.0": [0, 0, 0],
+						"0.0417": [0, 0, 0],
+						"0.125": {
+							"pre": [-2.33, 0, 0],
+							"post": [-2.33, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.2083": {
+							"post": [9, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.375": {
+							"post": [9, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.4583": {
+							"post": [4, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.5417": {
+							"post": [9, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.75": {
+							"post": [4, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.875": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						}
+					},
+					"position": {
+						"0.0": [0, 0, 0],
+						"0.125": {
+							"pre": [0, 0, 0],
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.2083": {
+							"post": [0, -0.08, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.375": {
+							"post": [0, -0.5, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.5": {
+							"post": [0, -0.25, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.625": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.75": [0, 0, 0]
+					}
+				},
+				"wing_left": {
+					"rotation": {
+						"0.125": [0, "-(5+math.sin(q.anim_time*90*4-30)*10)", 0],
+						"0.25": ["math.sin(q.anim_time*90*8+30)*3+ math.sin(q.anim_time*90*60-30)*4", "-(5+math.sin(q.anim_time*90*4-30)*10)", 0],
+						"0.3333": ["math.sin(q.anim_time*90*8)*1+ math.sin(q.anim_time*90*5)*2", "-(5+math.sin(q.anim_time*90*4-30)*10)", 0],
+						"0.5": [0, "-(5+math.sin(q.anim_time*90*4-30)*10)", 0],
+						"0.5833": ["math.sin(q.anim_time*90*8+30)*4+ math.sin(q.anim_time*90*60-30)*8", "-(5+math.sin(q.anim_time*90*4-30)*5)", 0],
+						"0.7917": ["math.sin(q.anim_time*90*8)*1+ math.sin(q.anim_time*90*5)*2", 0, 0],
+						"1.0": [0, 0, 0]
+					}
+				},
+				"wing_left2": {
+					"rotation": {
+						"0.0": [0, 0, 0],
+						"0.0833": [0, 0, 0],
+						"0.2083": [0, 0, "-((5+math.sin(q.anim_time*90*4-60)*10))"],
+						"0.6667": [0, 0, 0]
+					}
+				},
+				"wing_right": {
+					"rotation": {
+						"0.0": [0, "5+math.sin(q.anim_time*90*4-30)*10", 0],
+						"0.0833": [0, "5+math.sin(q.anim_time*90*4-30)*10", 0],
+						"0.1667": ["math.sin(q.anim_time*90*8)*5+ math.sin(q.anim_time*90*60)*10", "5+math.sin(q.anim_time*90*4-30)*10", 0],
+						"0.2917": ["math.sin(q.anim_time*90*8)*1+ math.sin(q.anim_time*90*5)*2", "5+math.sin(q.anim_time*90*4-30)*10", 0],
+						"0.5": [0, "5+math.sin(q.anim_time*90*4-30)*10", 0],
+						"0.5417": ["math.sin(q.anim_time*90*8)*2+ math.sin(q.anim_time*90*60)*4", "5+math.sin(q.anim_time*90*4-30)*5", 0],
+						"0.75": ["math.sin(q.anim_time*90*8)*1+ math.sin(q.anim_time*90*5)*2", 0, 0],
+						"1.0": [0, 0, 0]
+					}
+				},
+				"wing_right2": {
+					"rotation": {
+						"0.0": [0, 0, 0],
+						"0.0833": [0, 0, 0],
+						"0.2083": [0, 0, "(5+math.sin(q.anim_time*90*4-60)*10)"],
+						"0.6667": [0, 0, 0]
+					}
+				}
+			},
 			"sound_effects": {
-				"0.0417": {
+				"0.125": {
 					"effect": "pokemon.cottonee.cry"
 				}
 			}
 		},
+		"animation.cottonee.ground_idle": {
+			"loop": true,
+			"bones": {
+				"body": {
+					"rotation": [0, "-math.cos(q.anim_time*90)*2+math.sin(q.anim_time*90*3+90)/5", "math.sin(q.anim_time*90)*5+math.sin(q.anim_time*90*3+90)/2"],
+					"position": [
+						0,
+						"(math.clamp((math.sin(q.anim_time*90)*0.3), -0.1, 1)+math.clamp((math.sin(q.anim_time*90+180)*0.3), -0.1, 1))*4+math.cos(q.anim_time*90*4)/2",
+						0
+					]
+				},
+				"nimbus_top": {
+					"rotation": [0, 0, "(math.sin(q.anim_time*90)*5+math.sin(q.anim_time*90*3+90)/2)/4-math.cos(q.anim_time*90*4-30)/4"],
+					"position": [0, "-0.3+math.clamp((math.sin(q.anim_time*90+30)*0.1), 0, 1)*2+math.clamp((math.sin(q.anim_time*90+180+30)*0.1), 0, 1)*2", 0]
+				},
+				"nimbus_bottom": {
+					"rotation": [0, 0, "math.cos(q.anim_time*90*4-30)*1"],
+					"position": [
+						0,
+						"0.1-math.clamp((math.sin(q.anim_time*90-10)*0.1), 0, 0.2)-math.clamp((math.sin(q.anim_time*90+180-10)*0.1), 0, 0.2)+math.clamp((math.cos(q.anim_time*90*4+90)/2+math.cos(q.anim_time*90*2+90)/2),-0.1,1)/4-math.cos(q.anim_time*90*4+90)/8",
+						0
+					]
+				},
+				"wing_left": {
+					"rotation": [
+						"-math.cos(q.anim_time*90*2)*5+math.sin(q.anim_time*90*2*3+90)/2",
+						0,
+						"-((4+math.sin(q.anim_time*90-30)*5)-math.cos(q.anim_time*90*4+40)*2)"
+					]
+				},
+				"wing_left2": {
+					"rotation": [0, 0, "-(15+math.sin(q.anim_time*90-60)*5)"]
+				},
+				"wing_right": {
+					"rotation": ["-math.cos(q.anim_time*90*2)*5+math.sin(q.anim_time*90*2*3+90)/2", 0, "(4+math.sin(q.anim_time*90-30)*5)-math.cos(q.anim_time*90*4+40)*2"]
+				},
+				"wing_right2": {
+					"rotation": [0, 0, "(15+math.sin(q.anim_time*90-60)*5)"]
+				}
+			}
+		},
+		"animation.cottonee.ground_walk": {
+			"loop": true,
+			"animation_length": 8,
+			"bones": {
+				"body": {
+					"rotation": [
+						"0-math.cos(q.anim_time*90*4-160)*10-math.cos(q.anim_time*90*1-160-90)*5",
+						"-math.cos(q.anim_time*90*2)*2+math.sin(q.anim_time*90*5+90)/5",
+						"math.sin(q.anim_time*90*2)*5+math.sin(q.anim_time*90*5+90)/2+(math.sin(q.anim_time*90*2/4-90)*0.3+math.sin(q.anim_time*90*2/4+180-90)*10+math.cos(q.anim_time*90*4/4*2-90)*2)"
+					],
+					"position": [
+						"math.sin(q.anim_time*90*2/4)*0.3+math.sin(q.anim_time*90*2/4+180)*0.3*8+math.cos(q.anim_time*90*4/4*2)/8",
+						"math.clamp((math.clamp((math.sin(q.anim_time*90*2)*0.4), -0.1, 1)+math.clamp((math.sin(q.anim_time*90*2+180)*0.3), -0.1, 1))*20+math.cos(q.anim_time*90*4*2+90)/4+math.sin(q.anim_time*90*2-180)*2,0.5, 10)",
+						"-math.cos(q.anim_time*90*4+90)*0.5-math.cos(q.anim_time*90*2-20)*0.5"
+					]
+				},
+				"nimbus_top": {
+					"rotation": ["-3-math.cos(q.anim_time*90*4-160-30)*2-math.cos(q.anim_time*90*1-160-90-30)*1", 0, 0],
+					"position": [
+						0,
+						"(1-(math.clamp(math.sin(q.anim_time*90*2), -0.1, 1)*2+math.clamp(math.sin(q.anim_time*90*2+180), -0.1, 1)*1+math.sin(q.anim_time*90*2-180)*1))/2",
+						0
+					]
+				},
+				"nimbus_bottom": {
+					"rotation": [
+						"(-1+math.clamp(math.sin(q.anim_time*90*2), -0.1, 1)*2+math.clamp(math.sin(q.anim_time*90*2+180), -0.1, 1)*1+math.sin(q.anim_time*90*2-180)*1)*2",
+						0,
+						"-(math.sin(q.anim_time*90*2/4+180-90-30)*5+math.cos(q.anim_time*90*4/4*2-90-30)*1)"
+					],
+					"position": [
+						0,
+						"(-math.clamp(math.sin(q.anim_time*90*2), -0.1, 1)*2-math.clamp(math.sin(q.anim_time*90*2+180), -0.1, 1)*1-math.sin(q.anim_time*90*2-180)*1)/2",
+						0
+					]
+				},
+				"wing_left": {
+					"rotation": [
+						"0-math.clamp(-(0-math.cos(q.anim_time*90*4+90-10)*25-math.cos(q.anim_time*90*1+130-90-10)*20), -30, 90)",
+						"math.cos(q.anim_time*90*2-60)*20",
+						"0-math.cos(q.anim_time*90*4+90)*25-math.clamp(math.cos(q.anim_time*90*1)*20,10,20)"
+					],
+					"position": [0, "math.clamp((-math.cos(q.anim_time*90*4+90)*25-math.clamp(math.cos(q.anim_time*90*1)*20,10,20))/30, -10, 0)", 0]
+				},
+				"wing_left2": {
+					"rotation": [0, 0, "-math.clamp(6+math.cos(q.anim_time*90*4+90-30)*12-math.clamp(math.cos(q.anim_time*90*1-30)*10,0,20),0,30)"],
+					"position": [0, 0, 0]
+				},
+				"wing_right": {
+					"rotation": [
+						"(0-math.clamp(-(0-math.cos(q.anim_time*90*4+90)*25-math.cos(q.anim_time*90*1+130-90)*20), -30, 90))",
+						"-(math.cos(q.anim_time*90*2-60)*20)",
+						"-(0-math.cos(q.anim_time*90*4+90)*25-math.clamp(math.cos(q.anim_time*90*1+130-90)*20,10,20))"
+					],
+					"position": [0, "(0-math.cos(q.anim_time*90*4+90)*25-math.clamp(math.cos(q.anim_time*90*1+130-90)*20,10,20))/30", 0]
+				},
+				"wing_right2": {
+					"rotation": [0, 0, "math.clamp(6+math.cos(q.anim_time*90*4+90-30)*12-math.clamp(math.cos(q.anim_time*90*1+130-90-30)*10,0,10),0,30)"]
+				}
+			}
+		},
+		"animation.cottonee.air_idle": {
+			"loop": true,
+			"bones": {
+				"body": {
+					"rotation": [0, "-math.cos(q.anim_time*90)*2+math.sin(q.anim_time*90*3+90)/5", "math.sin(q.anim_time*90)*5+math.sin(q.anim_time*90*3+90)/2"],
+					"position": [0, "1+math.sin(q.anim_time*90)*0.3+math.sin(q.anim_time*90+180)*0.3*4+math.cos(q.anim_time*90*4)/2", 0]
+				},
+				"nimbus_top": {
+					"rotation": [0, 0, "(math.sin(q.anim_time*90)*5+math.sin(q.anim_time*90*3+90)/2)/4-math.cos(q.anim_time*90*4-30)/4"],
+					"position": [0, "-0.3+math.clamp((math.sin(q.anim_time*90+30)*0.1), 0, 1)*2+math.clamp((math.sin(q.anim_time*90+180+30)*0.1), 0, 1)*2", 0]
+				},
+				"nimbus_bottom": {
+					"rotation": [0, 0, "math.cos(q.anim_time*90*4-30)*1"],
+					"position": [
+						0,
+						"0.1-math.clamp((math.sin(q.anim_time*90-10)*0.1), 0, 0.2)-math.clamp((math.sin(q.anim_time*90+180-10)*0.1), 0, 0.2)+math.clamp((math.cos(q.anim_time*90*4+90)/2+math.cos(q.anim_time*90*2+90)/2),-0.1,1)/4-math.cos(q.anim_time*90*4+90)/8",
+						0
+					]
+				},
+				"wing_left": {
+					"rotation": [
+						"-math.cos(q.anim_time*90*2)*5+math.sin(q.anim_time*90*2*3+90)/2",
+						0,
+						"-((4+math.sin(q.anim_time*90-30)*5)-math.cos(q.anim_time*90*4+40)*2)"
+					]
+				},
+				"wing_left2": {
+					"rotation": [0, 0, "-(15+math.sin(q.anim_time*90-60)*5)"]
+				},
+				"wing_right": {
+					"rotation": ["-math.cos(q.anim_time*90*2)*5+math.sin(q.anim_time*90*2*3+90)/2", 0, "(4+math.sin(q.anim_time*90-30)*5)-math.cos(q.anim_time*90*4+40)*2"]
+				},
+				"wing_right2": {
+					"rotation": [0, 0, "(15+math.sin(q.anim_time*90-60)*5)"]
+				}
+			}
+		},
+		"animation.cottonee.air_fly": {
+			"loop": true,
+			"bones": {
+				"body": {
+					"rotation": ["-0-math.sin(q.anim_time*90*2+60)*4", 0, "0+math.sin(q.anim_time*90*1)*8"],
+					"position": ["-0-math.sin(q.anim_time*90*1)*1.5", "1+math.sin(q.anim_time*90*2)*1.5", "0+math.sin(q.anim_time*90*2-90)*0.5"]
+				},
+				"nimbus_top": {
+					"position": [0, "0+math.sin(q.anim_time*90*2-60)*0.2", 0]
+				},
+				"nimbus_bottom": {
+					"position": [0, "0+math.sin(q.anim_time*90*2-70)*0.2", 0]
+				},
+				"wing_left": {
+					"rotation": [0, 0, "-0-math.sin(q.anim_time*90*2+60)*-7.5"]
+				},
+				"wing_left2": {
+					"rotation": [0, 0, "-5-math.sin(q.anim_time*90*2+30)*-5"]
+				},
+				"wing_right": {
+					"rotation": [0, 0, "0+math.sin(q.anim_time*90*2+60)*-7.5"]
+				},
+				"wing_right2": {
+					"rotation": [0, 0, "5+math.sin(q.anim_time*90*2+30)*-5"]
+				}
+			}
+		},
+		"animation.cottonee.walk_speed_test": {
+			"loop": true,
+			"bones": {
+				"cottonee": {
+					"position": [0, 0, "20+q.anim_time*-10"]
+				}
+			}
+		},
+		"animation.cottonee.battle_idle": {
+			"loop": true,
+			"bones": {
+				"body": {
+					"rotation": [
+						0,
+						"5*(-math.cos(q.anim_time*90*2+60)*2+math.sin(q.anim_time*90*3*2+90+180)/5)",
+						"2*(math.sin(q.anim_time*90*2)*5+math.sin(q.anim_time*90*3*2+90)/2)"
+					],
+					"position": [
+						0,
+						"math.clamp((math.clamp((math.sin(q.anim_time*90)*0.3), 0.1, 1)+math.clamp((math.sin(q.anim_time*90+180)*0.3), 0.1, 1))*4+math.cos(q.anim_time*90*4)*1.5, 0.2, 20)",
+						0
+					]
+				},
+				"nimbus_top": {
+					"rotation": [0, 0, "(math.sin(q.anim_time*90*2)*5+math.sin(q.anim_time*90*3*2+90)/2)/4-math.cos(q.anim_time*90*4*2-30)/4"],
+					"position": [0, "-0.3+math.clamp((math.sin(q.anim_time*90*2+30)*0.1), 0, 1)*4+math.clamp((math.sin(q.anim_time*90*2+180+30)*0.1), 0, 1)*4", 0]
+				},
+				"nimbus_bottom": {
+					"rotation": [0, 0, "math.cos(q.anim_time*90*4*2-30)*1"],
+					"position": [
+						0,
+						"0.1-math.clamp((math.sin(q.anim_time*90*2-10)*0.1), 0, 0.2)-math.clamp((math.sin(q.anim_time*90*2+180-10)*0.1), 0, 0.2)+math.clamp((math.cos(q.anim_time*90*4*2+90)/2+math.cos(q.anim_time*90*2*2+90)/2),-0.1,1)/4-math.cos(q.anim_time*90*4*2+90)/8",
+						0
+					]
+				},
+				"wing_left": {
+					"rotation": [
+						"-math.cos(q.anim_time*90*2*2)*5+math.sin(q.anim_time*90*2*2*3+90)/2",
+						0,
+						"-((4+math.sin(q.anim_time*90*2-30)*10)-math.cos(q.anim_time*90*4*2+40)*2)"
+					]
+				},
+				"wing_left2": {
+					"rotation": [0, 0, "-(15+math.sin(q.anim_time*90-60)*5)"]
+				},
+				"wing_right": {
+					"rotation": [
+						"-math.cos(q.anim_time*90*2*2)*5+math.sin(q.anim_time*90*2*2*3+90)/2",
+						0,
+						"(4+math.sin(q.anim_time*90*2-30)*5)-math.cos(q.anim_time*90*4*2+40)*2"
+					]
+				},
+				"wing_right2": {
+					"rotation": [0, 0, "(15+math.sin(q.anim_time*90-60)*5)"]
+				}
+			}
+		},
+		"animation.cottonee.quirk_battle_hop": {
+			"animation_length": 4,
+			"bones": {
+				"body": {
+					"rotation": {
+						"0.0": [
+							0,
+							"5*(-math.cos(q.anim_time*90*2+60)*2+math.sin(q.anim_time*90*3*2+90+180)/5)",
+							"2*(math.sin(q.anim_time*90*2)*5+math.sin(q.anim_time*90*3*2+90)/2)"
+						],
+						"0.5": [5, 0, 0],
+						"1.0": [-2.5, 0, 0],
+						"1.75": [-2.5, 0, 0],
+						"2.0417": [5, 0, 0],
+						"3.5": [
+							0,
+							"5*(-math.cos(q.anim_time*90*2+60)*2+math.sin(q.anim_time*90*3*2+90+180)/5)",
+							"2*(math.sin(q.anim_time*90*2)*5+math.sin(q.anim_time*90*3*2+90)/2)"
+						]
+					},
+					"position": {
+						"0.0": [
+							0,
+							"math.clamp((math.clamp((math.sin(q.anim_time*90)*0.3), 0.1, 1)+math.clamp((math.sin(q.anim_time*90+180)*0.3), 0.1, 1))*4+math.cos(q.anim_time*90*4)*1.5, 0.2, 20)",
+							0
+						],
+						"0.4583": [0, 0, 0],
+						"0.5": [0, "math.cos(q.anim_time*90*2+180)*10", 0],
+						"1.0": [0, "5+math.cos(q.anim_time*90*2+180)*5", 0],
+						"3.0": [0, "2.5+math.cos(q.anim_time*90*4+180)*2.5", 0],
+						"3.5": [
+							0,
+							"math.clamp((math.clamp((math.sin(q.anim_time*90)*0.3), 0.1, 1)+math.clamp((math.sin(q.anim_time*90+180)*0.3), 0.1, 1))*4+math.cos(q.anim_time*90*4)*1.5, 0.2, 20)",
+							0
+						]
+					}
+				},
+				"nimbus_top": {
+					"rotation": {
+						"0.0": [0, 0, "(math.sin(q.anim_time*90*2)*5+math.sin(q.anim_time*90*3*2+90)/2)/4-math.cos(q.anim_time*90*4*2-30)/4"],
+						"0.5": [5, 0, 0],
+						"1.0": [-2.5, 0, 0],
+						"1.5833": [-2.5, 0, 0],
+						"2.0417": [0, 0, 0],
+						"3.5": [0, 0, "(math.sin(q.anim_time*90*2)*5+math.sin(q.anim_time*90*3*2+90)/2)/4-math.cos(q.anim_time*90*4*2-30)/4"]
+					},
+					"position": {
+						"0.0": [0, "-0.3+math.clamp((math.sin(q.anim_time*90*2+30)*0.1), 0, 1)*4+math.clamp((math.sin(q.anim_time*90*2+180+30)*0.1), 0, 1)*4", 0],
+						"0.5": [0, 0, 0],
+						"1.0": [0, "math.clamp((math.sin(q.anim_time*90*2+0)*0.1), 0, 1)*5+math.clamp((math.sin(q.anim_time*90*2+180+0)*0.1), 0, 1)*5", 0],
+						"2.0417": [0, "math.clamp((math.sin(q.anim_time*90*2+0)*0.1), 0, 1)*2+math.clamp((math.sin(q.anim_time*90*2+180+0)*0.1), 0, 1)*5", 0],
+						"3.5": [0, "-0.3+math.clamp((math.sin(q.anim_time*90*2+30)*0.1), 0, 1)*4+math.clamp((math.sin(q.anim_time*90*2+180+30)*0.1), 0, 1)*4", 0]
+					}
+				},
+				"nimbus_bottom": {
+					"rotation": {
+						"0.0": [0, 0, "math.cos(q.anim_time*90*4*2-30)*1"],
+						"0.4583": [-5, 0, 0],
+						"2.0": [-5, 0, 0],
+						"3.5": [0, 0, "math.cos(q.anim_time*90*4*2-30)*1"]
+					},
+					"position": {
+						"0.0": [
+							0,
+							"0.1-math.clamp((math.sin(q.anim_time*90*2-10)*0.1), 0, 0.2)-math.clamp((math.sin(q.anim_time*90*2+180-10)*0.1), 0, 0.2)+math.clamp((math.cos(q.anim_time*90*4*2+90)/2+math.cos(q.anim_time*90*2*2+90)/2),-0.1,1)/4-math.cos(q.anim_time*90*4*2+90)/8",
+							0
+						],
+						"0.4583": [0, -0.1, 0],
+						"1.0": [0, "-math.clamp((math.sin(q.anim_time*90*2-90)*0.1), 0, 1)*10-math.clamp((math.sin(q.anim_time*90*2+180-30)*0.1), 0, 1)*10", 0],
+						"1.125": [0, -1, 0],
+						"1.7917": [0, -0.9, 0],
+						"1.9167": [0, "-math.clamp((math.sin(q.anim_time*90*2)*0.1), 0, 1)*5-math.clamp((math.sin(q.anim_time*90*2+180)*0.1), 0, 1)*5", 0],
+						"3.5": [
+							0,
+							"0.1-math.clamp((math.sin(q.anim_time*90*2-10)*0.1), 0, 0.2)-math.clamp((math.sin(q.anim_time*90*2+180-10)*0.1), 0, 0.2)+math.clamp((math.cos(q.anim_time*90*4*2+90)/2+math.cos(q.anim_time*90*2*2+90)/2),-0.1,1)/4-math.cos(q.anim_time*90*4*2+90)/8",
+							0
+						]
+					}
+				},
+				"wing_left": {
+					"rotation": {
+						"0.0": [
+							"-math.cos(q.anim_time*90*2*2)*5+math.sin(q.anim_time*90*2*2*3+90)/2",
+							0,
+							"-((4+math.sin(q.anim_time*90*2-30)*10)-math.cos(q.anim_time*90*4*2+40)*2)"
+						],
+						"0.4583": [1, -2, -30],
+						"0.7917": [-1.15022, -1.91757, 27.53671],
+						"1.0": [
+							"-math.cos(q.anim_time*90*2*2)*5+math.sin(q.anim_time*90*2*2*3+90)/2",
+							0,
+							"-((4+math.sin(q.anim_time*90*2*5-30)*50)-math.cos(q.anim_time*90*4*2+40)*2)"
+						],
+						"2.0": [
+							"-math.cos(q.anim_time*90*2*2)*5+math.sin(q.anim_time*90*2*2*3+90)/2",
+							0,
+							"-((4+math.sin(q.anim_time*90*2-30)*10)-math.cos(q.anim_time*90*4*2+40)*2)"
+						],
+						"3.5": [
+							"-math.cos(q.anim_time*90*2*2)*5+math.sin(q.anim_time*90*2*2*3+90)/2",
+							0,
+							"-((4+math.sin(q.anim_time*90*2-30)*10)-math.cos(q.anim_time*90*4*2+40)*2)"
+						]
+					}
+				},
+				"wing_left2": {
+					"rotation": {
+						"0.0": [0, 0, "-(15+math.sin(q.anim_time*90-60)*5)"],
+						"3.5": [0, 0, "-(15+math.sin(q.anim_time*90-60)*5)"]
+					}
+				},
+				"wing_right": {
+					"rotation": {
+						"0.0": [
+							"-math.cos(q.anim_time*90*2*2)*5+math.sin(q.anim_time*90*2*2*3+90)/2",
+							0,
+							"(4+math.sin(q.anim_time*90*2-30)*5)-math.cos(q.anim_time*90*4*2+40)*2"
+						],
+						"0.4583": [1, 2, 30],
+						"0.7917": [-1.15022, 1.91757, -27.53671],
+						"1.0": [
+							"-math.cos(q.anim_time*90*2*2)*5+math.sin(q.anim_time*90*2*2*3+90)/2",
+							0,
+							"((4+math.sin(q.anim_time*90*2*5-30)*50)-math.cos(q.anim_time*90*4*2+40)*2)"
+						],
+						"2.0": [
+							"-math.cos(q.anim_time*90*2*2)*5+math.sin(q.anim_time*90*2*2*3+90)/2",
+							0,
+							"((4+math.sin(q.anim_time*90*2-30)*10)-math.cos(q.anim_time*90*4*2+40)*2)"
+						],
+						"3.5": [
+							"-math.cos(q.anim_time*90*2*2)*5+math.sin(q.anim_time*90*2*2*3+90)/2",
+							0,
+							"((4+math.sin(q.anim_time*90*2-30)*10)-math.cos(q.anim_time*90*4*2+40)*2)"
+						]
+					}
+				},
+				"wing_right2": {
+					"rotation": {
+						"0.0": [0, 0, "(15+math.sin(q.anim_time*90-60)*5)"],
+						"3.5": [0, 0, "(15+math.sin(q.anim_time*90-60)*5)"]
+					}
+				}
+			}
+		},
+		"animation.cottonee.sleep": {
+			"loop": true,
+			"animation_length": 8,
+			"bones": {
+				"cottonee": {
+					"position": [0, 0.25, 0]
+				},
+				"body": {
+					"rotation": ["6+math.cos(q.anim_time*90/2)*1", -0.8, 4.92442],
+					"position": [0, -0.25, 0]
+				},
+				"head": {
+					"rotation": [
+						"0+math.cos(q.anim_time*90/2)*1-(math.sin(q.anim_time*90/2-110)*30+math.clamp(math.sin(q.anim_time*90/2-110)*10+math.sin(q.anim_time*90*3)*10, 0, 20))*0.05",
+						0,
+						0
+					],
+					"position": [0, -0.2, 0]
+				},
+				"eyelid_right": {
+					"position": [0, 0, -0.1]
+				},
+				"eyelid_left": {
+					"position": [0, 0, -0.1]
+				},
+				"nimbus_top": {
+					"rotation": ["4.9953-math.cos(q.anim_time*90/2+150)*1", 0.21782, -7.4905],
+					"position": [-0.25, "-0.4+math.cos(q.anim_time*90/2)/20", "0+math.cos(q.anim_time*90/2)/8"]
+				},
+				"nimbus_bottom": {
+					"rotation": [
+						"-4-math.cos(q.anim_time*90/2)*2+(math.sin(q.anim_time*90/2-110)*30+math.clamp(math.sin(q.anim_time*90/2-110)*10+math.sin(q.anim_time*90*3)*10, 0, 20))*0.1",
+						-0.8672,
+						-4.92442
+					]
+				},
+				"wing_left": {
+					"rotation": ["-(42-math.cos(q.anim_time*90/2-40)*5)", -9.33591, 0.86752],
+					"position": [0, -1.5, 0.75]
+				},
+				"wing_left2": {
+					"rotation": [
+						0,
+						0,
+						"-(2.2+math.sin(query.anim_time*90-0-90)*1+math.clamp(-math.sin(query.anim_time*90*1/2-90)*1+math.clamp(math.sin(q.anim_time*90-90)*4, -5, 10)+math.clamp(math.sin(q.anim_time*90/2+180-90)*1, 0, 10)+math.clamp(math.sin(q.anim_time*90*4-90-90)*3,-5, 0), 2, 40))"
+					]
+				},
+				"wing_right": {
+					"rotation": ["-40+math.cos(q.anim_time*90/2-20)*3", 12.44969, -13.09382],
+					"position": [0, -2, 0.75]
+				},
+				"wing_right2": {
+					"rotation": [
+						0,
+						0,
+						"2.2+math.sin(query.anim_time*90+30-90)*1+math.clamp(-math.sin(query.anim_time*90*1/2+30-90)*1+math.clamp(math.sin(q.anim_time*90+30-90)*4, -5, 10)+math.clamp(math.sin(q.anim_time*90/2+180+60-90)*1, 0, 10)+math.clamp(math.sin(q.anim_time*90*4-90+45-90)*3,-5, 0), 2, 40)"
+					]
+				}
+			}
+		},
 		"animation.cottonee.ditto_face": {
 			"loop": true,
 			"bones": {

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0622_golett/golett.animation.json

@@ -8,14 +8,14 @@
 				"arm_left": {
 					"rotation": [0, "Math.sin((query.anim_time-0.4) * 90 * 3.2*1) * 15", "25+Math.sin((query.anim_time-0.6) * 90 * 3.2*1) * 5"]
 				},
-				"finger_left": {
-					"rotation": [0, 0, -40]
+				"finger_front_left": {
+					"rotation": [0, 0, 90]
 				},
-				"finger_left2": {
-					"rotation": [0, 0, -50]
+				"finger_middle_left": {
+					"rotation": [0, 0, 90]
 				},
-				"finger_left3": {
-					"rotation": [0, 0, -40]
+				"finger_back_left": {
+					"rotation": [0, 0, 90]
 				},
 				"hammer": {
 					"rotation": [0, 0, 12.5]
@@ -23,14 +23,14 @@
 				"arm_right": {
 					"rotation": [0, "(Math.sin((query.anim_time-0.4) * 90 * 3.2*1) * 15)", "-25+Math.sin((query.anim_time-0.6) * 90 * 3.2*1) * 5"]
 				},
-				"finger_right": {
-					"rotation": [0, 0, 40]
+				"finger_front_right": {
+					"rotation": [0, 0, -90]
 				},
-				"finger_right2": {
-					"rotation": [0, 0, 50]
+				"finger_middle_right": {
+					"rotation": [0, 0, -90]
 				},
-				"finger_right3": {
-					"rotation": [0, 0, 40]
+				"finger_back_right": {
+					"rotation": [0, 0, -90]
 				},
 				"leg_left": {
 					"rotation": {
@@ -110,6 +110,24 @@
 						"1.125": [5.5, 0, 0],
 						"1.25": [7.75, 0, 0]
 					}
+				},
+				"finger_front_left2": {
+					"rotation": [0, 0, 88]
+				},
+				"finger_middle_left2": {
+					"rotation": [0, 0, 88]
+				},
+				"finger_back_left2": {
+					"rotation": [0, 0, 88]
+				},
+				"finger_front_right2": {
+					"rotation": [0, 0, -88]
+				},
+				"finger_middle_right2": {
+					"rotation": [0, 0, -88]
+				},
+				"finger_back_right2": {
+					"rotation": [0, 0, -88]
 				}
 			}
 		},
@@ -121,40 +139,58 @@
 					"position": [0, "0.25+Math.cos((query.anim_time-0.4) * 90 * 1) * 0.2", 0]
 				},
 				"arm_left": {
-					"rotation": [0, "Math.cos((query.anim_time-0.8) * 90 * 1) * 6", 30]
+					"rotation": [0, "Math.cos((query.anim_time-0.8) * 90 * 1) * 6", 20]
 				},
 				"hand_left": {
-					"rotation": ["Math.cos((query.anim_time-0.3) * 90 * 1) * -5", 0, -35]
+					"rotation": ["Math.cos((query.anim_time-0.3) * 90 * 1) * -5", 0, -30]
 				},
-				"finger_left": {
-					"rotation": [0, 0, -60]
+				"finger_front_left": {
+					"rotation": [0, 0, 90]
 				},
-				"finger_left2": {
-					"rotation": [0, 0, -62.5]
+				"finger_middle_left": {
+					"rotation": [0, 0, 90]
 				},
-				"finger_left3": {
-					"rotation": [0, 0, -60]
+				"finger_back_left": {
+					"rotation": [0, 0, 90]
 				},
 				"arm_right": {
-					"rotation": [0, "Math.cos((query.anim_time-0.6) * 90 * 1) * 6", -30]
+					"rotation": [0, "Math.cos((query.anim_time-0.6) * 90 * 1) * 6", -20]
 				},
 				"hand_right": {
-					"rotation": ["Math.cos((query.anim_time-0.3) * 90 * 1) * 5", 0, 35]
+					"rotation": ["Math.cos((query.anim_time-0.3) * 90 * 1) * 5", 0, 30]
 				},
-				"finger_right": {
-					"rotation": [0, 0, 60]
+				"finger_front_right": {
+					"rotation": [0, 0, -90]
 				},
-				"finger_right2": {
-					"rotation": [0, 0, 62.5]
+				"finger_middle_right": {
+					"rotation": [0, 0, -90]
 				},
-				"finger_right3": {
-					"rotation": [0, 0, 60]
+				"finger_back_right": {
+					"rotation": [0, 0, -90]
 				},
 				"head": {
 					"rotation": [0, 0, 0]
 				},
 				"leg_right": {
 					"rotation": [0, 12.5, 0]
+				},
+				"finger_front_left2": {
+					"rotation": [0, 0, 88]
+				},
+				"finger_middle_left2": {
+					"rotation": [0, 0, 88]
+				},
+				"finger_back_left2": {
+					"rotation": [0, 0, 88]
+				},
+				"finger_front_right2": {
+					"rotation": [0, 0, -88]
+				},
+				"finger_middle_right2": {
+					"rotation": [0, 0, -88]
+				},
+				"finger_back_right2": {
+					"rotation": [0, 0, -88]
 				}
 			}
 		},
@@ -180,17 +216,68 @@
 				"hand_right": {
 					"rotation": [-10, 0, 35]
 				},
-				"eyelid_left": {
-					"position": [0, 0.00176, -0.12499]
-				},
-				"eyelid_right": {
-					"position": [0, 0.00141, -0.09999]
-				},
 				"leg_left": {
 					"rotation": [25.48184, -4.75113, -11.57518]
 				},
 				"leg_right": {
 					"rotation": [32.98184, 4.75113, 11.57518]
+				},
+				"finger_front_left": {
+					"rotation": [0, 0, 90]
+				},
+				"finger_middle_left": {
+					"rotation": [0, 0, 90]
+				},
+				"finger_back_left": {
+					"rotation": [0, 0, 90]
+				},
+				"finger_front_right": {
+					"rotation": [0, 0, -90]
+				},
+				"finger_middle_right": {
+					"rotation": [0, 0, -90]
+				},
+				"finger_back_right": {
+					"rotation": [0, 0, -90]
+				},
+				"finger_front_left2": {
+					"rotation": [0, 0, 88]
+				},
+				"finger_middle_left2": {
+					"rotation": [0, 0, 88]
+				},
+				"finger_back_left2": {
+					"rotation": [0, 0, 88]
+				},
+				"finger_front_right2": {
+					"rotation": [0, 0, -88]
+				},
+				"finger_middle_right2": {
+					"rotation": [0, 0, -88]
+				},
+				"finger_back_right2": {
+					"rotation": [0, 0, -88]
+				},
+				"chest_glow": {
+					"position": [0, 0, 0.1]
+				},
+				"chest_glow_off": {
+					"position": [0, 0, -0.1]
+				},
+				"eyes": {
+					"position": [0, 0, 0.1]
+				},
+				"eyes_off": {
+					"position": [0, 0, -0.1]
+				},
+				"glow_off_bottom": {
+					"scale": [0.98, 0.92, 0.98]
+				},
+				"glow_off_right": {
+					"scale": [0.9, 0.98, 0.98]
+				},
+				"glow_off_left": {
+					"scale": [0.9, 0.98, 0.98]
 				}
 			}
 		},
@@ -286,14 +373,14 @@
 						"2.0": [21.99054, 3.19908, -47.62113]
 					}
 				},
-				"finger_left": {
-					"rotation": [0, 0, -50]
+				"finger_front_left": {
+					"rotation": [0, 0, 90]
 				},
-				"finger_left2": {
-					"rotation": [0, 0, -55]
+				"finger_middle_left": {
+					"rotation": [0, 0, 90]
 				},
-				"finger_left3": {
-					"rotation": [0, 0, -50]
+				"finger_back_left": {
+					"rotation": [0, 0, 90]
 				},
 				"arm_right": {
 					"rotation": {
@@ -335,26 +422,14 @@
 						"2.0": [21.99054, -3.19908, 47.62113]
 					}
 				},
-				"finger_right": {
-					"rotation": [0, 0, 50]
+				"finger_front_right": {
+					"rotation": [0, 0, -90]
 				},
-				"finger_right2": {
-					"rotation": [0, 0, 55]
+				"finger_middle_right": {
+					"rotation": [0, 0, -90]
 				},
-				"finger_right3": {
-					"rotation": [0, 0, 50]
-				},
-				"eyelid_left": {
-					"position": {
-						"0.9167": [0, 0, 0],
-						"0.9583": [0, -0.01242, -0.10233]
-					}
-				},
-				"eyelid_right": {
-					"position": {
-						"0.9167": [0, 0, 0],
-						"0.9583": [0, 0.00198, -0.13461]
-					}
+				"finger_back_right": {
+					"rotation": [0, 0, -90]
 				},
 				"leg_left": {
 					"rotation": {
@@ -421,25 +496,24 @@
 						"1.7917": [21.5, 0, 0],
 						"1.875": [24, 0, 0]
 					}
-				}
-			}
-		},
-		"animation.golett.blink": {
-			"animation_length": 0.16667,
-			"bones": {
-				"eyelid_right": {
-					"position": {
-						"0.0": [0, 0, -0.1],
-						"0.125": [0, 0, -0.1],
-						"0.1667": [0, 0, 0]
-					}
 				},
-				"eyelid_left": {
-					"position": {
-						"0.0": [0, 0, -0.1],
-						"0.125": [0, 0, -0.1],
-						"0.1667": [0, 0, 0]
-					}
+				"finger_front_left2": {
+					"rotation": [0, 0, 88]
+				},
+				"finger_middle_left2": {
+					"rotation": [0, 0, 88]
+				},
+				"finger_back_left2": {
+					"rotation": [0, 0, 88]
+				},
+				"finger_front_right2": {
+					"rotation": [0, 0, -88]
+				},
+				"finger_middle_right2": {
+					"rotation": [0, 0, -88]
+				},
+				"finger_back_right2": {
+					"rotation": [0, 0, -88]
 				}
 			}
 		},
@@ -572,6 +646,32 @@
 					}
 				}
 			}
+		},
+		"animation.golett.off": {
+			"loop": true,
+			"bones": {
+				"chest_glow": {
+					"position": [0, 0, 0.1]
+				},
+				"chest_glow_off": {
+					"position": [0, 0, -0.1]
+				},
+				"eyes": {
+					"position": [0, 0, 0.1]
+				},
+				"eyes_off": {
+					"position": [0, 0, -0.1]
+				},
+				"glow_off_bottom": {
+					"scale": [0.98, 0.92, 0.98]
+				},
+				"glow_off_right": {
+					"scale": [0.9, 0.98, 0.98]
+				},
+				"glow_off_left": {
+					"scale": [0.9, 0.98, 0.98]
+				}
+			}
 		}
 	}
 }

common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0014_kakuna/kakuna.geo.json

@@ -53,9 +53,9 @@
 				{
 					"name": "locator_item_hat",
 					"parent": "head",
-					"pivot": [0, 16, 0],
+					"pivot": [0, 15.9, -0.5],
 					"locators": {
-						"item_hat": [0, 16.39905, -0.47821]
+						"item_hat": [0, 15.9, -0.5]
 					}
 				},
 				{

common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0016_pidgey/pidgey.geo.json

@@ -5,7 +5,7 @@
 			"description": {
 				"identifier": "geometry.pidgey",
 				"texture_width": 64,
-				"texture_height": 32,
+				"texture_height": 64,
 				"visible_bounds_width": 3,
 				"visible_bounds_height": 2.5,
 				"visible_bounds_offset": [0, 0.75, 0]
@@ -55,289 +55,418 @@
 				{
 					"name": "torso",
 					"parent": "body",
-					"pivot": [0, 5.25, -0.75],
+					"pivot": [0, 2.25, 0.75],
+					"rotation": [-10, 0, 0],
 					"cubes": [
-						{"origin": [-2, 2.75, -3.25], "size": [4, 5, 5], "inflate": 0.01, "uv": [16, 13]},
-						{"origin": [-2, 3.25, 1.25], "size": [4, 4, 3], "uv": [0, 25]}
+						{"origin": [-3, 1.75, -3], "size": [6, 6, 5], "inflate": 0.01, "uv": [24, 0]}
+					]
+				},
+				{
+					"name": "torso2",
+					"parent": "torso",
+					"pivot": [0, 1.8, -3],
+					"rotation": [35, 0, 0],
+					"cubes": [
+						{"origin": [-3, 1.8, -3], "size": [6, 5, 6], "uv": [0, 0]}
+					]
+				},
+				{
+					"name": "chest_tuff",
+					"parent": "torso2",
+					"pivot": [0, 6.8, -3],
+					"rotation": [-7.5, 0, 0],
+					"cubes": [
+						{"origin": [-3, 3.8, -3], "size": [6, 3, 0], "uv": [23, 60]},
+						{"origin": [3, 3.8, -3], "size": [0, 3, 2], "inflate": 0.01, "uv": [28, 46]},
+						{"origin": [-3, 3.8, -3], "size": [0, 3, 2], "inflate": 0.01, "uv": [23, 46]},
+						{"origin": [-2.5, 2.8, -3], "size": [5, 1, 0], "uv": [33, 50]}
 					]
 				},
 				{
 					"name": "neck",
-					"parent": "torso",
-					"pivot": [0, 5.25, -1.5]
-				},
-				{
-					"name": "head_ai",
-					"parent": "neck",
-					"pivot": [0, 5.25, -1.5],
+					"parent": "torso2",
+					"pivot": [0, 6.05, -0.25],
+					"rotation": [-22.5, 0, 0],
 					"cubes": [
-						{"origin": [-2, 4.25, -3.5], "size": [4, 5, 4], "uv": [0, 16]}
+						{"origin": [-2.5, 4.8, -2.75], "size": [5, 5, 5], "inflate": -0.15, "uv": [0, 11]}
 					]
 				},
 				{
 					"name": "head",
+					"parent": "neck",
+					"pivot": [0, 9.6, -0.15]
+				},
+				{
+					"name": "head_ai",
+					"parent": "head",
+					"pivot": [0, 9.6, -0.15]
+				},
+				{
+					"name": "head_angle",
 					"parent": "head_ai",
-					"pivot": [0, 9.25, -1.5],
+					"pivot": [0, 9.6, -0.15],
 					"cubes": [
-						{"origin": [-2, 7.25, -3.5], "size": [4, 4, 4], "inflate": 0.02, "uv": [0, 8]},
-						{"origin": [-1, 8.75, -5.5], "size": [2, 1, 2], "inflate": 0.01, "pivot": [0, 9.75, -3.5], "rotation": [10, 0, 0], "uv": [8, 0]}
+						{"origin": [-2.5, 7.55, -2.75], "size": [5, 4, 5], "uv": [20, 11]}
 					]
 				},
 				{
 					"name": "locator_mouth",
-					"parent": "head",
-					"pivot": [0, 8.6, -3.55],
+					"parent": "head_angle",
+					"pivot": [0, 8.65, -2.8],
 					"locators": {
-						"mouth": [0, 8.6, -3.55],
-						"special": [0, 8.6, -3.55]
+						"mouth": [0, 8.65, -2.8],
+						"special": [0, 8.65, -2.8]
 					}
 				},
 				{
 					"name": "locator_face",
-					"parent": "head",
-					"pivot": [0, 9.75, -4.2],
+					"parent": "head_angle",
+					"pivot": [0, 9.8, -3.45],
 					"locators": {
-						"face": [0, 9.75, -4.2]
+						"face": [0, 9.8, -3.45]
 					}
 				},
 				{
 					"name": "locator_item_face",
-					"parent": "head",
-					"pivot": [0, 9.75, -3.55],
+					"parent": "head_angle",
+					"pivot": [0, 9.8, -2.8],
 					"locators": {
-						"item_face": [0, 9.75, -3.55]
+						"item_face": [0, 9.8, -2.8]
 					}
 				},
 				{
 					"name": "locator_head",
-					"parent": "head",
-					"pivot": [0, 11.25, -2],
+					"parent": "head_angle",
+					"pivot": [0, 11.8, -1.25],
 					"locators": {
-						"head": [0, 11.25, -2]
+						"head": [0, 11.8, -1.25]
 					}
 				},
 				{
 					"name": "locator_item_hat",
-					"parent": "head",
-					"pivot": [0, 11.25, -1.5],
+					"parent": "head_angle",
+					"pivot": [0, 11.8, -0.75],
 					"locators": {
-						"item_hat": [0, 11.25, -1.5]
+						"item_hat": [0, 11.8, -0.75]
 					}
 				},
 				{
 					"name": "locator_eye_right",
-					"parent": "head",
-					"pivot": [-1.75, 9.775, -3.525],
+					"parent": "head_angle",
+					"pivot": [-1.75, 9.675, -2.775],
 					"locators": {
-						"eye1": [-1.75, 9.775, -3.525]
+						"eye1": [-1.75, 9.675, -2.775]
 					}
 				},
 				{
 					"name": "locator_eye_left",
-					"parent": "head",
-					"pivot": [1.75, 9.775, -3.525],
+					"parent": "head_angle",
+					"pivot": [1.75, 9.675, -2.775],
 					"locators": {
-						"eye2": [1.75, 9.775, -3.525]
+						"eye2": [1.75, 9.675, -2.775]
 					}
 				},
 				{
 					"name": "locator_beak",
-					"parent": "head",
-					"pivot": [0, 8.775, -5.375],
+					"parent": "head_angle",
+					"pivot": [0, 8.825, -4.625],
 					"locators": {
-						"beak": [0, 8.775, -5.375],
-						"physical": [0, 8.775, -5.375],
-						"jaw1": [0, 8.775, -5.375]
-					}
-				},
-				{
-					"name": "jaw",
-					"parent": "head",
-					"pivot": [0, 8.5, -3.5],
-					"rotation": [-5, 0, 0],
-					"cubes": [
-						{"origin": [-1, 7.75, -5], "size": [2, 1, 2], "uv": [0, 0]}
-					]
-				},
-				{
-					"name": "locator_jaw_lower",
-					"parent": "jaw",
-					"pivot": [0, 8.75, -5],
-					"locators": {
-						"jaw2": [0, 8.75, -5]
-					}
-				},
-				{
-					"name": "locator_item",
-					"parent": "jaw",
-					"pivot": [0, 8.75, -5],
-					"locators": {
-						"item": [0, 8.75, -5]
+						"beak": [0, 8.825, -4.625],
+						"physical": [0, 8.825, -4.625],
+						"jaw1": [0, 8.825, -4.625]
 					}
 				},
 				{
 					"name": "hair",
-					"parent": "head",
-					"pivot": [0, 9.25, -3.53],
-					"rotation": [2.5, 0, 0],
+					"parent": "head_angle",
+					"pivot": [0, 9.55, -3],
+					"rotation": [-5, 0, 0],
 					"cubes": [
-						{"origin": [-2, 9.25, -3.53], "size": [4, 2, 0], "uv": [42, 15]}
+						{"origin": [-1, 9.55, -3], "size": [2, 1, 0], "uv": [51, 50]},
+						{"origin": [-1.5, 10.55, -3], "size": [3, 1, 0], "uv": [57, 46]}
 					]
 				},
 				{
 					"name": "hair2",
 					"parent": "hair",
-					"pivot": [0, 11.25, -3.53],
-					"rotation": [-70, 0, 0],
+					"pivot": [0.5, 11.55, -3],
+					"rotation": [-60, 0, 0],
 					"cubes": [
-						{"origin": [-2.5, 11.25, -3.53], "size": [5, 2, 0], "uv": [41, 13]}
+						{"origin": [-1.5, 11.55, -3], "size": [3, 3, 0], "uv": [57, 48]}
 					]
 				},
 				{
-					"name": "hair3",
-					"parent": "hair2",
-					"pivot": [0, 13.25, -3.53],
-					"rotation": [-12.5, 0, 0],
+					"name": "face",
+					"parent": "head_angle",
+					"pivot": [-0.5, 9.05, -2.75],
 					"cubes": [
-						{"origin": [-2.5, 13.25, -3.53], "size": [5, 3, 0], "uv": [41, 10]}
+						{"origin": [-1, 8.55, -4.75], "size": [2, 1, 2], "inflate": 0.01, "pivot": [0, 9.55, -2.75], "rotation": [5, 0, 0], "uv": [56, 8]},
+						{"origin": [-0.5, 8.05, -4.75], "size": [1, 1, 0], "pivot": [-0.5, 9.05, -2.75], "rotation": [5, 0, 0], "uv": [54, 8]}
 					]
 				},
 				{
-					"name": "eyelid_right",
-					"parent": "head",
-					"pivot": [-1.41, 9.75, -2.41],
+					"name": "eyes",
+					"parent": "face",
+					"pivot": [0, 0, 0]
+				},
+				{
+					"name": "eye_left",
+					"parent": "eyes",
+					"pivot": [1.625, 9.6, -2.3],
 					"cubes": [
-						{"origin": [-1.91, 9.25, -3.41], "size": [1, 1, 2], "inflate": 0.02, "uv": [15, 15]}
+						{"origin": [0.5, 9.05, -2.75], "size": [2, 1, 1], "inflate": 0.01, "uv": [28, 21]}
+					]
+				},
+				{
+					"name": "pupil_left",
+					"parent": "eye_left",
+					"pivot": [1.75, 9.65, -2.35],
+					"cubes": [
+						{"origin": [1.25, 9.15, -2.85], "size": [1, 1, 1], "inflate": -0.08, "uv": [28, 27]}
+					]
+				},
+				{
+					"name": "eye_right",
+					"parent": "eyes",
+					"pivot": [-1.625, 9.6, -2.3],
+					"cubes": [
+						{"origin": [-2.5, 9.05, -2.75], "size": [2, 1, 1], "inflate": 0.01, "uv": [21, 21]}
+					]
+				},
+				{
+					"name": "pupil_right",
+					"parent": "eye_right",
+					"pivot": [-1.75, 9.65, -2.35],
+					"cubes": [
+						{"origin": [-2.25, 9.15, -2.85], "size": [1, 1, 1], "inflate": -0.08, "uv": [21, 27]}
 					]
 				},
 				{
 					"name": "eyelid_left",
-					"parent": "head",
-					"pivot": [1.41, 9.75, -2.41],
+					"parent": "eyes",
+					"pivot": [1.4, 9.55, -2.15],
 					"cubes": [
-						{"origin": [0.91, 9.25, -3.41], "size": [1, 1, 2], "inflate": 0.02, "uv": [20, 10], "mirror": true}
+						{"origin": [0.4, 9.05, -2.65], "size": [2, 1, 1], "inflate": 0.03, "uv": [28, 24]}
 					]
 				},
 				{
-					"name": "wing_closed_left",
-					"parent": "torso",
-					"pivot": [2, 5.75, -2],
+					"name": "eyelid_right",
+					"parent": "eyes",
+					"pivot": [-1.4, 9.55, -2.15],
 					"cubes": [
-						{"origin": [2, 2.75, -3], "size": [1, 5, 4], "uv": [12, 3], "mirror": true}
+						{"origin": [-2.4, 9.05, -2.65], "size": [2, 1, 1], "inflate": 0.03, "uv": [21, 24]}
+					]
+				},
+				{
+					"name": "jaw",
+					"parent": "face",
+					"pivot": [0, 8.55, -2.75],
+					"cubes": [
+						{"origin": [-1, 7.8, -4.25], "size": [2, 1, 2], "uv": [47, 8]}
+					]
+				},
+				{
+					"name": "locator_jaw_lower",
+					"parent": "jaw",
+					"pivot": [0, 8.8, -4.25],
+					"locators": {
+						"jaw2": [0, 8.8, -4.25]
+					}
+				},
+				{
+					"name": "locator_item",
+					"parent": "jaw",
+					"pivot": [0, 8.8, -4.25],
+					"locators": {
+						"item": [0, 8.8, -4.25]
+					}
+				},
+				{
+					"name": "face_ditto",
+					"parent": "head_angle",
+					"pivot": [0, 9.35, -2.7]
+				},
+				{
+					"name": "eyes_ditto",
+					"parent": "face_ditto",
+					"pivot": [0, 10.1, -2.72],
+					"cubes": [
+						{"origin": [-2, 9.6, -2.72], "size": [4, 1, 0], "uv": [36, 22]}
+					]
+				},
+				{
+					"name": "eyes_blink_ditto",
+					"parent": "face_ditto",
+					"pivot": [0, 10.1, -2.62],
+					"cubes": [
+						{"origin": [-2.5, 9.6, -2.62], "size": [5, 1, 0], "uv": [35, 24]},
+						{"origin": [-2, 10.1, -2.63], "size": [4, 1, 0], "uv": [36, 26]}
+					]
+				},
+				{
+					"name": "mouth_ditto",
+					"parent": "face_ditto",
+					"pivot": [0, 8.35, -2.7],
+					"cubes": [
+						{"origin": [-1.5, 7.6, -2.71], "size": [3, 1, 0], "uv": [37, 30]},
+						{"origin": [-2.5, 8.1, -2.71], "size": [5, 1, 0], "uv": [35, 28]}
+					]
+				},
+				{
+					"name": "mouth_open_ditto",
+					"parent": "face_ditto",
+					"pivot": [0, 8.6, -2.61],
+					"cubes": [
+						{"origin": [-2.5, 7.6, -2.61], "size": [5, 2, 0], "uv": [35, 32]}
+					]
+				},
+				{
+					"name": "brows",
+					"parent": "head_angle",
+					"pivot": [0, -1.7, 1.75],
+					"cubes": [
+						{"origin": [-1.5, 9.55, -2.78], "size": [3, 1, 0], "inflate": 0.01, "uv": [44, 50]},
+						{"origin": [-2.5, 11.55, -2.75], "size": [5, 3, 0], "pivot": [0, 11.55, -2.75], "rotation": [-72.5, 0, 0], "uv": [36, 60]},
+						{"origin": [2.5, 11.55, -2.75], "size": [0, 2, 1], "inflate": 0.01, "pivot": [0, 11.55, -2.75], "rotation": [-72.5, 0, 0], "uv": [44, 56]},
+						{"origin": [-2.5, 11.55, -2.75], "size": [0, 2, 1], "inflate": 0.01, "pivot": [0, 11.55, -2.75], "rotation": [-72.5, 0, 0], "uv": [41, 56]}
+					]
+				},
+				{
+					"name": "wings",
+					"parent": "torso",
+					"pivot": [0, 6.25, -2.75]
+				},
+				{
+					"name": "wings_closed",
+					"parent": "wings",
+					"pivot": [0, 6.25, -2.75],
+					"rotation": [-7.5, 0, 0]
+				},
+				{
+					"name": "wing_closed_left",
+					"parent": "wings_closed",
+					"pivot": [3, 6.25, -2.75],
+					"cubes": [
+						{"origin": [3, 3.25, -3.75], "size": [1, 5, 4], "uv": [10, 21]}
 					]
 				},
 				{
 					"name": "wing_closed_left2",
 					"parent": "wing_closed_left",
-					"pivot": [3, 2.75, 1],
+					"pivot": [4, 3.5, 0.25],
 					"cubes": [
-						{"origin": [2, 2.75, 1], "size": [1, 4, 3], "inflate": 0.01, "uv": [21, 0], "mirror": true}
+						{"origin": [3, 3.5, 0.25], "size": [1, 4, 3], "inflate": 0.01, "uv": [8, 39]}
 					]
 				},
 				{
 					"name": "wing_closed_left3",
 					"parent": "wing_closed_left2",
-					"pivot": [3, 2.75, 4],
+					"pivot": [3.5, 3.5, 3.25],
 					"cubes": [
-						{"origin": [3, 2.75, 4], "size": [0, 3, 4], "uv": [30, -4], "mirror": true}
+						{"origin": [3.5, 3.5, 3.25], "size": [0, 3, 4], "uv": [32, 52]}
 					]
 				},
 				{
 					"name": "wing_closed_right",
-					"parent": "torso",
-					"pivot": [-2, 5.75, -2],
+					"parent": "wings_closed",
+					"pivot": [-3, 6.25, -2.75],
 					"cubes": [
-						{"origin": [-3, 2.75, -3], "size": [1, 5, 4], "uv": [34, 14]}
+						{"origin": [-4, 3.25, -3.75], "size": [1, 5, 4], "uv": [0, 21]}
 					]
 				},
 				{
 					"name": "wing_closed_right2",
 					"parent": "wing_closed_right",
-					"pivot": [-3, 2.75, 1],
+					"pivot": [-4, 3.5, 0.25],
 					"cubes": [
-						{"origin": [-3, 2.75, 1], "size": [1, 4, 3], "inflate": 0.01, "uv": [30, 11]}
+						{"origin": [-4, 3.5, 0.25], "size": [1, 4, 3], "inflate": 0.01, "uv": [0, 39]}
 					]
 				},
 				{
 					"name": "wing_closed_right3",
 					"parent": "wing_closed_right2",
-					"pivot": [-3, 2.75, 4],
+					"pivot": [-3.5, 3.5, 3.25],
 					"cubes": [
-						{"origin": [-3, 2.75, 4], "size": [0, 3, 4], "uv": [38, -4]}
+						{"origin": [-3.5, 3.5, 3.25], "size": [0, 3, 4], "uv": [23, 52]}
 					]
 				},
+				{
+					"name": "wings_open",
+					"parent": "wings",
+					"pivot": [0, 7, -3]
+				},
 				{
 					"name": "wing_open_left",
-					"parent": "torso",
-					"pivot": [2, 6, -2.25],
+					"parent": "wings_open",
+					"pivot": [3, 7, -3],
 					"cubes": [
-						{"origin": [2, 5.5, -2.75], "size": [3, 1, 3], "uv": [24, 23], "mirror": true},
-						{"origin": [1.65, 6, -0.75], "size": [4, 0, 3], "pivot": [3.5, 5, 0.75], "rotation": [0, -17.5, 0], "uv": [43, 28], "mirror": true}
+						{"origin": [2, 6.5, -3.5], "size": [5, 1, 3], "uv": [14, 31]},
+						{"origin": [2.9, 7, -1.5], "size": [4, 0, 3], "pivot": [4.75, 6, 0], "rotation": [0, -17.5, 0], "uv": [9, 48]}
 					]
 				},
 				{
 					"name": "wing_open_left2",
 					"parent": "wing_open_left",
-					"pivot": [4.75, 6, -2.75],
+					"pivot": [6.75, 7, -3.5],
 					"cubes": [
-						{"origin": [4.75, 5.5, -3], "size": [4, 1, 3], "inflate": 0.01, "uv": [13, 24], "mirror": true},
-						{"origin": [4.75, 6.01, 0], "size": [4, 0, 3], "uv": [43, 24], "mirror": true}
+						{"origin": [6.75, 6.5, -4.75], "size": [5, 1, 4], "inflate": 0.01, "uv": [14, 35]},
+						{"origin": [6.75, 7.01, -0.75], "size": [5, 0, 3], "uv": [9, 52]}
 					]
 				},
 				{
 					"name": "wing_open_left3",
 					"parent": "wing_open_left2",
-					"pivot": [8.75, 6, -2.75],
+					"pivot": [11.75, 7, -4.75],
 					"cubes": [
-						{"origin": [8.75, 6.01, -2.75], "size": [4, 0, 5], "uv": [34, 4], "mirror": true}
+						{"origin": [11.75, 7.01, -4.75], "size": [5, 0, 7], "uv": [5, 56]}
 					]
 				},
 				{
 					"name": "locator_wing_left",
 					"parent": "wing_open_left3",
-					"pivot": [10.7, 6, -1.8],
+					"pivot": [13.7, 7, -3.8],
 					"rotation": [0, -90, 0],
 					"locators": {
 						"wing2": {
-							"offset": [10.7, 6, -1.8],
+							"offset": [13.7, 7, -3.8],
 							"rotation": [0, -90, 0]
 						}
 					}
 				},
 				{
 					"name": "wing_open_right",
-					"parent": "torso",
-					"pivot": [-2, 6, -2.25],
+					"parent": "wings_open",
+					"pivot": [-3, 7, -3],
 					"cubes": [
-						{"origin": [-5, 5.5, -2.75], "size": [3, 1, 3], "uv": [25, 27]},
-						{"origin": [-5.65, 6, -0.75], "size": [4, 0, 3], "pivot": [-3.5, 5, 0.75], "rotation": [0, 17.5, 0], "uv": [35, 28]}
+						{"origin": [-7, 6.5, -3.5], "size": [5, 1, 3], "uv": [0, 30]},
+						{"origin": [-6.9, 7, -1.5], "size": [4, 0, 3], "pivot": [-4.75, 6, 0], "rotation": [0, 17.5, 0], "uv": [-2, 48]}
 					]
 				},
 				{
 					"name": "wing_open_right2",
 					"parent": "wing_open_right",
-					"pivot": [-4.75, 6, -2.75],
+					"pivot": [-6.75, 7, -3.5],
 					"cubes": [
-						{"origin": [-8.75, 5.5, -3], "size": [4, 1, 3], "inflate": 0.01, "uv": [14, 28]},
-						{"origin": [-8.75, 6.01, 0], "size": [4, 0, 3], "uv": [35, 24]}
+						{"origin": [-11.75, 6.5, -4.75], "size": [5, 1, 4], "inflate": 0.01, "uv": [0, 34]},
+						{"origin": [-11.75, 7.01, -0.75], "size": [5, 0, 3], "uv": [-2, 52]}
 					]
 				},
 				{
 					"name": "wing_open_right3",
 					"parent": "wing_open_right2",
-					"pivot": [-8.75, 6, -2.75],
+					"pivot": [-11.75, 7, -4.75],
 					"cubes": [
-						{"origin": [-12.75, 6.01, -2.75], "size": [4, 0, 5], "uv": [25, 4]}
+						{"origin": [-16.75, 7.01, -4.75], "size": [5, 0, 7], "uv": [-6, 56]}
 					]
 				},
 				{
 					"name": "locator_wing_right",
 					"parent": "wing_open_right3",
-					"pivot": [-10.7, 6, -1.8],
+					"pivot": [-13.7, 7, -3.8],
 					"rotation": [0, 90, 0],
 					"locators": {
-						"wing1": {
-							"offset": [-10.7, 6, -1.8],
+						"wing3": {
+							"offset": [-13.7, 7, -3.8],
 							"rotation": [0, 90, 0]
 						}
 					}
@@ -345,61 +474,75 @@
 				{
 					"name": "tail",
 					"parent": "torso",
-					"pivot": [0, 5.25, 4.25]
+					"pivot": [0, 4.25, 2],
+					"cubes": [
+						{"origin": [-2, 2.25, 1.5], "size": [4, 4, 3], "uv": [46, 0]}
+					]
+				},
+				{
+					"name": "tail2",
+					"parent": "tail",
+					"pivot": [0, 4.25, 4.5]
 				},
 				{
 					"name": "tail_left",
-					"parent": "tail",
-					"pivot": [0, 5.15, 4.25],
+					"parent": "tail2",
+					"pivot": [0, 4.25, 4.5],
 					"rotation": [0, 22.5, 0],
 					"cubes": [
-						{"origin": [-0.5, 5.15, 4.25], "size": [2, 0, 5], "uv": [-1, 3], "mirror": true}
+						{"origin": [-0.5, 4.25, 4.5], "size": [2, 0, 5], "uv": [54, 58]}
 					]
 				},
 				{
 					"name": "tail_middle",
-					"parent": "tail",
-					"pivot": [0, 5.25, 4.25],
+					"parent": "tail2",
+					"pivot": [0, 4.25, 4.5],
 					"cubes": [
-						{"origin": [-1, 5.25, 4.25], "size": [2, 0, 5], "uv": [-5, 3]}
+						{"origin": [-1, 4.26, 4.5], "size": [2, 0, 5], "uv": [49, 58]}
 					]
 				},
 				{
 					"name": "locator_tail",
 					"parent": "tail_middle",
-					"pivot": [0, 5.225, 6.75],
-					"rotation": [0, 180, 0],
+					"pivot": [0, 4.225, 7],
+					"rotation": [180, 0, -180],
 					"locators": {
-						"tail": [0, 5.225, 6.75]
+						"tail": [0, 4.225, 7]
 					}
 				},
 				{
 					"name": "locator_tail_tip",
 					"parent": "tail_middle",
-					"pivot": [0, 5.225, 9.25],
+					"pivot": [0, 4.225, 9.5],
+					"rotation": [180, 0, -180],
 					"locators": {
 						"tail_tip": {
-							"offset": [0, 5.225, 9.25],
+							"offset": [0, 4.225, 9.5],
 							"rotation": [0, 180, 0]
 						}
 					}
 				},
 				{
 					"name": "tail_right",
-					"parent": "tail",
-					"pivot": [0, 5.15, 4.25],
+					"parent": "tail2",
+					"pivot": [0, 4.25, 4.5],
 					"rotation": [0, -22.5, 0],
 					"cubes": [
-						{"origin": [-1.5, 5.15, 4.25], "size": [2, 0, 5], "uv": [3, 3]}
+						{"origin": [-1.5, 4.25, 4.5], "size": [2, 0, 5], "uv": [44, 58]}
 					]
 				},
 				{
-					"name": "leg_left",
+					"name": "legs",
 					"parent": "body",
+					"pivot": [0, 3, 0.75]
+				},
+				{
+					"name": "leg_left",
+					"parent": "legs",
 					"pivot": [1.4, 3, 0.75],
 					"rotation": [5, 0, 0],
 					"cubes": [
-						{"origin": [0.9, 1.75, 0.25], "size": [1, 1, 1], "uv": [6, 0], "mirror": true}
+						{"origin": [0.9, 1.75, 0.25], "size": [1, 1, 1], "uv": [50, 12]}
 					]
 				},
 				{
@@ -408,7 +551,7 @@
 					"pivot": [1.4, 1.75, 1.25],
 					"rotation": [-15, 0, 0],
 					"cubes": [
-						{"origin": [0.9, 0.75, 0.25], "size": [1, 1, 1], "inflate": 0.01, "uv": [14, 0], "mirror": true}
+						{"origin": [0.9, 0.75, 0.25], "size": [1, 1, 1], "inflate": 0.01, "uv": [54, 12]}
 					]
 				},
 				{
@@ -417,7 +560,7 @@
 					"pivot": [1.4, 0.75, 0.25],
 					"rotation": [10, 0, 0],
 					"cubes": [
-						{"origin": [0.4, -0.25, -0.5], "size": [2, 1, 2], "inflate": 0.01, "uv": [16, 0], "mirror": true}
+						{"origin": [0.4, -0.25, -0.5], "size": [2, 1, 2], "inflate": 0.01, "uv": [50, 14]}
 					]
 				},
 				{
@@ -434,7 +577,7 @@
 					"parent": "foot_left",
 					"pivot": [1.4, 0.75, 1.5],
 					"cubes": [
-						{"origin": [1.4, -0.25, 1.5], "size": [0, 1, 1], "inflate": 0.01, "uv": [22, -1], "mirror": true}
+						{"origin": [0.9, -0.25, 1.5], "size": [1, 1, 1], "inflate": 0.01, "uv": [50, 19]}
 					]
 				},
 				{
@@ -442,7 +585,7 @@
 					"parent": "toe_back_left",
 					"pivot": [1.4, 0.75, 2.5],
 					"cubes": [
-						{"origin": [1.4, -0.25, 2.5], "size": [0, 1, 1], "uv": [2, 9], "mirror": true}
+						{"origin": [1.4, -0.25, 2.5], "size": [0, 1, 1], "uv": [22, 3]}
 					]
 				},
 				{
@@ -450,7 +593,7 @@
 					"parent": "foot_left",
 					"pivot": [0.9, 0.75, -0.5],
 					"cubes": [
-						{"origin": [0.9, -0.25, -1.5], "size": [0, 1, 1], "inflate": 0.01, "uv": [0, -1], "mirror": true}
+						{"origin": [0.4, -0.25, -1.5], "size": [1, 1, 1], "inflate": 0.01, "uv": [50, 17]}
 					]
 				},
 				{
@@ -458,7 +601,7 @@
 					"parent": "toe_inner_left",
 					"pivot": [0.9, 0.75, -1.5],
 					"cubes": [
-						{"origin": [0.9, -0.25, -2.5], "size": [0, 1, 1], "uv": [2, 7], "mirror": true}
+						{"origin": [0.9, -0.25, -2.5], "size": [0, 1, 1], "uv": [22, -1]}
 					]
 				},
 				{
@@ -466,7 +609,7 @@
 					"parent": "foot_left",
 					"pivot": [1.9, 0.75, -0.5],
 					"cubes": [
-						{"origin": [1.9, -0.25, -1.5], "size": [0, 1, 1], "inflate": 0.01, "uv": [2, 10], "mirror": true}
+						{"origin": [1.4, -0.25, -1.5], "size": [1, 1, 1], "inflate": 0.01, "uv": [54, 17]}
 					]
 				},
 				{
@@ -474,16 +617,16 @@
 					"parent": "toe_outer_left",
 					"pivot": [1.9, 0.75, -1.5],
 					"cubes": [
-						{"origin": [1.9, -0.25, -2.5], "size": [0, 1, 1], "uv": [2, 8], "mirror": true}
+						{"origin": [1.9, -0.25, -2.5], "size": [0, 1, 1], "uv": [22, 1]}
 					]
 				},
 				{
 					"name": "leg_right",
-					"parent": "body",
+					"parent": "legs",
 					"pivot": [-1.4, 3, 0.75],
 					"rotation": [5, 0, 0],
 					"cubes": [
-						{"origin": [-1.9, 1.75, 0.25], "size": [1, 1, 1], "uv": [6, 0]}
+						{"origin": [-1.9, 1.75, 0.25], "size": [1, 1, 1], "uv": [41, 12]}
 					]
 				},
 				{
@@ -492,7 +635,7 @@
 					"pivot": [-1.4, 1.75, 1.25],
 					"rotation": [-15, 0, 0],
 					"cubes": [
-						{"origin": [-1.9, 0.75, 0.25], "size": [1, 1, 1], "inflate": 0.01, "uv": [14, 0]}
+						{"origin": [-1.9, 0.75, 0.25], "size": [1, 1, 1], "inflate": 0.01, "uv": [45, 12]}
 					]
 				},
 				{
@@ -501,7 +644,7 @@
 					"pivot": [-1.4, 0.75, 0.25],
 					"rotation": [10, 0, 0],
 					"cubes": [
-						{"origin": [-2.4, -0.25, -0.5], "size": [2, 1, 2], "inflate": 0.01, "uv": [16, 0]}
+						{"origin": [-2.4, -0.25, -0.5], "size": [2, 1, 2], "inflate": 0.01, "uv": [41, 14]}
 					]
 				},
 				{
@@ -518,7 +661,7 @@
 					"parent": "foot_right",
 					"pivot": [-1.4, 0.75, 1.5],
 					"cubes": [
-						{"origin": [-1.4, -0.25, 1.5], "size": [0, 1, 1], "inflate": 0.01, "uv": [22, 0]}
+						{"origin": [-1.9, -0.25, 1.5], "size": [1, 1, 1], "inflate": 0.01, "uv": [41, 19]}
 					]
 				},
 				{
@@ -526,7 +669,7 @@
 					"parent": "toe_back_right",
 					"pivot": [-1.4, 0.75, 2.5],
 					"cubes": [
-						{"origin": [-1.4, -0.25, 2.5], "size": [0, 1, 1], "uv": [0, 9]}
+						{"origin": [-1.4, -0.25, 2.5], "size": [0, 1, 1], "uv": [19, 3]}
 					]
 				},
 				{
@@ -534,7 +677,7 @@
 					"parent": "foot_right",
 					"pivot": [-0.9, 0.75, -0.5],
 					"cubes": [
-						{"origin": [-0.9, -0.25, -1.5], "size": [0, 1, 1], "inflate": 0.01, "uv": [0, 10]}
+						{"origin": [-1.4, -0.25, -1.5], "size": [1, 1, 1], "inflate": 0.01, "uv": [41, 17]}
 					]
 				},
 				{
@@ -542,7 +685,7 @@
 					"parent": "toe_inner_right",
 					"pivot": [-0.9, 0.75, -1.5],
 					"cubes": [
-						{"origin": [-0.9, -0.25, -2.5], "size": [0, 1, 1], "uv": [0, 7]}
+						{"origin": [-0.9, -0.25, -2.5], "size": [0, 1, 1], "uv": [19, -1]}
 					]
 				},
 				{
@@ -550,7 +693,7 @@
 					"parent": "foot_right",
 					"pivot": [-1.9, 0.75, -0.5],
 					"cubes": [
-						{"origin": [-1.9, -0.25, -1.5], "size": [0, 1, 1], "inflate": 0.01, "uv": [0, 0]}
+						{"origin": [-2.4, -0.25, -1.5], "size": [1, 1, 1], "inflate": 0.01, "uv": [45, 17]}
 					]
 				},
 				{
@@ -558,7 +701,7 @@
 					"parent": "toe_outer_right",
 					"pivot": [-1.9, 0.75, -1.5],
 					"cubes": [
-						{"origin": [-1.9, -0.25, -2.5], "size": [0, 1, 1], "uv": [0, 8]}
+						{"origin": [-1.9, -0.25, -2.5], "size": [0, 1, 1], "uv": [19, 1]}
 					]
 				}
 			]

common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0017_pidgeotto/pidgeotto.geo.json

@@ -4,8 +4,8 @@
 		{
 			"description": {
 				"identifier": "geometry.pidgeotto",
-				"texture_width": 64,
-				"texture_height": 64,
+				"texture_width": 96,
+				"texture_height": 96,
 				"visible_bounds_width": 5,
 				"visible_bounds_height": 2.5,
 				"visible_bounds_offset": [0, 0.75, 0]
@@ -34,7 +34,7 @@
 				{
 					"name": "body",
 					"parent": "pidgeotto",
-					"pivot": [0, 7, -2]
+					"pivot": [0, 8, -1]
 				},
 				{
 					"name": "locator_target",
@@ -57,325 +57,411 @@
 					"parent": "body",
 					"pivot": [0, 5.5, 1.75],
 					"cubes": [
-						{"origin": [-3, 3, -6], "size": [6, 7, 6], "inflate": 0.01, "uv": [0, 0]},
-						{"origin": [-3, 3.5, 0], "size": [6, 6, 4], "uv": [36, 34]}
+						{"origin": [-3, 3.5, -1.5], "size": [6, 5, 5], "uv": [0, 14]},
+						{"origin": [-2, 4.5, 3.5], "size": [4, 4, 2], "uv": [0, 49]}
+					]
+				},
+				{
+					"name": "torso2",
+					"parent": "torso",
+					"pivot": [0, 3.5, -1.5],
+					"rotation": [-42.5, 0, 0],
+					"cubes": [
+						{"origin": [-3, 3.5, -8.5], "size": [6, 7, 7], "inflate": 0.01, "uv": [0, 0]}
 					]
 				},
 				{
 					"name": "neck",
-					"parent": "torso",
-					"pivot": [0, 5.75, -3.75],
+					"parent": "torso2",
+					"pivot": [0, 5.25, -7.5],
+					"rotation": [52.5, 0, 0],
 					"cubes": [
-						{"origin": [-2.5, 5.75, -6.25], "size": [5, 6, 5], "uv": [12, 13]}
+						{"origin": [-2.5, 4.75, -9], "size": [5, 5, 5], "inflate": -0.01, "uv": [22, 32]}
 					]
 				},
 				{
 					"name": "head",
 					"parent": "neck",
-					"pivot": [0, 11.75, -3.75],
-					"cubes": [
-						{"origin": [-2.5, 9.25, -6.25], "size": [5, 5, 5], "inflate": 0.01, "uv": [0, 25]}
-					]
+					"pivot": [0, 10, -6.5]
 				},
 				{
-					"name": "beak",
+					"name": "head_ai",
 					"parent": "head",
-					"pivot": [0, 11.75, -6.25],
-					"rotation": [5, 0, 0],
+					"pivot": [0, 10, -6.5]
+				},
+				{
+					"name": "head_angle",
+					"parent": "head_ai",
+					"pivot": [0, 10, -6.5],
 					"cubes": [
-						{"origin": [-1, 10.75, -8.25], "size": [2, 1, 3], "inflate": 0.01, "uv": [29, 22]},
-						{"origin": [-0.5, 10.25, -8.25], "size": [1, 1, 0], "uv": [4, 1]}
+						{"origin": [-2.5, 7.75, -9], "size": [5, 5, 5], "uv": [26, 0]}
 					]
 				},
 				{
-					"name": "hair",
-					"parent": "beak",
-					"pivot": [-0.5, 11.5, -6.25],
-					"rotation": [5, 0, 0],
-					"cubes": [
-						{"origin": [2.5, 12.5, -6.25], "size": [0, 2, 1], "pivot": [2.5, 13.5, -6.25], "rotation": [0, 15, 0], "uv": [18, -1]},
-						{"origin": [-2.5, 11.5, -6.25], "size": [5, 3, 0], "uv": [32, 0]},
-						{"origin": [-2.5, 12.5, -6.25], "size": [0, 2, 1], "pivot": [-2.5, 13.5, -6.25], "rotation": [0, -15, 0], "uv": [18, 2]}
-					]
+					"name": "locator_mouth",
+					"parent": "head_angle",
+					"pivot": [0, 9.2, -9],
+					"locators": {
+						"mouth": [0, 9.2, -9],
+						"special": [0, 9.2, -9]
+					}
 				},
 				{
-					"name": "hair2",
-					"parent": "hair",
-					"pivot": [-0.5, 14.5, -6.25],
-					"rotation": [-80, 0, 0],
-					"cubes": [
-						{"origin": [-3, 14.5, -6.25], "size": [6, 4, 2], "inflate": 0.02, "uv": [0, 35]}
-					]
+					"name": "locator_face",
+					"parent": "head_angle",
+					"pivot": [0, 10.25, -9.025],
+					"locators": {
+						"face": [0, 10.25, -9.025]
+					}
 				},
 				{
-					"name": "hair3",
-					"parent": "hair2",
-					"pivot": [-0.5, 18.5, -6.25],
-					"rotation": [-52.5, 0, 0],
-					"cubes": [
-						{"origin": [-2.5, 18.5, -6.25], "size": [5, 4, 2], "inflate": 0.02, "uv": [0, 41]}
-					]
+					"name": "locator_item_face",
+					"parent": "head_angle",
+					"pivot": [0, 10.65, -9.025],
+					"locators": {
+						"item_face": [0, 10.65, -9.025]
+					}
 				},
 				{
-					"name": "hair4",
-					"parent": "hair3",
-					"pivot": [-0.5, 22.5, -5.75],
-					"rotation": [-17.5, 0, 0],
-					"cubes": [
-						{"origin": [-2, 21.5, -5.75], "size": [4, 3, 1], "uv": [26, 42]}
-					]
+					"name": "locator_head",
+					"parent": "head_angle",
+					"pivot": [0, 13.25, -8.25],
+					"locators": {
+						"head": [0, 13.25, -8.25]
+					}
 				},
 				{
-					"name": "hair5",
-					"parent": "hair4",
-					"pivot": [0, 24.5, -5.25],
-					"rotation": [-22.5, 0, 0],
-					"cubes": [
-						{"origin": [-1.5, 24.5, -5.25], "size": [3, 2, 0], "uv": [46, 11]}
-					]
+					"name": "locator_item_hat",
+					"parent": "head_angle",
+					"pivot": [0, 13.75, -6.5],
+					"locators": {
+						"item_hat": [0, 13.75, -6.5]
+					}
 				},
 				{
 					"name": "hairstrand",
-					"parent": "beak",
-					"pivot": [-0.5, 11.75, -6.25],
-					"rotation": [10, 0, 0],
+					"parent": "head_angle",
+					"pivot": [-0.5, 10.25, -9],
+					"rotation": [15, 0, 0],
 					"cubes": [
-						{"origin": [-0.5, 11.75, -6.25], "size": [1, 1, 0], "uv": [0, 14]}
+						{"origin": [-0.5, 10.25, -9], "size": [1, 1, 0], "uv": [12, 53]}
 					]
 				},
 				{
 					"name": "hairstrand2",
 					"parent": "hairstrand",
-					"pivot": [-0.5, 12.75, -6.25],
+					"pivot": [-0.5, 11.25, -9],
 					"cubes": [
-						{"origin": [-0.5, 12.75, -6.25], "size": [1, 2, 0], "uv": [2, 13]}
+						{"origin": [-0.5, 11.25, -9], "size": [1, 2, 0], "uv": [58, 35]}
 					]
 				},
 				{
 					"name": "hairstrand3",
 					"parent": "hairstrand2",
-					"pivot": [-0.5, 14.75, -6.25],
+					"pivot": [-0.5, 13.25, -9],
 					"cubes": [
-						{"origin": [-0.5, 14.75, -6.25], "size": [1, 1, 0], "uv": [0, 13]}
+						{"origin": [-0.5, 13.25, -9], "size": [1, 1, 0], "uv": [14, 53]}
+					]
+				},
+				{
+					"name": "hair",
+					"parent": "head_angle",
+					"pivot": [-0.5, 10, -9],
+					"rotation": [10, 0, 0],
+					"cubes": [
+						{"origin": [2.5, 11, -9], "size": [0, 2, 1], "pivot": [2.5, 12, -9], "rotation": [0, 15, 0], "uv": [20, 33]},
+						{"origin": [-2.5, 10, -9], "size": [5, 3, 0], "uv": [54, 48]},
+						{"origin": [-2.5, 11, -9], "size": [0, 2, 1], "pivot": [-2.5, 12, -9], "rotation": [0, -15, 0], "uv": [20, 36]}
+					]
+				},
+				{
+					"name": "hair2",
+					"parent": "hair",
+					"pivot": [-0.5, 13, -9],
+					"rotation": [-80, 0, 0],
+					"cubes": [
+						{"origin": [-3, 13, -9], "size": [6, 4, 2], "inflate": 0.02, "uv": [42, 32]}
+					]
+				},
+				{
+					"name": "hair3",
+					"parent": "hair2",
+					"pivot": [-0.5, 17, -9],
+					"rotation": [-52.5, 0, 0],
+					"cubes": [
+						{"origin": [-2.5, 17, -9], "size": [5, 4, 2], "inflate": 0.02, "uv": [44, 38]}
+					]
+				},
+				{
+					"name": "hair4",
+					"parent": "hair3",
+					"pivot": [-0.5, 21, -8.5],
+					"rotation": [-17.5, 0, 0],
+					"cubes": [
+						{"origin": [-2, 20, -8.5], "size": [4, 3, 1], "uv": [54, 44]}
+					]
+				},
+				{
+					"name": "hair5",
+					"parent": "hair4",
+					"pivot": [0, 23, -8],
+					"rotation": [-22.5, 0, 0],
+					"cubes": [
+						{"origin": [-1.5, 23, -8], "size": [3, 2, 0], "uv": [56, 24]}
+					]
+				},
+				{
+					"name": "face",
+					"parent": "head_angle",
+					"pivot": [0, 10.25, -9]
+				},
+				{
+					"name": "beak",
+					"parent": "face",
+					"pivot": [0, 10.25, -9],
+					"rotation": [5, 0, 0],
+					"cubes": [
+						{"origin": [-0.5, 8.75, -11], "size": [1, 1, 0], "uv": [20, 41]},
+						{"origin": [-1, 9.25, -11], "size": [2, 1, 3], "inflate": 0.01, "uv": [42, 54]}
 					]
 				},
 				{
 					"name": "locator_beak",
 					"parent": "beak",
-					"pivot": [0, 10.925, -8.25],
+					"pivot": [0, 9.425, -11],
 					"locators": {
-						"beak": [0, 10.925, -8.25],
-						"physical": [0, 10.925, -8.25],
-						"jaw1": [0, 10.925, -8.25]
+						"beak": [0, 9.425, -11],
+						"physical": [0, 9.425, -11],
+						"jaw1": [0, 9.425, -11]
 					}
 				},
 				{
-					"name": "locator_mouth",
-					"parent": "head",
-					"pivot": [0, 10.7, -6.25],
-					"locators": {
-						"mouth": [0, 10.7, -6.25],
-						"special": [0, 10.7, -6.25]
-					}
-				},
-				{
-					"name": "locator_face",
-					"parent": "head",
-					"pivot": [0, 11.75, -6.275],
-					"locators": {
-						"face": [0, 11.75, -6.275]
-					}
-				},
-				{
-					"name": "locator_item_face",
-					"parent": "head",
-					"pivot": [0, 12.15, -6.275],
-					"locators": {
-						"item_face": [0, 12.15, -6.275]
-					}
-				},
-				{
-					"name": "locator_head",
-					"parent": "head",
-					"pivot": [0, 14.75, -5.5],
-					"locators": {
-						"head": [0, 14.75, -5.5]
-					}
-				},
-				{
-					"name": "locator_item_hat",
-					"parent": "head",
-					"pivot": [0, 15.25, -3.75],
-					"locators": {
-						"item_hat": [0, 15.25, -3.75]
-					}
+					"name": "eyes",
+					"parent": "face",
+					"pivot": [0, 7.25, -5.5]
 				},
 				{
 					"name": "eye_left",
-					"parent": "head",
-					"pivot": [0.5, 8.75, -2.75],
+					"parent": "eyes",
+					"pivot": [-1.3, 10.15, -7.5],
 					"cubes": [
-						{"origin": [0.515, 12.75, -6.265], "size": [2, 1, 2], "inflate": 0.01, "uv": [24, 8]},
-						{"origin": [0.51, 11.25, -6.26], "size": [2, 2, 2], "inflate": 0.01, "uv": [24, 0]}
+						{"origin": [0.515, 11.25, -9.015], "size": [2, 1, 2], "inflate": 0.01, "uv": [56, 0]},
+						{"origin": [0.51, 9.75, -9.01], "size": [2, 2, 2], "inflate": 0.01, "uv": [36, 10]}
 					]
 				},
 				{
 					"name": "pupil_left",
 					"parent": "eye_left",
-					"pivot": [1.51, 12, -5.765],
+					"pivot": [1.51, 10.5, -8.515],
 					"cubes": [
-						{"origin": [1.01, 11.5, -6.265], "size": [1, 1, 1], "inflate": 0.01, "uv": [6, 13]}
+						{"origin": [1.01, 10, -9.015], "size": [1, 1, 1], "inflate": 0.01, "uv": [8, 58]}
 					]
 				},
 				{
 					"name": "locator_eye_left",
 					"parent": "pupil_left",
-					"pivot": [1.55, 12.025, -6.275],
+					"pivot": [1.55, 10.525, -9.025],
 					"locators": {
-						"eye2": [1.55, 12.025, -6.275]
+						"eye2": [1.55, 10.525, -9.025]
 					}
 				},
-				{
-					"name": "eyelid_left",
-					"parent": "eye_left",
-					"pivot": [-0.6, 8.75, -2.65],
-					"cubes": [
-						{"origin": [0.41, 11.25, -6.16], "size": [2, 2, 2], "inflate": 0.02, "uv": [50, 4]}
-					]
-				},
 				{
 					"name": "eye_right",
-					"parent": "head",
-					"pivot": [-0.5, 8.75, -2.75],
+					"parent": "eyes",
+					"pivot": [-1.3, 10.15, -7.5],
 					"cubes": [
-						{"origin": [-2.51, 11.25, -6.26], "size": [2, 2, 2], "inflate": 0.01, "uv": [24, 4]},
-						{"origin": [-2.01, 11.5, -6.265], "size": [1, 1, 1], "inflate": 0.01, "uv": [22, 0]},
-						{"origin": [-2.515, 12.75, -6.265], "size": [2, 1, 2], "inflate": 0.01, "uv": [24, 26]}
-					]
-				},
-				{
-					"name": "eyelid_right",
-					"parent": "eye_right",
-					"pivot": [-0.4, 8.75, -2.65],
-					"cubes": [
-						{"origin": [-2.41, 11.25, -6.16], "size": [2, 2, 2], "inflate": 0.02, "uv": [50, 0]}
+						{"origin": [-2.51, 9.75, -9.01], "size": [2, 2, 2], "inflate": 0.01, "uv": [12, 49]},
+						{"origin": [-2.01, 10, -9.015], "size": [1, 1, 1], "inflate": 0.01, "uv": [56, 29]},
+						{"origin": [-2.515, 11.25, -9.015], "size": [2, 1, 2], "inflate": 0.01, "uv": [56, 3]}
 					]
 				},
 				{
 					"name": "pupil_right",
 					"parent": "eye_right",
-					"pivot": [-1.51, 12, -5.765],
+					"pivot": [-1.51, 10.5, -8.515],
 					"cubes": [
-						{"origin": [-2.01, 11.5, -6.265], "size": [1, 1, 1], "inflate": 0.01, "uv": [22, 0]}
+						{"origin": [-2.01, 10, -9.015], "size": [1, 1, 1], "inflate": 0.01, "uv": [58, 31]}
 					]
 				},
 				{
 					"name": "locator_eye_right",
 					"parent": "pupil_right",
-					"pivot": [-1.55, 12.025, -6.275],
+					"pivot": [-1.55, 10.525, -9.025],
 					"locators": {
-						"eye1": [-1.55, 12.025, -6.275]
+						"eye1": [-1.55, 10.525, -9.025]
 					}
 				},
+				{
+					"name": "eyelid_left",
+					"parent": "eyes",
+					"pivot": [1.41, 10.75, -7.91],
+					"cubes": [
+						{"origin": [0.41, 9.75, -8.91], "size": [2, 2, 2], "inflate": 0.02, "uv": [54, 51]}
+					]
+				},
+				{
+					"name": "eyelid_right",
+					"parent": "eyes",
+					"pivot": [-1.41, 10.75, -7.91],
+					"cubes": [
+						{"origin": [-2.41, 9.75, -8.91], "size": [2, 2, 2], "inflate": 0.02, "uv": [0, 55]}
+					]
+				},
 				{
 					"name": "jaw",
-					"parent": "head",
-					"pivot": [0, 10.5, -6.25],
+					"parent": "face",
+					"pivot": [0, 9, -9],
 					"rotation": [-7.5, 0, 0],
 					"cubes": [
-						{"origin": [-1, 10, -7.75], "size": [2, 1, 2], "uv": [18, 25]}
+						{"origin": [-1, 8.5, -10.5], "size": [2, 1, 2], "uv": [52, 55]}
 					]
 				},
 				{
 					"name": "locator_jaw_lower",
 					"parent": "jaw",
-					"pivot": [0, 11, -7.75],
+					"pivot": [0, 9.5, -10.5],
 					"locators": {
-						"jaw2": [0, 11, -7.75]
+						"jaw2": [0, 9.5, -10.5]
 					}
 				},
 				{
 					"name": "locator_item",
 					"parent": "jaw",
-					"pivot": [0, 11, -7.75],
+					"pivot": [0, 9.5, -10.5],
 					"locators": {
-						"item": [0, 11, -7.75]
+						"item": [0, 9.5, -10.5]
 					}
 				},
 				{
-					"name": "wing_closed_right",
-					"parent": "torso",
-					"pivot": [-3, 8.25, -4.5],
+					"name": "face_ditto",
+					"parent": "head_angle",
+					"pivot": [0, 9.5, -8.9]
+				},
+				{
+					"name": "eyes_ditto",
+					"parent": "face_ditto",
+					"pivot": [0, 10.25, -8.92],
 					"cubes": [
-						{"origin": [-4, 3.25, -4.5], "size": [1, 7, 5], "uv": [47, 22]}
+						{"origin": [-2, 9.75, -8.92], "size": [4, 1, 0], "uv": [86, 83]}
+					]
+				},
+				{
+					"name": "eyes_blink_ditto",
+					"parent": "face_ditto",
+					"pivot": [0, 10.25, -8.82],
+					"cubes": [
+						{"origin": [-2.5, 9.75, -8.82], "size": [5, 1, 0], "uv": [85, 85]},
+						{"origin": [-2, 10.25, -8.83], "size": [4, 1, 0], "uv": [86, 87]}
+					]
+				},
+				{
+					"name": "mouth_ditto",
+					"parent": "face_ditto",
+					"pivot": [0, 8.5, -8.9],
+					"cubes": [
+						{"origin": [-1.5, 7.75, -8.91], "size": [3, 1, 0], "uv": [87, 91]},
+						{"origin": [-2.5, 8.25, -8.91], "size": [5, 1, 0], "uv": [85, 89]}
+					]
+				},
+				{
+					"name": "mouth_open_ditto",
+					"parent": "face_ditto",
+					"pivot": [0, 8.75, -8.81],
+					"cubes": [
+						{"origin": [-2.5, 7.75, -8.81], "size": [5, 2, 0], "uv": [85, 93]}
+					]
+				},
+				{
+					"name": "wings",
+					"parent": "torso2",
+					"pivot": [0, 7.75, -8.75]
+				},
+				{
+					"name": "wings_closed",
+					"parent": "wings",
+					"pivot": [0, 7.75, -8.75],
+					"rotation": [35, 0, 0]
+				},
+				{
+					"name": "wing_closed_right",
+					"parent": "wings_closed",
+					"pivot": [-3, 7.75, -8.75],
+					"cubes": [
+						{"origin": [-4, 2.75, -8.75], "size": [1, 7, 5], "uv": [20, 42]}
 					]
 				},
 				{
 					"name": "wing_closed_right2",
 					"parent": "wing_closed_right",
-					"pivot": [-3.4, 3.25, 0.5],
+					"pivot": [-3.4, 2.75, -3.75],
 					"cubes": [
-						{"origin": [-4, 3.25, 0.5], "size": [1, 6, 4], "inflate": 0.01, "uv": [42, 17]}
+						{"origin": [-4, 2.75, -3.75], "size": [1, 6, 4], "inflate": 0.01, "uv": [44, 44]}
 					]
 				},
 				{
 					"name": "wing_closed_right3",
 					"parent": "wing_closed_right2",
-					"pivot": [-3.4, 3.25, 4.5],
+					"pivot": [-3.4, 2.75, 0.25],
 					"cubes": [
-						{"origin": [-3.5, 3.25, 4.5], "size": [0, 5, 6], "uv": [0, 42]}
+						{"origin": [-3.5, 2.75, 0.25], "size": [0, 5, 6], "uv": [44, 10]}
 					]
 				},
 				{
 					"name": "wing_closed_left",
-					"parent": "torso",
-					"pivot": [3, 8.25, -4.5],
+					"parent": "wings_closed",
+					"pivot": [3, 7.75, -8.75],
 					"cubes": [
-						{"origin": [3, 3.25, -4.5], "size": [1, 7, 5], "uv": [47, 22], "mirror": true}
+						{"origin": [3, 2.75, -8.75], "size": [1, 7, 5], "uv": [32, 42]}
 					]
 				},
 				{
 					"name": "wing_closed_left2",
 					"parent": "wing_closed_left",
-					"pivot": [3.4, 3.25, 0.5],
+					"pivot": [3.4, 2.75, -3.75],
 					"cubes": [
-						{"origin": [3, 3.25, 0.5], "size": [1, 6, 4], "inflate": 0.01, "uv": [54, 17], "mirror": true}
+						{"origin": [3, 2.75, -3.75], "size": [1, 6, 4], "inflate": 0.01, "uv": [46, 0]}
 					]
 				},
 				{
 					"name": "wing_closed_left3",
 					"parent": "wing_closed_left2",
-					"pivot": [3.4, 3.25, 4.5],
+					"pivot": [3.4, 2.75, 0.25],
 					"cubes": [
-						{"origin": [3.5, 3.25, 4.5], "size": [0, 5, 6], "uv": [13, 42], "mirror": true}
+						{"origin": [3.5, 2.75, 0.25], "size": [0, 5, 6], "uv": [44, 21]}
 					]
 				},
+				{
+					"name": "wings_open",
+					"parent": "wings",
+					"pivot": [0, 7.25, -7.5],
+					"rotation": [35, 0, 0]
+				},
 				{
 					"name": "wing_open_left",
-					"parent": "torso",
-					"pivot": [3, 7.75, -3.75],
+					"parent": "wings_open",
+					"pivot": [3, 7.25, -7.5],
 					"cubes": [
-						{"origin": [2, 7.5, -4.75], "size": [7, 1, 6], "inflate": 0.01, "uv": [14, 29]},
-						{"origin": [2, 7.9, 0.15], "size": [7, 0, 4], "pivot": [7, 8, 2.75], "rotation": [0, -12.5, 0], "uv": [22, 51]}
+						{"origin": [2, 7, -8.5], "size": [7, 1, 6], "inflate": 0.01, "uv": [0, 60]},
+						{"origin": [2, 7.4, -3.6], "size": [7, 0, 4], "pivot": [7, 7.5, -1], "rotation": [0, -12.5, 0], "uv": [22, 78]}
 					]
 				},
 				{
 					"name": "wing_open_left2",
 					"parent": "wing_open_left",
-					"pivot": [8.95, 8, -4.75],
+					"pivot": [8.95, 7.5, -8.5],
 					"cubes": [
-						{"origin": [8.7, 7.5, -5], "size": [7, 1, 5], "uv": [12, 36]},
-						{"origin": [7.7, 8, 0], "size": [8, 0, 5], "uv": [43, 51]}
+						{"origin": [8.7, 7, -8.75], "size": [7, 1, 5], "uv": [0, 67]},
+						{"origin": [7.7, 7.5, -3.75], "size": [8, 0, 5], "uv": [43, 83]}
 					]
 				},
 				{
 					"name": "locator_wing_left",
 					"parent": "wing_open_left2",
-					"pivot": [15.2, 8, -4.55],
+					"pivot": [15.2, 7.5, -8.3],
 					"rotation": [0, -90, 0],
 					"locators": {
 						"wing2": {
-							"offset": [15.2, 8, -4.55],
+							"offset": [15.2, 7.5, -8.3],
 							"rotation": [0, -90, 0]
 						}
 					}
@@ -383,45 +469,45 @@
 				{
 					"name": "wing_open_left3",
 					"parent": "wing_open_left2",
-					"pivot": [15.7, 8, -5],
+					"pivot": [15.7, 7.5, -8.75],
 					"cubes": [
-						{"origin": [14.7, 8, -5], "size": [6, 0, 10], "uv": [-10, 54]}
+						{"origin": [14.7, 7.5, -8.75], "size": [6, 0, 10], "uv": [-10, 86]}
 					]
 				},
 				{
 					"name": "wing_open_left4",
 					"parent": "wing_open_left3",
-					"pivot": [20.7, 8, -4],
+					"pivot": [20.7, 7.5, -7.75],
 					"cubes": [
-						{"origin": [20.7, 8, -4], "size": [5, 0, 8], "uv": [18, 56]}
+						{"origin": [20.7, 7.5, -7.75], "size": [5, 0, 8], "uv": [18, 88]}
 					]
 				},
 				{
 					"name": "wing_open_right",
-					"parent": "torso",
-					"pivot": [-3, 7.75, -3.75],
+					"parent": "wings_open",
+					"pivot": [-3, 7.25, -7.5],
 					"cubes": [
-						{"origin": [-9, 7.5, -4.75], "size": [7, 1, 6], "inflate": 0.01, "uv": [30, 3], "mirror": true},
-						{"origin": [-9, 7.9, 0.15], "size": [7, 0, 4], "pivot": [-7, 8, 2.75], "rotation": [0, 12.5, 0], "uv": [22, 46], "mirror": true}
+						{"origin": [-9, 7, -8.5], "size": [7, 1, 6], "inflate": 0.01, "uv": [26, 60], "mirror": true},
+						{"origin": [-9, 7.4, -3.6], "size": [7, 0, 4], "pivot": [-7, 7.5, -1], "rotation": [0, 12.5, 0], "uv": [22, 83], "mirror": true}
 					]
 				},
 				{
 					"name": "wing_open_right2",
 					"parent": "wing_open_right",
-					"pivot": [-9, 8, -4.75],
+					"pivot": [-9, 7.5, -8.5],
 					"cubes": [
-						{"origin": [-15.7, 7.5, -5], "size": [7, 1, 5], "uv": [27, 10], "mirror": true},
-						{"origin": [-15.7, 8, 0], "size": [8, 0, 5], "uv": [43, 45], "mirror": true}
+						{"origin": [-15.7, 7, -8.75], "size": [7, 1, 5], "uv": [24, 67], "mirror": true},
+						{"origin": [-15.7, 7.5, -3.75], "size": [8, 0, 5], "uv": [43, 77], "mirror": true}
 					]
 				},
 				{
 					"name": "locator_wing_right",
 					"parent": "wing_open_right2",
-					"pivot": [-15.2, 8, -4.55],
+					"pivot": [-15.2, 7.5, -8.3],
 					"rotation": [0, 90, 0],
 					"locators": {
 						"wing1": {
-							"offset": [-15.2, 8, -4.55],
+							"offset": [-15.2, 7.5, -8.3],
 							"rotation": [0, 90, 0]
 						}
 					}
@@ -429,261 +515,261 @@
 				{
 					"name": "wing_open_right3",
 					"parent": "wing_open_right2",
-					"pivot": [-15.7, 8, -5],
+					"pivot": [-15.7, 7.5, -8.75],
 					"cubes": [
-						{"origin": [-20.7, 8, -5], "size": [6, 0, 10], "uv": [3, 54], "mirror": true}
+						{"origin": [-20.7, 7.5, -8.75], "size": [6, 0, 10], "uv": [3, 86], "mirror": true}
 					]
 				},
 				{
 					"name": "wing_open_right4",
 					"parent": "wing_open_right3",
-					"pivot": [-20.7, 8, -4],
+					"pivot": [-20.7, 7.5, -7.75],
 					"cubes": [
-						{"origin": [-25.7, 8, -4], "size": [5, 0, 8], "uv": [29, 56], "mirror": true}
+						{"origin": [-25.7, 7.5, -7.75], "size": [5, 0, 8], "uv": [29, 88], "mirror": true}
 					]
 				},
 				{
 					"name": "tail",
 					"parent": "torso",
-					"pivot": [0, 7.6, 4]
+					"pivot": [0, 7.6, 5.5]
 				},
 				{
 					"name": "tail_middle",
 					"parent": "tail",
-					"pivot": [0, 7.7, 4],
+					"pivot": [0, 7.7, 5.5],
 					"cubes": [
-						{"origin": [-1, 7.7, 4], "size": [2, 0, 9], "uv": [-1, 16]}
+						{"origin": [-1, 7.7, 5.5], "size": [2, 0, 9], "uv": [22, 14]}
 					]
 				},
 				{
 					"name": "locator_tail",
 					"parent": "tail_middle",
-					"pivot": [0, 7.725, 8.5],
+					"pivot": [0, 7.725, 10],
 					"rotation": [180, 0, -180],
 					"locators": {
-						"tail": [0, 7.725, 8.5]
+						"tail": [0, 7.725, 10]
 					}
 				},
 				{
 					"name": "locator_tail_tip",
 					"parent": "tail_middle",
-					"pivot": [0, 7.725, 13],
+					"pivot": [0, 7.725, 14.5],
 					"rotation": [180, 0, -180],
 					"locators": {
-						"tail_tip": [0, 7.725, 13]
+						"tail_tip": [0, 7.725, 14.5]
 					}
 				},
 				{
 					"name": "tail_left",
 					"parent": "tail",
-					"pivot": [-0.5, 7.6, 4],
+					"pivot": [-0.5, 7.6, 5.5],
 					"rotation": [0, 12.5, 0],
 					"cubes": [
-						{"origin": [-0.5, 7.6, 4], "size": [2, 0, 9], "uv": [-5, 16]}
+						{"origin": [-0.5, 7.6, 5.5], "size": [2, 0, 9], "uv": [22, 23]}
 					]
 				},
 				{
 					"name": "tail_right",
 					"parent": "tail",
-					"pivot": [0.5, 7.6, 4],
+					"pivot": [0.5, 7.6, 5.5],
 					"rotation": [0, -12.5, 0],
 					"cubes": [
-						{"origin": [-1.5, 7.6, 4], "size": [2, 0, 9], "uv": [-9, 16]}
+						{"origin": [-1.5, 7.6, 5.5], "size": [2, 0, 9], "uv": [0, 24]}
 					]
 				},
 				{
 					"name": "tail_left2",
 					"parent": "tail",
-					"pivot": [0, 7.5, 4],
+					"pivot": [0, 7.5, 5.5],
 					"rotation": [0, 27.5, 0],
 					"cubes": [
-						{"origin": [0, 7.5, 4], "size": [2, 0, 8], "uv": [52, 35]}
+						{"origin": [0, 7.5, 5.5], "size": [2, 0, 8], "uv": [0, 33]}
 					]
 				},
 				{
 					"name": "tail_right2",
 					"parent": "tail",
-					"pivot": [0, 7.5, 4],
+					"pivot": [0, 7.5, 5.5],
 					"rotation": [0, -27.5, 0],
 					"cubes": [
-						{"origin": [-2, 7.5, 4], "size": [2, 0, 8], "uv": [48, 35]}
+						{"origin": [-2, 7.5, 5.5], "size": [2, 0, 8], "uv": [0, 41]}
 					]
 				},
 				{
 					"name": "legs",
 					"parent": "body",
-					"pivot": [2.25, 4, 0.75]
+					"pivot": [0, 4, 0.75]
 				},
 				{
 					"name": "leg_left",
 					"parent": "legs",
-					"pivot": [2.25, 4, 0.75],
+					"pivot": [2.25, 5.25, 0.65],
 					"rotation": [5, 0, 0],
 					"cubes": [
-						{"origin": [1.25, 2.75, -0.75], "size": [2, 3, 3], "inflate": 0.01, "uv": [48, 15]}
+						{"origin": [1.25, 2.74604, -0.85933], "size": [2, 3, 3], "inflate": 0.01, "uv": [12, 54]}
 					]
 				},
 				{
 					"name": "leg_left2",
 					"parent": "leg_left",
-					"pivot": [2.25, 2.75, 1.25],
+					"pivot": [2.25, 2.74604, 1.14067],
 					"rotation": [-15, 0, 0],
 					"cubes": [
-						{"origin": [1.75, 0.75, 0.25], "size": [1, 2, 1], "uv": [15, 27]}
+						{"origin": [1.75, 0.74604, 0.14067], "size": [1, 2, 1], "uv": [8, 55]}
 					]
 				},
 				{
 					"name": "foot_left",
 					"parent": "leg_left2",
-					"pivot": [2.25, 0.75, 1.25],
+					"pivot": [2.25, 0.74604, 0.64067],
 					"rotation": [10, 0, 0],
 					"cubes": [
-						{"origin": [1.25, -0.07635, -0.98481], "size": [2, 1, 3], "uv": [29, 22]}
+						{"origin": [1.25, -0.16713, -1.10173], "size": [2, 1, 3], "uv": [26, 10]}
 					]
 				},
 				{
 					"name": "locator_foot_secondary",
 					"parent": "foot_left",
-					"pivot": [2.25, 0.5, 0.5],
+					"pivot": [2.25, 0.40922, 0.38308],
 					"rotation": [90, 0, 0],
 					"locators": {
-						"foot_secondary": [2.25, 0.5, 0.5]
+						"foot_secondary": [2.25, 0.40922, 0.38308]
 					}
 				},
 				{
 					"name": "toe_back_left",
 					"parent": "foot_left",
-					"pivot": [2.25, 0.92365, 2.01519],
+					"pivot": [2.25, 0.83287, 1.89827],
 					"cubes": [
-						{"origin": [1.75, -0.07635, 2.01519], "size": [1, 1, 2], "inflate": 0.01, "uv": [8, 13]}
+						{"origin": [1.75, -0.16713, 1.89827], "size": [1, 1, 2], "inflate": 0.01, "uv": [56, 6]}
 					]
 				},
 				{
 					"name": "claw_back_left",
 					"parent": "toe_back_left",
-					"pivot": [2.25, 0.92365, 4.01519],
+					"pivot": [2.25, 0.83287, 3.89827],
 					"cubes": [
-						{"origin": [2.25, -0.07635, 4.01519], "size": [0, 1, 1], "uv": [4, -1]}
+						{"origin": [2.25, -0.16713, 3.89827], "size": [0, 1, 1], "uv": [20, 39]}
 					]
 				},
 				{
 					"name": "toe_inner_left",
 					"parent": "foot_left",
-					"pivot": [2.25, 0.92365, -0.73481],
+					"pivot": [2.25, 0.83287, -0.85173],
 					"rotation": [0, 12.5, 0],
 					"cubes": [
-						{"origin": [1.25, -0.07635, -2.73481], "size": [1, 1, 2], "inflate": 0.01, "uv": [18, 0]}
+						{"origin": [1.25, -0.16713, -2.85173], "size": [1, 1, 2], "inflate": 0.01, "uv": [56, 9]}
 					]
 				},
 				{
 					"name": "claw_inner_left",
 					"parent": "toe_inner_left",
-					"pivot": [1.75, 0.92365, -2.73481],
+					"pivot": [1.75, 0.83287, -2.85173],
 					"cubes": [
-						{"origin": [1.75, -0.07635, -3.73481], "size": [0, 1, 1], "uv": [0, -1]}
+						{"origin": [1.75, -0.16713, -3.85173], "size": [0, 1, 1], "uv": [42, 38]}
 					]
 				},
 				{
 					"name": "toe_outer_left",
 					"parent": "foot_left",
-					"pivot": [2.25, 0.92365, -0.73481],
+					"pivot": [2.25, 0.83287, -0.85173],
 					"rotation": [0, -12.5, 0],
 					"cubes": [
-						{"origin": [2.25, -0.07635, -2.73481], "size": [1, 1, 2], "inflate": 0.01, "uv": [18, 3]}
+						{"origin": [2.25, -0.16713, -2.85173], "size": [1, 1, 2], "inflate": 0.01, "uv": [56, 12]}
 					]
 				},
 				{
 					"name": "claw_outer_left",
 					"parent": "toe_outer_left",
-					"pivot": [2.75, 0.92365, -2.73481],
+					"pivot": [2.75, 0.83287, -2.85173],
 					"cubes": [
-						{"origin": [2.75, -0.07635, -3.73481], "size": [0, 1, 1], "uv": [4, 3]}
+						{"origin": [2.75, -0.16713, -3.85173], "size": [0, 1, 1], "uv": [42, 40]}
 					]
 				},
 				{
 					"name": "leg_right",
 					"parent": "legs",
-					"pivot": [-2.25, 4, 0.75],
+					"pivot": [-2.25, 5.25, 0.65],
 					"rotation": [5, 0, 0],
 					"cubes": [
-						{"origin": [-3.25, 2.75, -0.75], "size": [2, 3, 3], "inflate": 0.01, "uv": [53, 9]}
+						{"origin": [-3.25, 2.74604, -0.85933], "size": [2, 3, 3], "inflate": 0.01, "uv": [22, 54]}
 					]
 				},
 				{
 					"name": "leg_right2",
 					"parent": "leg_right",
-					"pivot": [-2.25, 2.75, 1.25],
+					"pivot": [-2.25, 2.74604, 1.14067],
 					"rotation": [-15, 0, 0],
 					"cubes": [
-						{"origin": [-2.75, 0.75, 0.25], "size": [1, 2, 1], "uv": [15, 24]}
+						{"origin": [-2.75, 0.74604, 0.14067], "size": [1, 2, 1], "uv": [56, 26]}
 					]
 				},
 				{
 					"name": "foot_right",
 					"parent": "leg_right2",
-					"pivot": [-2.25, 0.75, 1.25],
+					"pivot": [-2.25, 0.74604, 0.64067],
 					"rotation": [10, 0, 0],
 					"cubes": [
-						{"origin": [-3.25, -0.07635, -0.98481], "size": [2, 1, 3], "uv": [32, 16]}
+						{"origin": [-3.25, -0.16713, -1.10173], "size": [2, 1, 3], "uv": [32, 54]}
 					]
 				},
 				{
 					"name": "locator_foot_primary",
 					"parent": "foot_right",
-					"pivot": [-2.25, 0.5, 0.5],
+					"pivot": [-2.25, 0.40922, 0.38308],
 					"rotation": [90, 0, 0],
 					"locators": {
-						"foot_primary": [-2.25, 0.5, 0.5]
+						"foot_primary": [-2.25, 0.40922, 0.38308]
 					}
 				},
 				{
 					"name": "toe_back_right",
 					"parent": "foot_right",
-					"pivot": [-2.25, 0.92365, 2.01519],
+					"pivot": [-2.25, 0.83287, 1.89827],
 					"cubes": [
-						{"origin": [-2.75, -0.07635, 2.01519], "size": [1, 1, 2], "inflate": 0.01, "uv": [2, 13]}
+						{"origin": [-2.75, -0.16713, 1.89827], "size": [1, 1, 2], "inflate": 0.01, "uv": [56, 15]}
 					]
 				},
 				{
 					"name": "claw_back_right",
 					"parent": "toe_back_right",
-					"pivot": [-2.25, 0.92365, 4.01519],
+					"pivot": [-2.25, 0.83287, 3.89827],
 					"cubes": [
-						{"origin": [-2.25, -0.07635, 4.01519], "size": [0, 1, 1], "uv": [4, 2]}
+						{"origin": [-2.25, -0.16713, 3.89827], "size": [0, 1, 1], "uv": [32, 58]}
 					]
 				},
 				{
 					"name": "toe_inner_right",
 					"parent": "foot_right",
-					"pivot": [-2.25, 0.92365, -0.73481],
+					"pivot": [-2.25, 0.83287, -0.85173],
 					"rotation": [0, -12.5, 0],
 					"cubes": [
-						{"origin": [-2.25, -0.07635, -2.73481], "size": [1, 1, 2], "inflate": 0.01, "uv": [0, 0]}
+						{"origin": [-2.25, -0.16713, -2.85173], "size": [1, 1, 2], "inflate": 0.01, "uv": [56, 18]}
 					]
 				},
 				{
 					"name": "claw_inner_right",
 					"parent": "toe_inner_right",
-					"pivot": [-1.75, 0.92365, -2.73481],
+					"pivot": [-1.75, 0.83287, -2.85173],
 					"cubes": [
-						{"origin": [-1.75, -0.07635, -3.73481], "size": [0, 1, 1], "uv": [0, 3]}
+						{"origin": [-1.75, -0.16713, -3.85173], "size": [0, 1, 1], "uv": [58, 33]}
 					]
 				},
 				{
 					"name": "toe_outer_right",
 					"parent": "foot_right",
-					"pivot": [-2.25, 0.92365, -0.73481],
+					"pivot": [-2.25, 0.83287, -0.85173],
 					"rotation": [0, 12.5, 0],
 					"cubes": [
-						{"origin": [-3.25, -0.07635, -2.73481], "size": [1, 1, 2], "inflate": 0.01, "uv": [0, 3]}
+						{"origin": [-3.25, -0.16713, -2.85173], "size": [1, 1, 2], "inflate": 0.01, "uv": [56, 21]}
 					]
 				},
 				{
 					"name": "claw_outer_right",
 					"parent": "toe_outer_right",
-					"pivot": [-2.75, 0.92365, -2.73481],
+					"pivot": [-2.75, 0.83287, -2.85173],
 					"cubes": [
-						{"origin": [-2.75, -0.07635, -3.73481], "size": [0, 1, 1], "uv": [0, 2]}
+						{"origin": [-2.75, -0.16713, -3.85173], "size": [0, 1, 1], "uv": [34, 58]}
 					]
 				}
 			]

common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0027_sandshrew/sandshrew.geo.json

@@ -52,23 +52,30 @@
 						"middle": [0, 8, 0]
 					}
 				},
+				{
+					"name": "ball",
+					"parent": "body",
+					"pivot": [0, 6, 0],
+					"cubes": [
+						{"origin": [-4.5, 0, -6], "size": [9, 12, 12], "uv": [22, 40]}
+					]
+				},
 				{
 					"name": "torso",
 					"parent": "body",
-					"pivot": [0, 4.5, 0.25],
-					"rotation": [7.5, 0, 0],
+					"pivot": [0, 4.5, 0.75],
+					"rotation": [15, 0, 0],
 					"cubes": [
-						{"origin": [-4, 2, -3.75], "size": [8, 9, 8], "uv": [0, 0]},
-						{"origin": [-0.5, 2, 2.25], "size": [1, 9, 2], "inflate": 0.01, "uv": [53, 40]}
+						{"origin": [-4, 2, -3.75], "size": [8, 9, 9], "uv": [0, 0]},
+						{"origin": [-0.5, 2, 3.25], "size": [1, 9, 2], "inflate": 0.01, "uv": [52, 41]}
 					]
 				},
 				{
 					"name": "head",
 					"parent": "torso",
 					"pivot": [0, 11, -0.75],
-					"rotation": [5, 0, 0],
 					"cubes": [
-						{"origin": [-3.5, 10.5, -4.75], "size": [7, 6, 7], "uv": [0, 17]}
+						{"origin": [-3.5, 10.5, -4.05], "size": [7, 6, 7], "uv": [0, 18]}
 					]
 				},
 				{
@@ -120,158 +127,158 @@
 				{
 					"name": "muzzle",
 					"parent": "face",
-					"pivot": [0, 15, -4.55],
-					"rotation": [-7.5, 0, 0],
+					"pivot": [0, 15.4, -4.15],
+					"rotation": [-12.5, 0, 0],
 					"cubes": [
-						{"origin": [-2.5, 11, -5.55], "size": [5, 4, 2], "uv": [21, 17]}
+						{"origin": [-2.5, 11.4, -5.15], "size": [5, 4, 2], "uv": [21, 18]}
 					]
 				},
 				{
 					"name": "muzzle_bend",
 					"parent": "muzzle",
-					"pivot": [0, 11, -5.525],
+					"pivot": [0, 11.4, -5.125],
 					"rotation": [7.5, 0, 0],
 					"cubes": [
-						{"origin": [-1.5, 10, -5.55], "size": [3, 1, 2], "uv": [28, 23]}
+						{"origin": [-1.5, 10.4, -5.15], "size": [3, 1, 2], "uv": [28, 24]}
 					]
 				},
 				{
 					"name": "eyes",
 					"parent": "face",
-					"pivot": [0, 13.25, -3.1],
+					"pivot": [0, 13.25, -2.5],
 					"rotation": [25, 0, 0]
 				},
 				{
 					"name": "eye_left",
 					"parent": "eyes",
-					"pivot": [3.51, 13.25, -3.1],
+					"pivot": [3.51, 13.25, -2.5],
 					"cubes": [
-						{"origin": [2.42, 12.25, -3.4], "size": [1, 2, 2], "inflate": 0.1, "uv": [44, 21]},
-						{"origin": [2.47, 12.7, -4.55], "size": [1, 1, 1], "inflate": 0.05, "uv": [45, 19]}
+						{"origin": [2.42, 12.25, -2.8], "size": [1, 2, 2], "inflate": 0.1, "uv": [0, 0]},
+						{"origin": [2.47, 12.7, -3.95], "size": [1, 1, 1], "inflate": 0.05, "uv": [27, 34]}
 					]
 				},
 				{
 					"name": "locator_eye_left",
 					"parent": "eye_left",
-					"pivot": [3.5, 13.25, -2.9],
+					"pivot": [3.5, 13.25, -2.3],
 					"rotation": [0, -90, 0],
 					"locators": {
-						"eye2": [3.5, 13.25, -2.9]
+						"eye2": [3.5, 13.25, -2.3]
 					}
 				},
 				{
 					"name": "eye_right",
 					"parent": "eyes",
-					"pivot": [-3.51, 13.25, -3.1],
+					"pivot": [-3.51, 13.25, -2.5],
 					"cubes": [
-						{"origin": [-3.42, 12.25, -3.4], "size": [1, 2, 2], "inflate": 0.1, "uv": [38, 21]},
-						{"origin": [-3.47, 12.7, -4.55], "size": [1, 1, 1], "inflate": 0.05, "uv": [39, 19]}
+						{"origin": [-3.42, 12.25, -2.8], "size": [1, 2, 2], "inflate": 0.1, "uv": [2, 4]},
+						{"origin": [-3.47, 12.7, -3.95], "size": [1, 1, 1], "inflate": 0.05, "uv": [28, 32]}
 					]
 				},
 				{
 					"name": "locator_eye_right",
 					"parent": "eye_right",
-					"pivot": [-3.5, 13.25, -2.9],
+					"pivot": [-3.5, 13.25, -2.3],
 					"rotation": [0, 90, 0],
 					"locators": {
-						"eye1": [-3.5, 13.25, -2.9]
+						"eye1": [-3.5, 13.25, -2.3]
 					}
 				},
 				{
 					"name": "eyelid_left",
 					"parent": "eyes",
-					"pivot": [3.41, 13.25, -3.1],
+					"pivot": [3.41, 13.25, -2.4],
 					"cubes": [
-						{"origin": [2.37, 12.7, -4.55], "size": [1, 1, 1], "inflate": 0.05, "uv": [45, 25]},
-						{"origin": [2.32, 12.25, -3.4], "size": [1, 2, 2], "inflate": 0.1, "uv": [44, 27]}
+						{"origin": [2.37, 12.7, -3.85], "size": [1, 1, 1], "inflate": 0.05, "uv": [60, 46]},
+						{"origin": [2.32, 12.25, -2.7], "size": [1, 2, 2], "inflate": 0.1, "uv": [39, 28]}
 					]
 				},
 				{
 					"name": "eyelid_right",
 					"parent": "eyes",
-					"pivot": [-3.41, 13.25, -3.1],
+					"pivot": [-3.41, 13.25, -2.4],
 					"cubes": [
-						{"origin": [-3.37, 12.7, -4.55], "size": [1, 1, 1], "inflate": 0.05, "uv": [39, 25]},
-						{"origin": [-3.32, 12.25, -3.4], "size": [1, 2, 2], "inflate": 0.1, "uv": [38, 27]}
+						{"origin": [-3.37, 12.7, -3.85], "size": [1, 1, 1], "inflate": 0.05, "uv": [0, 30]},
+						{"origin": [-3.32, 12.25, -2.7], "size": [1, 2, 2], "inflate": 0.1, "uv": [36, 28]}
 					]
 				},
 				{
 					"name": "eyelid_happy_left",
 					"parent": "eyes",
-					"pivot": [3.41, 13.55, -3.05],
+					"pivot": [3.41, 13.55, -2.35],
 					"rotation": [-25, 0, 0],
 					"cubes": [
-						{"origin": [2.37, 12.5, -4.5], "size": [1, 1, 1], "inflate": 0.05, "uv": [45, 25]},
-						{"origin": [2.32, 12.55, -3.35], "size": [1, 2, 2], "inflate": 0.1, "uv": [44, 31]}
+						{"origin": [2.37, 12.5, -3.8], "size": [1, 1, 1], "inflate": 0.05, "uv": [60, 46]},
+						{"origin": [2.32, 12.55, -2.65], "size": [1, 2, 2], "inflate": 0.1, "uv": [39, 32]}
 					]
 				},
 				{
 					"name": "eyelid_happy_right",
 					"parent": "eyes",
-					"pivot": [-3.41, 13.55, -3.05],
+					"pivot": [-3.41, 13.55, -2.35],
 					"rotation": [-25, 0, 0],
 					"cubes": [
-						{"origin": [-3.37, 12.5, -4.5], "size": [1, 1, 1], "inflate": 0.05, "uv": [39, 25]},
-						{"origin": [-3.32, 12.55, -3.35], "size": [1, 2, 2], "inflate": 0.1, "uv": [38, 31]}
+						{"origin": [-3.37, 12.5, -3.8], "size": [1, 1, 1], "inflate": 0.05, "uv": [0, 30]},
+						{"origin": [-3.32, 12.55, -2.65], "size": [1, 2, 2], "inflate": 0.1, "uv": [36, 32]}
 					]
 				},
 				{
 					"name": "eyelid_hurt_left",
 					"parent": "eyes",
-					"pivot": [3.41, 13.55, -3.05],
+					"pivot": [3.41, 13.55, -2.35],
 					"rotation": [-25, 0, 0],
 					"cubes": [
-						{"origin": [2.37, 12.5, -4.5], "size": [1, 1, 1], "inflate": 0.05, "uv": [45, 25]},
-						{"origin": [2.32, 12.55, -3.35], "size": [1, 2, 2], "inflate": 0.1, "uv": [44, 35]}
+						{"origin": [2.37, 12.5, -3.8], "size": [1, 1, 1], "inflate": 0.05, "uv": [0, 22]},
+						{"origin": [2.32, 12.55, -2.65], "size": [1, 2, 2], "inflate": 0.1, "uv": [39, 36]}
 					]
 				},
 				{
 					"name": "eyelid_hurt_right",
 					"parent": "eyes",
-					"pivot": [-3.41, 13.55, -3.05],
+					"pivot": [-3.41, 13.55, -2.35],
 					"rotation": [-25, 0, 0],
 					"cubes": [
-						{"origin": [-3.37, 12.5, -4.5], "size": [1, 1, 1], "inflate": 0.05, "uv": [39, 25]},
-						{"origin": [-3.32, 12.55, -3.35], "size": [1, 2, 2], "inflate": 0.1, "uv": [38, 35]}
+						{"origin": [-3.37, 12.5, -3.8], "size": [1, 1, 1], "inflate": 0.05, "uv": [0, 30]},
+						{"origin": [-3.32, 12.55, -2.65], "size": [1, 2, 2], "inflate": 0.1, "uv": [36, 36]}
 					]
 				},
 				{
 					"name": "face_ditto",
 					"parent": "head",
-					"pivot": [0, 12.75, -4.65]
+					"pivot": [0, 12.75, -3.95]
 				},
 				{
 					"name": "eyes_ditto",
 					"parent": "face_ditto",
-					"pivot": [0, 13.5, -4.67],
+					"pivot": [0, 13.5, -3.97],
 					"cubes": [
-						{"origin": [-3, 13, -4.67], "size": [6, 1, 0], "uv": [51, 27]}
+						{"origin": [-3, 13, -3.97], "size": [6, 1, 0], "uv": [36, 20]}
 					]
 				},
 				{
 					"name": "eyes_blink_ditto",
 					"parent": "face_ditto",
-					"pivot": [0, 13.5, -4.57],
+					"pivot": [0, 13.5, -3.87],
 					"cubes": [
-						{"origin": [-3.5, 13, -4.57], "size": [7, 1, 0], "uv": [50, 28]},
-						{"origin": [-3, 13.5, -4.58], "size": [6, 1, 0], "uv": [51, 29]}
+						{"origin": [-3.5, 13, -3.87], "size": [7, 1, 0], "uv": [35, 21]},
+						{"origin": [-3, 13.5, -3.88], "size": [6, 1, 0], "uv": [46, 30]}
 					]
 				},
 				{
 					"name": "mouth_ditto",
 					"parent": "face_ditto",
-					"pivot": [0, 11.75, -4.65],
+					"pivot": [0, 11.75, -3.95],
 					"cubes": [
-						{"origin": [-2.5, 11, -4.66], "size": [5, 1, 0], "uv": [52, 31]},
-						{"origin": [-3.5, 11.5, -4.66], "size": [7, 1, 0], "uv": [50, 30]}
+						{"origin": [-2.5, 11, -3.96], "size": [5, 1, 0], "uv": [47, 32]},
+						{"origin": [-3.5, 11.5, -3.96], "size": [7, 1, 0], "uv": [45, 31]}
 					]
 				},
 				{
 					"name": "mouth_open_ditto",
 					"parent": "face_ditto",
-					"pivot": [0, 11.5, -4.56],
+					"pivot": [0, 11.5, -3.86],
 					"cubes": [
-						{"origin": [-3.5, 10.5, -4.56], "size": [7, 2, 0], "uv": [50, 32]}
+						{"origin": [-3.5, 10.5, -3.86], "size": [7, 2, 0], "uv": [45, 33]}
 					]
 				},
 				{
@@ -280,7 +287,7 @@
 					"pivot": [2.25, 15, 0.75],
 					"rotation": [0, -20, 35],
 					"cubes": [
-						{"origin": [1, 15.25, 0.75], "size": [3, 4, 0], "pivot": [0, 15.25, 0.75], "rotation": [0, 0, 10], "uv": [57, 35]}
+						{"origin": [1, 15.25, 0.75], "size": [3, 4, 0], "pivot": [0, 15.25, 0.75], "rotation": [0, 0, 10], "uv": [52, 36]}
 					]
 				},
 				{
@@ -289,87 +296,94 @@
 					"pivot": [-2.25, 15, 0.75],
 					"rotation": [0, 20, -35],
 					"cubes": [
-						{"origin": [-4, 15.25, 0.75], "size": [3, 4, 0], "pivot": [0, 15.25, 0.75], "rotation": [0, 0, -10], "uv": [50, 35]}
+						{"origin": [-4, 15.25, 0.75], "size": [3, 4, 0], "pivot": [0, 15.25, 0.75], "rotation": [0, 0, -10], "uv": [45, 36]}
 					]
 				},
 				{
 					"name": "arms",
 					"parent": "torso",
-					"pivot": [0, 9, -1.25]
+					"pivot": [0, 9, -0.75]
 				},
 				{
 					"name": "arm_right",
 					"parent": "arms",
-					"pivot": [-4, 9, -1.25],
+					"pivot": [-4, 9, -0.75],
 					"cubes": [
-						{"origin": [-7, 7.5, -2.75], "size": [3, 3, 3], "inflate": 0.01, "uv": [24, 0]}
+						{"origin": [-7, 7.5, -2.25], "size": [3, 3, 3], "inflate": 0.01, "uv": [26, 0]}
 					]
 				},
 				{
 					"name": "arm_right2",
 					"parent": "arm_right",
-					"pivot": [-7, 10.5, 0.25],
+					"pivot": [-7, 10.5, 0.75],
 					"cubes": [
-						{"origin": [-10, 7.5, -2.75], "size": [3, 3, 3], "uv": [32, 6]},
-						{"origin": [-11, 8.75, -2.75], "size": [1, 0, 1], "pivot": [-10, 8.75, -2.25], "rotation": [15, 0, -15], "uv": [35, 13]},
-						{"origin": [-11.25, 9.75, -1.75], "size": [2, 0, 1], "pivot": [-10, 9.75, -1.25], "rotation": [0, 0, -10], "uv": [33, 15]},
-						{"origin": [-11, 8.75, -0.75], "size": [1, 0, 1], "pivot": [-10, 8.75, -0.25], "rotation": [-15, 0, -15], "uv": [33, 13]}
+						{"origin": [-10, 7.5, -2.25], "size": [3, 3, 3], "uv": [34, 6]},
+						{"origin": [-11, 8.75, -2.25], "size": [1, 0, 1], "pivot": [-10, 8.75, -1.75], "rotation": [15, 0, -15], "uv": [35, 12]},
+						{"origin": [-11.25, 9.75, -1.25], "size": [2, 0, 1], "pivot": [-10, 9.75, -0.75], "rotation": [0, 0, -10], "uv": [33, 14]},
+						{"origin": [-11, 8.75, -0.25], "size": [1, 0, 1], "pivot": [-10, 8.75, 0.25], "rotation": [-15, 0, -15], "uv": [33, 12]}
 					]
 				},
 				{
 					"name": "locator_item",
 					"parent": "arm_right2",
-					"pivot": [-10, 9, -1.25],
+					"pivot": [-10, 9, -0.75],
 					"locators": {
-						"item": [-10, 9, -1.25]
+						"item": [-10, 9, -0.75]
+					}
+				},
+				{
+					"name": "locator_physical",
+					"parent": "arm_right2",
+					"pivot": [-9, 9, -0.75],
+					"locators": {
+						"physical": [-9, 9, -0.75]
 					}
 				},
 				{
 					"name": "locator_hand_primary",
 					"parent": "arm_right2",
-					"pivot": [-9, 9, -1.25],
+					"pivot": [-9, 9, -0.75],
 					"rotation": [0, 90, 0],
 					"locators": {
-						"hand_primary": [-9, 9, -1.25],
-						"physical": [-9, 9, -1.25]
+						"hand_primary": [-9, 9, -0.75]
 					}
 				},
 				{
 					"name": "arm_left",
 					"parent": "arms",
-					"pivot": [4, 9, -1.25],
+					"pivot": [4, 9, -0.75],
 					"cubes": [
-						{"origin": [4, 7.5, -2.75], "size": [3, 3, 3], "inflate": 0.01, "uv": [36, 0]}
+						{"origin": [4, 7.5, -2.25], "size": [3, 3, 3], "inflate": 0.01, "uv": [38, 0]}
 					]
 				},
 				{
 					"name": "arm_left2",
 					"parent": "arm_left",
-					"pivot": [7, 10.5, 0.25],
+					"pivot": [7, 10.5, 0.75],
 					"cubes": [
-						{"origin": [7, 7.5, -2.75], "size": [3, 3, 3], "uv": [44, 6]},
-						{"origin": [10, 8.75, -2.75], "size": [1, 0, 1], "pivot": [10, 8.75, -2.25], "rotation": [15, 0, 15], "uv": [35, 14]},
-						{"origin": [9.25, 9.75, -1.75], "size": [2, 0, 1], "pivot": [10, 9.75, -1.25], "rotation": [0, 0, 15], "uv": [33, 16]},
-						{"origin": [10, 8.75, -0.75], "size": [1, 0, 1], "pivot": [10, 8.75, -0.25], "rotation": [-15, 0, 15], "uv": [33, 14]}
+						{"origin": [7, 7.5, -2.25], "size": [3, 3, 3], "uv": [52, 0]},
+						{"origin": [10, 8.75, -2.25], "size": [1, 0, 1], "pivot": [10, 8.75, -1.75], "rotation": [15, 0, 15], "uv": [35, 13]},
+						{"origin": [9.25, 9.75, -1.25], "size": [2, 0, 1], "pivot": [10, 9.75, -0.75], "rotation": [0, 0, 15], "uv": [33, 15]},
+						{"origin": [10, 8.75, -0.25], "size": [1, 0, 1], "pivot": [10, 8.75, 0.25], "rotation": [-15, 0, 15], "uv": [33, 13]}
 					]
 				},
 				{
 					"name": "locator_hand_secondary",
 					"parent": "arm_left2",
-					"pivot": [9, 9, -1.25],
+					"pivot": [9, 9, -0.75],
 					"rotation": [0, -90, 0],
 					"locators": {
-						"hand_secondary": [9, 9, -1.25]
+						"hand_secondary": [9, 9, -0.75]
 					}
 				},
 				{
 					"name": "tail",
 					"parent": "torso",
-					"pivot": [0, 4, 4.25],
+					"pivot": [0, 4, 3.25],
 					"cubes": [
-						{"origin": [-2, 2, 4.25], "size": [4, 4, 4], "uv": [48, 12]},
-						{"origin": [-0.5, 2, 8.25], "size": [1, 4, 0], "inflate": 0.01, "uv": [31, 45]},
-						{"origin": [-2, 2.5, 8.25], "size": [4, 1, 0], "inflate": 0.01, "uv": [25, 50]}
+						{"origin": [-2, 2, 3.75], "size": [4, 4, 5], "uv": [16, 41]},
+						{"origin": [-0.5, 2, 8.75], "size": [1, 4, 0], "inflate": 0.01, "uv": [62, 48]},
+						{"origin": [-2, 2.5, 8.75], "size": [4, 1, 0], "inflate": 0.01, "uv": [56, 42]}
 					]
 				},
 				{
@@ -377,33 +391,33 @@
 					"parent": "tail",
 					"pivot": [0, 4, 8.25],
 					"cubes": [
-						{"origin": [-1.5, 2.5, 7.25], "size": [3, 3, 4], "uv": [50, 20]}
+						{"origin": [-1.5, 2.5, 8.15], "size": [3, 3, 4], "uv": [50, 23]}
 					]
 				},
 				{
 					"name": "locator_tail",
 					"parent": "tail2",
-					"pivot": [0, 4, 7.75],
+					"pivot": [0, 4, 8.25],
 					"rotation": [0, 180, 0],
 					"locators": {
-						"tail": [0, 4, 7.75]
+						"tail": [0, 4, 8.25]
 					}
 				},
 				{
 					"name": "tail3",
 					"parent": "tail2",
-					"pivot": [0, 4, 11.25],
+					"pivot": [0, 4, 11.75],
 					"cubes": [
-						{"origin": [-1, 3, 10.25], "size": [2, 2, 3], "uv": [54, 3]}
+						{"origin": [-1, 3, 10.75], "size": [2, 2, 4], "uv": [38, 14]}
 					]
 				},
 				{
 					"name": "locator_tail_tip",
 					"parent": "tail3",
-					"pivot": [0, 4, 13.25],
+					"pivot": [0, 4, 13.75],
 					"rotation": [0, 180, 0],
 					"locators": {
-						"tail_tip": [0, 4, 13.25]
+						"tail_tip": [0, 4, 13.75]
 					}
 				},
 				{
@@ -416,17 +430,24 @@
 					"parent": "legs",
 					"pivot": [3.75, 5, 0.25],
 					"cubes": [
-						{"origin": [2, 1.5, -2.25], "size": [4, 5, 5], "uv": [18, 30]},
-						{"origin": [2, 2, -2.25], "size": [4, 4, 5], "inflate": 0.01, "uv": [0, 55]},
-						{"origin": [3, 0.5, -1], "size": [2, 1, 3], "uv": [28, 26]}
+						{"origin": [2, 1.5, -2.25], "size": [4, 5, 5], "uv": [46, 6]},
+						{"origin": [2, 2, -2.25], "size": [4, 4, 5], "inflate": 0.01, "uv": [0, 55]}
+					]
+				},
+				{
+					"name": "leg_left2",
+					"parent": "leg_left",
+					"pivot": [4, 1.6, -1],
+					"cubes": [
+						{"origin": [3, 0.5, -1], "size": [2, 1, 3], "uv": [54, 16]}
 					]
 				},
 				{
 					"name": "foot_left",
-					"parent": "leg_left",
+					"parent": "leg_left2",
 					"pivot": [3.75, 1, 0.75],
 					"cubes": [
-						{"origin": [2.5, 0, -1.75], "size": [3, 1, 4], "uv": [14, 40]}
+						{"origin": [2.5, 0, -1.75], "size": [3, 1, 4], "uv": [39, 22]}
 					]
 				},
 				{
@@ -443,8 +464,8 @@
 					"parent": "foot_left",
 					"pivot": [4, 0.45, -1.75],
 					"cubes": [
-						{"origin": [3, 0.25, -4], "size": [1, 0, 3], "pivot": [3, 0.25, -1.25], "rotation": [5, 0, -25], "uv": [37, 16]},
-						{"origin": [4, 0.25, -4], "size": [1, 0, 3], "pivot": [5, 0.25, -1.25], "rotation": [5, 0, 25], "uv": [35, 16]}
+						{"origin": [3, 0.25, -4], "size": [1, 0, 3], "pivot": [3, 0.25, -1.25], "rotation": [5, 0, -25], "uv": [37, 15]},
+						{"origin": [4, 0.25, -4], "size": [1, 0, 3], "pivot": [5, 0.25, -1.25], "rotation": [5, 0, 25], "uv": [35, 15]}
 					]
 				},
 				{
@@ -452,17 +473,24 @@
 					"parent": "legs",
 					"pivot": [-3.75, 5, 0.25],
 					"cubes": [
-						{"origin": [-6, 1.5, -2.25], "size": [4, 5, 5], "uv": [0, 30]},
-						{"origin": [-6, 2, -2.25], "size": [4, 4, 5], "inflate": 0.01, "uv": [0, 46], "mirror": true},
+						{"origin": [-6, 1.5, -2.25], "size": [4, 5, 5], "uv": [0, 31]},
+						{"origin": [-6, 2, -2.25], "size": [4, 4, 5], "inflate": 0.01, "uv": [0, 46], "mirror": true}
+					]
+				},
+				{
+					"name": "leg_right2",
+					"parent": "leg_right",
+					"pivot": [-4, 1.6, -1],
+					"cubes": [
 						{"origin": [-5, 0.5, -1], "size": [2, 1, 3], "uv": [13, 31]}
 					]
 				},
 				{
 					"name": "foot_right",
-					"parent": "leg_right",
+					"parent": "leg_right2",
 					"pivot": [-3.75, 1, 0.75],
 					"cubes": [
-						{"origin": [-5.5, 0, -1.75], "size": [3, 1, 4], "uv": [0, 40]}
+						{"origin": [-5.5, 0, -1.75], "size": [3, 1, 4], "uv": [0, 41]}
 					]
 				},
 				{
@@ -479,16 +507,8 @@
 					"parent": "foot_right",
 					"pivot": [-4, 0.45, -1.75],
 					"cubes": [
-						{"origin": [-4, 0.25, -4], "size": [1, 0, 3], "pivot": [-3, 0.25, -1.25], "rotation": [5, 0, 25], "uv": [37, 13]},
-						{"origin": [-5, 0.25, -4], "size": [1, 0, 3], "pivot": [-5, 0.25, -1.25], "rotation": [5, 0, -25], "uv": [35, 13]}
-					]
-				},
-				{
-					"name": "ball",
-					"parent": "sandshrew",
-					"pivot": [0, 6, 0],
-					"cubes": [
-						{"origin": [-4.5, 0, -6], "size": [9, 12, 12], "uv": [22, 40]}
+						{"origin": [-4, 0.25, -4], "size": [1, 0, 3], "pivot": [-3, 0.25, -1.25], "rotation": [5, 0, 25], "uv": [37, 12]},
+						{"origin": [-5, 0.25, -4], "size": [1, 0, 3], "pivot": [-5, 0.25, -1.25], "rotation": [5, 0, -25], "uv": [35, 12]}
 					]
 				}
 			]

common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0029_nidoranf/nidoranf.geo.json

@@ -111,6 +111,14 @@
 						{"origin": [2.9, 8.75, -7.65], "size": [0, 2, 3], "inflate": 0.03, "uv": [0, 2]}
 					]
 				},
+				{
+					"name": "eyelid_hurt_left",
+					"parent": "eyes",
+					"pivot": [2.9, 9.75, -6.15],
+					"cubes": [
+						{"origin": [2.9, 8.75, -7.65], "size": [0, 2, 3], "inflate": 0.03, "uv": [0, 41]}
+					]
+				},
 				{
 					"name": "eyelid_right",
 					"parent": "eyes",
@@ -119,6 +127,14 @@
 						{"origin": [-2.9, 8.75, -7.65], "size": [0, 2, 3], "inflate": 0.03, "uv": [0, 0]}
 					]
 				},
+				{
+					"name": "eyelid_hurt_right",
+					"parent": "eyes",
+					"pivot": [-2.9, 9.75, -6.15],
+					"cubes": [
+						{"origin": [-2.9, 8.75, -7.65], "size": [0, 2, 3], "inflate": 0.03, "uv": [0, 44]}
+					]
+				},
 				{
 					"name": "eye_right",
 					"parent": "eyes",

common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0030_nidorina/nidorina.geo.json

@@ -21,8 +21,13 @@
 					"pivot": [0, 0, 0]
 				},
 				{
-					"name": "torso",
+					"name": "hips",
 					"parent": "body",
+					"pivot": [0, 6, 3]
+				},
+				{
+					"name": "torso",
+					"parent": "hips",
 					"pivot": [0, 6, 3],
 					"cubes": [
 						{"origin": [-4, 3, 0], "size": [8, 7, 6], "inflate": 0.01, "uv": [0, 0]},
@@ -31,7 +36,7 @@
 					]
 				},
 				{
-					"name": "upper_torso",
+					"name": "torso2",
 					"parent": "torso",
 					"pivot": [0, 9.5, 0],
 					"cubes": [
@@ -40,7 +45,7 @@
 				},
 				{
 					"name": "neck",
-					"parent": "upper_torso",
+					"parent": "torso2",
 					"pivot": [0, 9.5, -3.5],
 					"cubes": [
 						{"origin": [-3, 4.5, -5.5], "size": [6, 5, 2], "inflate": -0.01, "uv": [0, 39]}
@@ -177,6 +182,14 @@
 						{"origin": [2.9, 6.5, -10], "size": [0, 2, 3], "inflate": 0.03, "uv": [0, 44]}
 					]
 				},
+				{
+					"name": "left_eyelid_hurt",
+					"parent": "eyes",
+					"pivot": [2.9, 7.5, -8.5],
+					"cubes": [
+						{"origin": [2.9, 6.5, -10], "size": [0, 2, 3], "inflate": 0.03, "uv": [0, 49]}
+					]
+				},
 				{
 					"name": "right_eye",
 					"parent": "eyes",
@@ -202,6 +215,14 @@
 						{"origin": [-2.9, 6.5, -10], "size": [0, 2, 3], "inflate": 0.03, "uv": [0, 46], "mirror": true}
 					]
 				},
+				{
+					"name": "right_eyelid_hurt",
+					"parent": "eyes",
+					"pivot": [-2.9, 7.5, -8.5],
+					"cubes": [
+						{"origin": [-2.9, 6.5, -10], "size": [0, 2, 3], "inflate": 0.03, "uv": [0, 52], "mirror": true}
+					]
+				},
 				{
 					"name": "tail_1",
 					"parent": "torso",
@@ -237,18 +258,18 @@
 					}
 				},
 				{
-					"name": "arms_torso",
-					"parent": "body",
-					"pivot": [0, 6, 3]
-				},
-				{
-					"name": "arms_upper_torso",
-					"parent": "arms_torso",
+					"name": "ftorso2",
+					"parent": "hips",
 					"pivot": [0, 9.5, 0]
 				},
+				{
+					"name": "arms",
+					"parent": "ftorso2",
+					"pivot": [0, 4.25, -1.5]
+				},
 				{
 					"name": "left_upper_arm",
-					"parent": "arms_upper_torso",
+					"parent": "arms",
 					"pivot": [3.5, 4.5, -1.5],
 					"cubes": [
 						{"origin": [2.5, 3.5, -3], "size": [2, 2, 3], "inflate": 0.01, "uv": [42, 26]}
@@ -307,7 +328,7 @@
 				},
 				{
 					"name": "right_upper_arm",
-					"parent": "arms_upper_torso",
+					"parent": "arms",
 					"pivot": [-3.5, 4.5, -1.5],
 					"cubes": [
 						{"origin": [-4.5, 3.5, -3], "size": [2, 2, 3], "inflate": 0.01, "uv": [54, 0]}
@@ -374,43 +395,13 @@
 					}
 				},
 				{
-					"name": "left_leg",
+					"name": "legs",
 					"parent": "body",
-					"pivot": [3.5, 4.5, 3.5],
-					"cubes": [
-						{"origin": [2, 2, 1.5], "size": [3, 4, 4], "inflate": 0.01, "uv": [50, 5]}
-					]
-				},
-				{
-					"name": "left_foot",
-					"parent": "left_leg",
-					"pivot": [3.5, 2, 2],
-					"cubes": [
-						{"origin": [2, 0, 2], "size": [3, 2, 3], "uv": [16, 41]}
-					]
-				},
-				{
-					"name": "locator_foot_secondary",
-					"parent": "left_foot",
-					"pivot": [3.5, 1, 3.5],
-					"rotation": [90, 0, 0],
-					"locators": {
-						"foot_secondary": [3.5, 1, 3.5]
-					}
-				},
-				{
-					"name": "left_foot_claws",
-					"parent": "left_foot",
-					"pivot": [3.5, 1, 2.25],
-					"cubes": [
-						{"origin": [3.5, 0, 0.5], "size": [0, 1, 2], "uv": [0, 3]},
-						{"origin": [4.5, 0, 1], "size": [0, 1, 1], "pivot": [4.5, 0.5, 2], "rotation": [0, -10, 0], "uv": [0, 15]},
-						{"origin": [2.5, 0, 1], "size": [0, 1, 1], "pivot": [2.5, 0.5, 2], "rotation": [0, 10, 0], "uv": [2, 14]}
-					]
+					"pivot": [0, 4, 3.5]
 				},
 				{
 					"name": "right_leg",
-					"parent": "body",
+					"parent": "legs",
 					"pivot": [-3.5, 4.5, 3.5],
 					"cubes": [
 						{"origin": [-5, 2, 1.5], "size": [3, 4, 4], "inflate": 0.01, "uv": [28, 0]}
@@ -443,6 +434,41 @@
 						{"origin": [-2.5, 0, 1], "size": [0, 1, 1], "pivot": [-2.5, 0.5, 2], "rotation": [0, -10, 0], "uv": [4, 0]}
 					]
 				},
+				{
+					"name": "left_leg",
+					"parent": "legs",
+					"pivot": [3.5, 4.5, 3.5],
+					"cubes": [
+						{"origin": [2, 2, 1.5], "size": [3, 4, 4], "inflate": 0.01, "uv": [50, 5]}
+					]
+				},
+				{
+					"name": "left_foot",
+					"parent": "left_leg",
+					"pivot": [3.5, 2, 2],
+					"cubes": [
+						{"origin": [2, 0, 2], "size": [3, 2, 3], "uv": [16, 41]}
+					]
+				},
+				{
+					"name": "locator_foot_secondary",
+					"parent": "left_foot",
+					"pivot": [3.5, 1, 3.5],
+					"rotation": [90, 0, 0],
+					"locators": {
+						"foot_secondary": [3.5, 1, 3.5]
+					}
+				},
+				{
+					"name": "left_foot_claws",
+					"parent": "left_foot",
+					"pivot": [3.5, 1, 2.25],
+					"cubes": [
+						{"origin": [3.5, 0, 0.5], "size": [0, 1, 2], "uv": [0, 3]},
+						{"origin": [4.5, 0, 1], "size": [0, 1, 1], "pivot": [4.5, 0.5, 2], "rotation": [0, -10, 0], "uv": [0, 15]},
+						{"origin": [2.5, 0, 1], "size": [0, 1, 1], "pivot": [2.5, 0.5, 2], "rotation": [0, 10, 0], "uv": [2, 14]}
+					]
+				},
 				{
 					"name": "locator_target",
 					"parent": "body",

common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0032_nidoranm/nidoranm.geo.json

@@ -102,6 +102,22 @@
 						"eye2": [3, 6.5, -8.05]
 					}
 				},
+				{
+					"name": "eye_right",
+					"parent": "eyes",
+					"pivot": [-3, 7, -7],
+					"cubes": [
+						{"origin": [-3, 6, -8.5], "size": [0, 2, 3], "inflate": 0.01, "uv": [22, 13]}
+					]
+				},
+				{
+					"name": "locator_eye_right",
+					"parent": "eye_right",
+					"pivot": [-3, 6.5, -8.05],
+					"locators": {
+						"eye3": [-3, 6.5, -8.05]
+					}
+				},
 				{
 					"name": "eyelid_left",
 					"parent": "eyes",
@@ -119,20 +135,36 @@
 					]
 				},
 				{
-					"name": "eye_right",
+					"name": "eyelid_happy_left",
 					"parent": "eyes",
-					"pivot": [-3, 7, -7],
+					"pivot": [3.9, 7, -7],
 					"cubes": [
-						{"origin": [-3, 6, -8.5], "size": [0, 2, 3], "inflate": 0.01, "uv": [22, 13]}
+						{"origin": [2.9, 6, -8.5], "size": [0, 2, 3], "inflate": 0.02, "uv": [0, 48]}
 					]
 				},
 				{
-					"name": "locator_eye_right",
-					"parent": "eye_right",
-					"pivot": [-3, 6.5, -8.05],
-					"locators": {
-						"eye1": [-3, 6.5, -8.05]
-					}
+					"name": "eyelid_happy_right",
+					"parent": "eyes",
+					"pivot": [-3.9, 7, -7],
+					"cubes": [
+						{"origin": [-2.9, 6, -8.5], "size": [0, 2, 3], "inflate": 0.02, "uv": [0, 51]}
+					]
+				},
+				{
+					"name": "eyelid_hurt_left",
+					"parent": "eyes",
+					"pivot": [3.9, 7, -7],
+					"cubes": [
+						{"origin": [2.9, 6, -8.5], "size": [0, 2, 3], "inflate": 0.02, "uv": [0, 54]}
+					]
+				},
+				{
+					"name": "eyelid_hurt_right",
+					"parent": "eyes",
+					"pivot": [-3.9, 7, -7],
+					"cubes": [
+						{"origin": [-2.9, 6, -8.5], "size": [0, 2, 3], "inflate": 0.02, "uv": [0, 57]}
+					]
 				},
 				{
 					"name": "ear_left",

common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0075_graveler/graveler_alolan.geo.json

@@ -195,6 +195,14 @@
 						{"origin": [-2.5, 10, -7], "size": [1, 2, 0], "inflate": 0.02, "uv": [20, 68]}
 					]
 				},
+				{
+					"name": "locator_eye_right",
+					"parent": "pupil_right",
+					"pivot": [-2, 10.75, -7],
+					"locators": {
+						"eye_left2": [-2, 10.75, -7]
+					}
+				},
 				{
 					"name": "eyelid_right",
 					"parent": "eye_right",
@@ -220,6 +228,14 @@
 						{"origin": [1.5, 10, -7], "size": [1, 2, 0], "inflate": 0.02, "uv": [20, 70]}
 					]
 				},
+				{
+					"name": "locator_eye_left",
+					"parent": "pupil_left",
+					"pivot": [2, 10.75, -7],
+					"locators": {
+						"eye_left": [2, 10.75, -7]
+					}
+				},
 				{
 					"name": "eyelid_left",
 					"parent": "eye_left",